From 55172e04963333e88894699c7a4a60bf7f7492d2 Mon Sep 17 00:00:00 2001
From: Nicola Pievani <nicola.pievani@egalware>
Date: Mon, 30 Dec 2024 17:45:18 +0100
Subject: [PATCH] Gestione configurazione Pulsanti da INI

---
 EgtStone3D.vbproj                |   3 +
 ProjManager/ProjManagerV.xaml    |   2 +-
 Resources/ProjManager/folder.png | Bin 0 -> 2142 bytes
 SceneButton/SceneButtonV.xaml    | 119 +++++++++++++++++++++----------
 SceneButton/SceneButtonV.xaml.vb |   6 +-
 SceneButton/SceneButtonVM.vb     |  86 +++++++++++++++++-----
 6 files changed, 156 insertions(+), 60 deletions(-)
 create mode 100644 Resources/ProjManager/folder.png

diff --git a/EgtStone3D.vbproj b/EgtStone3D.vbproj
index ff573c3..a92b9f1 100644
--- a/EgtStone3D.vbproj
+++ b/EgtStone3D.vbproj
@@ -210,6 +210,9 @@
   <ItemGroup>
     <Resource Include="Resources\ProjManager\save.png" />
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\ProjManager\folder.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
   <PropertyGroup>
     <PostBuildEvent>IF "$(PlatformName)"=="x86" IF "$(ConfigurationName)" == "Release" copy $(TargetPath) c:\EgtProg\EgtStone3D\EgtStone3DR32.exe
diff --git a/ProjManager/ProjManagerV.xaml b/ProjManager/ProjManagerV.xaml
index f315bf0..239b013 100644
--- a/ProjManager/ProjManagerV.xaml
+++ b/ProjManager/ProjManagerV.xaml
@@ -14,7 +14,7 @@
 
    <!--apertura file-->
    <Button Command="{Binding OpenFileCmd}">
-      <Image Source="/Resources/ProjManager/save.png"/>
+      <Image Source="/Resources/ProjManager/folder.png"/>
    </Button>
 
 </StackPanel>
diff --git a/Resources/ProjManager/folder.png b/Resources/ProjManager/folder.png
new file mode 100644
index 0000000000000000000000000000000000000000..8dcd9495defa52a1488673c83a071e174738f178
GIT binary patch
literal 2142
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
U8I1x@4*&oF07*qoM6N<$g7)+Ywg3PC

literal 0
HcmV?d00001

diff --git a/SceneButton/SceneButtonV.xaml b/SceneButton/SceneButtonV.xaml
index d8d970d..09d42ac 100644
--- a/SceneButton/SceneButtonV.xaml
+++ b/SceneButton/SceneButtonV.xaml
@@ -1,42 +1,87 @@
 <UserControl x:Class="SceneButtonV" 
+             xmlns:local="clr-namespace:EgtStone3D"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-   
-    <DockPanel>
-      <StackPanel Orientation="Horizontal" DockPanel.Dock="Top">
-            <ListView ItemsSource="{Binding TopListBtn}">
-                <ListView.ItemTemplate>
-                    <DataTemplate x:Name="SingleLineDataTemplate">
-                        <StackPanel Orientation="Horizontal" Height="44">
-                            <Button Content="{Binding Name}" VerticalAlignment="Center"
-                                    Command="{Binding CmdBtn}"/>
-                        </StackPanel>
-                    </DataTemplate>
-                </ListView.ItemTemplate>
-            </ListView>
-      </StackPanel>
-      <StackPanel Orientation="Horizontal" DockPanel.Dock="Bottom">
-         <Button Content="BOTTOM BUTTON" Height="50" Width="50"/>
-         <Button Content="BOTTOM BUTTON" Height="50" Width="50"/>
-         <Button Content="BOTTOM BUTTON" Height="50" Width="50"/>
-         <Button Content="BOTTOM BUTTON" Height="50" Width="50"/>
-         <Button Content="BOTTOM BUTTON" Height="50" Width="50"/>
-      </StackPanel>
-      <StackPanel Orientation="Vertical" DockPanel.Dock="Right">
-         <Button Content="RIGHT BUTTON" Height="50" Width="50"/>
-         <Button Content="RIGHT BUTTON" Height="50" Width="50"/>
-         <Button Content="RIGHT BUTTON" Height="50" Width="50"/>
-         <Button Content="RIGHT BUTTON" Height="50" Width="50"/>
-         <Button Content="RIGHT BUTTON" Height="50" Width="50"/>
-      </StackPanel>
-      <StackPanel Orientation="Vertical" DockPanel.Dock="Left">
-         <Button Content="LEFT BUTTON" Height="50" Width="50"/>
-         <Button Content="LEFT BUTTON" Height="50" Width="50"/>
-         <Button Content="LEFT BUTTON" Height="50" Width="50"/>
-         <Button Content="LEFT BUTTON" Height="50" Width="50"/>
-      </StackPanel>
 
-      <Canvas Width="50" Height="50" Background="Transparent"/>
-   </DockPanel>
-   
+    <DockPanel>
+        <ItemsControl ItemsSource="{Binding TopListBtn}" DockPanel.Dock="Top" HorizontalAlignment="left">
+            <ItemsControl.ItemsPanel>
+                <ItemsPanelTemplate>
+                    <StackPanel Orientation="Horizontal" />
+                </ItemsPanelTemplate>
+            </ItemsControl.ItemsPanel>
+            <ItemsControl.Resources>
+                <DataTemplate DataType="{x:Type local:_Button}">
+                    <Button Content="{Binding Name}" VerticalAlignment="Center"
+                                Command="{Binding CmdBtn}"/>
+                </DataTemplate>
+                <DataTemplate DataType="{x:Type local:_ToggleButton}">
+                    <ToggleButton Content="{Binding Name}" VerticalAlignment="Center"
+                                 Command="{Binding CmdBtn}" IsChecked="{Binding IsChecked}"/>
+                </DataTemplate>
+            </ItemsControl.Resources>
+
+        </ItemsControl>
+
+        <ItemsControl ItemsSource="{Binding BottomListBtn}" DockPanel.Dock="Bottom" HorizontalAlignment="Left">
+            <ItemsControl.ItemsPanel>
+                <ItemsPanelTemplate>
+                    <StackPanel Orientation="Horizontal" />
+                </ItemsPanelTemplate>
+            </ItemsControl.ItemsPanel>
+            <ItemsControl.Resources>
+                <DataTemplate DataType="{x:Type local:_Button}">
+                    <Button Content="{Binding Name}" VerticalAlignment="Center"
+                                Command="{Binding CmdBtn}"/>
+                </DataTemplate>
+                <DataTemplate DataType="{x:Type local:_ToggleButton}">
+
+                    <ToggleButton Content="{Binding Name}" VerticalAlignment="Center"
+                                Command="{Binding CmdBtn}" IsChecked="{Binding IsChecked}"/>
+                </DataTemplate>
+            </ItemsControl.Resources>
+        </ItemsControl>
+
+        <ItemsControl ItemsSource="{Binding RightListBtn}" DockPanel.Dock="Right" HorizontalAlignment="Right">
+                <ItemsControl.ItemsPanel>
+                    <ItemsPanelTemplate>
+                        <StackPanel Orientation="Vertical"/>
+                    </ItemsPanelTemplate>
+                </ItemsControl.ItemsPanel>
+                <ItemsControl.Resources>
+                    <DataTemplate DataType="{x:Type local:_Button}">
+                        <Button Content="{Binding Name}" VerticalAlignment="Center"
+                                Command="{Binding CmdBtn}"/>
+                    </DataTemplate>
+                <DataTemplate DataType="{x:Type local:_ToggleButton}">
+                    <ToggleButton Content="{Binding Name}" VerticalAlignment="Center"
+                                Command="{Binding CmdBtn}" IsChecked="{Binding IsChecked}"/>
+                    </DataTemplate>
+                </ItemsControl.Resources>
+
+            </ItemsControl>
+
+        <ItemsControl ItemsSource="{Binding LeftListBtn}" DockPanel.Dock="Left" HorizontalAlignment="Right">
+            <ItemsControl.ItemsPanel>
+                <ItemsPanelTemplate>
+                    <StackPanel Orientation="Vertical"/>
+                </ItemsPanelTemplate>
+            </ItemsControl.ItemsPanel>
+            <ItemsControl.Resources>
+                <DataTemplate DataType="{x:Type local:_Button}">
+                    <Button Content="{Binding Name}" VerticalAlignment="Center"
+        Command="{Binding CmdBtn}"/>
+                </DataTemplate>
+                <DataTemplate DataType="{x:Type local:_ToggleButton}">
+
+                    <ToggleButton Content="{Binding Name}" VerticalAlignment="Center"
+        Command="{Binding CmdBtn}" IsChecked="{Binding IsChecked}"/>
+                </DataTemplate>
+            </ItemsControl.Resources>
+
+        </ItemsControl>
+
+        <Canvas Width="50" Height="50" Background="Transparent"/>
+    </DockPanel>
+
 </UserControl>
diff --git a/SceneButton/SceneButtonV.xaml.vb b/SceneButton/SceneButtonV.xaml.vb
index 8f91d27..c8b0e40 100644
--- a/SceneButton/SceneButtonV.xaml.vb
+++ b/SceneButton/SceneButtonV.xaml.vb
@@ -22,10 +22,8 @@ Public Class SceneButtonV
 #Region "METHODS"
 
    Private Sub Init()
-      'Me.Width = Map.refMainWindowV.ActualWidth
-      'Me.Height = Map.refMainWindowV.ActualHeight
-      Me.Width = 1920
-      Me.Height = 600
+      Me.Width = Map.refMainWindowV.ActualWidth
+      Me.Height = Map.refMainWindowV.ActualHeight - 50
    End Sub
 
    Private Sub SceneButtonV_Loaded(sender As Object, e As RoutedEventArgs)
diff --git a/SceneButton/SceneButtonVM.vb b/SceneButton/SceneButtonVM.vb
index cb43d11..2edf79b 100644
--- a/SceneButton/SceneButtonVM.vb
+++ b/SceneButton/SceneButtonVM.vb
@@ -1,4 +1,5 @@
-Imports EgtWPFLib5
+Imports System.Windows.Forms.AxHost
+Imports EgtWPFLib5
 
 Public Class SceneButtonVM
 
@@ -43,10 +44,30 @@ Public Class SceneButtonVM
    End Property
 
    Sub New()
+      SetButtonsLocation("TopListBtn", m_TopListBtn)
+      SetButtonsLocation("LeftListBtn", m_LeftListBtn)
+      SetButtonsLocation("RightListBtn", m_RightListBtn)
+      SetButtonsLocation("BottomListBtn", m_BottomListBtn)
+   End Sub
+
+   Private Sub SetButtonsLocation(PositionList As String, ListBtn As List(Of ScenaBtn))
       Dim Index As Integer = 1
       Dim sBtnString As String = String.Empty
-      While GetMainPrivateProfileString("LeftListBtn", "Btn_" & Index.ToString, "", sBtnString) > 0
-         m_TopListBtn.Add(New ScenaBtn(0, "Btn 1", "Img 1"))
+      While GetMainPrivateProfileString(PositionList, "Btn_" & Index.ToString, "", sBtnString) > 0
+         Dim sItems As String() = Split(sBtnString, ",")
+         If sItems.Count < 3 Then
+            ' Errore di configurazione comando: mancano dei parametri
+            '...
+         Else
+            Dim nType As Integer = 0
+            If sItems(0) = "Button" Then
+               ' Button
+               ListBtn.Add(New _Button(sItems(1), sItems(2), sItems(3)))
+            ElseIf sItems(0) = "ToggleButton" Then
+               ' ToggelButton
+               ListBtn.Add(New _ToggleButton(sItems(1), sItems(2), sItems(3)))
+            End If
+         End If
          Index = Index + 1
          sBtnString = String.Empty
       End While
@@ -56,16 +77,6 @@ End Class
 
 Public Class ScenaBtn
 
-   Private m_Type As Integer
-   Public Property Type As Integer
-      Get
-         Return m_Type
-      End Get
-      Set(value As Integer)
-         m_Type = value
-      End Set
-   End Property
-
    Private m_Name As String
    Public Property Name As String
       Get
@@ -86,10 +97,20 @@ Public Class ScenaBtn
       End Set
    End Property
 
-   Sub New(_Type As Integer, _Name As String, _Img As String)
-      m_Type = _Type
+   Private m_Flag As String
+   Public Property Flag As String
+      Get
+         Return m_Flag
+      End Get
+      Set(value As String)
+         m_Flag = value
+      End Set
+   End Property
+
+   Sub New(_Name As String, _Img As String, _Flag As String)
       m_Name = _Name
       m_Img = _Img
+      m_Flag = _Flag
    End Sub
 
    Private m_CmdBtn As ICommand
@@ -108,10 +129,39 @@ Public Class ScenaBtn
 
 End Class
 
+Public Class _Button
+   Inherits ScenaBtn
+
+   Sub New(_Name As String, _Img As String, _Flag As String)
+      MyBase.New(_Name, _Img, _Flag)
+   End Sub
+
+End Class
+
+Public Class _ToggleButton
+   Inherits ScenaBtn
+
+   Private m_IsChecked As Boolean
+   Public Property IsChecked As Boolean
+      Get
+         Return m_IsChecked
+      End Get
+      Set(value As Boolean)
+         m_IsChecked = value
+      End Set
+   End Property
+
+
+   Sub New(_Name As String, _Img As String, _Flag As String)
+      MyBase.New(_Name, _Img, _Flag)
+   End Sub
+
+End Class
+
 Module SceneCmd
-   Public Sub Exec(Name)
-      Select Case Name
-         Case "Btn 1"
+   Public Sub Exec(Flag)
+      Select Case Flag
+         Case "Pair"
             Dim x As Boolean = True
          Case Else
             Dim x As Boolean = False