diff --git a/My Project/AssemblyInfo.vb b/My Project/AssemblyInfo.vb index 274ea94..bcf37a3 100644 --- a/My Project/AssemblyInfo.vb +++ b/My Project/AssemblyInfo.vb @@ -70,6 +70,6 @@ Imports System.Windows ' by using the '*' as shown below: ' - - + + diff --git a/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/MachiningParameterExpanderVM.vb b/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/MachiningParameterExpanderVM.vb index ae5ae1a..2a3da48 100644 --- a/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/MachiningParameterExpanderVM.vb +++ b/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/MachiningParameterExpanderVM.vb @@ -166,6 +166,9 @@ Public Class MachiningParameterExpanderVM m_CurrOperation.ReadOperationParam() + ' Riferimento a operazione selezionata + EgtWPFLib5.MachiningTreeViewItem.sh_SelMach = m_CurrOperation + IsModified(False) ErrorOnOperation(False) diff --git a/OptionPanel/MachiningOptionPanel/SimulationExpander/SimulationExpanderVM.vb b/OptionPanel/MachiningOptionPanel/SimulationExpander/SimulationExpanderVM.vb index 8f0cda6..2350564 100644 --- a/OptionPanel/MachiningOptionPanel/SimulationExpander/SimulationExpanderVM.vb +++ b/OptionPanel/MachiningOptionPanel/SimulationExpander/SimulationExpanderVM.vb @@ -32,6 +32,17 @@ Public Class SimulationExpanderVM End Set End Property + Private m_bOnlySimulation As Boolean = False + Public Property bOnlySimulation As Boolean + Get + Return m_bOnlySimulation + End Get + Set(value As Boolean) + m_bOnlySimulation = value + NotifyPropertyChanged("bOnlySimulation") + End Set + End Property + Public Overrides Property SliderValue As Double Get Return m_SliderValue @@ -150,6 +161,14 @@ Public Class SimulationExpanderVM ' disattivo MTable e SpecialPanel se vado in simulazione Map.refDoorPanelVM.MTableIsEnabled(False) Map.refSpecialPanelVM.SpecialPanelIsEnabled(False) + If m_bOnlySimulation Then + Map.refTopCommandBarVM.DrawIsEnabled = False + Map.refOperationsListExpanderVM.OpersListViewIsEnabled = False + Map.refOperationParametersExpanderVM.OperParamsViewIsEnabled = False + Map.refEstimationsExpanderVM.Estimation_IsEnabled =False + Map.refMachGroupPanelVM.SetMachGroupState(False) + Map.refEstimationsExpanderVM.NotifyPropertyChanged("Estimation_IsEnabled") + End If Return True End Function @@ -336,10 +355,15 @@ Public Class SimulationExpanderVM End While SetSimExecuting(False) IniFile.m_bSimulExecuting = False - Map.refTopCommandBarVM.DrawIsEnabled = True - Map.refOperationsListExpanderVM.OpersListViewIsEnabled = True - Map.refOperationParametersExpanderVM.OperParamsViewIsEnabled = True - Map.refMachGroupPanelVM.SetMachGroupState(True) ' Map.refMachGroupPanelVM.MachGroupPanelIsEnabled = True + If m_bOnlySimulation Then + ' Impedisco salvataggio eventuale modifica stato virtual milling + EgtResetModified() + Else + Map.refTopCommandBarVM.DrawIsEnabled = True + Map.refOperationsListExpanderVM.OpersListViewIsEnabled = True + Map.refOperationParametersExpanderVM.OperParamsViewIsEnabled = True + Map.refMachGroupPanelVM.SetMachGroupState(True) + End If Map.refEstimationsExpanderVM.NotifyPropertyChanged(NameOf(Map.refEstimationsExpanderVM.Estimation_IsEnabled)) If IniFile.m_bSimulEndExitApp Then refMainWindowVM.CloseApplication( Nothing) diff --git a/Project/ProjectVM.vb b/Project/ProjectVM.vb index c87e58a..bb222db 100644 --- a/Project/ProjectVM.vb +++ b/Project/ProjectVM.vb @@ -478,7 +478,7 @@ Public Class ProjectVM End If ' Esecuzione bOk = ExecBeam(sFile, sMachine, nFlag, True) - ' altrimenti pareti + ' altrimenti pareti Else ' Verifica abilitazione elaborazione pareti If Not VerifyWall(sFile, sMachine, nFlag) Then @@ -492,12 +492,12 @@ Public Class ProjectVM If nFlag = 0 Or nFlag = 3 Or nFlag = 4 Then Map.refMachinePanelVM.SaveCurrentMachine() Map.refMainWindowVM.CloseApplicationCmd() - ' Altrimenti se richiesta visualizzazione DB utensili + ' Altrimenti se richiesta visualizzazione DB utensili ElseIf nFlag = 11 And bOk Then MyMachinePanelVM.ToolDb() Map.refMachinePanelVM.SaveCurrentMachine() Map.refMainWindowVM.CloseApplicationCmd() - ' Altrimenti se richiesta visualizzazione DB lavorazioni + ' Altrimenti se richiesta visualizzazione DB lavorazioni ElseIf nFlag = 12 And bOk Then MyMachinePanelVM.MachDb() If bBeam Then @@ -507,7 +507,7 @@ Public Class ProjectVM End If Map.refMachinePanelVM.SaveCurrentMachine() Map.refMainWindowVM.CloseApplicationCmd() - ' Altrimenti se errore + ' Altrimenti se errore ElseIf Not bOk Then EgtZoom(ZM.ALL) End If diff --git a/Special-BeamWall/Beam.vb b/Special-BeamWall/Beam.vb index cb1f2f1..a628170 100644 --- a/Special-BeamWall/Beam.vb +++ b/Special-BeamWall/Beam.vb @@ -57,7 +57,13 @@ Module Beam Map.refManageLayerExpanderVM.SelectIdInObjTreeNoMark(EgtGetCurrLayer()) If EgtGetCurrMachGroup() <> GDB_ID.NULL Then Map.refTopCommandBarVM.SetMachiningMode() + ' Se simulazione If bOk And nFlag = 2 Then + ' Se da TS3 impedisco di fare altro + If bBtl Then + Map.refSimulationExpanderVM.bOnlySimulation = True + End If + ' Vado in simulazione Map.refSimulationExpanderVM.Simulation_IsExpanded = True End If End If diff --git a/Special-BeamWall/Wall.vb b/Special-BeamWall/Wall.vb index 7e8d96b..b6b0c49 100644 --- a/Special-BeamWall/Wall.vb +++ b/Special-BeamWall/Wall.vb @@ -58,7 +58,13 @@ Module Wall Map.refManageLayerExpanderVM.SelectIdInObjTreeNoMark(EgtGetCurrLayer()) If EgtGetCurrMachGroup() <> GDB_ID.NULL Then Map.refTopCommandBarVM.SetMachiningMode() + ' Se simulazione If bOk And nFlag = 2 Then + ' Se da TS3 impedisco di fare altro + If bBtl Then + Map.refSimulationExpanderVM.bOnlySimulation = True + End If + ' Vado in simulazione Map.refSimulationExpanderVM.Simulation_IsExpanded = True End If End If