1 files changed, 42 insertions, 43 deletions
diff --git a/GUIModel/Meter/SpeedGuage.qml b/GUIModel/Meter/SpeedGuage.qml
index 6667cad..c268f61 100644
--- a/GUIModel/Meter/SpeedGuage.qml
+++ b/GUIModel/Meter/SpeedGuage.qml
@@ -15,15 +15,15 @@
  */
 
 import QtQuick 2.14
-import QtGraphicalEffects 1.14
 import QtQuick.Shapes 1.14
+import "qrc:/MeterEffect/"
 
 Item {
     id: speedGuage
-    x:666
-    y:97
-    width:588
-    height:588
+    x: 666
+    y: 97
+    width: 588
+    height: 588
     property real speedValue
 
     readonly property real speedGuageMax: 100
@@ -31,85 +31,84 @@ Item {
 
     onSpeedValueChanged: {
         limitSpeedValue();
-        effectPwr.angle = (2.25 * speedValue*Math.PI/180)+effectPwr.angleBase
+        effectPwr.angle = (2.25 * speedValue * Math.PI / 180) + effectPwr.angleBase;
     }
 
-    Connections{
+    Connections {
         target: rootItem
-        onTransNormalToAdas:{
-            normalToAdasAnimation.start()
+        onTransNormalToAdas: {
+            normalToAdasAnimation.start();
         }
     }
 
-    function limitSpeedValue(){
-        if(speedGuageMax < speedValue){
-            speedValue = speedGuageMax
-        }else if(speedValue < speedGuageMin){
-            speedValue = speedGuageMin
+    function limitSpeedValue() {
+        if (speedGuageMax < speedValue) {
+            speedValue = speedGuageMax;
+        } else if (speedValue < speedGuageMin) {
+            speedValue = speedGuageMin;
         }
     }
 
     /* Guage - visible in Normal mode */
     Item {
-        id:pwrGuageGroup
-        width:588
-        height:588
-        
-        Image{
-            id:pwrGuage
+        id: pwrGuageGroup
+        width: 588
+        height: 588
+
+        Image {
+            id: pwrGuage
             source: "qrc:/Images/NormalView/METER/pwr_guage.png"
-            width:588
-            height:588
+            width: 588
+            height: 588
 
             anchors.horizontalCenter: parent.horizontalCenter
             anchors.verticalCenter: parent.verticalCenter
             opacity: 1
             visible: false
         }
-        ShaderEffect{
+        ShaderEffect {
             id: effectPwr
             anchors.fill: parent
             visible: true
             blending: true
             supportsAtlasTextures: true
-            property real angleBase: -pi*1/2
-            property real angle:-pi*1/2
-            property var src: ShaderEffectSource{
+            property real angleBase: -pi * 1 / 2
+            property real angle: -pi * 1 / 2
+            property var src: ShaderEffectSource {
                 sourceItem: pwrGuage
                 live: false
             }
 
             readonly property real pi: 3.1415926535
 
-            vertexShader: "qrc:/Shaders/vert/guageMask.vert"
-            fragmentShader:"qrc:/Shaders/frag/guageMask.frag"
+            vertexShader: ShaderPath.guageMaskVert
+            fragmentShader: ShaderPath.guageMaskFrag
         }
     }
-    
-    
-    Image{
-        id:ringLine
+
+    Image {
+        id: ringLine
         source: "qrc:/Images/NormalView/METER/ring_line.ktx"
-        width:588
-        height:588
+        width: 588
+        height: 588
         anchors.horizontalCenter: parent.horizontalCenter
         anchors.verticalCenter: parent.verticalCenter
     }
-    
-    Image{
-        id:speedTxt
+
+    Image {
+        id: speedTxt
         source: "qrc:/Images/NormalView/SPEED/speed_txt.png"
-        width:588
-        height:588
+        width: 588
+        height: 588
         anchors.horizontalCenter: parent.horizontalCenter
         anchors.verticalCenter: parent.verticalCenter
     }
-    
-    Image{
-        id:ring5
+
+    Image {
+        id: ring5
         source: "qrc:/Images/NormalView/METER/ring5.png"
         width: 34
-        height:24
+        height: 24
         anchors.left: parent.left
         anchors.leftMargin: -11
         anchors.verticalCenter: parent.verticalCenter