diff --git a/OptionPanel/MachiningOptionPanel/OperationExpander/DispositionParameterExpander/DispositionParameterExpanderVM.vb b/OptionPanel/MachiningOptionPanel/OperationExpander/DispositionParameterExpander/DispositionParameterExpanderVM.vb index 3d192c4..50e4991 100644 --- a/OptionPanel/MachiningOptionPanel/OperationExpander/DispositionParameterExpander/DispositionParameterExpanderVM.vb +++ b/OptionPanel/MachiningOptionPanel/OperationExpander/DispositionParameterExpander/DispositionParameterExpanderVM.vb @@ -273,7 +273,7 @@ Public Class DispositionParameterExpanderVM End If Select Case m_ActiveObject Case ObjectType.RAWPART - ' Abilito la selezione delle Fixture + ' Abilito la selezione dei Grezzi Map.refProjectVM.SceneSelType = SceneSelTypeOpt.RAWPART Case ObjectType.FIXTURE ' Abilito la selezione delle Fixture diff --git a/OptionPanel/MachiningOptionPanel/OperationExpander/DispositionParameterExpander/FixtureParameters/FixtureParametersVM.vb b/OptionPanel/MachiningOptionPanel/OperationExpander/DispositionParameterExpander/FixtureParameters/FixtureParametersVM.vb index 7c8ab7a..59200d9 100644 --- a/OptionPanel/MachiningOptionPanel/OperationExpander/DispositionParameterExpander/FixtureParameters/FixtureParametersVM.vb +++ b/OptionPanel/MachiningOptionPanel/OperationExpander/DispositionParameterExpander/FixtureParameters/FixtureParametersVM.vb @@ -62,8 +62,8 @@ Public Class FixtureParametersVM Dim nUsedFixtureId As Integer = EgtGetFirstFixture() While nUsedFixtureId <> GDB_ID.NULL Dim sUsedFixtureName As String = String.Empty + EgtGetName(nUsedFixtureId, sUsedFixtureName) For Index = 0 To m_FixtureTypeList.Count - 1 - EgtGetName(nUsedFixtureId, sUsedFixtureName) If sUsedFixtureName = m_FixtureTypeList(Index).Name Then Dim CurrFixtureType As FixtureType = DirectCast(m_FixtureTypeList(Index), FixtureType) CurrFixtureType.UsedNumber += 1 @@ -76,6 +76,7 @@ Public Class FixtureParametersVM Friend Sub UpdateFixtureTypeList() m_FixtureTypeList = New ObservableCollection(Of FixtureListItem)(FixtureType.ReadFixtureTypeFromMachIni()) + UpdateFixtureCount() OnPropertyChanged("FixtureTypeList") End Sub diff --git a/OptionPanel/MachiningOptionPanel/SimulationExpander/SimulationExpanderVM.vb b/OptionPanel/MachiningOptionPanel/SimulationExpander/SimulationExpanderVM.vb index ed42214..156511f 100644 --- a/OptionPanel/MachiningOptionPanel/SimulationExpander/SimulationExpanderVM.vb +++ b/OptionPanel/MachiningOptionPanel/SimulationExpander/SimulationExpanderVM.vb @@ -348,8 +348,10 @@ Public Class SimulationExpanderVM End If ' Aggiorno stato visualizzazione macchina (dipende anche da utensile) UpdateMachView() - ' Aggiorno visualizzazione - EgtDraw() + ' Aggiorno visualizzazione (solo se interfaccia non minimizzata, per aumentare velocità) + If Application.Current.MainWindow.WindowState <> WindowState.Minimized Then + EgtDraw() + End If ' Aggiorno dati CNC If nShowDataCounter = 5 Or GetSimulationStatus() = MCH_SIM_ST.UI_PAUSE Or GetSimulationStatus() = MCH_SIM_ST.UI_STOP Then ShowCncData()