diff --git a/SourceCode/GPS/Classes/CABLine.cs b/SourceCode/GPS/Classes/CABLine.cs
index 95817ae30..d95d52980 100644
--- a/SourceCode/GPS/Classes/CABLine.cs
+++ b/SourceCode/GPS/Classes/CABLine.cs
@@ -498,8 +498,8 @@ public void DrawABLines()
GL.Begin(PrimitiveType.Points);
GL.Color3(1.0f, 1.0f, 0.0f);
GL.Vertex3(goalPointAB.easting, goalPointAB.northing, 0.0);
- GL.Vertex3(mf.gyd.rEastSteer, mf.gyd.rNorthSteer, 0.0);
- GL.Vertex3(mf.gyd.rEastPivot, mf.gyd.rNorthPivot, 0.0);
+ //GL.Vertex3(mf.gyd.rEastSteer, mf.gyd.rNorthSteer, 0.0);
+ //GL.Vertex3(mf.gyd.rEastPivot, mf.gyd.rNorthPivot, 0.0);
GL.End();
GL.PointSize(1.0f);
diff --git a/SourceCode/GPS/Classes/CCamera.cs b/SourceCode/GPS/Classes/CCamera.cs
index ef65cf507..9096499bc 100644
--- a/SourceCode/GPS/Classes/CCamera.cs
+++ b/SourceCode/GPS/Classes/CCamera.cs
@@ -29,7 +29,7 @@ public class CCamera
public CCamera()
{
//get the pitch of camera from settings
- camPitch = Properties.Settings.Default.setwin;
+ camPitch = Properties.Settings.Default.setDisplay_camPitch;
zoomValue = Properties.Settings.Default.setDisplay_camZoom;
camPosZ = 0.0;
camFollowing = true;
diff --git a/SourceCode/GPS/Forms/GUI.Designer.cs b/SourceCode/GPS/Forms/GUI.Designer.cs
index a1ed62ead..bf1860382 100644
--- a/SourceCode/GPS/Forms/GUI.Designer.cs
+++ b/SourceCode/GPS/Forms/GUI.Designer.cs
@@ -1044,7 +1044,7 @@ public void SaveFormGPSWindowSettings()
Settings.Default.setWindow_Minimized = true;
}
- Settings.Default.setwin = camera.camPitch;
+ Settings.Default.setDisplay_camPitch = camera.camPitch;
Properties.Settings.Default.setDisplay_camZoom = camera.zoomValue;
Settings.Default.setF_UserTotalArea = fd.workedAreaTotalUser;
diff --git a/SourceCode/GPS/Forms/Sections.Designer.cs b/SourceCode/GPS/Forms/Sections.Designer.cs
index b1fa13723..d748f4295 100644
--- a/SourceCode/GPS/Forms/Sections.Designer.cs
+++ b/SourceCode/GPS/Forms/Sections.Designer.cs
@@ -39,14 +39,11 @@ private void btnSectionMasterManual_Click(object sender, EventArgs e)
case btnStates.Off:
manualBtnState = btnStates.On;
btnSectionMasterManual.Image = Properties.Resources.ManualOn;
- sounds.sndSectionOff.Play();
-
break;
case btnStates.On:
manualBtnState = btnStates.Off;
btnSectionMasterManual.Image = Properties.Resources.ManualOff;
- sounds.sndSectionOff.Play();
break;
}
diff --git a/SourceCode/GPS/Properties/Settings.Designer.cs b/SourceCode/GPS/Properties/Settings.Designer.cs
index 3d896313f..e726d6748 100644
--- a/SourceCode/GPS/Properties/Settings.Designer.cs
+++ b/SourceCode/GPS/Properties/Settings.Designer.cs
@@ -23,18 +23,6 @@ public static Settings Default {
}
}
- [global::System.Configuration.UserScopedSettingAttribute()]
- [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
- [global::System.Configuration.DefaultSettingValueAttribute("-62")]
- public double setwin {
- get {
- return ((double)(this["setwin"]));
- }
- set {
- this["setwin"] = value;
- }
- }
-
[global::System.Configuration.UserScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("30, 30")]
@@ -1382,7 +1370,7 @@ public bool setF_isRemoteWorkSystemOn {
[global::System.Configuration.UserScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
- [global::System.Configuration.DefaultSettingValueAttribute("False")]
+ [global::System.Configuration.DefaultSettingValueAttribute("True")]
public bool setDisplay_isAutoStartAgIO {
get {
return ((bool)(this["setDisplay_isAutoStartAgIO"]));
@@ -2771,5 +2759,17 @@ public string setDisplay_buttonOrder {
this["setDisplay_buttonOrder"] = value;
}
}
+
+ [global::System.Configuration.UserScopedSettingAttribute()]
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.Configuration.DefaultSettingValueAttribute("-62")]
+ public double setDisplay_camPitch {
+ get {
+ return ((double)(this["setDisplay_camPitch"]));
+ }
+ set {
+ this["setDisplay_camPitch"] = value;
+ }
+ }
}
}
diff --git a/SourceCode/GPS/Properties/Settings.settings b/SourceCode/GPS/Properties/Settings.settings
index 467dd467c..df9d60bfe 100644
--- a/SourceCode/GPS/Properties/Settings.settings
+++ b/SourceCode/GPS/Properties/Settings.settings
@@ -2,9 +2,6 @@
-
- -62
-
30, 30
@@ -342,7 +339,7 @@
False
- False
+ True
0.1
@@ -689,5 +686,8 @@
0,1,2,3,4,5,6,7
+
+ -62
+
\ No newline at end of file
diff --git a/SourceCode/GPS/app.config b/SourceCode/GPS/app.config
index deb3a2b45..4291cc04b 100644
--- a/SourceCode/GPS/app.config
+++ b/SourceCode/GPS/app.config
@@ -7,9 +7,6 @@
-
- -62
-
30, 30
@@ -344,7 +341,7 @@
False
- False
+ True
0.1
@@ -691,6 +688,9 @@
0,1,2,3,4,5,6,7
+
+ -62
+