diff --git a/3dPrintApp/Constants/Const3dPrint.vb b/3dPrintApp/Constants/Const3dPrint.vb index 34c2e65..a463b79 100644 --- a/3dPrintApp/Constants/Const3dPrint.vb +++ b/3dPrintApp/Constants/Const3dPrint.vb @@ -96,6 +96,8 @@ Public Const MAC_RIBSLEADOUTWIPEDIR = "RibsLeadOutWipeDir" Public Const MAC_MATERIALS = "Materials" + ' parametri StartMach + Public Const LAY_NEWSTART = "NewStart" Public Const FILE_PATH = "FilePath" diff --git a/3dPrintApp/Constants/ConstGen.vb b/3dPrintApp/Constants/ConstGen.vb index ffbf0cd..5463dfd 100644 --- a/3dPrintApp/Constants/ConstGen.vb +++ b/3dPrintApp/Constants/ConstGen.vb @@ -39,6 +39,7 @@ Public Module ConstGen ' MOdalita' di modifica Public Enum ModifyModes As Integer NULL = 0 + SELECT_ = 1 DISPOSITION = 2 REFERENCE = 3 STARTMACH = 4 diff --git a/3dPrintApp/ControllerInputPanel/ControllerInputPanelVM.vb b/3dPrintApp/ControllerInputPanel/ControllerInputPanelVM.vb index 4bc2a73..2441db9 100644 --- a/3dPrintApp/ControllerInputPanel/ControllerInputPanelVM.vb +++ b/3dPrintApp/ControllerInputPanel/ControllerInputPanelVM.vb @@ -223,6 +223,7 @@ Public Class ControllerInputPanelVM Friend Sub PrepareInputBox(sTitle As String, sLabel As String, sCheckLabel As String, bShowCombo As Boolean, bShowBtn As Boolean) + If Map.refTopPanelVM.SelPage = Pages.MODIFY AndAlso Map.refTopPanelVM.SelModifyMode.ModifyMode = ModifyModes.DISPOSITION Then Return Title = sTitle If sLabel <> "" Then Message = sLabel diff --git a/3dPrintApp/DispositionPanel/DispositionPanelV.xaml b/3dPrintApp/DispositionPanel/DispositionPanelV.xaml index 6726655..f126e04 100644 --- a/3dPrintApp/DispositionPanel/DispositionPanelV.xaml +++ b/3dPrintApp/DispositionPanel/DispositionPanelV.xaml @@ -20,6 +20,7 @@ + @@ -59,6 +60,12 @@ Margin="5,0,0,0" Style="{StaticResource LeftPanel_TextBox}"/> + + + @@ -54,48 +60,32 @@ - - - - - - @@ -183,6 +173,7 @@ + @@ -222,6 +213,12 @@ Margin="5,0,0,0" Style="{StaticResource LeftPanel_TextBox}"/> + +