-introdotto griglia dinamica per gestire spostamento colonne

Project/ProjectV.xaml

@@ -13,7 +13,7 @@
    </ItemsControl.ItemsPanel>
    <ItemsControl.ItemContainerStyle>
       <Style>
-         <Setter Property="DockPanel.Dock" Value="{Binding}" />
+         <Setter Property="DockPanel.Dock" Value="{Binding}"/>
       </Style>
    </ItemsControl.ItemContainerStyle>
    

Project/ProjectVM.vb

@@ -1,7 +1,7 @@
-Imports System.Windows.Forms.Integration
-Imports System.Windows.Interop
+Imports System.Globalization
 Imports System.IO
-Imports System.Globalization
+Imports System.Windows.Forms.Integration
+Imports System.Windows.Interop
 Imports EgtUILib
 Imports EgtWPFLib5
 
@@ -57,9 +57,15 @@ Public Class ProjectVM
       End Get
    End Property
 
-
+   Private m_DynamicGrid As New Grid()
+   Public ReadOnly Property DynamicGrid As Grid
+      Get
+         Return m_DynamicGrid
+      End Get
+   End Property
 
 #End Region
+
 #Region "EGTUILIB FIELDS"
 
    Private m_bCPlaneTypePos As Boolean
@@ -79,6 +85,17 @@ Public Class ProjectVM
       TMDbParamVisibility.bFirst = True
       ' Inizializza i parametri della scena
       'InitializeEgtProject()
+
+      Dim m_TopTrayV As New TopTrayV
+      Dim m_LeftTrayV As New LeftTrayV
+      Dim m_RightTrayV As New RightTrayV
+      Dim m_BottomTrayV As New BottomTrayV
+      Dim m_SceneContentControlV As New SceneContentControlV
+
+      DynamicGridModule.CreateDynamicGrid()
+
+      Dim gridSplitter As GridSplitter = DynamicGridModule.CreateGridSplitter()
+
       ' aggiungo componenti interfaccia
       Dim bPlugin As Boolean = False
       Dim PluginDirNameList() As String = {}
@@ -105,12 +122,17 @@ Public Class ProjectVM
                Dim ConfigurationData As IPluginConfigData = Map.refMainWindowVM.GetConfigData(Of IPluginConfigData)(PluginName & ".ConfigurationData")
                If Not IsNothing(ConfigurationData) And ConfigurationData.ControlList.Count > 0 Then
                   For Each Element In ConfigurationData.ControlList
+                     PopolateGridWithPlugIn(m_TopTrayV, m_RightTrayV, m_BottomTrayV, m_SceneContentControlV, gridSplitter)
                      Select Case Element.Name
                         Case PLUGIN_RIGHT_TRAY
-                           m_PanelList.Add(New RightTrayV)
+                           'm_PanelList.Add(New RightTrayV)
+                           'aggiungo RightTrayV alla griglia
+                           m_DynamicGrid.Children.Add(m_RightTrayV)
                            Map.refOptionPanelVM.SetPanelViewState(Element.ViewPanelState)
                         Case PLUGIN_LEFT_TRAY
-                           m_PanelList.Add(New LeftTrayV)
+                           'm_PanelList.Add(New LeftTrayV)
+                           ' aggiungo LeftTrayV alla griglia
+                           m_DynamicGrid.Children.Add(m_LeftTrayV)
                         Case Else
                            m_PanelList.Add(Map.refMainWindowVM.GetControlByName(Of IPluginControl)(Element))
                      End Select
@@ -118,17 +140,44 @@ Public Class ProjectVM
                End If
             End If
          Next
-         m_PanelList.Add(New BottomTrayV)
-         m_PanelList.Add(New TopTrayV)
+         'm_PanelList.Add(New BottomTrayV)
+         'm_PanelList.Add(New TopTrayV)
+         ' aggiungo gridSplitter alla griglia
+         m_DynamicGrid.Children.Add(gridSplitter)
+         ' aggiungo BottomTrayV alla griglia
+         m_DynamicGrid.Children.Add(m_BottomTrayV)
+         ' aggiungo TopTrayV alla griglia
+         m_DynamicGrid.Children.Add(m_TopTrayV)
          ' nascondo tasti gestione progetto se attivo plugin
          Map.refTopCommandBarVM.SetProjectManagerVisibility(False)
       Else
-         m_PanelList.Add(New TopTrayV)
-         m_PanelList.Add(New LeftTrayV)
-         m_PanelList.Add(New RightTrayV)
-         m_PanelList.Add(New BottomTrayV)
+         'm_PanelList.Add(New TopTrayV)
+         'm_PanelList.Add(New LeftTrayV)
+         'm_PanelList.Add(New RightTrayV)
+         'm_PanelList.Add(New BottomTrayV)
+         DynamicGridModule.PopulateGrid(m_TopTrayV, m_LeftTrayV, m_RightTrayV, m_BottomTrayV, m_SceneContentControlV, gridSplitter)
+         ' aggiungo TopTrayV alla griglia
+         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
+         m_DynamicGrid.Children.Add(m_BottomTrayV)
       End If
-      m_PanelList.Add(New SceneContentControlV)
+      'm_PanelList.Add(New SceneContentControlV)
+      ' aggiungo SceneContentControlV alla griglia
+      m_DynamicGrid.Children.Add(m_SceneContentControlV)
+      ' Carico le dimensioni salvate su ini se presenti
+      AddHandler m_DynamicGrid.Loaded,
+      Sub()
+         DynamicGridModule.RestoreGridLayout(If(IsActivePlugin(), DynamicGridModule.PROJECT_EGTCAM5_PLUGIN, DynamicGridModule.PROJECT_EGTCAM5))
+         m_DynamicGrid.UpdateLayout()
+      End Sub
+
+      m_PanelList.Add(m_DynamicGrid)
    End Sub
 
 #End Region
@@ -222,14 +271,14 @@ Public Class ProjectVM
          If IniFile.IsActiveTrimming() Then
             bExtensions = True
             Dim sVersion As String = "---"
-            IniFile.GetSpecialLuaVersion( IniFile.m_sTrimmingDirPath, sVersion) 
+            IniFile.GetSpecialLuaVersion(IniFile.m_sTrimmingDirPath, sVersion)
             Dim sOut As String = "Trimming ver. " & sVersion & "   " & IniFile.m_sTrimmingDirPath
             EgtOutLog(sOut)
          End If
          If IniFile.IsActiveReversePost() Then
             bExtensions = True
             Dim sVersion As String = "---"
-            IniFile.GetSpecialLuaVersion( IniFile.m_sReversePostDirPath, sVersion) 
+            IniFile.GetSpecialLuaVersion(IniFile.m_sReversePostDirPath, sVersion)
             Dim sOut As String = "ReversePost ver. " & sVersion & "   " & IniFile.m_sReversePostDirPath
             EgtOutLog(sOut)
          End If
@@ -387,9 +436,9 @@ Public Class ProjectVM
       Dim nShowCurveDir As Integer = GetPrivateProfileInt(S_SCENE, K_CURVEDIR, 0)
       Map.refShowPanelVM.ShowCurveDir(nShowCurveDir)
       ' qualità di visualizzazione delle superfici
-      OptionModule.SetShowSurfQuality( False)
+      OptionModule.SetShowSurfQuality(False)
       ' tipo visualizzazione per Zmap
-      EgtSetShowZmap( OptionModule.m_nShowZmapType, False)
+      EgtSetShowZmap(OptionModule.m_nShowZmapType, False)
       ' dimensione lineare max in pixel delle textures
       Dim nTxrMaxLinPix As Integer = GetPrivateProfileInt(S_SCENE, K_TEXMAXLINPIX, 4096)
       EgtSetTextureMaxLinPixels(nTxrMaxLinPix)
@@ -1134,7 +1183,7 @@ Public Class ProjectVM
                   EgtGetPlaneSnapPoint(e.Location, Vector3d.Z_AX, TableRef.z, ptCurr)
                   DispositionUtility.VtHookFinder(nFixtureId, ptCurr)
                   Exit While
-               ElseIf DispositionUtility.VerifyTableAxis( nFixtureId) Then
+               ElseIf DispositionUtility.VerifyTableAxis(nFixtureId) Then
                   m_SelType = DispositionUtility.SelType.BARS
                   m_nIdToSel = nFixtureId
                   ' Drag possibile
@@ -1232,7 +1281,7 @@ Public Class ProjectVM
                m_nIdToDesel = GDB_ID.NULL
                EgtDraw()
                Return
-            ' altrimenti verifico il tipo del primo oggetto selezionato
+               ' altrimenti verifico il tipo del primo oggetto selezionato
             Else
                Dim nFirstSelId As Integer = EgtGetFirstSelectedObj()
                ' se è un riferimento resetto lo stato di selezione ed esco