fix errors

selenur · Jan 24, 2017 · c992212 · c992212
1 parent 4e80d2c
commit c992212
Show file tree

Hide file tree

Showing 23 changed files with 974 additions and 141 deletions.
diff --git a/App.config b/App.config
@@ -49,6 +49,15 @@
             <setting name="Setting" serializeAs="String">
                 <value>0</value>
             </setting>
+            <setting name="ColorBack" serializeAs="String">
+                <value>Silver</value>
+            </setting>
+            <setting name="ColorTraectory" serializeAs="String">
+                <value>Blue</value>
+            </setting>
+            <setting name="ColorGrid" serializeAs="String">
+                <value>Purple</value>
+            </setting>
         </ToolsGenGkode.Properties.Settings>
     </userSettings>
 </configuration>
diff --git a/DataProcessing.cs b/DataProcessing.cs
diff --git a/Preview_Image.cs b/Preview_Image.cs
@@ -271,7 +271,8 @@ public void SetImage(Bitmap bmp)
                 return;
             }
 
-            pictureBoxPreview.Image = DrawAxes(bmp);
+            //pictureBoxPreview.Image = DrawAxes(bmp);
+            pictureBoxPreview.Image = bmp;
             containsData = true;
         }
     }

diff --git a/Preview_Vectors.Designer.cs b/Preview_Vectors.Designer.cs
diff --git a/Preview_Vectors.cs b/Preview_Vectors.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Drawing;
 using System.Windows.Forms;
 using SharpGL;
 using SharpGL.Enumerations;
@@ -15,6 +16,10 @@ public partial class Preview_Vectors : UserControl
     {
         public bool containsData;
 
+        public FColor Color_3DBack;
+        public FColor Color_3DContur;
+        public FColor Color_Grid;
+
         List<GroupPoint> DrawVectors = new List<GroupPoint>();
 
         public void SetNewData(List<GroupPoint> _DrawVectors)
@@ -40,6 +45,25 @@ public void SetNewData(List<cncPoint> _DrawPoints)
         public Preview_Vectors()
         {
             InitializeComponent();
+
+            try
+            {
+                Color_3DBack = new FColor(Properties.Settings.Default.ColorBack);
+                Color_3DContur = new FColor(Properties.Settings.Default.ColorTraectory);
+                Color_Grid = new FColor(Properties.Settings.Default.ColorGrid);
+            }
+            catch (Exception)
+            {
+
+                Color_3DBack = new FColor(120, 120, 120);
+                Color_3DContur = new FColor(0, 255, 0);
+                Color_Grid = new FColor(100, 0, 204);
+            }
+            //
+            //
+            //
+
+
         }
 
         private void openGLControl1_OpenGLDraw(object sender, RenderEventArgs args)
@@ -74,8 +98,14 @@ private void openGLControl1_OpenGLDraw(object sender, RenderEventArgs args)
 
             OpenGL gl = openGLControl1.OpenGL;
 
+
+
+
             gl.Clear(OpenGL.GL_COLOR_BUFFER_BIT | OpenGL.GL_DEPTH_BUFFER_BIT); // очистка буфера цвета и буфера глубины 
-            gl.ClearColor(0.5f, 0.5f, 0.5f, 1);
+
+
+            //gl.ClearColor(0.5f, 0.5f, 0.5f, 1);
+            gl.ClearColor(Color_3DBack.R, Color_3DBack.G, Color_3DBack.B, 1);
             //gl.ClearColor(0.7f, 0.7f, 0.7f, 1);
 
             gl.LoadIdentity();                                         // очищение текущей матрицы
@@ -190,7 +220,11 @@ private void openGLControl1_OpenGLDraw(object sender, RenderEventArgs args)
             if (DrawVectors.Count > 0)
             {
                 gl.LineWidth(0.1f);
-                gl.Color(CalcColor(100), 0F, CalcColor(204)); //(1.0f/255)*color
+
+
+
+                gl.Color(Color_Grid.R, Color_Grid.G, Color_Grid.B); //(1.0f/255)*color
+                //gl.Color(CalcColor(100), 0F, CalcColor(204)); //(1.0f/255)*color
                 gl.Begin(OpenGL.GL_LINES);
 
                 int gridStep = (int)numericUpDown2.Value;
@@ -247,7 +281,9 @@ private void openGLControl1_OpenGLDraw(object sender, RenderEventArgs args)
                     gl.LineWidth(sizeVec);
 
                     gl.Begin(OpenGL.GL_LINE_STRIP);
-                    gl.Color(0f, 1.0f, 0);
+
+                    gl.Color(Color_3DContur.R, Color_3DContur.G, Color_3DContur.B);
+                    //gl.Color(0f, 1.0f, 0);
 
                     foreach (cncPoint point in Vector.Points)
                     {
@@ -374,6 +410,9 @@ private void openGLControl1_OpenGLInitialized(object sender, EventArgs e)
 
 
 
+
+
+
             //// инициализация OpenGL
             //// инициализация бибилиотеки glut 
             //Glut.glutInit();
@@ -445,7 +484,7 @@ private void openGLControl1_KeyDown(object sender, KeyEventArgs e)
 
         private void openGLControl1_KeyUp(object sender, KeyEventArgs e)
         {
-            Setting.keyShift = e.Shift;
+            Setting.keyShift = false;
 
             openGLControl1.Refresh();
 
@@ -608,5 +647,74 @@ private void numericUpDown1_ValueChanged(object sender, EventArgs e)
         {
             openGLControl1.Refresh();
         }
+
+        private void btSetting_Click(object sender, EventArgs e)
+        {
+            SelectColor3D colorFRM = new SelectColor3D(this);
+            DialogResult dlres = colorFRM.ShowDialog();
+
+            if (dlres == DialogResult.OK)
+            {
+                Properties.Settings.Default.ColorBack = Color.FromArgb(Color_3DBack.iR, Color_3DBack.iG, Color_3DBack.iB);
+                Properties.Settings.Default.ColorTraectory = Color.FromArgb(Color_3DContur.iR, Color_3DContur.iG, Color_3DContur.iB);
+                Properties.Settings.Default.ColorGrid = Color.FromArgb(Color_Grid.iR, Color_Grid.iG, Color_Grid.iB);
+                Properties.Settings.Default.Save();
+            }
+            else
+            {
+                Color_3DBack = new FColor(Properties.Settings.Default.ColorBack);
+                Color_3DContur = new FColor(Properties.Settings.Default.ColorTraectory);
+                Color_Grid = new FColor(Properties.Settings.Default.ColorGrid);
+            }
+            openGLControl1.Refresh();
+            openGLControl1.Refresh();
+        }
     }
+
+    public class FColor
+    {
+        public float R, G, B;
+
+        public int iR, iG, iB;
+
+
+        public FColor()
+        {
+            R = 1.0F;
+            G = 1.0F;
+            B = 1.0F;
+
+            iR = 255;
+            iG = 255;
+            iB = 255;
+
+        }
+
+        public FColor(int _R, int _G, int _B)
+        {
+            iR = _R;
+            iG = _G;
+            iB = _B;
+
+
+            R = (1.0f / 255) * _R;
+            G = (1.0f / 255) * _G;
+            B = (1.0f / 255) * _B;
+        }
+
+        public FColor(Color _clr)
+        {
+            iR = _clr.R;
+            iG = _clr.G;
+            iB = _clr.B;
+
+
+            R = (1.0f / 255) * _clr.R;
+            G = (1.0f / 255) * _clr.G;
+            B = (1.0f / 255) * _clr.B;
+        }
+
+
+    }
+
 }
diff --git a/Program.cs b/Program.cs
@@ -4,7 +4,7 @@
 using System.Windows.Forms;
 using ToolsGenGkode;
 
-namespace WindowsFormsApplication1
+namespace ToolsGeneratorGCode
 {
     static class Program
     {

diff --git a/Properties/AssemblyInfo.cs b/Properties/AssemblyInfo.cs
@@ -34,5 +34,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.0.0.30")]
-[assembly: AssemblyFileVersion("2.0.0.30")]
+[assembly: AssemblyVersion("2.0.0.36")]
+[assembly: AssemblyFileVersion("2.0.0.36")]
diff --git a/Properties/Resources.Designer.cs b/Properties/Resources.Designer.cs
diff --git a/Properties/Resources.resx b/Properties/Resources.resx
@@ -211,4 +211,7 @@
   <data name="layout_edit" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\layout_edit.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="color_swatch" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\color_swatch.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
 </root>
diff --git a/Properties/Settings.Designer.cs b/Properties/Settings.Designer.cs
diff --git a/Properties/Settings.settings b/Properties/Settings.settings
@@ -41,5 +41,14 @@
     <Setting Name="Setting" Type="System.Decimal" Scope="User">
       <Value Profile="(Default)">0</Value>
     </Setting>
+    <Setting Name="ColorBack" Type="System.Drawing.Color" Scope="User">
+      <Value Profile="(Default)">Silver</Value>
+    </Setting>
+    <Setting Name="ColorTraectory" Type="System.Drawing.Color" Scope="User">
+      <Value Profile="(Default)">Blue</Value>
+    </Setting>
+    <Setting Name="ColorGrid" Type="System.Drawing.Color" Scope="User">
+      <Value Profile="(Default)">Purple</Value>
+    </Setting>
   </Settings>
 </SettingsFile>
diff --git a/Resources/color_swatch.png b/Resources/color_swatch.png