From 8cc6324d641a64ac9c2cdfd2ab3c02cd35685527 Mon Sep 17 00:00:00 2001
From: Demetrio Cassarino <demetrio.cassarino@egalware.com>
Date: Thu, 4 Apr 2024 09:10:53 +0200
Subject: [PATCH] -gestione interfaccia con griglia dinamica

---
 DrawPanel/DrawPanelV.xaml              |  2 -
 DrawPanel/DrawPanelVM.vb               | 10 +++++
 EgtCAM5.vbproj                         |  7 ----
 LeftTray/GridSplitterLeft.xaml         | 11 ------
 LeftTray/GridSplitterLeft.xaml.vb      |  3 --
 OptionPanel/DrawOptionPanelV.xaml      |  2 +-
 OptionPanel/MachiningOptionPanelV.xaml |  2 +-
 OptionPanel/OptionPanelV.xaml          |  2 +-
 Project/ProjectVM.vb                   | 55 +++++++++++++++-----------
 RightTray/RightTrayV.xaml              |  1 +
 TopCommandBar/TopCommandBarVM.vb       |  6 ++-
 Utility/Dictionary.xaml                |  4 ++
 12 files changed, 55 insertions(+), 50 deletions(-)
 delete mode 100644 LeftTray/GridSplitterLeft.xaml
 delete mode 100644 LeftTray/GridSplitterLeft.xaml.vb

diff --git a/DrawPanel/DrawPanelV.xaml b/DrawPanel/DrawPanelV.xaml
index b8ae658..3ebf56d 100644
--- a/DrawPanel/DrawPanelV.xaml
+++ b/DrawPanel/DrawPanelV.xaml
@@ -15,8 +15,6 @@
          </Expander.Header>
          <UniformGrid Columns="3">
             <Button x:Name="PuntoBtn" ToolTip="Punto" Style="{StaticResource DrawPanelButton}"
-                    ToolTipService.ShowOnDisabled="True"
-                    ContextMenuService.Placement="Right"
                     Command="{Binding PointBaseCommand}" IsEnabled="{Binding bLayerOk}">
                <Image Source="/Resources/DrawPanel/Point+.png" Stretch="Uniform"/>
                <Button.ContextMenu>
diff --git a/DrawPanel/DrawPanelVM.vb b/DrawPanel/DrawPanelVM.vb
index 890b28c..a6b9e61 100644
--- a/DrawPanel/DrawPanelVM.vb
+++ b/DrawPanel/DrawPanelVM.vb
@@ -454,6 +454,16 @@ Public Class DrawPanelVM
       End Set
    End Property
 
+   Private m_LeftTray_Visibility As Visibility = Visibility.Visible
+   Public Property LeftTray_Visibility As Visibility
+      Get
+         Return m_LeftTray_Visibility
+      End Get
+      Set(value As Visibility)
+         m_LeftTray_Visibility = value
+      End Set
+   End Property
+
 #End Region    ' Button state
 
    ' Definizione comandi
diff --git a/EgtCAM5.vbproj b/EgtCAM5.vbproj
index bbf65a2..9eb9ba3 100644
--- a/EgtCAM5.vbproj
+++ b/EgtCAM5.vbproj
@@ -161,9 +161,6 @@
       <DependentUpon>CurrSetUpV.xaml</DependentUpon>
     </Compile>
     <Compile Include="CurrSetUp\CurrSetUpVM.vb" />
-    <Compile Include="LeftTray\GridSplitterLeft.xaml.vb">
-      <DependentUpon>GridSplitterLeft.xaml</DependentUpon>
-    </Compile>
     <Compile Include="LeftTray\LeftTrayV.xaml.vb">
       <DependentUpon>LeftTrayV.xaml</DependentUpon>
     </Compile>
@@ -457,10 +454,6 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="LeftTray\GridSplitterLeft.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
     <Page Include="LeftTray\LeftTrayV.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
diff --git a/LeftTray/GridSplitterLeft.xaml b/LeftTray/GridSplitterLeft.xaml
deleted file mode 100644
index 3d426a5..0000000
--- a/LeftTray/GridSplitterLeft.xaml
+++ /dev/null
@@ -1,11 +0,0 @@
-<Grid x:Class="GridSplitterLeft"
-      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-      xmlns:local="clr-namespace:EgtCAM5"
-      DockPanel.Dock="Left">
-
-   <GridSplitter Width="5" 
-                 HorizontalAlignment="Center" 
-                 VerticalAlignment="Stretch"/>
-
-</Grid>
diff --git a/LeftTray/GridSplitterLeft.xaml.vb b/LeftTray/GridSplitterLeft.xaml.vb
deleted file mode 100644
index 431e4aa..0000000
--- a/LeftTray/GridSplitterLeft.xaml.vb
+++ /dev/null
@@ -1,3 +0,0 @@
-Public Class GridSplitterLeft
-
-End Class
diff --git a/OptionPanel/DrawOptionPanelV.xaml b/OptionPanel/DrawOptionPanelV.xaml
index 808bf97..f918b28 100644
--- a/OptionPanel/DrawOptionPanelV.xaml
+++ b/OptionPanel/DrawOptionPanelV.xaml
@@ -1,6 +1,6 @@
 <UserControl x:Class="DrawOptionPanelV"
    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Width="250"
+   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" 
    xmlns:EgtFloating="clr-namespace:EgtWPFLib5.EgtFloating;assembly=EgtWPFLib5"
    xmlns:interactivity="clr-namespace:System.Windows.Interactivity;assembly=System.Windows.Interactivity">
 
diff --git a/OptionPanel/MachiningOptionPanelV.xaml b/OptionPanel/MachiningOptionPanelV.xaml
index 8bf918d..a4f8518 100644
--- a/OptionPanel/MachiningOptionPanelV.xaml
+++ b/OptionPanel/MachiningOptionPanelV.xaml
@@ -1,6 +1,6 @@
 <UserControl x:Class="MachiningOptionPanelV"
    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Width="250"
+   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" 
    xmlns:EgtFloating="clr-namespace:EgtWPFLib5.EgtFloating;assembly=EgtWPFLib5"
    xmlns:interactivity="clr-namespace:System.Windows.Interactivity;assembly=System.Windows.Interactivity">
 
diff --git a/OptionPanel/OptionPanelV.xaml b/OptionPanel/OptionPanelV.xaml
index 4ec1a1c..c593a21 100644
--- a/OptionPanel/OptionPanelV.xaml
+++ b/OptionPanel/OptionPanelV.xaml
@@ -1,6 +1,6 @@
 <EgtFloating:EgtFloatingPanel x:Class="OptionPanelV"
                               xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Width="250"
+                              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                               xmlns:EgtFloating="clr-namespace:EgtWPFLib5.EgtFloating;assembly=EgtWPFLib5"
                               TitleBarOrientation="Vertical"
                               Visibility="{Binding Panel_Visibility}">
diff --git a/Project/ProjectVM.vb b/Project/ProjectVM.vb
index 9dccdd5..86bd4f3 100644
--- a/Project/ProjectVM.vb
+++ b/Project/ProjectVM.vb
@@ -101,26 +101,41 @@ Public Class ProjectVM
       Dim m_SceneContentControlV As New SceneContentControlV
 
       ' creo colonne griglia dinamica
-      Dim gridCol1 As ColumnDefinition = New ColumnDefinition()
-      'gridCol1.Width = New GridLength(100)
-      Dim gridCol2 As ColumnDefinition = New ColumnDefinition()
-      Dim gridCol3 As ColumnDefinition = New ColumnDefinition()
+      Dim gridCol1 As ColumnDefinition = New ColumnDefinition With {
+         .Width = New GridLength(1, GridUnitType.Auto)
+      }
+      Dim gridCol2 As ColumnDefinition = New ColumnDefinition With {
+         .Width = New GridLength(1, GridUnitType.Star)
+      }
+      Dim gridCol3 As ColumnDefinition = New ColumnDefinition With {
+         .Width = New GridLength(1, GridUnitType.Auto)
+      }
       ' aggiungo le colonne alla griglia
       m_DynamicGrid.ColumnDefinitions.Add(gridCol1)
       m_DynamicGrid.ColumnDefinitions.Add(gridCol2)
       m_DynamicGrid.ColumnDefinitions.Add(gridCol3)
 
       ' creo righe griglia dinamica
-      Dim gridRow1 As RowDefinition = New RowDefinition()
-      gridRow1.Height = New GridLength(50, GridUnitType.Auto)
-      Dim gridRow2 As RowDefinition = New RowDefinition()
-      Dim gridRow3 As RowDefinition = New RowDefinition()
+      Dim gridRow1 As RowDefinition = New RowDefinition With {
+         .Height = New GridLength(1, GridUnitType.Auto)
+      }
+      Dim gridRow2 As RowDefinition = New RowDefinition With {
+         .Height = New GridLength(1, GridUnitType.Star)
+      }
+      Dim gridRow3 As RowDefinition = New RowDefinition With {
+         .Height = New GridLength(1, GridUnitType.Auto)
+      }
       ' aggiungo righe alla griglia
       m_DynamicGrid.RowDefinitions.Add(gridRow1)
       m_DynamicGrid.RowDefinitions.Add(gridRow2)
       m_DynamicGrid.RowDefinitions.Add(gridRow3)
 
       ' creo gridsplitter
+      Dim gridSplitter As GridSplitter = New GridSplitter With {
+         .Width = 20,
+         .HorizontalAlignment = HorizontalAlignment.Right,
+         .VerticalAlignment = VerticalAlignment.Stretch
+      }
 
       ' aggiungo TopTrayV
       Grid.SetRow(m_TopTrayV, 0)
@@ -129,31 +144,25 @@ Public Class ProjectVM
       ' aggiungo LeftTrayV
       Grid.SetRow(m_LeftTrayV, 1)
       Grid.SetColumn(m_LeftTrayV, 0)
-      'Grid.SetRowSpan(m_LeftTrayV, 2)
+      Grid.SetRowSpan(m_LeftTrayV, 2)
 
       ' aggiungo RightTrayV
       Grid.SetRow(m_RightTrayV, 1)
       Grid.SetColumn(m_RightTrayV, 2)
+      Grid.SetRowSpan(m_RightTrayV, 2)
 
-      ' aggiungo RightTrayV
+      'aggiungo gridSplitter
+      Grid.SetRow(gridSplitter, 1)
+      Grid.SetColumn(gridSplitter, 1)
+
+      ' aggiungo BottomTrayV
       Grid.SetRow(m_BottomTrayV, 2)
-      Grid.SetColumnSpan(m_TopTrayV, 3)
+      Grid.SetColumn(m_BottomTrayV, 1)
 
       ' aggiungo Scena
       Grid.SetRow(m_SceneContentControlV, 1)
       Grid.SetColumn(m_SceneContentControlV, 1)
 
-      '' aggiungo TopTrayV alla griglia
-      'm_DynamicGrid.Children.Add(m_TopTrayV)
-      '' aggiungo LeftTrayV alla griglia
-      'm_DynamicGrid.Children.Add(m_LeftTrayV)
-      '' aggiungo RightTrayV alla griglia
-      'm_DynamicGrid.Children.Add(m_RightTrayV)
-      '' aggiungo BottomTrayV alla griglia
-      'm_DynamicGrid.Children.Add(m_BottomTrayV)
-      '' aggiungo SceneContentControlV alla griglia
-      'm_DynamicGrid.Children.Add(m_SceneContentControlV)
-
       ' aggiungo componenti interfaccia
       Dim bPlugin As Boolean = False
       Dim PluginDirNameList() As String = {}
@@ -206,6 +215,8 @@ Public Class ProjectVM
          m_DynamicGrid.Children.Add(m_TopTrayV)
          ' aggiungo LeftTrayV alla griglia
          m_DynamicGrid.Children.Add(m_LeftTrayV)
+         ' aggiungo gridSplitter alla griglia
+         m_DynamicGrid.Children.Add(gridSplitter)
          ' aggiungo RightTrayV alla griglia
          m_DynamicGrid.Children.Add(m_RightTrayV)
          ' aggiungo BottomTrayV alla griglia
diff --git a/RightTray/RightTrayV.xaml b/RightTray/RightTrayV.xaml
index 2562feb..204f8e5 100644
--- a/RightTray/RightTrayV.xaml
+++ b/RightTray/RightTrayV.xaml
@@ -3,5 +3,6 @@
       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
       xmlns:local="clr-namespace:EgtCAM5"
       DockPanel.Dock="Right">
+   
    <local:OptionPanelV DataContext="{StaticResource OptionPanelViewModel}"/>
 </Grid>
diff --git a/TopCommandBar/TopCommandBarVM.vb b/TopCommandBar/TopCommandBarVM.vb
index 53d68a1..9385d0a 100644
--- a/TopCommandBar/TopCommandBarVM.vb
+++ b/TopCommandBar/TopCommandBarVM.vb
@@ -775,7 +775,8 @@ Public Class TopCommandBarVM
       ' ProjectV
       If Not IsNothing(Map.refProjectV) Then
          If IniFile.IsActivePlugin() Then
-            For Each Panel In Map.refProjectVM.PanelList
+            'For Each Panel In Map.refProjectVM.PanelList
+            For Each Panel In Map.refProjectVM.DynamicGridList
                If TypeOf Panel Is WinFormPluginControlV Then
                   Dim WinFormPanel As WinFormPluginControlV = TryCast(Panel, WinFormPluginControlV)
                   If Not IsNothing(WinFormPanel) Then
@@ -823,7 +824,8 @@ Public Class TopCommandBarVM
    Friend Sub MachiningMode_IsChecked()
       ' ProjectV
       If IniFile.IsActivePlugin() Then
-         For Each Panel In Map.refProjectVM.PanelList
+         'For Each Panel In Map.refProjectVM.PanelList
+         For Each Panel In Map.refProjectVM.DynamicGridList
             If TypeOf Panel Is WinFormPluginControlV Then
                Dim WinFormPanel As WinFormPluginControlV = TryCast(Panel, WinFormPluginControlV)
                If Not IsNothing(WinFormPanel) Then
diff --git a/Utility/Dictionary.xaml b/Utility/Dictionary.xaml
index dce5871..5cd84a7 100644
--- a/Utility/Dictionary.xaml
+++ b/Utility/Dictionary.xaml
@@ -458,6 +458,10 @@
    <Style x:Key="DrawPanelButton" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
       <Setter Property="Height" Value="30"/>
       <Setter Property="Width" Value="30"/>
+      <Setter Property="ToolTipService.ShowOnDisabled" Value="True"/>
+      <Setter Property="ContextMenuService.Placement" Value="Right"/>
+      <Setter Property="ContextMenuService.HorizontalOffset" Value="-1.5"/>
+      <Setter Property="ContextMenuService.VerticalOffset" Value="-3.5"/>
    </Style>
 
    <Style x:Key="MachiningsTextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource {x:Type TextBlock}}">