From dda46787db9dbbb232e2c81b4ef093fba7036ec3 Mon Sep 17 00:00:00 2001 From: Demetrio Cassarino Date: Thu, 12 Mar 2026 11:31:10 +0100 Subject: [PATCH] -introdotto griglia dinamica per gestire spostamento colonne --- Constants/ConstGen.vb | 3 + EgtCAM5.vbproj | 1 + MainWindow/MainWindowVM.vb | 19 +- .../InfoExpander/InfoExpanderV.xaml | 2 +- .../InfoExpander/InfoExpanderVM.vb | 1 + .../ManageLayerExpander/LayerTreeView.vb | 1 + .../ManageLayerExpanderV.xaml | 12 +- .../ManageLayerExpanderVM.vb | 18 + OptionPanel/DrawOptionPanelV.xaml | 26 +- OptionPanel/DrawOptionPanelV.xaml.vb | 26 +- OptionPanel/DrawOptionPanelVM.vb | 86 ++++- .../OperationsListExpanderV.xaml | 309 +++++++++--------- .../OperationsListExpanderVM.vb | 3 + OptionPanel/MachiningOptionPanelV.xaml | 27 +- OptionPanel/MachiningOptionPanelV.xaml.vb | 20 +- OptionPanel/MachiningOptionPanelVM.vb | 46 +++ OptionPanel/OptionPanelV.xaml | 2 +- OptionPanel/OptionPanelVM.vb | 1 + Project/ProjectV.xaml | 2 +- Project/ProjectVM.vb | 87 +++-- RightTray/RightTrayV.xaml | 3 +- Utility/Dictionary.xaml | 13 +- Utility/DynamicGridModule.vb | 241 ++++++++++++++ 23 files changed, 739 insertions(+), 210 deletions(-) create mode 100644 Utility/DynamicGridModule.vb diff --git a/Constants/ConstGen.vb b/Constants/ConstGen.vb index e68b058..fb43a0a 100644 --- a/Constants/ConstGen.vb +++ b/Constants/ConstGen.vb @@ -51,6 +51,9 @@ Module ConstGen ' Chiave di Info in gruppo di lavoro per none part-program Public Const KEY_MCHGRP_NCNAME As String = "NcName" + ' File Dimensioni Griglia CAM5 + Public Const DIMENSION_FILE_NAME As String = "Dimension.ini" + ' Costante per flag di BBox Public Const BBFLAG As Integer = GDB_BB.ONLY_VISIBLE + GDB_BB.IGNORE_TEXT + GDB_BB.IGNORE_DIM diff --git a/EgtCAM5.vbproj b/EgtCAM5.vbproj index a02b479..7fb7837 100644 --- a/EgtCAM5.vbproj +++ b/EgtCAM5.vbproj @@ -322,6 +322,7 @@ + diff --git a/MainWindow/MainWindowVM.vb b/MainWindow/MainWindowVM.vb index fc92104..ec23db5 100644 --- a/MainWindow/MainWindowVM.vb +++ b/MainWindow/MainWindowVM.vb @@ -46,6 +46,13 @@ Public Class MainWindowVM End Set End Property + Private m_sDimensionDir As String = String.Empty + Public ReadOnly Property DimensionDir As String + Get + Return m_sDimensionDir + End Get + End Property + Private m_cmdMainWindow_ContentRendered As ICommand Private m_cmdAboutBox As ICommand ' MainWindow Activated Event @@ -97,11 +104,11 @@ Public Class MainWindowVM Public ReadOnly Property IconSource As String Get - #If PLATFORM = "x64" Then +#If PLATFORM = "x64" Then Return "/Resources/EgtCAM5_64.ico" - #else - Return "/Resources/EgtCAM5.ico" - #End If +#Else + Return "/Resources/EgtCAM5.ico" +#End If End Get End Property @@ -197,7 +204,7 @@ Public Class MainWindowVM End If End Sub - Private Function OnTerminateProcess( nExitCode As Integer) As Boolean + Private Function OnTerminateProcess(nExitCode As Integer) As Boolean ' Aggiorno istanze usate ReleaseInstance() ' Dichiaro di procedere con la terminazione del programma @@ -347,6 +354,8 @@ Public Class MainWindowVM Else IniFile.m_sToolMakersDir = m_sDataRoot & "\" & TOOLMAKER_DFL_DIR End If + ' Recupero percorso file Dimension + m_sDimensionDir = m_sConfigDir & "\" & DIMENSION_FILE_NAME ' Verifico indice di istanza ManageInstance() ' Imposto tipo di chiave diff --git a/OptionPanel/DrawOptionPanel/InfoExpander/InfoExpanderV.xaml b/OptionPanel/DrawOptionPanel/InfoExpander/InfoExpanderV.xaml index 723305f..67cb498 100644 --- a/OptionPanel/DrawOptionPanel/InfoExpander/InfoExpanderV.xaml +++ b/OptionPanel/DrawOptionPanel/InfoExpander/InfoExpanderV.xaml @@ -8,7 +8,7 @@ - diff --git a/OptionPanel/DrawOptionPanel/InfoExpander/InfoExpanderVM.vb b/OptionPanel/DrawOptionPanel/InfoExpander/InfoExpanderVM.vb index 4d7d69a..8e7c725 100644 --- a/OptionPanel/DrawOptionPanel/InfoExpander/InfoExpanderVM.vb +++ b/OptionPanel/DrawOptionPanel/InfoExpander/InfoExpanderVM.vb @@ -21,6 +21,7 @@ Public Class InfoExpanderVM Set(value As Boolean) If value <> m_IsExpanded Then m_IsExpanded = value + Map.refDrawOptionPanelVM.SetInfoRowIsExpanded(m_IsExpanded) OnPropertyChanged("IsEnabled") End If End Set diff --git a/OptionPanel/DrawOptionPanel/ManageLayerExpander/LayerTreeView.vb b/OptionPanel/DrawOptionPanel/ManageLayerExpander/LayerTreeView.vb index 19480e3..1fe2e5d 100644 --- a/OptionPanel/DrawOptionPanel/ManageLayerExpander/LayerTreeView.vb +++ b/OptionPanel/DrawOptionPanel/ManageLayerExpander/LayerTreeView.vb @@ -24,6 +24,7 @@ Public Class LayerTreeViewItem Set(value As Boolean) If (value <> m_isSelected) Then m_isSelected = value + Map.refDrawOptionPanelVM.SetInfoRowIsExpanded(value) If value Then ' recupero l'Id del nuovo oggetto selezionato Map.refManageLayerExpanderVM.IsRightClickedLayerTreeItem(False) diff --git a/OptionPanel/DrawOptionPanel/ManageLayerExpander/ManageLayerExpanderV.xaml b/OptionPanel/DrawOptionPanel/ManageLayerExpander/ManageLayerExpanderV.xaml index 29e5dce..663f881 100644 --- a/OptionPanel/DrawOptionPanel/ManageLayerExpander/ManageLayerExpanderV.xaml +++ b/OptionPanel/DrawOptionPanel/ManageLayerExpander/ManageLayerExpanderV.xaml @@ -5,7 +5,7 @@ xmlns:expression="clr-namespace:Microsoft.Expression.Interactivity.Core;assembly=Microsoft.Expression.Interactions" xmlns:local="clr-namespace:EgtCAM5"> - + @@ -13,7 +13,11 @@ - + + + + +