From 412c3c4b5de7b03ba526f9ba48d3638046bf258a Mon Sep 17 00:00:00 2001 From: Emmanuele Sassi Date: Mon, 29 Apr 2024 11:41:17 +0200 Subject: [PATCH] - aggiunto flag per VirtualAdditive --- Icarus/Constants/ConstGen.vb | 3 ++ Icarus/Constants/ConstIni.vb | 1 + Icarus/SimulationPanel/MySimulation.vb | 2 + Icarus/SimulationPanel/SimulationPanelV.xaml | 17 ++++++ Icarus/SimulationPanel/SimulationPanelVM.vb | 54 ++++++++++++++++++++ 5 files changed, 77 insertions(+) diff --git a/Icarus/Constants/ConstGen.vb b/Icarus/Constants/ConstGen.vb index cd3b6e5..ee8020e 100644 --- a/Icarus/Constants/ConstGen.vb +++ b/Icarus/Constants/ConstGen.vb @@ -78,4 +78,7 @@ Public Module ConstGen ' Nome file Lua con le funzioni di attrezzaggio Public Const SETUP_LUA As String = "SetUp.lua" + ' Chiave di Info in gruppo di lavoro per attivazione Virtual Milling + Public Const KEY_MCHGRP_VM As String = "Vm" + End Module diff --git a/Icarus/Constants/ConstIni.vb b/Icarus/Constants/ConstIni.vb index 7c9c0ee..0b23c24 100644 --- a/Icarus/Constants/ConstIni.vb +++ b/Icarus/Constants/ConstIni.vb @@ -109,6 +109,7 @@ Public Module ConstIni 'Public Const K_SLIDERX As String = "SliderX" 'Public Const K_SLIDERVAL As String = "SliderVal" Public Const K_MACHVIEWMODE As String = "MachViewMode" + Public Const K_VIRTUALADDITIVE As String = "VirtualAdditive" Public Const S_PRINTING3D As String = "3dPrinting" Public Const K_3PRNBASEDIR As String = "BaseDir" diff --git a/Icarus/SimulationPanel/MySimulation.vb b/Icarus/SimulationPanel/MySimulation.vb index 15b321c..6a16988 100644 --- a/Icarus/SimulationPanel/MySimulation.vb +++ b/Icarus/SimulationPanel/MySimulation.vb @@ -63,6 +63,8 @@ Public Class MySimulation ' Aggiornamenti per bottone Play/Pause SetShowPlay(True) NotifyPropertyChanged("PlayPauseImage") + ' Abilito check VMill + VMill_IsEnabled = True Select Case nMove Case MCH_SIM.END_ StatusMsg = EgtMsg(MSG_SIMULATIONPAGEUC + 1) 'Simulazione completata diff --git a/Icarus/SimulationPanel/SimulationPanelV.xaml b/Icarus/SimulationPanel/SimulationPanelV.xaml index 6a9b38c..8df96ba 100644 --- a/Icarus/SimulationPanel/SimulationPanelV.xaml +++ b/Icarus/SimulationPanel/SimulationPanelV.xaml @@ -67,6 +67,23 @@ + + + + + + + + 0, Visibility.Visible, Visibility.Collapsed) + End Get + End Property + +#Region "Messages" + + Public ReadOnly Property VirtualAdditive_Msg As String + Get + Return "Virtual Additive" + End Get + End Property + +#End Region ' Definizione comandi Private m_cmdOk As ICommand @@ -101,6 +140,21 @@ Public Class SimulationPanelVM MySimul.SliderValue = SliderVal MySimul.ShowCncData() MySimul.StatusMsg = EgtMsg(MSG_SIMULATIONPAGEUC + 14) ' Home + ' Gestione check VMill + If GetMainPrivateProfileInt(S_SIMUL, K_VIRTUALADDITIVE, 0) > 0 Then + Dim bVal As Boolean + MySimul.VMill_IsEnabled = True + m_VirtualAdditive_IsChecked = EgtGetInfo(EgtGetCurrMachGroup(), KEY_MCHGRP_VM, bVal) AndAlso bVal + Else + ' Disabilito Vmill, ma inibisco dichiarazione progetto modificato + EgtDisableModified() + MySimul.VMill_IsEnabled = False + m_VirtualAdditive_IsChecked = False + EgtRemoveInfo(EgtGetCurrMachGroup(), KEY_MCHGRP_VM) + EgtEnableModified() + End If + NotifyPropertyChanged(VirtualAdditive_IsChecked) + NotifyPropertyChanged(VirtualAdditive_Visibility) ' nascondo slider strati e layer da visualizzare Map.refSliderManagerVM.SetSliderVisibility(False) Map.refViewLayerManagerVM.SetViewLayerManagerVisibility(False)