From 77b45aa9b16b1bcc4c1a5b7ae8df38c3ff6abb77 Mon Sep 17 00:00:00 2001 From: Demetrio Cassarino Date: Tue, 4 Feb 2025 16:47:20 +0100 Subject: [PATCH] =?UTF-8?q?-aggiunto=20ridimensionameto=20griglia,=20possi?= =?UTF-8?q?bilit=C3=A0=20di=20averla=20o=20no?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application.xaml.vb | 14 +-- Constants/ConstEgtStone3D.vb | 16 ++- Constants/ConstIni.vb | 1 + EgtStone3D.vbproj | 15 ++- GridPanel/GridPaneV.xaml | 28 +++++ GridPanel/GridPaneV.xaml.vb | 3 + GridPanel/GridPanelVM.vb | 160 ++++++++++++++++++++++++++++ My Project/AssemblyInfo.vb | 4 +- OptionsWindow/OptionModule.vb | 27 +++++ OptionsWindow/OptionWindowV.xaml | 1 + Resources/EgalwareLogo.ico | Bin 3120 -> 14554 bytes SceneHost/MySceneHostVM.vb | 34 +++++- TopPanel/TopPanelV.xaml | 10 +- Utility/EgtStone3DDefaultStyle.xaml | 35 +++++- Utility/Map.vb | 12 +++ 15 files changed, 337 insertions(+), 23 deletions(-) create mode 100644 GridPanel/GridPaneV.xaml create mode 100644 GridPanel/GridPaneV.xaml.vb create mode 100644 GridPanel/GridPanelVM.vb diff --git a/Application.xaml.vb b/Application.xaml.vb index ec665b9..5290da7 100644 --- a/Application.xaml.vb +++ b/Application.xaml.vb @@ -12,13 +12,13 @@ Protected Overrides Sub OnStartup(e As StartupEventArgs) MyBase.OnStartup(e) ShutdownMode = System.Windows.ShutdownMode.OnMainWindowClose - 'If e.Args.Count = 0 Then - ' ' creo finestra SplashScreen - ' Dim SplashScreen As New SplashScreenV - ' Me.MainWindow = SplashScreen - ' Me.MainWindow.Show() - ' Map.SetRefSplashScreen(SplashScreen) - 'End If + If e.Args.Count = 0 Then + ' creo finestra SplashScreen + Dim SplashScreen As New SplashScreenV + Me.MainWindow = SplashScreen + Me.MainWindow.Show() + Map.SetRefSplashScreen(SplashScreen) + End If ' Creo la View principale Me.MainWindow = New MainWindowV ' Mostro la View principale diff --git a/Constants/ConstEgtStone3D.vb b/Constants/ConstEgtStone3D.vb index 3fc92b3..535255a 100644 --- a/Constants/ConstEgtStone3D.vb +++ b/Constants/ConstEgtStone3D.vb @@ -34,7 +34,9 @@ Public Const ASSEMBLER As String = " Avvio Assembler" + ' unità di misura Public Const MILLIMETER As String = "mm" + Public Const INCH As String = "in" Public Const CHILD As String = "Child" Public Const SOLID As String = "Solid" @@ -63,16 +65,20 @@ Public Const UTILITY_FOLDER As String = "Utility" - Public Const TABLE = "Table" + Public Const TABLE As String = "Table" - Public Const SUBTITLE = "SubTitle" + Public Const SUBTITLE As String = "SubTitle" ' nome file cn in progetto - Public Const KEY_ISOFILE_PATH = "IsoFilePath" + Public Const KEY_ISOFILE_PATH As String = "IsoFilePath" - Public Const FILE_PATH = "FilePath" + Public Const FILE_PATH As String = "FilePath" - 'enum per le trasformazioni + ' info per griglia + Public Const GRID_ON As String = "GRID ON " + Public Const GRID_OFF As String = "GRID OFF" + + ' enum per le trasformazioni Public Enum PairStage As Integer FirstLine = 0 SecondLine = 1 diff --git a/Constants/ConstIni.vb b/Constants/ConstIni.vb index 26d65ee..5357d2d 100644 --- a/Constants/ConstIni.vb +++ b/Constants/ConstIni.vb @@ -18,4 +18,5 @@ Public Const S_MRUFILES As String = "MruFiles" Public Const S_MRUIMPORTFILES As String = "MruImportFiles" Public Const S_IMPORT As String = "Import" + Public Const K_GRIDSTATE As String = "GridState" End Module diff --git a/EgtStone3D.vbproj b/EgtStone3D.vbproj index f66eeb8..66fa1d8 100644 --- a/EgtStone3D.vbproj +++ b/EgtStone3D.vbproj @@ -70,8 +70,7 @@ true - - + Resources\EgalwareLogo.ico @@ -117,6 +116,10 @@ EgtMessageBoxV.xaml + + + GridPaneV.xaml + MainWindowV.xaml @@ -233,6 +236,10 @@ Designer MSBuild:Compile + + Designer + MSBuild:Compile + Designer MSBuild:Compile @@ -385,15 +392,13 @@ SettingsSingleFileGenerator Settings.Designer.vb + - - - diff --git a/GridPanel/GridPaneV.xaml b/GridPanel/GridPaneV.xaml new file mode 100644 index 0000000..350db4c --- /dev/null +++ b/GridPanel/GridPaneV.xaml @@ -0,0 +1,28 @@ + + +