在UOS上编译完成，顺便修改了几处在win下导致的不严谨

2020-09-09 18:06:00 +08:00
parent 3bba1e3000
commit d2df2efaeb
16 changed files with 114 additions and 48 deletions
@@ -222,13 +222,17 @@ void Cockpit::wheelEvent(QWheelEvent *e)

 void Cockpit::setPitch(double Pitch)
 {
-#ifdef __MINGW32__
+#ifdef unix

 #else
-        if(isnan(Pitch))
-        {
-            return;
-        }
+    #ifdef __MINGW32__
+
+    #else
+            if(isnan(Pitch))
+            {
+                return;
+            }
+    #endif
 #endif

        //if(Pitch > 360) Pitch = 360;
@@ -250,13 +254,17 @@ void Cockpit::setPitch(double Pitch)

 void Cockpit::setPitchTarget(double Pitch)
 {
-#ifdef __MINGW32__
+#ifdef unix

 #else
-        if(isnan(Pitch))
-        {
-            return;
-        }
+    #ifdef __MINGW32__
+
+    #else
+            if(isnan(Pitch))
+            {
+                return;
+            }
+    #endif
 #endif

        //if(Pitch > 360) Pitch = 360;
@@ -279,14 +287,17 @@ void Cockpit::setPitchTarget(double Pitch)

 void Cockpit::setRoll(double Roll)
 {
-#ifdef __MINGW32__
-
+#ifdef unix

 #else
-        if(isnan(Roll))
-        {
-            return;
-        }
+    #ifdef __MINGW32__
+
+    #else
+            if(isnan(Roll))
+            {
+                return;
+            }
+    #endif
 #endif
        //if(Roll > 360) Roll = 360;
        //else if(Roll < -360) Roll = -360;
@@ -307,14 +318,17 @@ void Cockpit::setRoll(double Roll)

 void Cockpit::setRollTarget(double Roll)
 {
-#ifdef __MINGW32__
-
+#ifdef unix

 #else
-        if(isnan(Roll))
-        {
-            return;
-        }
+    #ifdef __MINGW32__
+
+    #else
+            if(isnan(Roll))
+            {
+                return;
+            }
+    #endif
 #endif
        //if(Roll > 360) Roll = 360;
        //else if(Roll < -360) Roll = -360;
@@ -336,14 +350,18 @@ void Cockpit::setRollTarget(double Roll)

 void Cockpit::setYaw(double Yaw)
 {
-#ifdef __MINGW32__

+#ifdef unix

 #else
-    if(isnan(Yaw))
-    {
-        return;
-    }
+    #ifdef __MINGW32__
+
+    #else
+        if(isnan(Yaw))
+        {
+            return;
+        }
+    #endif
 #endif

    if(Yaw < 0) Yaw += 360;
@@ -359,14 +377,18 @@ void Cockpit::setYaw(double Yaw)

 void Cockpit::setYawTarget(double Yaw)
 {
-#ifdef __MINGW32__
-
+#ifdef unix

 #else
-    if(isnan(Yaw))
-    {
-        return;
-    }
+    #ifdef __MINGW32__
+
+
+    #else
+        if(isnan(Yaw))
+        {
+            return;
+        }
+    #endif
 #endif
    if(Yaw < 0) Yaw += 360;
    else if(Yaw > 360) Yaw -= 360;