diff --git a/Constants/ConstIni.vb b/Constants/ConstIni.vb index 8ea7293..7fb3283 100644 --- a/Constants/ConstIni.vb +++ b/Constants/ConstIni.vb @@ -132,6 +132,11 @@ Module ConstIni Public Const K_CTSA_TOLERANCE As String = "Tolerance" Public Const K_CTSA As String = "CTSA" + Public Const S_COLORTOENGRAVE As String = "ColorToEngrave" + Public Const K_CTE_ENABLE As String = "Enable" + Public Const K_CTE_TOLERANCE As String = "Tolerance" + Public Const K_CTE As String = "CTE" + Public Const S_RAWPART As String = "RawPart" Public Const K_RAWCOLOR As String = "RawColor" Public Const K_KERFCOLOR As String = "KerfColor" diff --git a/DxfImportWindow/DxfImportWindowVM.vb b/DxfImportWindow/DxfImportWindowVM.vb index fcd7957..ab15e77 100644 --- a/DxfImportWindow/DxfImportWindowVM.vb +++ b/DxfImportWindow/DxfImportWindowVM.vb @@ -969,6 +969,10 @@ Public Class DxfImportWindowVM If GetPrivateProfileInt(S_COLORTOSIDEANG, K_CTSA_ENABLE, 0, IniFile.m_sIniFile) <> 0 Then SideEntityControlVM.ColorToSideAngle(DxfImportWindowMap.refDxfImportSceneHostV.ImportDxfScene.GetCtx()) End If + ' Se prevista gestione colore->incisioni + If GetPrivateProfileInt(S_COLORTOENGRAVE, K_CTE_ENABLE, 0, IniFile.m_sIniFile) <> 0 Then + SideEntityControlVM.ColorToEngrave(DxfImportWindowMap.refDxfImportSceneHostV.ImportDxfScene.GetCtx()) + End If ' Eseguo zoom EgtZoom(ZM.ALL) ' disabilito bottoni UseLayer e UseRegion, abilito bottoni Reset e Insert @@ -1005,6 +1009,10 @@ Public Class DxfImportWindowVM If GetPrivateProfileInt(S_COLORTOSIDEANG, K_CTSA_ENABLE, 0, IniFile.m_sIniFile) <> 0 Then SideEntityControlVM.ColorToSideAngle(DxfImportWindowMap.refDxfImportSceneHostV.ImportDxfScene.GetCtx()) End If + ' Se prevista gestione colore->incisioni + If GetPrivateProfileInt(S_COLORTOENGRAVE, K_CTE_ENABLE, 0, IniFile.m_sIniFile) <> 0 Then + SideEntityControlVM.ColorToEngrave(DxfImportWindowMap.refDxfImportSceneHostV.ImportDxfScene.GetCtx()) + End If ' Eseguo zoom EgtZoom(ZM.ALL) ' disabilito bottoni UseLayer. UseRegion e UseClosedCurve, abilito bottoni Reset e Insert @@ -1041,6 +1049,10 @@ Public Class DxfImportWindowVM If GetPrivateProfileInt(S_COLORTOSIDEANG, K_CTSA_ENABLE, 0, IniFile.m_sIniFile) <> 0 Then SideEntityControlVM.ColorToSideAngle(DxfImportWindowMap.refDxfImportSceneHostV.ImportDxfScene.GetCtx()) End If + ' Se prevista gestione colore->incisioni + If GetPrivateProfileInt(S_COLORTOENGRAVE, K_CTE_ENABLE, 0, IniFile.m_sIniFile) <> 0 Then + SideEntityControlVM.ColorToEngrave(DxfImportWindowMap.refDxfImportSceneHostV.ImportDxfScene.GetCtx()) + End If ' Eseguo zoom EgtZoom(ZM.ALL) ' disabilito bottoni UseLayer e UseRegion, abilito bottoni Reset e Insert diff --git a/EgtStoneLib/ConstMach.vb b/EgtStoneLib/ConstMach.vb index 4ed04f0..862e645 100644 --- a/EgtStoneLib/ConstMach.vb +++ b/EgtStoneLib/ConstMach.vb @@ -156,6 +156,7 @@ Module ConstMach ' Info in entità da tagliare per affondamento Public Const INFO_DEPTH As String = "Depth" Public Const INFO_DEPTH2 As String = "Depth2" + Public Const INFO_WIDTH As String = "Width" ' Info in entità da tagliare per taglio ristretto Public Const INFO_STRICT As String = "Strict" ' Info in entità da tagliare per angolo di lato e tallone diff --git a/OptionPanel/NestingTab/NestingTabVM.vb b/OptionPanel/NestingTab/NestingTabVM.vb index bd0ff75..858b7fa 100644 --- a/OptionPanel/NestingTab/NestingTabVM.vb +++ b/OptionPanel/NestingTab/NestingTabVM.vb @@ -81,7 +81,18 @@ Public Class NestingTabVM Return LenToString(m_dStepMove, 2) End Get Set(value As String) - StringToLen(value, m_dStepMove) + Dim dValue As Double + 'StringToLen(value, m_dStepMove) + If StringToLen(value, dValue) Then + If dValue < 0 Then + dValue = 0 + ElseIf dValue > 1000 Then + dValue = 1000 + End If + m_dStepMove = dValue + WriteMainPrivateProfileString(S_NEST, K_STEP, DoubleToString(m_dStepMove, 2)) + End If + NotifyPropertyChanged("StepMove") End Set End Property @@ -91,7 +102,18 @@ Public Class NestingTabVM Return DoubleToString(m_dRotationAngle, 2) End Get Set(value As String) - StringToDouble(value, m_dRotationAngle) + Dim dValue As Double + 'StringToDouble(value, m_dRotationAngle) + If StringToLen(value, dValue) Then + If dValue < 0 Then + dValue = 0 + ElseIf dValue > 180 Then + dValue = 180 + End If + m_dRotationAngle = dValue + WriteMainPrivateProfileString(S_NEST, K_ANGSTEP, DoubleToString(m_dRotationAngle, 2)) + End If + NotifyPropertyChanged("RotationAngle") End Set End Property diff --git a/OptionWindow/OptionWindowV.xaml b/OptionWindow/OptionWindowV.xaml index a29dd93..a3008ee 100644 --- a/OptionWindow/OptionWindowV.xaml +++ b/OptionWindow/OptionWindowV.xaml @@ -11,7 +11,7 @@ - + @@ -69,6 +69,7 @@ + @@ -143,6 +144,81 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +