diff --git a/Constants/ConstEgtStone3D.vb b/Constants/ConstEgtStone3D.vb new file mode 100644 index 0000000..d1a0925 --- /dev/null +++ b/Constants/ConstEgtStone3D.vb @@ -0,0 +1,11 @@ +Module ConstEgtStone3D + + Public Const EGT_ROTATE As String = "Rotate" + + Public Const EGT_PAIR As String = "Pair" + + Public Const ASSEMBLER_FILENAME As String = "AssemblerLog.txt" + + Public Const ASSEMBLER As String = " Avvio Assembler" + +End Module diff --git a/Constants/ConstGen.vb b/Constants/ConstGen.vb index 08de7f4..09beb2b 100644 --- a/Constants/ConstGen.vb +++ b/Constants/ConstGen.vb @@ -32,4 +32,11 @@ ' Sottodirettorio di default per toolmakers Public Const TOOLMAKERS_DFL_DIR As String = "ToolMakers" + ' Sottodirettorio del Vein 3D + Public Const VEIND3D_DIR As String = "Vein3D_Dir" + ' Sottodirettorio del Create Solid + Public Const CREATESOLID_DIR As String = "CreateSolid" + ' Sottodirettorio dell'Operation Solid + Public Const OPERATIONSOLID_DIR As String = "OperationSolid" + End Module diff --git a/Constants/ConstIni.vb b/Constants/ConstIni.vb index 6404dd6..4ddcd17 100644 --- a/Constants/ConstIni.vb +++ b/Constants/ConstIni.vb @@ -10,4 +10,6 @@ Public Const K_LINEWIDTH As String = "LineWidth" Public Const K_CUSTOMCOLORS As String = "CustomColors" + Public Const K_VEIND3D As String = "Vein3D" + End Module diff --git a/EgtStone3D.vbproj b/EgtStone3D.vbproj index ed03a51..ab8bb1c 100644 --- a/EgtStone3D.vbproj +++ b/EgtStone3D.vbproj @@ -98,6 +98,7 @@ MSBuild:Compile Designer + MainWindowV.xaml diff --git a/MainWindow/MainWindowM.vb b/MainWindow/MainWindowM.vb index 11610f2..7afeb6e 100644 --- a/MainWindow/MainWindowM.vb +++ b/MainWindow/MainWindowM.vb @@ -162,11 +162,11 @@ Public Class MainWindowM Sub New() InitializeEgtEnvironment() ' carico il file LUA con tutte le funzioni di accoppiamento - GetMainPrivateProfileString("Vein3D", "Vein3D_Dir", "", m_sVein3DDir) + GetMainPrivateProfileString(K_VEIND3D, VEIND3D_DIR, "", m_sVein3DDir) ' Path del lua da utilizzare - GetMainPrivateProfileString("Vein3D", "CreateSolid", "", m_sCreateSolidPath) + GetMainPrivateProfileString(K_VEIND3D, CREATESOLID_DIR, "", m_sCreateSolidPath) ' Path del lua da utilizzare - GetMainPrivateProfileString("Vein3D", "OperationSolid", "", m_sOperationSolidPath) + GetMainPrivateProfileString(K_VEIND3D, OPERATIONSOLID_DIR, "", m_sOperationSolidPath) End Sub #End Region ' Constructor diff --git a/MainWindow/MainWindowV.xaml b/MainWindow/MainWindowV.xaml index 6bbad52..2e7cfd9 100644 --- a/MainWindow/MainWindowV.xaml +++ b/MainWindow/MainWindowV.xaml @@ -7,7 +7,6 @@ AllowDrop="True" ShowInTaskbar="True" Topmost="False" - Title="EgtStone3D" Style="{StaticResource NoStyle_Window}"> diff --git a/Pair/PairV.xaml b/Pair/PairV.xaml index 7ce3ee7..5d0dde0 100644 --- a/Pair/PairV.xaml +++ b/Pair/PairV.xaml @@ -1,43 +1,36 @@  - - - - Flip ∥ - Flip ⟂ + xmlns:EgtStone3D="clr-namespace:EgtStone3D"> + + + + + - - - - - - - - - - - - - - - - - - - - - - + + - + + + + + + + + + + + + + + + + + + + + diff --git a/SceneButton/SceneButtonV.xaml.vb b/SceneButton/SceneButtonV.xaml.vb index 604c66d..63fb6d5 100644 --- a/SceneButton/SceneButtonV.xaml.vb +++ b/SceneButton/SceneButtonV.xaml.vb @@ -1,11 +1,13 @@ -Imports System.Windows.Interop +Public Class SceneButtonV -Public Class SceneButtonV +#Region "FIELDS & PROPERTIES" Private m_refSceneButtonVM As SceneButtonVM Public m_PairUC As PairV Public m_RotateUC As RotateV +#End Region ' Fields & Properties + #Region "CONSTRUCTOR" Sub New() @@ -48,6 +50,7 @@ Public Class SceneButtonV MainGrid.Children.Remove(PairUC) PairUC = Nothing End Sub + Public Sub LoadRotateUC() If IsNothing(m_RotateUC) Then m_RotateUC = New RotateV diff --git a/SceneHost/MySceneHostVM.vb b/SceneHost/MySceneHostVM.vb index c8f57a7..d32ce6e 100644 --- a/SceneHost/MySceneHostVM.vb +++ b/SceneHost/MySceneHostVM.vb @@ -1,6 +1,5 @@ Imports EgtUILib Imports EgtWPFLib5 -Imports System.IO Public Class MySceneHostVM Inherits SceneHostVM diff --git a/SceneHost/SceneHostV.xaml.vb b/SceneHost/SceneHostV.xaml.vb index fbdb6bb..5266aef 100644 --- a/SceneHost/SceneHostV.xaml.vb +++ b/SceneHost/SceneHostV.xaml.vb @@ -1,5 +1,4 @@ -Imports System.Collections.ObjectModel -Imports EgtUILib +Imports EgtUILib Imports EgtUILib.EgtInterface Imports EgtWPFLib5 @@ -9,6 +8,8 @@ Public Class SceneHostV Private m_MySceneHostVM As MySceneHostVM + Private m_SelType As Integer = GDB_TY.CRV_LINE + ' variabili per la selezione in over Private m_nIdMouseOverSel As Integer = 0 Private m_nIdMarked1 As Integer = 0 @@ -75,7 +76,8 @@ Public Class SceneHostV #End Region ' Constructor - Private m_SelType As Integer = GDB_TY.CRV_LINE +#Region "EVENTS" + Private Sub OnMouseMoveScene(sender As Object, e As System.Windows.Forms.MouseEventArgs) Handles MainScene.OnMouseMoveScene OnMouseOver(sender, e, m_SelType) ' Se drag non abilitato o già in esecuzione, esco @@ -642,4 +644,6 @@ Line1: EgtDraw() End Sub +#End Region ' Events + End Class diff --git a/SecondaryWindow/SecondaryWindowV.xaml b/SecondaryWindow/SecondaryWindowV.xaml index 9b8adda..c27ae7f 100644 --- a/SecondaryWindow/SecondaryWindowV.xaml +++ b/SecondaryWindow/SecondaryWindowV.xaml @@ -10,7 +10,7 @@ Background="Transparent" Style="{DynamicResource {x:Type EgtWPFLib5:EgtMainWindow}}"> - + diff --git a/SecondaryWindow/SecondaryWindowVM.vb b/SecondaryWindow/SecondaryWindowVM.vb index b952ae9..fa339b8 100644 --- a/SecondaryWindow/SecondaryWindowVM.vb +++ b/SecondaryWindow/SecondaryWindowVM.vb @@ -47,5 +47,4 @@ Public Class SecondaryWindowVM #End Region ' COMMANDS - End Class diff --git a/Utility/AssLogM.vb b/Utility/AssLogM.vb index 3d747c2..8ffb58d 100644 --- a/Utility/AssLogM.vb +++ b/Utility/AssLogM.vb @@ -1,11 +1,19 @@ Imports System.IO Module AssLogM + +#Region "FIELDS & PROPERTIES" + Public Property AssemblerFunctionLog As String = String.Empty + +#End Region ' Fields & Properties + +#Region "METHODS" + Public Sub InitAssLog() - AssemblerFunctionLog = Map.refMainWindowVM.MainWindowM.sDataRoot & "\Temp\" & "AssemblerLog.txt" + AssemblerFunctionLog = Map.refMainWindowVM.MainWindowM.sTempDir & "\" & ASSEMBLER_FILENAME File.WriteAllText(AssemblerFunctionLog, String.Empty) - AssLog(Date.Now.ToString & " Avvio Assembler") + AssLog(Date.Now.ToString & ASSEMBLER) End Sub Public Function AssLog(sMsg As String) As Boolean @@ -14,4 +22,7 @@ Module AssLogM AssLogWriter.Close() Return True End Function + +#End Region ' Methods + End Module diff --git a/Utility/EgtStone3DDictionary.xaml b/Utility/EgtStone3DDictionary.xaml index df738ea..2105b29 100644 --- a/Utility/EgtStone3DDictionary.xaml +++ b/Utility/EgtStone3DDictionary.xaml @@ -351,4 +351,148 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Utility/EstCalc.vb b/Utility/EstCalc.vb index 21dc612..9651f41 100644 --- a/Utility/EstCalc.vb +++ b/Utility/EstCalc.vb @@ -1,8 +1,10 @@ Imports System.Globalization Imports EgtUILib -Imports EgtWPFLib5 Module EstCalc + +#Region "METHODS" + 'Friend Function CompoColor(sIniFile As String) As Color3d ' Dim InsertColor As New Color3d(89, 210, 210, 25) ' Dim IndexColor As Integer = GetPrivateProfileInt(S_COMPO, K_LASTCOLOR, 1, sIniFile) @@ -1089,5 +1091,7 @@ Module EstCalc ' Return ( nText <> GDB_ID.NULL) ' End Function +#End Region ' Methods + End Module diff --git a/Utility/PartSolidM.vb b/Utility/PartSolidM.vb index 65bae96..f12510a 100644 --- a/Utility/PartSolidM.vb +++ b/Utility/PartSolidM.vb @@ -1,7 +1,9 @@ Imports EgtUILib.EgtInterface Public Class PartSolidM -#Region "properties" + +#Region "FIELDS & PROPERTIES" + Private m_PartId As Integer = -1 Public ReadOnly Property PartId As Integer Get @@ -180,9 +182,10 @@ Public Class PartSolidM Private m_nLayTempId As Integer = -1 -#End Region ' properties +#End Region ' Fields & Properties + +#Region "CONSTRUCTOR" -#Region "metodi" Sub New(nId As Integer) ' salvo il riferimento della VeinMatchingWindow Dim nPartId As Integer = -1 @@ -243,6 +246,10 @@ Public Class PartSolidM End If End Sub +#End Region ' Constructor + +#Region "METHODS" + Public Sub SelectSinglePart() If EgtIsSelectedObj(m_PartId) Then Return Dim bOk As Boolean = EgtSelectObj(m_PartId) @@ -407,5 +414,6 @@ Public Class PartSolidM Return EgtIsSelectedObj(PartId) End Function -#End Region ' metodi +#End Region ' Methods + End Class diff --git a/Utility/SolidManagerM.vb b/Utility/SolidManagerM.vb index ac2a227..40b40dd 100644 --- a/Utility/SolidManagerM.vb +++ b/Utility/SolidManagerM.vb @@ -4,8 +4,15 @@ Imports EgtWPFLib5 Module SolidManagerM +#Region "FIELDS & PROPERTIES" + Public m_PartSolidList As New ObservableCollection(Of PartSolidM) '' lista dei PartSolid Public m_nVeinCtx As Integer = DirectCast(Map.refSceneHostV.DataContext, SceneHostVM).MainScene.GetCtx() + +#End Region ' Fields & Properties + +#Region "METHODS" + Public Function GetPartSolid(nId As Integer) As PartSolidM ' se la lista non esiste la creo If m_PartSolidList.Count = 0 Then @@ -474,4 +481,6 @@ Module SolidManagerM Return False End Function +#End Region ' Methods + End Module