Cleanup

BindableListView Class File Seperation
magicrub · Jun 26, 2020 · e8a191c · e8a191c
1 parent 0188f84
commit e8a191c
Show file tree

Hide file tree

Showing 10 changed files with 691 additions and 57 deletions.
diff --git a/ExtLibs/Controls/BindableListView.cs b/ExtLibs/Controls/BindableListView.cs
diff --git a/ExtLibs/Controls/ControlExt.cs b/ExtLibs/Controls/ControlExt.cs
@@ -1,39 +1,14 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Drawing;
 using System.Linq;
 using System.Text;
 using System.Windows.Forms;
+using System;
+using System.Drawing;
+using System.Windows.Forms;
 
 namespace MissionPlanner.Controls
 {
-    public static class SuspendUpdate
-    {
-        private const int WM_SETREDRAW = 0x000B;
-
-        public static void Suspend(Control control)
-        {
-            Message msgSuspendUpdate = Message.Create(control.Handle, WM_SETREDRAW, IntPtr.Zero,
-                IntPtr.Zero);
-
-            NativeWindow window = NativeWindow.FromHandle(control.Handle);
-            window.DefWndProc(ref msgSuspendUpdate);
-        }
-
-        public static void Resume(Control control)
-        {
-            // Create a C "true" boolean as an IntPtr
-            IntPtr wparam = new IntPtr(1);
-            Message msgResumeUpdate = Message.Create(control.Handle, WM_SETREDRAW, wparam,
-                IntPtr.Zero);
-
-            NativeWindow window = NativeWindow.FromHandle(control.Handle);
-            window.DefWndProc(ref msgResumeUpdate);
-
-            control.Invalidate();
-        }
-    }
-
     public static class ControlExt
     {
 

diff --git a/ExtLibs/Controls/SuspendUpdate.cs b/ExtLibs/Controls/SuspendUpdate.cs
@@ -0,0 +1,32 @@
+using System;
+using System.Windows.Forms;
+
+namespace MissionPlanner.Controls
+{
+    public static class SuspendUpdate
+    {
+        private const int WM_SETREDRAW = 0x000B;
+
+        public static void Suspend(Control control)
+        {
+            Message msgSuspendUpdate = Message.Create(control.Handle, WM_SETREDRAW, IntPtr.Zero,
+                IntPtr.Zero);
+
+            NativeWindow window = NativeWindow.FromHandle(control.Handle);
+            window.DefWndProc(ref msgSuspendUpdate);
+        }
+
+        public static void Resume(Control control)
+        {
+            // Create a C "true" boolean as an IntPtr
+            IntPtr wparam = new IntPtr(1);
+            Message msgResumeUpdate = Message.Create(control.Handle, WM_SETREDRAW, wparam,
+                IntPtr.Zero);
+
+            NativeWindow window = NativeWindow.FromHandle(control.Handle);
+            window.DefWndProc(ref msgResumeUpdate);
+
+            control.Invalidate();
+        }
+    }
+}
diff --git a/GCSViews/ConfigurationView/ConfigTradHeli4.cs b/GCSViews/ConfigurationView/ConfigTradHeli4.cs
@@ -183,12 +183,4 @@ public void Deactivate()
             tableLayoutPanel5.Controls.Clear();
         }
     }
-
-    public enum uitype  
-    {
-        Combo,
-        Num,
-        Check,
-        Mask
-    }
 }
diff --git a/GCSViews/ConfigurationView/ConfigUAVCAN.cs b/GCSViews/ConfigurationView/ConfigUAVCAN.cs
@@ -439,18 +439,4 @@ private void but_uavcanfilebrowser_Click(object sender, EventArgs e)
             new UAVCANFileUI(can, id).ShowUserControl();
         }
     }
-
-    public class UAVCANModel
-    {
-        public byte ID { get; set; }
-        public string Name { get; set; } = "?";
-        public string Mode { get; set; }
-        public string Health { get; set; }
-        public TimeSpan Uptime { get; set; }
-        public string HardwareVersion { get; set; }
-        public string SoftwareVersion { get; set; }
-        public ulong SoftwareCRC { get; set; }
-        public uavcan.uavcan_protocol_GetNodeInfo_res RawMsg { get; set; }
-        public string HardwareUID { get; set; }
-    }
 }
diff --git a/GCSViews/ConfigurationView/UAVCANModel.cs b/GCSViews/ConfigurationView/UAVCANModel.cs
@@ -0,0 +1,19 @@
+using System;
+using UAVCAN;
+
+namespace MissionPlanner.GCSViews.ConfigurationView
+{
+    public class UAVCANModel
+    {
+        public byte ID { get; set; }
+        public string Name { get; set; } = "?";
+        public string Mode { get; set; }
+        public string Health { get; set; }
+        public TimeSpan Uptime { get; set; }
+        public string HardwareVersion { get; set; }
+        public string SoftwareVersion { get; set; }
+        public ulong SoftwareCRC { get; set; }
+        public uavcan.uavcan_protocol_GetNodeInfo_res RawMsg { get; set; }
+        public string HardwareUID { get; set; }
+    }
+}
diff --git a/GCSViews/ConfigurationView/uitype.cs b/GCSViews/ConfigurationView/uitype.cs
@@ -0,0 +1,10 @@
+namespace MissionPlanner.GCSViews.ConfigurationView
+{
+    public enum uitype  
+    {
+        Combo,
+        Num,
+        Check,
+        Mask
+    }
+}
diff --git a/GCSViews/FlightData.cs b/GCSViews/FlightData.cs
@@ -2488,15 +2488,15 @@ private void goHereToolStripMenuItem_Click(object sender, EventArgs e)
                 return;
             }
 
-            if (MainV2.comPort.MAV.GuidedMode.z == 0)
+            if (MainV2.comPort.MAV.GuidedMode.z == 0f)
             {
                 flyToHereAltToolStripMenuItem_Click(null, null);
 
-                if (MainV2.comPort.MAV.GuidedMode.z == 0)
+                if (MainV2.comPort.MAV.GuidedMode.z == 0f)
                     return;
             }
 
-            if (MouseDownStart.Lat == 0 || MouseDownStart.Lng == 0)
+            if (MouseDownStart.Lat == 0.0 || MouseDownStart.Lng == 0.0)
             {
                 CustomMessageBox.Show(Strings.BadCoords, Strings.ERROR);
                 return;
@@ -3688,14 +3688,13 @@ private void pointCameraHereToolStripMenuItem_Click(object sender, EventArgs e)
                 "Enter Target Alt (Relative to home)", ref alt))
                 return;
 
-            float intalt = 0;
-            if (!float.TryParse(alt, out intalt))
+            if (!float.TryParse(alt, out var intalt))
             {
                 CustomMessageBox.Show("Bad Alt");
                 return;
             }
 
-            if (MouseDownStart.Lat == 0 || MouseDownStart.Lng == 0)
+            if (MouseDownStart.Lat == 0.0 || MouseDownStart.Lng == 0.0)
             {
                 CustomMessageBox.Show("Bad Lat/Long");
                 return;

diff --git a/MissionPlanner.csproj b/MissionPlanner.csproj
@@ -511,6 +511,8 @@
       <DependentUpon>ConfigUserDefined.cs</DependentUpon>
     </Compile>
     <Compile Include="GCSViews\ConfigurationView\DeviceInfo.cs" />
+    <Compile Include="GCSViews\ConfigurationView\UAVCANModel.cs" />
+    <Compile Include="GCSViews\ConfigurationView\uitype.cs" />
     <Compile Include="GlobalSuppressions.cs" />
     <Compile Include="Joystick\JoystickAxis.cs">
       <SubType>UserControl</SubType>

diff --git a/aot.sh b/aot.sh
@@ -7,3 +7,8 @@ for i in *.dll; do sudo mono --aot $i; done
 
 sudo mono --aot 'MissionPlanner.exe'
 
+
+#gdb --args mono --debug 'MissionPlanner.exe'
+
+#handle SIGXCPU SIG33 SIG35 SIG36 SIG37 SIG38 SIGPWR nostop noprint
+
-Original file line number
+Diff line change
@@ Expand Up / @@ -183,12 +183,4 @@ public void Deactivate() @@
                 tableLayoutPanel5.Controls.Clear();
             }
         }
-        public enum uitype
-        {
-            Combo,
-            Num,
-            Check,
-            Mask
-        }
     }
Original file line number	Diff line number	Diff line change
Expand Up		@@ -7,3 +7,8 @@ for i in *.dll; do sudo mono --aot $i; done

		sudo mono --aot 'MissionPlanner.exe'


		#gdb --args mono --debug 'MissionPlanner.exe'

		#handle SIGXCPU SIG33 SIG35 SIG36 SIG37 SIG38 SIGPWR nostop noprint