diff --git a/Constants/ConstIni.vb b/Constants/ConstIni.vb index 8d7b7fe..38e4099 100644 --- a/Constants/ConstIni.vb +++ b/Constants/ConstIni.vb @@ -89,6 +89,7 @@ Module ConstIni Public Const K_FLPCURRDIR As String = "CurrDir" Public Const S_DOORS As String = "Doors" + Public Const K_DDFENABLE As String = "DdfEnable" Public Const K_DDFEXEC As String = "DdfExec" Public Const K_DDFFUNCTION As String = "DdfFun" Public Const K_DDFDIR As String = "DdfDir" diff --git a/My Project/AssemblyInfo.vb b/My Project/AssemblyInfo.vb index 1867e17..f9990e9 100644 --- a/My Project/AssemblyInfo.vb +++ b/My Project/AssemblyInfo.vb @@ -70,5 +70,5 @@ Imports System.Windows ' by using the '*' as shown below: ' - - + + diff --git a/ProjectPage/ProjectView.xaml.vb b/ProjectPage/ProjectView.xaml.vb index e888ad0..1623061 100644 --- a/ProjectPage/ProjectView.xaml.vb +++ b/ProjectPage/ProjectView.xaml.vb @@ -39,6 +39,8 @@ Public Class ProjectView If GetPrivateProfileFloatingWinPos(S_GENERAL, "OptionPanel", sState, nIndex, nLeft, nTop) And Not String.IsNullOrEmpty(sState) Then PanelPositioning(OptionPanel, sState, nIndex, nLeft, nTop) End If + Dim bDoors As Boolean = (GetPrivateProfileInt(S_DOORS, K_DDFENABLE, 0) <> 0) + bDoors = True Application.Msn.Register(Application.DRAWMODE_ISCHECKED, Sub() ShowPanel.Visibility = Visibility.Visible ViewPanel.Visibility = Visibility.Visible @@ -46,7 +48,7 @@ Public Class ProjectView GridPanel.Visibility = Visibility.Visible DbPanel.Visibility = Visibility.Visible ExecutePanel.Visibility = Visibility.Visible - DoorsPanel.Visibility = Visibility.Visible + DoorsPanel.Visibility = If(bDoors, Visibility.Visible, Visibility.Collapsed) DrawPanel.Visibility = Visibility.Visible OptionPanel.Visibility = Visibility.Visible MachGroupPanel.Visibility = Visibility.Collapsed diff --git a/ToolsDbWindow/ToolTreeView.vb b/ToolsDbWindow/ToolTreeView.vb index cad9d2e..3d74cd1 100644 --- a/ToolsDbWindow/ToolTreeView.vb +++ b/ToolsDbWindow/ToolTreeView.vb @@ -839,13 +839,13 @@ Public Class ToolTreeViewItem Dim dValue As Double = 0 Dim sValue As String = String.Empty EgtTdbGetCurrToolParam(MCH_TP.CORR, nValue) - Corr = nValue + Corr = nValue.ToString() EgtTdbGetCurrToolParam(MCH_TP.EXIT_, nValue) - ExitPar = nValue + ExitPar = nValue.ToString() EgtTdbGetCurrToolParam(MCH_TP.TYPE, nValue) Type = nValue EgtTdbGetCurrToolParam(MCH_TP.COOLANT, nValue) - Coolant = nValue + Coolant = nValue.ToString() EgtTdbGetCurrToolParam(MCH_TP.CORNRAD, dValue) CornRad = LenToString(dValue, 4) EgtTdbGetCurrToolParam(MCH_TP.DIAM, dValue) @@ -907,11 +907,15 @@ Public Class ToolTreeViewItem Friend Sub WriteToolParam() EgtSetCurrentContext(IniFile.m_ProjectSceneContext) + Dim nValue As Integer = 0 Dim dValue As Double = 0 - EgtTdbSetCurrToolParam(MCH_TP.CORR, Corr) - EgtTdbSetCurrToolParam(MCH_TP.EXIT_, ExitPar) + Int32.TryParse(Corr, nValue) + EgtTdbSetCurrToolParam(MCH_TP.CORR, nValue) + Int32.TryParse(ExitPar, nValue) + EgtTdbSetCurrToolParam(MCH_TP.EXIT_, nValue) EgtTdbSetCurrToolParam(MCH_TP.TYPE, Type) - EgtTdbSetCurrToolParam(MCH_TP.COOLANT, Coolant) + Int32.TryParse(Coolant, nValue) + EgtTdbSetCurrToolParam(MCH_TP.COOLANT, nValue) StringToLen(CornRad, dValue) EgtTdbSetCurrToolParam(MCH_TP.CORNRAD, dValue) StringToLen(Diam, dValue)