diff --git a/AboutBoxWindow/AboutBoxView.xaml b/AboutBoxWindow/AboutBoxView.xaml index 0efe2c4..702b54f 100644 --- a/AboutBoxWindow/AboutBoxView.xaml +++ b/AboutBoxWindow/AboutBoxView.xaml @@ -1,4 +1,4 @@ - - + diff --git a/Application.xaml.vb b/Application.xaml.vb index 0681fc3..391b60c 100644 --- a/Application.xaml.vb +++ b/Application.xaml.vb @@ -11,11 +11,11 @@ Class Application MyBase.OnStartup(e) ShutdownMode = System.Windows.ShutdownMode.OnMainWindowClose ' Creo la View principale - Dim MainWndView As New MainWindow + Dim MainWndView As New MainWindowV MainWindow = MainWndView System.Windows.Forms.Integration.ElementHost.EnableModelessKeyboardInterop(Me.MainWindow) ' Creo il ViewModel principale - Dim MainWndViewModel As New MainWindowViewModel + Dim MainWndViewModel As New MainWindowVM ' Assegno il ViewModel alla View MainWndView.DataContext = MainWndViewModel ' Mostro la View principale diff --git a/ProjectPage/DoorsPanel/DoorsPanelView.xaml b/DoorsPanel/DoorPanelV.xaml similarity index 93% rename from ProjectPage/DoorsPanel/DoorsPanelView.xaml rename to DoorsPanel/DoorPanelV.xaml index c1f308a..6804f17 100644 --- a/ProjectPage/DoorsPanel/DoorsPanelView.xaml +++ b/DoorsPanel/DoorPanelV.xaml @@ -1,4 +1,4 @@ - diff --git a/DoorsPanel/DoorPanelV.xaml.vb b/DoorsPanel/DoorPanelV.xaml.vb new file mode 100644 index 0000000..6321205 --- /dev/null +++ b/DoorsPanel/DoorPanelV.xaml.vb @@ -0,0 +1,3 @@ +Public Class DoorPanelV + +End Class diff --git a/ProjectPage/DoorsPanel/DoorsPanelViewModel.vb b/DoorsPanel/DoorPanelVM.vb similarity index 96% rename from ProjectPage/DoorsPanel/DoorsPanelViewModel.vb rename to DoorsPanel/DoorPanelVM.vb index c35e2b4..4e09dd0 100644 --- a/ProjectPage/DoorsPanel/DoorsPanelViewModel.vb +++ b/DoorsPanel/DoorPanelVM.vb @@ -3,7 +3,7 @@ Imports EgtUILib Namespace EgtCAM5 - Public Class DoorsPanelViewModel + Public Class DoorPanelVM Inherits ViewModelBase Public ReadOnly Property MruDoorNames As ObservableCollection(Of String) diff --git a/ProjectPage/DrawPanel/DrawPanelView.xaml b/DrawPanel/DrawPanelV.xaml similarity index 98% rename from ProjectPage/DrawPanel/DrawPanelView.xaml rename to DrawPanel/DrawPanelV.xaml index 89dcb2c..38db379 100644 --- a/ProjectPage/DrawPanel/DrawPanelView.xaml +++ b/DrawPanel/DrawPanelV.xaml @@ -1,4 +1,4 @@ - Public Sub Point(ByVal param As Object) If (Keyboard.Modifiers And ModifierKeys.Control) = ModifierKeys.Control Then - EgtCAM5Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.FRAME) + Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.FRAME) ElseIf (Keyboard.Modifiers And ModifierKeys.Shift) = ModifierKeys.Shift Then - EgtCAM5Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.VECTOR) + Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.VECTOR) Else - EgtCAM5Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.POINT) + Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.POINT) End If End Sub @@ -455,10 +455,10 @@ Namespace EgtCAM5 ''' Public Sub Line2P(ByVal param As Object) If (Keyboard.Modifiers And ModifierKeys.Control) = ModifierKeys.Control Then - EgtCAM5Map.refProjectVM.GetController.SetContinue() + Map.refProjectVM.GetController.SetContinue() 'EmitStripStatusOutput(EgtMsg(399)) ' Continue : 'L' with line, 'A' with arc End If - EgtCAM5Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.LINE2P) + Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.LINE2P) End Sub #End Region ' Line2PCommand @@ -482,9 +482,9 @@ Namespace EgtCAM5 ''' Public Sub LinePDL(ByVal param As Object) If (Keyboard.Modifiers And ModifierKeys.Shift) <> ModifierKeys.Shift Then - EgtCAM5Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.LINEPDL) + Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.LINEPDL) Else - EgtCAM5Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.LINEPVL) + Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.LINEPVL) End If End Sub @@ -508,7 +508,7 @@ Namespace EgtCAM5 ''' Execute the CircleCP. This method is invoked by the CircleCPCommand. ''' Public Sub CircleCP(ByVal param As Object) - EgtCAM5Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.CIRCLECP) + Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.CIRCLECP) End Sub #End Region ' CircleCPCommand @@ -531,7 +531,7 @@ Namespace EgtCAM5 ''' Execute the CircleCD. This method is invoked by the CircleCDCommand. ''' Public Sub CircleCD(ByVal param As Object) - EgtCAM5Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.CIRCLECD) + Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.CIRCLECD) End Sub #End Region ' CircleCDCommand @@ -554,7 +554,7 @@ Namespace EgtCAM5 ''' Execute the ArcCSE. This method is invoked by the ArcCSECommand. ''' Public Sub ArcCSE(ByVal param As Object) - EgtCAM5Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.ARCCSE) + Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.ARCCSE) End Sub #End Region ' ArcCSECommand @@ -577,7 +577,7 @@ Namespace EgtCAM5 ''' Execute the Arc3P. This method is invoked by the Arc3PCommand. ''' Public Sub Arc3P(ByVal param As Object) - EgtCAM5Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.ARC3P) + Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.ARC3P) End Sub #End Region ' Arc3PCommand @@ -602,12 +602,12 @@ Namespace EgtCAM5 Public Sub ArcPDP(ByVal param As Object) If (Keyboard.Modifiers And ModifierKeys.Shift) <> ModifierKeys.Shift Then If (Keyboard.Modifiers And ModifierKeys.Control) = ModifierKeys.Control Then - EgtCAM5Map.refProjectVM.GetController.SetContinue() + Map.refProjectVM.GetController.SetContinue() 'EmitStripStatusOutput(EgtMsg(399)) ' Continue : 'L' with line, 'A' with arc End If - EgtCAM5Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.ARCPDP) + Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.ARCPDP) Else - EgtCAM5Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.ARCPVP) + Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.ARCPVP) End If End Sub @@ -631,7 +631,7 @@ Namespace EgtCAM5 ''' Execute the Fillet. This method is invoked by the FilletCommand. ''' Public Sub Fillet(ByVal param As Object) - EgtCAM5Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.FILLET) + Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.FILLET) End Sub #End Region ' FilletCommand @@ -654,7 +654,7 @@ Namespace EgtCAM5 ''' Execute the Chamfer. This method is invoked by the ChamferCommand. ''' Public Sub Chamfer(ByVal param As Object) - EgtCAM5Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.CHAMFER) + Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.CHAMFER) End Sub #End Region ' ChamferCommand @@ -677,7 +677,7 @@ Namespace EgtCAM5 ''' Execute the Rectangle2P. This method is invoked by the Rectangle2PCommand. ''' Public Sub Rectangle2P(ByVal param As Object) - EgtCAM5Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.RECTANGLE2P) + Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.RECTANGLE2P) End Sub #End Region ' Rectangle2PCommand @@ -700,7 +700,7 @@ Namespace EgtCAM5 ''' Execute the Polygon. This method is invoked by the PolygonCommand. ''' Public Sub Polygon(ByVal param As Object) - EgtCAM5Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.POLYGON) + Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.POLYGON) End Sub #End Region ' PolygonCommand @@ -723,7 +723,7 @@ Namespace EgtCAM5 ''' Execute the PolygonSide. This method is invoked by the PolygonSideCommand. ''' Public Sub PolygonSide(ByVal param As Object) - EgtCAM5Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.POLYGONSIDE) + Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.POLYGONSIDE) End Sub #End Region ' PolygonSideCommand @@ -747,9 +747,9 @@ Namespace EgtCAM5 ''' Public Sub Text(ByVal param As Object) If (Keyboard.Modifiers And ModifierKeys.Shift) <> ModifierKeys.Shift Then - EgtCAM5Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.TEXT) + Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.TEXT) Else - EgtCAM5Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.TEXTPLUS) + Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.TEXTPLUS) End If End Sub @@ -774,9 +774,9 @@ Namespace EgtCAM5 ''' Public Sub Plane(ByVal param As Object) If (Keyboard.Modifiers And ModifierKeys.Shift) = ModifierKeys.Shift Then - EgtCAM5Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.REGION) + Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.REGION) Else - EgtCAM5Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.PLANE) + Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.PLANE) End If End Sub @@ -800,7 +800,7 @@ Namespace EgtCAM5 ''' Execute the Extrude. This method is invoked by the ExtrudeCommand. ''' Public Sub Extrude(ByVal param As Object) - EgtCAM5Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.EXTRUDE) + Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.EXTRUDE) End Sub #End Region ' ExtrudeCommand @@ -823,7 +823,7 @@ Namespace EgtCAM5 ''' Execute the Revolve. This method is invoked by the RevolveCommand. ''' Public Sub Revolve(ByVal param As Object) - EgtCAM5Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.REVOLVE) + Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.REVOLVE) End Sub #End Region ' RevolveCommand @@ -846,7 +846,7 @@ Namespace EgtCAM5 ''' Execute the Screw. This method is invoked by the ScrewCommand. ''' Public Sub Screw(ByVal param As Object) - EgtCAM5Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.SCREW) + Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.SCREW) End Sub #End Region ' ScrewCommand @@ -869,7 +869,7 @@ Namespace EgtCAM5 ''' Execute the Ruled. This method is invoked by the RuledCommand. ''' Public Sub Ruled(ByVal param As Object) - EgtCAM5Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.RULED) + Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.RULED) End Sub #End Region ' RuledCommand @@ -892,7 +892,7 @@ Namespace EgtCAM5 ''' Execute the MergeSurf. This method is invoked by the MergeSurfCommand. ''' Public Sub MergeSurf(ByVal param As Object) - EgtCAM5Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.MERGESURF) + Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.MERGESURF) End Sub #End Region ' MergeSurfCommand @@ -915,7 +915,7 @@ Namespace EgtCAM5 ''' Execute the ExplodeSurf. This method is invoked by the ExplodeSurfCommand. ''' Public Sub ExplodeSurf(ByVal param As Object) - EgtCAM5Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.EXPLODESURF) + Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.EXPLODESURF) End Sub #End Region ' ExplodeSurfCommand @@ -938,7 +938,7 @@ Namespace EgtCAM5 ''' Execute the InvertSurf. This method is invoked by the InvertSurfCommand. ''' Public Sub InvertSurf(ByVal param As Object) - EgtCAM5Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.INVERTSURF) + Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.INVERTSURF) End Sub #End Region ' InvertSurfCommand @@ -961,8 +961,8 @@ Namespace EgtCAM5 ''' Execute the Delete. This method is invoked by the DeleteCommand. ''' Public Sub Delete(ByVal param As Object) - EgtCAM5Map.refProjectVM.GetController.SetLastInteger(GDB_ID.SEL) - EgtCAM5Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.DELETE) + Map.refProjectVM.GetController.SetLastInteger(GDB_ID.SEL) + Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.DELETE) End Sub #End Region ' DeleteCommand @@ -986,9 +986,9 @@ Namespace EgtCAM5 ''' Public Sub ChangeLayer(ByVal param As Object) If (Keyboard.Modifiers And ModifierKeys.Shift) <> ModifierKeys.Shift Then - EgtCAM5Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.CHANGELAYERGLOB) + Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.CHANGELAYERGLOB) Else - EgtCAM5Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.CHANGELAYER) + Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.CHANGELAYER) End If End Sub @@ -1012,7 +1012,7 @@ Namespace EgtCAM5 ''' Execute the ChangeAlpha. This method is invoked by the ChangeAlphaCommand. ''' Public Sub ChangeAlpha(ByVal param As Object) - EgtCAM5Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.CHANGEALPHA) + Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.CHANGEALPHA) End Sub #End Region ' ChangeAlphaCommand @@ -1035,7 +1035,7 @@ Namespace EgtCAM5 ''' Execute the ResetColor. This method is invoked by the ResetColorCommand. ''' Public Sub ResetColor(ByVal param As Object) - EgtCAM5Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.RESETCOLOR) + Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.RESETCOLOR) End Sub #End Region ' ResetColorCommand @@ -1058,7 +1058,7 @@ Namespace EgtCAM5 ''' Execute the ChangeColor. This method is invoked by the ChangeColorCommand. ''' Public Sub ChangeColor(ByVal param As Object) - EgtCAM5Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.CHANGECOLOR) + Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.CHANGECOLOR) End Sub #End Region ' ChangeColorCommand @@ -1081,7 +1081,7 @@ Namespace EgtCAM5 ''' Execute the InvertCurve. This method is invoked by the InvertCurveCommand. ''' Public Sub InvertCurve(ByVal param As Object) - EgtCAM5Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.INVERTCURVE) + Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.INVERTCURVE) End Sub #End Region ' InvertCurveCommand @@ -1104,7 +1104,7 @@ Namespace EgtCAM5 ''' Execute the ChangeStartCurve. This method is invoked by the InvertCurveCommand. ''' Public Sub ChangeStartCurve(ByVal param As Object) - EgtCAM5Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.CHANGESTARTCURVE) + Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.CHANGESTARTCURVE) End Sub #End Region ' ChangeStartCurveCommand @@ -1127,7 +1127,7 @@ Namespace EgtCAM5 ''' Execute the ExtendCurve. This method is invoked by the ExtendCurveCommand. ''' Public Sub ExtendCurve(ByVal param As Object) - EgtCAM5Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.TRIMEXTENDCURVE) + Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.TRIMEXTENDCURVE) End Sub #End Region ' ExtendCurveCommand @@ -1150,7 +1150,7 @@ Namespace EgtCAM5 ''' Execute the BreakCurve. This method is invoked by the BreakCurveCommand. ''' Public Sub BreakCurve(ByVal param As Object) - EgtCAM5Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.BREAKCURVE) + Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.BREAKCURVE) End Sub #End Region ' BreakCurveCommand @@ -1173,7 +1173,7 @@ Namespace EgtCAM5 ''' Execute the SplitCurve. This method is invoked by the SplitCurveCommand. ''' Public Sub SplitCurve(ByVal param As Object) - EgtCAM5Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.SPLITCURVE) + Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.SPLITCURVE) End Sub #End Region ' SplitCurveCommand @@ -1197,11 +1197,11 @@ Namespace EgtCAM5 ''' Public Sub JoinCurve(ByVal param As Object) If (Keyboard.Modifiers And ModifierKeys.Shift) <> ModifierKeys.Shift Then - EgtCAM5Map.refProjectVM.GetController.SetLastBoolean(False) + Map.refProjectVM.GetController.SetLastBoolean(False) Else - EgtCAM5Map.refProjectVM.GetController.SetLastBoolean(True) + Map.refProjectVM.GetController.SetLastBoolean(True) End If - EgtCAM5Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.JOINCURVE) + Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.JOINCURVE) End Sub #End Region ' JoinCurveCommand @@ -1224,7 +1224,7 @@ Namespace EgtCAM5 ''' Execute the ExplodeCurve. This method is invoked by the ExplodeCurveCommand. ''' Public Sub ExplodeCurve(ByVal param As Object) - EgtCAM5Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.EXPLODECURVE) + Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.EXPLODECURVE) End Sub #End Region ' ExplodeCurveCommand @@ -1247,7 +1247,7 @@ Namespace EgtCAM5 ''' Execute the SetCurveTh. This method is invoked by the SetCurveThCommand. ''' Public Sub SetCurveTh(ByVal param As Object) - EgtCAM5Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.SETCURVETHICKNESS) + Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.SETCURVETHICKNESS) End Sub #End Region ' SetCurveThCommand @@ -1270,7 +1270,7 @@ Namespace EgtCAM5 ''' Execute the Move. This method is invoked by the MoveCommand. ''' Public Sub Move(ByVal param As Object) - EgtCAM5Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.MOVE) + Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.MOVE) End Sub #End Region ' MoveCommand @@ -1293,7 +1293,7 @@ Namespace EgtCAM5 ''' Execute the Rotate. This method is invoked by the RotateCommand. ''' Public Sub Rotate(ByVal param As Object) - EgtCAM5Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.ROTATE) + Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.ROTATE) End Sub #End Region ' RotateCommand @@ -1316,7 +1316,7 @@ Namespace EgtCAM5 ''' Execute the Rotate3D. This method is invoked by the Rotate3DCommand. ''' Public Sub Rotate3D(ByVal param As Object) - EgtCAM5Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.ROTATE3D) + Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.ROTATE3D) End Sub #End Region ' Rotate3DCommand @@ -1339,7 +1339,7 @@ Namespace EgtCAM5 ''' Execute the Mirror. This method is invoked by the MirrorCommand. ''' Public Sub Mirror(ByVal param As Object) - EgtCAM5Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.MIRROR) + Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.MIRROR) End Sub #End Region ' MirrorCommand @@ -1362,7 +1362,7 @@ Namespace EgtCAM5 ''' Execute the Mirror3D. This method is invoked by the Mirror3DCommand. ''' Public Sub Mirror3D(ByVal param As Object) - EgtCAM5Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.MIRROR3D) + Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.MIRROR3D) End Sub #End Region ' Mirror3DCommand @@ -1385,7 +1385,7 @@ Namespace EgtCAM5 ''' Execute the Scale. This method is invoked by the ScaleCommand. ''' Public Sub Scale(ByVal param As Object) - EgtCAM5Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.SCALE) + Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.SCALE) End Sub #End Region ' ScaleCommand @@ -1408,7 +1408,7 @@ Namespace EgtCAM5 ''' Execute the Scale3D. This method is invoked by the Scale3DCommand. ''' Public Sub Scale3D(ByVal param As Object) - EgtCAM5Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.SCALE3D) + Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.SCALE3D) End Sub #End Region ' Scale3DCommand @@ -1431,7 +1431,7 @@ Namespace EgtCAM5 ''' Execute the Offset. This method is invoked by the OffsetCommand. ''' Public Sub Offset(ByVal param As Object) - EgtCAM5Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.OFFSET) + Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.OFFSET) End Sub #End Region ' OffsetCommand @@ -1440,7 +1440,7 @@ Namespace EgtCAM5 Private Sub OnIdle() If IniFile.m_ProjectMode = ProjectModeOpt.DRAW OrElse IniFile.m_ProjectMode = ProjectModeOpt.ONLYDRAW Then - bLayerOk = EgtCAM5Map.refProjectVM.GetController.GetCurrLayer <> GDB_ID.NULL + bLayerOk = Map.refProjectVM.GetController.GetCurrLayer <> GDB_ID.NULL If Not IniFile.m_ProjectSceneContext = 0 Then bSelOk = EgtGetFirstSelectedObj() <> GDB_ID.NULL bLayerOkAndSelOk = m_bLayerOk And m_bSelOk diff --git a/EgtCAM5.vbproj b/EgtCAM5.vbproj index a3f7143..ea273bf 100644 --- a/EgtCAM5.vbproj +++ b/EgtCAM5.vbproj @@ -151,15 +151,15 @@ - + - - + + - - MachOptionsView.xaml + + MachOptionV.xaml - + MTableDbV.xaml @@ -167,162 +167,161 @@ - - OptionsV.xaml + + OptionWindowV.xaml - - - DbPanelView.xaml + + + MachinePanelV.xaml - - - DoorsPanelView.xaml + + + DoorPanelV.xaml - - - - MachiningsDbView.xaml + + + MachiningDbV.xaml - - + + - - DrawPanelView.xaml + + DrawPanelV.xaml - - - ExecutePanelView.xaml + + + ExecutePanelV.xaml - - - GridPanelView.xaml + + + GridPanelV.xaml - - - GunStockPanelView.xaml + + + GunStockPanelV.xaml Code - - - MachGroupPanelView.xaml + + + MachGroupPanelV.xaml - - + + MachiningTreeExpanderView.xaml - + FixtureParametersView.xaml - - + + RawPartOptionView.xaml - - - - - + + + + + DispositionParameterExpanderView.xaml - - + + MachiningParameterExpanderView.xaml - - - - PopUpGridPanelView.xaml + + + + PopUpGridPanelV.xaml - - - PopUpViewPanelView.xaml + + + PopUpViewPanelV.xaml - - - SpecialPanelView.xaml + + + SpecialPanelV.xaml - - - ViewPanelView.xaml + + + ViewPanelV.xaml - - - - InstrumentPanelView.xaml + + + + InstrumentPanelV.xaml - - - OptionPanelView.xaml + + + OptionPanelV.xaml - - + + InfoExpanderView.xaml - - + + InputExpanderView.xaml - - - - + + + + ManageLayerExpanderView.xaml - - - + + + OperationExpanderView.xaml - - + + SimulationExpanderView.xaml - - - ProjectView.xaml + + + ProjectV.xaml - - - ShowPanelView.xaml + + + ShowPanelV.xaml - - - SetUpView.xaml + + + SetUpV.xaml - + - - GunStockWndView.xaml + + GunStockWndV.xaml - - - StatusBarView.xaml + + + StatusBarV.xaml - - + + - + - - ToolsDbView.xaml + + ToolsDbV.xaml - + - - TopCommandBarView.xaml + + TopCommandBarV.xaml - - + + Designer MSBuild:Compile - + Designer MSBuild:Compile @@ -330,23 +329,23 @@ Designer MSBuild:Compile - + Designer MSBuild:Compile - + Designer MSBuild:Compile - + Designer MSBuild:Compile - + Designer MSBuild:Compile - + MSBuild:Compile Designer @@ -354,123 +353,123 @@ Application.xaml Code - - MainWindow.xaml + + MainWindowV.xaml Code - + MSBuild:Compile Designer - + Designer MSBuild:Compile - + Designer MSBuild:Compile - + Designer MSBuild:Compile - + Designer MSBuild:Compile - + Designer MSBuild:Compile - + Designer MSBuild:Compile - + Designer MSBuild:Compile - + Designer MSBuild:Compile - + Designer MSBuild:Compile - + Designer MSBuild:Compile - + Designer MSBuild:Compile - + Designer MSBuild:Compile - + Designer MSBuild:Compile - + Designer MSBuild:Compile - + Designer MSBuild:Compile - + Designer MSBuild:Compile - + Designer MSBuild:Compile - + Designer MSBuild:Compile - + MSBuild:Compile Designer - + Designer MSBuild:Compile - + Designer MSBuild:Compile - + Designer MSBuild:Compile - + Designer MSBuild:Compile - + Designer MSBuild:Compile - + Designer MSBuild:Compile - + Designer MSBuild:Compile - + Designer MSBuild:Compile - + Designer MSBuild:Compile diff --git a/EgtCAM5Params.vb b/EgtCAM5Params.vb deleted file mode 100644 index a649b7a..0000000 --- a/EgtCAM5Params.vb +++ /dev/null @@ -1,4 +0,0 @@ -Module EgtCAM5Params - - -End Module diff --git a/ProjectPage/ExecutePanel/ExecutePanelView.xaml b/ExecutePanel/ExecutePanelV.xaml similarity index 92% rename from ProjectPage/ExecutePanel/ExecutePanelView.xaml rename to ExecutePanel/ExecutePanelV.xaml index 5aac0db..94f6ecf 100644 --- a/ProjectPage/ExecutePanel/ExecutePanelView.xaml +++ b/ExecutePanel/ExecutePanelV.xaml @@ -1,4 +1,4 @@ - diff --git a/ExecutePanel/ExecutePanelV.xaml.vb b/ExecutePanel/ExecutePanelV.xaml.vb new file mode 100644 index 0000000..b30327f --- /dev/null +++ b/ExecutePanel/ExecutePanelV.xaml.vb @@ -0,0 +1,3 @@ +Public Class ExecutePanelV + +End Class diff --git a/ProjectPage/ExecutePanel/ExecutePanelViewModel.vb b/ExecutePanel/ExecutePanelVM.vb similarity index 94% rename from ProjectPage/ExecutePanel/ExecutePanelViewModel.vb rename to ExecutePanel/ExecutePanelVM.vb index 61c3026..37c4174 100644 --- a/ProjectPage/ExecutePanel/ExecutePanelViewModel.vb +++ b/ExecutePanel/ExecutePanelVM.vb @@ -3,7 +3,7 @@ Imports EgtUILib Namespace EgtCAM5 - Public Class ExecutePanelViewModel + Public Class ExecutePanelVM Inherits ViewModelBase #Region "FIELDS & PROPERTIES" diff --git a/ProjectPage/GridPanel/GridPanelView.xaml b/GridPanel/GridPanelV.xaml similarity index 96% rename from ProjectPage/GridPanel/GridPanelView.xaml rename to GridPanel/GridPanelV.xaml index b200968..a6aa234 100644 --- a/ProjectPage/GridPanel/GridPanelView.xaml +++ b/GridPanel/GridPanelV.xaml @@ -1,4 +1,4 @@ - diff --git a/GridPanel/GridPanelV.xaml.vb b/GridPanel/GridPanelV.xaml.vb new file mode 100644 index 0000000..d421ac5 --- /dev/null +++ b/GridPanel/GridPanelV.xaml.vb @@ -0,0 +1,3 @@ +Public Class GridPanelV + +End Class diff --git a/ProjectPage/GridPanel/GridPanelViewModel.vb b/GridPanel/GridPanelVM.vb similarity index 82% rename from ProjectPage/GridPanel/GridPanelViewModel.vb rename to GridPanel/GridPanelVM.vb index 093e28b..a859322 100644 --- a/ProjectPage/GridPanel/GridPanelViewModel.vb +++ b/GridPanel/GridPanelVM.vb @@ -2,7 +2,7 @@ Namespace EgtCAM5 - Public Class GridPanelViewModel + Public Class GridPanelVM Inherits ViewModelBase #Region "FIELDS & PROPERTIES" @@ -89,8 +89,8 @@ Namespace EgtCAM5 ''' Execute the CPlaneTop. This method is invoked by the CPlaneTopCommand. ''' Public Sub CPlaneTop(ByVal param As Object) - EgtCAM5Map.refProjectVM.GetController.SetLastInteger(Controller.GRID_TYPE.TOP) - EgtCAM5Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.GRID) + Map.refProjectVM.GetController.SetLastInteger(Controller.GRID_TYPE.TOP) + Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.GRID) End Sub #End Region ' CPlaneTopCommand @@ -113,8 +113,8 @@ Namespace EgtCAM5 ''' Execute the CPlaneFront. This method is invoked by the CPlaneFrontCommand. ''' Public Sub CPlaneFront(ByVal param As Object) - EgtCAM5Map.refProjectVM.GetController.SetLastInteger(Controller.GRID_TYPE.FRONT) - EgtCAM5Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.GRID) + Map.refProjectVM.GetController.SetLastInteger(Controller.GRID_TYPE.FRONT) + Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.GRID) End Sub #End Region ' CPlaneFrontCommand @@ -137,8 +137,8 @@ Namespace EgtCAM5 ''' Execute the CPlaneRight. This method is invoked by the CPlaneRightCommand. ''' Public Sub CPlaneRight(ByVal param As Object) - EgtCAM5Map.refProjectVM.GetController.SetLastInteger(Controller.GRID_TYPE.RIGHT) - EgtCAM5Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.GRID) + Map.refProjectVM.GetController.SetLastInteger(Controller.GRID_TYPE.RIGHT) + Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.GRID) End Sub #End Region ' CPlaneRightCommand @@ -161,8 +161,8 @@ Namespace EgtCAM5 ''' Execute the CPlaneBack. This method is invoked by the CPlaneBackCommand. ''' Public Sub CPlaneBack(ByVal param As Object) - EgtCAM5Map.refProjectVM.GetController.SetLastInteger(Controller.GRID_TYPE.BACK) - EgtCAM5Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.GRID) + Map.refProjectVM.GetController.SetLastInteger(Controller.GRID_TYPE.BACK) + Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.GRID) End Sub #End Region ' CPlaneBackCommand @@ -185,8 +185,8 @@ Namespace EgtCAM5 ''' Execute the CPlaneLeft. This method is invoked by the CPlaneLeftCommand. ''' Public Sub CPlaneLeft(ByVal param As Object) - EgtCAM5Map.refProjectVM.GetController.SetLastInteger(Controller.GRID_TYPE.LEFT) - EgtCAM5Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.GRID) + Map.refProjectVM.GetController.SetLastInteger(Controller.GRID_TYPE.LEFT) + Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.GRID) End Sub #End Region ' CPlaneLeftCommand @@ -209,8 +209,8 @@ Namespace EgtCAM5 ''' Execute the CPlaneBottom. This method is invoked by the CPlaneBottomCommand. ''' Public Sub CPlaneBottom(ByVal param As Object) - EgtCAM5Map.refProjectVM.GetController.SetLastInteger(Controller.GRID_TYPE.BOTTOM) - EgtCAM5Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.GRID) + Map.refProjectVM.GetController.SetLastInteger(Controller.GRID_TYPE.BOTTOM) + Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.GRID) End Sub #End Region ' CPlaneBottomCommand @@ -233,7 +233,7 @@ Namespace EgtCAM5 ''' Execute the CPlaneElevation. This method is invoked by the CPlaneElevationCommand. ''' Public Sub CPlaneElevation(ByVal param As Object) - EgtCAM5Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.GRID_ELEVATION) + Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.GRID_ELEVATION) End Sub #End Region ' CPlaneElevationCommand @@ -256,7 +256,7 @@ Namespace EgtCAM5 ''' Execute the CPlaneOrigin. This method is invoked by the CPlaneOriginCommand. ''' Public Sub CPlaneOrigin(ByVal param As Object) - EgtCAM5Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.GRID_ORIGIN) + Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.GRID_ORIGIN) End Sub #End Region ' CPlaneOriginCommand diff --git a/ProjectPage/GunStockPanel/GunStockPanelView.xaml b/GunStockPanel/GunStockPanelV.xaml similarity index 95% rename from ProjectPage/GunStockPanel/GunStockPanelView.xaml rename to GunStockPanel/GunStockPanelV.xaml index 225b205..9d8ddf2 100644 --- a/ProjectPage/GunStockPanel/GunStockPanelView.xaml +++ b/GunStockPanel/GunStockPanelV.xaml @@ -1,4 +1,4 @@ - diff --git a/GunStockPanel/GunStockPanelV.xaml.vb b/GunStockPanel/GunStockPanelV.xaml.vb new file mode 100644 index 0000000..60def5a --- /dev/null +++ b/GunStockPanel/GunStockPanelV.xaml.vb @@ -0,0 +1,3 @@ +Public Class GunStockPanelV + +End Class diff --git a/ProjectPage/GunStockPanel/GunStockPanelViewModel.vb b/GunStockPanel/GunStockPanelVM.vb similarity index 95% rename from ProjectPage/GunStockPanel/GunStockPanelViewModel.vb rename to GunStockPanel/GunStockPanelVM.vb index d532014..8c2216b 100644 --- a/ProjectPage/GunStockPanel/GunStockPanelViewModel.vb +++ b/GunStockPanel/GunStockPanelVM.vb @@ -3,7 +3,7 @@ Imports EgtUILib Namespace EgtCAM5 - Public Class GunStockPanelViewModel + Public Class GunStockPanelVM Inherits ViewModelBase Public ReadOnly Property MruNewGunStockNames As ObservableCollection(Of String) diff --git a/ProjectPage/InstrumentPanel/InstrumentPanelView.xaml b/InstrumentPanel/InstrumentPanelV.xaml similarity index 92% rename from ProjectPage/InstrumentPanel/InstrumentPanelView.xaml rename to InstrumentPanel/InstrumentPanelV.xaml index b8711bf..a121aaa 100644 --- a/ProjectPage/InstrumentPanel/InstrumentPanelView.xaml +++ b/InstrumentPanel/InstrumentPanelV.xaml @@ -1,4 +1,4 @@ - m_AnalyzeIsChecked Then m_AnalyzeIsChecked = value If value Then - EgtCAM5Map.refProjectVM.GetScene.SetStatusAnalyze() + Map.refProjectVM.GetScene.SetStatusAnalyze() Else - EgtCAM5Map.refProjectVM.GetScene.ResetStatusAnalyze() + Map.refProjectVM.GetScene.ResetStatusAnalyze() Application.Msn.NotifyColleagues(Application.SELECTIDINOBJTREE, GDB_ID.NULL) End If OnPropertyChanged("AnalyzeIsChecked") @@ -64,9 +64,9 @@ Namespace EgtCAM5 If value <> m_GetDistIsChecked Then m_GetDistIsChecked = value If value Then - EgtCAM5Map.refProjectVM.GetScene.SetStatusGetDistance() + Map.refProjectVM.GetScene.SetStatusGetDistance() Else - EgtCAM5Map.refProjectVM.GetScene.ResetStatusGetDistance() + Map.refProjectVM.GetScene.ResetStatusGetDistance() Application.Msn.NotifyColleagues(Application.NOTIFYSTATUSOUTPUT, String.Empty) End If OnPropertyChanged("GetDistIsChecked") diff --git a/ProjectPage/MachGroupPanel/MachGroupPanelView.xaml b/MachGroupPanel/MachGroupPanelV.xaml similarity index 96% rename from ProjectPage/MachGroupPanel/MachGroupPanelView.xaml rename to MachGroupPanel/MachGroupPanelV.xaml index 2eec889..a3c49c1 100644 --- a/ProjectPage/MachGroupPanel/MachGroupPanelView.xaml +++ b/MachGroupPanel/MachGroupPanelV.xaml @@ -1,4 +1,4 @@ - diff --git a/MachGroupPanel/MachGroupPanelV.xaml.vb b/MachGroupPanel/MachGroupPanelV.xaml.vb new file mode 100644 index 0000000..c5376fb --- /dev/null +++ b/MachGroupPanel/MachGroupPanelV.xaml.vb @@ -0,0 +1,3 @@ +Public Class MachGroupPanelV + +End Class diff --git a/ProjectPage/MachGroupPanel/MachGroupPanelViewModel.vb b/MachGroupPanel/MachGroupPanelVM.vb similarity index 96% rename from ProjectPage/MachGroupPanel/MachGroupPanelViewModel.vb rename to MachGroupPanel/MachGroupPanelVM.vb index 5761a80..2fb8775 100644 --- a/ProjectPage/MachGroupPanel/MachGroupPanelViewModel.vb +++ b/MachGroupPanel/MachGroupPanelVM.vb @@ -4,7 +4,7 @@ Imports EgtUILib Namespace EgtCAM5 - Public Class MachGroupPanelViewModel + Public Class MachGroupPanelVM Inherits ViewModelBase #Region "FIELDS & PROPERTIES" @@ -241,7 +241,7 @@ Namespace EgtCAM5 ' aggiorno la lista dei gruppi MachGroupList.RemoveAt(nSelectedMachGroupIndex) ' ritorno alla modalità disegno - EgtCAM5Map.refTopCommandBarVM.DrawIsChecked = True + Map.refTopCommandBarVM.DrawIsChecked = True Case MessageBoxResult.No Return End Select diff --git a/MachOptionsWindow/MachOptionsView.xaml b/MachOptionsWindow/MachOptionV.xaml similarity index 96% rename from MachOptionsWindow/MachOptionsView.xaml rename to MachOptionsWindow/MachOptionV.xaml index 986cdd6..3ae73f4 100644 --- a/MachOptionsWindow/MachOptionsView.xaml +++ b/MachOptionsWindow/MachOptionV.xaml @@ -1,4 +1,4 @@ - diff --git a/MachinePanel/MachinePanelV.xaml.vb b/MachinePanel/MachinePanelV.xaml.vb new file mode 100644 index 0000000..841ceab --- /dev/null +++ b/MachinePanel/MachinePanelV.xaml.vb @@ -0,0 +1,3 @@ +Public Class MachinePanelV + +End Class diff --git a/ProjectPage/DbPanel/DbPanelViewModel.vb b/MachinePanel/MachinePanelVM.vb similarity index 89% rename from ProjectPage/DbPanel/DbPanelViewModel.vb rename to MachinePanel/MachinePanelVM.vb index 49cb4cd..3e4c763 100644 --- a/ProjectPage/DbPanel/DbPanelViewModel.vb +++ b/MachinePanel/MachinePanelVM.vb @@ -2,7 +2,7 @@ Namespace EgtCAM5 - Public Class DbPanelViewModel + Public Class MachinePanelVM Inherits ViewModelBase #Region "FIELDS & PROPERTIES" @@ -71,10 +71,10 @@ Namespace EgtCAM5 MessageBox.Show(EgtMsg(MSG_TOOLSERRORS + 30), EgtMsg(MSG_MESSAGEBOX + 1), MessageBoxButton.OK, MessageBoxImage.Error) Return End If - Dim ToolDbWindow As New ToolsDbView + Dim ToolDbWindow As New ToolsDbV ToolDbWindow.Height = 640 ToolDbWindow.Width = 1024 - ToolDbWindow.DataContext = New ToolsDbViewModel + ToolDbWindow.DataContext = New ToolsDbVM ToolDbWindow.Owner = Application.Current.MainWindow ToolDbWindow.ShowDialog() End Sub @@ -106,10 +106,10 @@ Namespace EgtCAM5 MessageBox.Show(EgtMsg(MSG_MACHININGSERRORS + 7), EgtMsg(MSG_MESSAGEBOX + 1), MessageBoxButton.OK, MessageBoxImage.Error) Return End If - Dim MachDbWindow As New MachiningsDbView + Dim MachDbWindow As New MachiningDbV MachDbWindow.Height = 614 MachDbWindow.Width = 1024 - MachDbWindow.DataContext = New MachiningsDbViewModel + MachDbWindow.DataContext = New MachiningDbVM MachDbWindow.Owner = Application.Current.MainWindow MachDbWindow.ShowDialog() End Sub @@ -134,10 +134,10 @@ Namespace EgtCAM5 ''' Execute the Exec. This method is invoked by the ExecCommand. ''' Public Sub MachOptions(ByVal param As Object) - Dim MachOptionWindow As New MachOptionsView + Dim MachOptionWindow As New MachOptionV 'MachOptionWindow.Height = 614 'MachOptionWindow.Width = 256 - MachOptionWindow.DataContext = New MachOptionsViewModel + MachOptionWindow.DataContext = New MachOptionVM MachOptionWindow.Owner = Application.Current.MainWindow MachOptionWindow.ShowDialog() End Sub diff --git a/MachiningsDbWindow/MachiningsDbView.xaml b/MachiningDbWindow/MachiningDbV.xaml similarity index 98% rename from MachiningsDbWindow/MachiningsDbView.xaml rename to MachiningDbWindow/MachiningDbV.xaml index 818719d..f57a2bd 100644 --- a/MachiningsDbWindow/MachiningsDbView.xaml +++ b/MachiningDbWindow/MachiningDbV.xaml @@ -1,4 +1,4 @@ - - + diff --git a/MainWindow/MainWindow.xaml.vb b/MainWindow/MainWindowV.xaml.vb similarity index 55% rename from MainWindow/MainWindow.xaml.vb rename to MainWindow/MainWindowV.xaml.vb index 10bbcdf..986ffeb 100644 --- a/MainWindow/MainWindow.xaml.vb +++ b/MainWindow/MainWindowV.xaml.vb @@ -1,6 +1,6 @@ Imports EgtWPFLib5 -Class MainWindow +Class MainWindowV Inherits EgtCustomWindow Private Sub EgtCustomWindow_Loaded(sender As Object, e As RoutedEventArgs) Handles Me.Loaded @@ -13,14 +13,14 @@ Class MainWindow Private Sub MainWindow_Drop(sender As Object, e As DragEventArgs) ' Se drag di file If e.Data.GetDataPresent(DataFormats.FileDrop) Then - ' Attivo il programma - Me.Activate() - ' Recupero l'array di stringhe con i nomi del file - Dim sFiles() As String = DirectCast(e.Data.GetData(DataFormats.FileDrop), String()) - ' Apro il primo come file standard - If EgtCAM5Map.refProjectVM.OpenStdFile(sFiles(0)) Then Return - ' Riprovo come file descrizione porta - EgtCAM5Map.refProjectVM.OpenDoorFile(sFiles(0)) + ' Attivo il programma + Me.Activate() + ' Recupero l'array di stringhe con i nomi del file + Dim sFiles() As String = DirectCast(e.Data.GetData(DataFormats.FileDrop), String()) + ' Apro il primo come file standard + If Map.refProjectVM.OpenStdFile(sFiles(0)) Then Return + ' Riprovo come file descrizione porta + Map.refProjectVM.OpenDoorFile(sFiles(0)) End If End Sub diff --git a/MainWindow/MainWindowViewModel.vb b/MainWindow/MainWindowVM.vb similarity index 91% rename from MainWindow/MainWindowViewModel.vb rename to MainWindow/MainWindowVM.vb index fa69e4b..ba6f378 100644 --- a/MainWindow/MainWindowViewModel.vb +++ b/MainWindow/MainWindowVM.vb @@ -7,7 +7,7 @@ Imports EgtUILib Namespace EgtCAM5 - Public Class MainWindowViewModel + Public Class MainWindowVM Inherits ViewModelBase #Region "FIELDS" @@ -31,8 +31,8 @@ Namespace EgtCAM5 End Get Set(value As String) If value <> m_Title Then - m_Title = value - OnPropertyChanged("Title") + m_Title = value + OnPropertyChanged("Title") End If End Set End Property @@ -48,12 +48,12 @@ Namespace EgtCAM5 Private m_cmdCloseApplication As ICommand ' GRAPHICAL ELEMENTS - Private m_TopCommandBar As TopCommandBarView - Public ReadOnly Property TopCommandBar As TopCommandBarView + Private m_TopCommandBar As TopCommandBarV + Public ReadOnly Property TopCommandBar As TopCommandBarV Get If IsNothing(m_TopCommandBar) Then - m_TopCommandBar = New TopCommandBarView - m_TopCommandBar.DataContext = New TopCommandBarViewModel + m_TopCommandBar = New TopCommandBarV + m_TopCommandBar.DataContext = New TopCommandBarVM End If Return m_TopCommandBar End Get @@ -61,27 +61,27 @@ Namespace EgtCAM5 ' GRAPHICAL FIELDS WITH PROPERTY - Private m_StatusBar As StatusBarView + Private m_StatusBar As StatusBarV Private m_bfirst As Boolean = True - Public ReadOnly Property StatusBar As StatusBarView + Public ReadOnly Property StatusBar As StatusBarV Get If m_bfirst Then m_bfirst = False - m_StatusBar = New StatusBarView - m_StatusBar.DataContext = New StatusBarViewModel + m_StatusBar = New StatusBarV + m_StatusBar.DataContext = New StatusBarVM End If Return m_StatusBar End Get End Property - Private m_ProjectPage As ProjectView + Private m_ProjectPage As ProjectV Private m_bFirstProjectPage As Boolean = True - Public ReadOnly Property ProjectPage As ProjectView + Public ReadOnly Property ProjectPage As ProjectV Get If m_bFirstProjectPage Then m_bFirstProjectPage = False - m_ProjectPage = New ProjectView - m_ProjectPage.DataContext = New ProjectViewModel + m_ProjectPage = New ProjectV + m_ProjectPage.DataContext = New ProjectVM End If Return m_ProjectPage End Get @@ -93,7 +93,7 @@ Namespace EgtCAM5 Sub New() ' Inizializzo EgtCAM5Map - EgtCAM5Map.BeginInit(Me) + Map.BeginInit(Me) ' INITIALIZE EGALTECH ENVIRONMENT InitializeEgtEnvironment() @@ -109,22 +109,22 @@ Namespace EgtCAM5 #Region "AboutBoxCommand" - ' Returns a command that manage the MainWindow_Unloaded command - Public ReadOnly Property AboutBoxCommand() As ICommand - Get - If m_cmdAboutBox Is Nothing Then - m_cmdAboutBox = New Command(AddressOf AboutBox) - End If - Return m_cmdAboutBox - End Get - End Property + ' Returns a command that manage the MainWindow_Unloaded command + Public ReadOnly Property AboutBoxCommand() As ICommand + Get + If m_cmdAboutBox Is Nothing Then + m_cmdAboutBox = New Command(AddressOf AboutBox) + End If + Return m_cmdAboutBox + End Get + End Property - ' Manage the MainWindow_Unloaded event. This method is invoked by the cmdMainWindow_Unloaded. - Public Sub AboutBox(ByVal param As Object) - Dim AboutBoxWindow As New AboutBoxView - AboutBoxWindow.Owner = Application.Current.MainWindow - AboutBoxWindow.ShowDialog() - End Sub + ' Manage the MainWindow_Unloaded event. This method is invoked by the cmdMainWindow_Unloaded. + Public Sub AboutBox(ByVal param As Object) + Dim AboutBoxWindow As New AboutBoxWndV + AboutBoxWindow.Owner = Application.Current.MainWindow + AboutBoxWindow.ShowDialog() + End Sub #End Region ' AboutBoxCommand diff --git a/My Project/AssemblyInfo.vb b/My Project/AssemblyInfo.vb index 3cbe89b..87b9afe 100644 --- a/My Project/AssemblyInfo.vb +++ b/My Project/AssemblyInfo.vb @@ -70,5 +70,5 @@ Imports System.Windows ' by using the '*' as shown below: ' - - + + diff --git a/ProjectPage/OptionPanel/DrawOptionPanel/InfoExpander/InfoExpanderView.xaml b/OptionPanel/DrawOptionPanel/InfoExpander/InfoExpanderView.xaml similarity index 100% rename from ProjectPage/OptionPanel/DrawOptionPanel/InfoExpander/InfoExpanderView.xaml rename to OptionPanel/DrawOptionPanel/InfoExpander/InfoExpanderView.xaml diff --git a/ProjectPage/OptionPanel/DrawOptionPanel/InfoExpander/InfoExpanderView.xaml.vb b/OptionPanel/DrawOptionPanel/InfoExpander/InfoExpanderView.xaml.vb similarity index 100% rename from ProjectPage/OptionPanel/DrawOptionPanel/InfoExpander/InfoExpanderView.xaml.vb rename to OptionPanel/DrawOptionPanel/InfoExpander/InfoExpanderView.xaml.vb diff --git a/ProjectPage/OptionPanel/DrawOptionPanel/InfoExpander/InfoExpanderViewModel.vb b/OptionPanel/DrawOptionPanel/InfoExpander/InfoExpanderViewModel.vb similarity index 100% rename from ProjectPage/OptionPanel/DrawOptionPanel/InfoExpander/InfoExpanderViewModel.vb rename to OptionPanel/DrawOptionPanel/InfoExpander/InfoExpanderViewModel.vb diff --git a/ProjectPage/OptionPanel/DrawOptionPanel/InputExpander/InputExpanderView.xaml b/OptionPanel/DrawOptionPanel/InputExpander/InputExpanderView.xaml similarity index 100% rename from ProjectPage/OptionPanel/DrawOptionPanel/InputExpander/InputExpanderView.xaml rename to OptionPanel/DrawOptionPanel/InputExpander/InputExpanderView.xaml diff --git a/ProjectPage/OptionPanel/DrawOptionPanel/InputExpander/InputExpanderView.xaml.vb b/OptionPanel/DrawOptionPanel/InputExpander/InputExpanderView.xaml.vb similarity index 100% rename from ProjectPage/OptionPanel/DrawOptionPanel/InputExpander/InputExpanderView.xaml.vb rename to OptionPanel/DrawOptionPanel/InputExpander/InputExpanderView.xaml.vb diff --git a/ProjectPage/OptionPanel/DrawOptionPanel/InputExpander/InputExpanderViewModel.vb b/OptionPanel/DrawOptionPanel/InputExpander/InputExpanderViewModel.vb similarity index 100% rename from ProjectPage/OptionPanel/DrawOptionPanel/InputExpander/InputExpanderViewModel.vb rename to OptionPanel/DrawOptionPanel/InputExpander/InputExpanderViewModel.vb diff --git a/ProjectPage/OptionPanel/DrawOptionPanel/ManageLayerExpander/LayerTreeView.vb b/OptionPanel/DrawOptionPanel/ManageLayerExpander/LayerTreeView.vb similarity index 100% rename from ProjectPage/OptionPanel/DrawOptionPanel/ManageLayerExpander/LayerTreeView.vb rename to OptionPanel/DrawOptionPanel/ManageLayerExpander/LayerTreeView.vb diff --git a/ProjectPage/OptionPanel/DrawOptionPanel/ManageLayerExpander/ManageLayerExpanderView.xaml b/OptionPanel/DrawOptionPanel/ManageLayerExpander/ManageLayerExpanderView.xaml similarity index 100% rename from ProjectPage/OptionPanel/DrawOptionPanel/ManageLayerExpander/ManageLayerExpanderView.xaml rename to OptionPanel/DrawOptionPanel/ManageLayerExpander/ManageLayerExpanderView.xaml diff --git a/ProjectPage/OptionPanel/DrawOptionPanel/ManageLayerExpander/ManageLayerExpanderView.xaml.vb b/OptionPanel/DrawOptionPanel/ManageLayerExpander/ManageLayerExpanderView.xaml.vb similarity index 100% rename from ProjectPage/OptionPanel/DrawOptionPanel/ManageLayerExpander/ManageLayerExpanderView.xaml.vb rename to OptionPanel/DrawOptionPanel/ManageLayerExpander/ManageLayerExpanderView.xaml.vb diff --git a/ProjectPage/OptionPanel/DrawOptionPanel/ManageLayerExpander/ManageLayerExpanderViewModel.vb b/OptionPanel/DrawOptionPanel/ManageLayerExpander/ManageLayerExpanderViewModel.vb similarity index 100% rename from ProjectPage/OptionPanel/DrawOptionPanel/ManageLayerExpander/ManageLayerExpanderViewModel.vb rename to OptionPanel/DrawOptionPanel/ManageLayerExpander/ManageLayerExpanderViewModel.vb diff --git a/ProjectPage/OptionPanel/MachiningOptionPanel/MachiningsTreeViewExpander/MachiningTreeExpanderView.xaml b/OptionPanel/MachiningOptionPanel/MachiningsTreeViewExpander/MachiningTreeExpanderView.xaml similarity index 100% rename from ProjectPage/OptionPanel/MachiningOptionPanel/MachiningsTreeViewExpander/MachiningTreeExpanderView.xaml rename to OptionPanel/MachiningOptionPanel/MachiningsTreeViewExpander/MachiningTreeExpanderView.xaml diff --git a/ProjectPage/OptionPanel/MachiningOptionPanel/MachiningsTreeViewExpander/MachiningTreeExpanderView.xaml.vb b/OptionPanel/MachiningOptionPanel/MachiningsTreeViewExpander/MachiningTreeExpanderView.xaml.vb similarity index 100% rename from ProjectPage/OptionPanel/MachiningOptionPanel/MachiningsTreeViewExpander/MachiningTreeExpanderView.xaml.vb rename to OptionPanel/MachiningOptionPanel/MachiningsTreeViewExpander/MachiningTreeExpanderView.xaml.vb diff --git a/ProjectPage/OptionPanel/MachiningOptionPanel/MachiningsTreeViewExpander/MachiningTreeExpanderViewModel.vb b/OptionPanel/MachiningOptionPanel/MachiningsTreeViewExpander/MachiningTreeExpanderViewModel.vb similarity index 100% rename from ProjectPage/OptionPanel/MachiningOptionPanel/MachiningsTreeViewExpander/MachiningTreeExpanderViewModel.vb rename to OptionPanel/MachiningOptionPanel/MachiningsTreeViewExpander/MachiningTreeExpanderViewModel.vb diff --git a/ProjectPage/OptionPanel/MachiningOptionPanel/MachiningsTreeViewExpander/MachiningTreeViewExpander.vb b/OptionPanel/MachiningOptionPanel/MachiningsTreeViewExpander/MachiningTreeViewExpander.vb similarity index 100% rename from ProjectPage/OptionPanel/MachiningOptionPanel/MachiningsTreeViewExpander/MachiningTreeViewExpander.vb rename to OptionPanel/MachiningOptionPanel/MachiningsTreeViewExpander/MachiningTreeViewExpander.vb diff --git a/ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/DispositionParameterExpander/DispositionParameterExpanderView.xaml b/OptionPanel/MachiningOptionPanel/OperationExpander/DispositionParameterExpander/DispositionParameterExpanderView.xaml similarity index 100% rename from ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/DispositionParameterExpander/DispositionParameterExpanderView.xaml rename to OptionPanel/MachiningOptionPanel/OperationExpander/DispositionParameterExpander/DispositionParameterExpanderView.xaml diff --git a/ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/DispositionParameterExpander/DispositionParameterExpanderView.xaml.vb b/OptionPanel/MachiningOptionPanel/OperationExpander/DispositionParameterExpander/DispositionParameterExpanderView.xaml.vb similarity index 100% rename from ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/DispositionParameterExpander/DispositionParameterExpanderView.xaml.vb rename to OptionPanel/MachiningOptionPanel/OperationExpander/DispositionParameterExpander/DispositionParameterExpanderView.xaml.vb diff --git a/ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/DispositionParameterExpander/DispositionParameterExpanderViewModel.vb b/OptionPanel/MachiningOptionPanel/OperationExpander/DispositionParameterExpander/DispositionParameterExpanderViewModel.vb similarity index 100% rename from ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/DispositionParameterExpander/DispositionParameterExpanderViewModel.vb rename to OptionPanel/MachiningOptionPanel/OperationExpander/DispositionParameterExpander/DispositionParameterExpanderViewModel.vb diff --git a/ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/DispositionParameterExpander/DispositionUtility.vb b/OptionPanel/MachiningOptionPanel/OperationExpander/DispositionParameterExpander/DispositionUtility.vb similarity index 100% rename from ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/DispositionParameterExpander/DispositionUtility.vb rename to OptionPanel/MachiningOptionPanel/OperationExpander/DispositionParameterExpander/DispositionUtility.vb diff --git a/ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/DispositionParameterExpander/FixtureParameters/FixtureParametersView.xaml b/OptionPanel/MachiningOptionPanel/OperationExpander/DispositionParameterExpander/FixtureParameters/FixtureParametersView.xaml similarity index 100% rename from ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/DispositionParameterExpander/FixtureParameters/FixtureParametersView.xaml rename to OptionPanel/MachiningOptionPanel/OperationExpander/DispositionParameterExpander/FixtureParameters/FixtureParametersView.xaml diff --git a/ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/DispositionParameterExpander/FixtureParameters/FixtureParametersView.xaml.vb b/OptionPanel/MachiningOptionPanel/OperationExpander/DispositionParameterExpander/FixtureParameters/FixtureParametersView.xaml.vb similarity index 100% rename from ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/DispositionParameterExpander/FixtureParameters/FixtureParametersView.xaml.vb rename to OptionPanel/MachiningOptionPanel/OperationExpander/DispositionParameterExpander/FixtureParameters/FixtureParametersView.xaml.vb diff --git a/ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/DispositionParameterExpander/FixtureParameters/FixtureParametersViewModel.vb b/OptionPanel/MachiningOptionPanel/OperationExpander/DispositionParameterExpander/FixtureParameters/FixtureParametersViewModel.vb similarity index 100% rename from ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/DispositionParameterExpander/FixtureParameters/FixtureParametersViewModel.vb rename to OptionPanel/MachiningOptionPanel/OperationExpander/DispositionParameterExpander/FixtureParameters/FixtureParametersViewModel.vb diff --git a/ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/DispositionParameterExpander/RawPartOption/RawPartOptionView.xaml b/OptionPanel/MachiningOptionPanel/OperationExpander/DispositionParameterExpander/RawPartOption/RawPartOptionView.xaml similarity index 100% rename from ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/DispositionParameterExpander/RawPartOption/RawPartOptionView.xaml rename to OptionPanel/MachiningOptionPanel/OperationExpander/DispositionParameterExpander/RawPartOption/RawPartOptionView.xaml diff --git a/ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/DispositionParameterExpander/RawPartOption/RawPartOptionView.xaml.vb b/OptionPanel/MachiningOptionPanel/OperationExpander/DispositionParameterExpander/RawPartOption/RawPartOptionView.xaml.vb similarity index 100% rename from ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/DispositionParameterExpander/RawPartOption/RawPartOptionView.xaml.vb rename to OptionPanel/MachiningOptionPanel/OperationExpander/DispositionParameterExpander/RawPartOption/RawPartOptionView.xaml.vb diff --git a/ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/DispositionParameterExpander/RawPartOption/RawPartOptionViewModel.vb b/OptionPanel/MachiningOptionPanel/OperationExpander/DispositionParameterExpander/RawPartOption/RawPartOptionViewModel.vb similarity index 100% rename from ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/DispositionParameterExpander/RawPartOption/RawPartOptionViewModel.vb rename to OptionPanel/MachiningOptionPanel/OperationExpander/DispositionParameterExpander/RawPartOption/RawPartOptionViewModel.vb diff --git a/ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/MachiningParameterExpanderView.xaml b/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/MachiningParameterExpanderView.xaml similarity index 100% rename from ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/MachiningParameterExpanderView.xaml rename to OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/MachiningParameterExpanderView.xaml diff --git a/ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/MachiningParameterExpanderView.xaml.vb b/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/MachiningParameterExpanderView.xaml.vb similarity index 100% rename from ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/MachiningParameterExpanderView.xaml.vb rename to OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/MachiningParameterExpanderView.xaml.vb diff --git a/ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/MachiningParameterExpanderViewModel.vb b/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/MachiningParameterExpanderViewModel.vb similarity index 97% rename from ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/MachiningParameterExpanderViewModel.vb rename to OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/MachiningParameterExpanderViewModel.vb index 3a9403e..2927182 100644 --- a/ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/MachiningParameterExpanderViewModel.vb +++ b/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/MachiningParameterExpanderViewModel.vb @@ -2515,25 +2515,25 @@ Public Class OperationParamVisibilityConverter Case MCH_OY.NONE Return Visibility.Hidden Case MCH_OY.DISP - Return SharedFieldsClass.OperationDisposition(CInt(parameter)) + Return TMDbParamVisibility.OperationDisposition(CInt(parameter)) Case MCH_OY.DRILLING - Return SharedFieldsClass.Drilling(CInt(parameter)) + Return TMDbParamVisibility.Drilling(CInt(parameter)) Case MCH_OY.SAWING - Return SharedFieldsClass.Sawing(CInt(parameter)) + Return TMDbParamVisibility.Sawing(CInt(parameter)) Case MCH_OY.MILLING - Return SharedFieldsClass.Milling(CInt(parameter)) + Return TMDbParamVisibility.Milling(CInt(parameter)) Case MCH_OY.POCKETING - Return SharedFieldsClass.Pocketing(CInt(parameter)) + Return TMDbParamVisibility.Pocketing(CInt(parameter)) Case MCH_OY.MORTISING - Return SharedFieldsClass.Mortising(CInt(parameter)) + Return TMDbParamVisibility.Mortising(CInt(parameter)) Case MCH_OY.SAWROUGHING - Return SharedFieldsClass.Sawroughing(CInt(parameter)) + Return TMDbParamVisibility.Sawroughing(CInt(parameter)) Case MCH_OY.SAWFINISHING - Return SharedFieldsClass.Sawfinishing(CInt(parameter)) + Return TMDbParamVisibility.Sawfinishing(CInt(parameter)) Case MCH_OY.GENMACHINING - Return SharedFieldsClass.GenMachining(CInt(parameter)) + Return TMDbParamVisibility.GenMachining(CInt(parameter)) Case MCH_OY.CHISELING - Return SharedFieldsClass.Chiseling(CInt(parameter)) + Return TMDbParamVisibility.Chiseling(CInt(parameter)) Case Else Return Visibility.Hidden End Select diff --git a/ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/OperationExpanderView.xaml b/OptionPanel/MachiningOptionPanel/OperationExpander/OperationExpanderView.xaml similarity index 100% rename from ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/OperationExpanderView.xaml rename to OptionPanel/MachiningOptionPanel/OperationExpander/OperationExpanderView.xaml diff --git a/ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/OperationExpanderView.xaml.vb b/OptionPanel/MachiningOptionPanel/OperationExpander/OperationExpanderView.xaml.vb similarity index 100% rename from ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/OperationExpanderView.xaml.vb rename to OptionPanel/MachiningOptionPanel/OperationExpander/OperationExpanderView.xaml.vb diff --git a/ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/OperationExpanderViewModel.vb b/OptionPanel/MachiningOptionPanel/OperationExpander/OperationExpanderViewModel.vb similarity index 97% rename from ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/OperationExpanderViewModel.vb rename to OptionPanel/MachiningOptionPanel/OperationExpander/OperationExpanderViewModel.vb index fffc547..809817a 100644 --- a/ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/OperationExpanderViewModel.vb +++ b/OptionPanel/MachiningOptionPanel/OperationExpander/OperationExpanderViewModel.vb @@ -789,10 +789,10 @@ Namespace EgtCAM5 Index += 1 End While ' creo ed apro finestra SetUp - Dim SetUpWindow As New SetUpView + Dim SetUpWindow As New SetUpWindowV SetUpWindow.Height = 614 SetUpWindow.Width = 1024 - SetUpWindow.DataContext = New SetUpViewModel + SetUpWindow.DataContext = New SetUpWindowVM SetUpWindow.Owner = Application.Current.MainWindow SetUpWindow.ShowDialog() Application.Msn.NotifyColleagues(Application.EMITTITLE) diff --git a/ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/OperationListBoxItem/DispositionOpListBoxItem.vb b/OptionPanel/MachiningOptionPanel/OperationExpander/OperationListBoxItem/DispositionOpListBoxItem.vb similarity index 100% rename from ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/OperationListBoxItem/DispositionOpListBoxItem.vb rename to OptionPanel/MachiningOptionPanel/OperationExpander/OperationListBoxItem/DispositionOpListBoxItem.vb diff --git a/ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/OperationListBoxItem/MachiningOpListBoxItem.vb b/OptionPanel/MachiningOptionPanel/OperationExpander/OperationListBoxItem/MachiningOpListBoxItem.vb similarity index 100% rename from ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/OperationListBoxItem/MachiningOpListBoxItem.vb rename to OptionPanel/MachiningOptionPanel/OperationExpander/OperationListBoxItem/MachiningOpListBoxItem.vb diff --git a/ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/OperationListBoxItem/OperationListBoxItem.vb b/OptionPanel/MachiningOptionPanel/OperationExpander/OperationListBoxItem/OperationListBoxItem.vb similarity index 100% rename from ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/OperationListBoxItem/OperationListBoxItem.vb rename to OptionPanel/MachiningOptionPanel/OperationExpander/OperationListBoxItem/OperationListBoxItem.vb diff --git a/ProjectPage/OptionPanel/MachiningOptionPanel/SimulationExpander/MachineAxis.vb b/OptionPanel/MachiningOptionPanel/SimulationExpander/MachineAxis.vb similarity index 100% rename from ProjectPage/OptionPanel/MachiningOptionPanel/SimulationExpander/MachineAxis.vb rename to OptionPanel/MachiningOptionPanel/SimulationExpander/MachineAxis.vb diff --git a/ProjectPage/OptionPanel/MachiningOptionPanel/SimulationExpander/SimulationExpanderView.xaml b/OptionPanel/MachiningOptionPanel/SimulationExpander/SimulationExpanderView.xaml similarity index 100% rename from ProjectPage/OptionPanel/MachiningOptionPanel/SimulationExpander/SimulationExpanderView.xaml rename to OptionPanel/MachiningOptionPanel/SimulationExpander/SimulationExpanderView.xaml diff --git a/ProjectPage/OptionPanel/MachiningOptionPanel/SimulationExpander/SimulationExpanderView.xaml.vb b/OptionPanel/MachiningOptionPanel/SimulationExpander/SimulationExpanderView.xaml.vb similarity index 100% rename from ProjectPage/OptionPanel/MachiningOptionPanel/SimulationExpander/SimulationExpanderView.xaml.vb rename to OptionPanel/MachiningOptionPanel/SimulationExpander/SimulationExpanderView.xaml.vb diff --git a/ProjectPage/OptionPanel/MachiningOptionPanel/SimulationExpander/SimulationExpanderViewModel.vb b/OptionPanel/MachiningOptionPanel/SimulationExpander/SimulationExpanderViewModel.vb similarity index 96% rename from ProjectPage/OptionPanel/MachiningOptionPanel/SimulationExpander/SimulationExpanderViewModel.vb rename to OptionPanel/MachiningOptionPanel/SimulationExpander/SimulationExpanderViewModel.vb index 311635d..b4c9c45 100644 --- a/ProjectPage/OptionPanel/MachiningOptionPanel/SimulationExpander/SimulationExpanderViewModel.vb +++ b/OptionPanel/MachiningOptionPanel/SimulationExpander/SimulationExpanderViewModel.vb @@ -62,7 +62,7 @@ Namespace EgtCAM5 EgtDeselectAll() Application.Msn.NotifyColleagues(Application.REMOVEMARKFROMLASTOPERATION) Application.Msn.NotifyColleagues(Application.GETDISTANCE_ISCHECKED, False) - EgtCAM5Map.refTopCommandBarVM.SaveIsEnabled = False + Map.refTopCommandBarVM.SaveIsEnabled = False If IniFile.m_bShowOnlyTable Then EgtShowOnlyTable(False) EgtZoom(ZM.ALL, False) @@ -76,7 +76,7 @@ Namespace EgtCAM5 EgtShowOnlyTable(True) EgtZoom(ZM.ALL) End If - EgtCAM5Map.refTopCommandBarVM.SaveIsEnabled = True + Map.refTopCommandBarVM.SaveIsEnabled = True End If m_IsExpanded = value Application.Msn.NotifyColleagues(Application.SIMULATIONEXPANDER_GET_ISEXPANDED, value) diff --git a/ProjectPage/OptionPanel/OptionPanelView.xaml b/OptionPanel/OptionPanelV.xaml similarity index 94% rename from ProjectPage/OptionPanel/OptionPanelView.xaml rename to OptionPanel/OptionPanelV.xaml index ce79874..9dd03fc 100644 --- a/ProjectPage/OptionPanel/OptionPanelView.xaml +++ b/OptionPanel/OptionPanelV.xaml @@ -1,4 +1,4 @@ - diff --git a/PopUpGridPanel/PopUpGridPanelV.xaml.vb b/PopUpGridPanel/PopUpGridPanelV.xaml.vb new file mode 100644 index 0000000..5aa4402 --- /dev/null +++ b/PopUpGridPanel/PopUpGridPanelV.xaml.vb @@ -0,0 +1,3 @@ +Public Class PopUpGridPanelV + +End Class diff --git a/ProjectPage/PopUpGridPanel/PopUpGridPanelViewModel.vb b/PopUpGridPanel/PopUpGridPanelViewModel.vb similarity index 84% rename from ProjectPage/PopUpGridPanel/PopUpGridPanelViewModel.vb rename to PopUpGridPanel/PopUpGridPanelViewModel.vb index 4ea20ed..1c5aaa5 100644 --- a/ProjectPage/PopUpGridPanel/PopUpGridPanelViewModel.vb +++ b/PopUpGridPanel/PopUpGridPanelViewModel.vb @@ -2,7 +2,7 @@ Namespace EgtCAM5 - Public Class PopUpGridPanelViewModel + Public Class PopUpGridPanelVM Inherits ViewModelBase #Region "FIELDS & PROPERTIES" @@ -66,8 +66,8 @@ Namespace EgtCAM5 ''' Execute the CPlaneView. This method is invoked by the CPlaneViewCommand. ''' Public Sub CPlaneView(ByVal param As Object) - EgtCAM5Map.refProjectVM.GetController.SetLastInteger(Controller.GRID_TYPE.VIEW) - EgtCAM5Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.GRID) + Map.refProjectVM.GetController.SetLastInteger(Controller.GRID_TYPE.VIEW) + Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.GRID) End Sub #End Region ' CPlaneViewCommand @@ -91,9 +91,9 @@ Namespace EgtCAM5 ''' Public Sub CPlaneRotate(ByVal param As Object) If (Keyboard.Modifiers And ModifierKeys.Shift) <> ModifierKeys.Shift Then - EgtCAM5Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.GRID_ROTATE) + Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.GRID_ROTATE) Else - EgtCAM5Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.GRID_ROTATE3D) + Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.GRID_ROTATE3D) End If End Sub @@ -117,7 +117,7 @@ Namespace EgtCAM5 ''' Execute the CPlane3P. This method is invoked by the CPlane3PCommand. ''' Public Sub CPlane3P(ByVal param As Object) - EgtCAM5Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.GRID_3P) + Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.GRID_3P) End Sub #End Region ' CPlane3PCommand @@ -140,7 +140,7 @@ Namespace EgtCAM5 ''' Execute the CPlanePerpObj. This method is invoked by the CPlanePerpObjCommand. ''' Public Sub CPlanePerpObj(ByVal param As Object) - EgtCAM5Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.GRID_PERPCURVE) + Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.GRID_PERPCURVE) End Sub #End Region ' CPlanePerpObjCommand @@ -163,7 +163,7 @@ Namespace EgtCAM5 ''' Execute the CPlaneObj. This method is invoked by the CPlaneObjCommand. ''' Public Sub CPlaneObj(ByVal param As Object) - EgtCAM5Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.GRID_OBJ) + Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.GRID_OBJ) End Sub #End Region ' CPlaneObjCommand diff --git a/ProjectPage/PopUpViewPanel/PopUpViewPanelView.xaml b/PopUpViewPanel/PopUpViewPanelV.xaml similarity index 95% rename from ProjectPage/PopUpViewPanel/PopUpViewPanelView.xaml rename to PopUpViewPanel/PopUpViewPanelV.xaml index 8faa056..2510620 100644 --- a/ProjectPage/PopUpViewPanel/PopUpViewPanelView.xaml +++ b/PopUpViewPanel/PopUpViewPanelV.xaml @@ -1,4 +1,4 @@ - diff --git a/PopUpViewPanel/PopUpViewPanelV.xaml.vb b/PopUpViewPanel/PopUpViewPanelV.xaml.vb new file mode 100644 index 0000000..b89c7aa --- /dev/null +++ b/PopUpViewPanel/PopUpViewPanelV.xaml.vb @@ -0,0 +1,3 @@ +Public Class PopUpViewPanelV + +End Class diff --git a/ProjectPage/PopUpViewPanel/PopUpViewPanelViewModel.vb b/PopUpViewPanel/PopUpViewPanelVM.vb similarity index 90% rename from ProjectPage/PopUpViewPanel/PopUpViewPanelViewModel.vb rename to PopUpViewPanel/PopUpViewPanelVM.vb index e5c91ec..a18b9f4 100644 --- a/ProjectPage/PopUpViewPanel/PopUpViewPanelViewModel.vb +++ b/PopUpViewPanel/PopUpViewPanelVM.vb @@ -2,7 +2,7 @@ Namespace EgtCAM5 - Public Class PopUpViewPanelViewModel + Public Class PopUpViewPanelVM Inherits ViewModelBase #Region "FIELDS & PROPERTIES" @@ -77,7 +77,7 @@ Namespace EgtCAM5 ''' Execute the ZoomIn. This method is invoked by the ZoomInCommand. ''' Public Sub ZoomIn(ByVal param As Object) - EgtCAM5Map.refProjectVM.GetScene.ZoomIn() + Map.refProjectVM.GetScene.ZoomIn() End Sub #End Region ' ZoomInCommand @@ -100,7 +100,7 @@ Namespace EgtCAM5 ''' Execute the ZoomOut. This method is invoked by the ZoomOutCommand. ''' Public Sub ZoomOut(ByVal param As Object) - EgtCAM5Map.refProjectVM.GetScene.ZoomOut() + Map.refProjectVM.GetScene.ZoomOut() End Sub #End Region ' ZoomOutCommand @@ -123,7 +123,7 @@ Namespace EgtCAM5 ''' Execute the IsoViewSE. This method is invoked by the IsoViewSECommand. ''' Public Sub IsoViewSE(ByVal param As Object) - EgtCAM5Map.refProjectVM.GetScene.IsoViewSE() + Map.refProjectVM.GetScene.IsoViewSE() End Sub #End Region ' IsoViewSECommand @@ -146,7 +146,7 @@ Namespace EgtCAM5 ''' Execute the IsoViewNE. This method is invoked by the IsoViewNECommand. ''' Public Sub IsoViewNE(ByVal param As Object) - EgtCAM5Map.refProjectVM.GetScene.IsoViewNE() + Map.refProjectVM.GetScene.IsoViewNE() End Sub #End Region ' IsoViewNECommand @@ -169,7 +169,7 @@ Namespace EgtCAM5 ''' Execute the IsoViewNW. This method is invoked by the IsoViewNWCommand. ''' Public Sub IsoViewNW(ByVal param As Object) - EgtCAM5Map.refProjectVM.GetScene.IsoViewNW() + Map.refProjectVM.GetScene.IsoViewNW() End Sub #End Region ' IsoViewNWCommand @@ -192,7 +192,7 @@ Namespace EgtCAM5 ''' Execute the GetDist. This method is invoked by the GetDistCommand. ''' Public Sub ViewToCPlane(ByVal param As Object) - EgtCAM5Map.refProjectVM.GetScene.CPlaneView() + Map.refProjectVM.GetScene.CPlaneView() End Sub #End Region ' ViewToCPlaneCommand diff --git a/ProjectPage/ProjectView.xaml b/Project/ProjectV.xaml similarity index 72% rename from ProjectPage/ProjectView.xaml rename to Project/ProjectV.xaml index b07a5e3..ec9ae3a 100644 --- a/ProjectPage/ProjectView.xaml +++ b/Project/ProjectV.xaml @@ -1,4 +1,4 @@ - - + - - + + - + - - + + - + - + - + - + - + - + - + - + diff --git a/ProjectPage/ProjectView.xaml.vb b/Project/ProjectV.xaml.vb similarity index 98% rename from ProjectPage/ProjectView.xaml.vb rename to Project/ProjectV.xaml.vb index da3bbfd..31a42ae 100644 --- a/ProjectPage/ProjectView.xaml.vb +++ b/Project/ProjectV.xaml.vb @@ -1,6 +1,6 @@ Imports EgtWPFLib5.EgtFloating -Public Class ProjectView +Public Class ProjectV Private m_bDoors As Boolean = False Private m_bGunStock As Boolean = False diff --git a/ProjectPage/ProjectViewModel.vb b/Project/ProjectVM.vb similarity index 97% rename from ProjectPage/ProjectViewModel.vb rename to Project/ProjectVM.vb index 23bedfe..194bd02 100644 --- a/ProjectPage/ProjectViewModel.vb +++ b/Project/ProjectVM.vb @@ -7,7 +7,7 @@ Imports EgtWPFLib5.EgtFloating Namespace EgtCAM5 - Public Class ProjectViewModel + Public Class ProjectVM Inherits TabViewModel #Region "FIELDS" @@ -66,9 +66,9 @@ Namespace EgtCAM5 Sub New() ' Creo riferimento a questa classe in EgtCAM5Map - EgtCAM5Map.SetRefProjectVM(Me) + Map.SetRefProjectVM(Me) ' Creo classe di supporto per la visualizzazione dei parametri utensile e di lavorazione per Db e operazioni - SharedFieldsClass.bFirst = True + TMDbParamVisibility.bFirst = True ManageClosingApplication() RegisterMainWindowCommands() ' Inizializza i parametri della scena @@ -157,7 +157,7 @@ Namespace EgtCAM5 ' inizializzo gestore lavorazioni EgtInitMachMgr(IniFile.m_sMachinesRoot) ' Apro progetto vuoto - EgtCAM5Map.refTopCommandBarVM.NewCmd() + Map.refTopCommandBarVM.NewCmd() ' Seleziono la macchina impostata nel file ini Application.Msn.NotifyColleagues(Application.LOADCURRENTMACHINE) EgtSetCurrentContext(IniFile.m_ProjectSceneContext) @@ -172,7 +172,7 @@ Namespace EgtCAM5 Dim sText As String = EgtMsg(MSG_MISSINGKEYWD + 2) & vbCrLf & EgtMsg(MSG_MISSINGKEYWD + 3) Dim sTitle As String = EgtMsg(MSG_MISSINGKEYWD + 1) MessageBox.Show(sText, sTitle, MessageBoxButton.OK, MessageBoxImage.Error) - ' Altrimenti manca la licenza + ' Altrimenti manca la licenza Else EgtOutLog("Problems with Licence") ' Box di avviso licenza con problemi : "Programma senza licenza. \n Caricala e riavvia il programma." "Errore" @@ -1063,16 +1063,16 @@ Namespace EgtCAM5 If e.KeyData = System.Windows.Forms.Keys.Delete Then m_Controller.SetLastInteger(GDB_ID.SEL) m_Controller.ExecuteCommand(Controller.CMD.DELETE) - ' Con SPAZIO ripeto l'ultimo comando + ' Con SPAZIO ripeto l'ultimo comando ElseIf e.KeyData = System.Windows.Forms.Keys.Space Then m_Controller.RepeatLastCommand() - ' Con 'A' e in modalità continuazione, forzo il passaggio ad arco + ' Con 'A' e in modalità continuazione, forzo il passaggio ad arco ElseIf e.KeyData = System.Windows.Forms.Keys.A And m_Controller.GetContinue() Then m_Controller.ContinueArcPDP() - ' Con 'L' e in modalità continuazione, forzo il passaggio a retta + ' Con 'L' e in modalità continuazione, forzo il passaggio a retta ElseIf e.KeyData = System.Windows.Forms.Keys.L And m_Controller.GetContinue() Then m_Controller.ContinueLine2P() - ' Con 'V' cambio lo stato del check + ' Con 'V' cambio lo stato del check ElseIf e.KeyData = System.Windows.Forms.Keys.V Then Application.Msn.NotifyColleagues(Application.CHANGEINPUTBOXCHECK) End If diff --git a/ProjectPage/DbPanel/DbPanelView.xaml.vb b/ProjectPage/DbPanel/DbPanelView.xaml.vb deleted file mode 100644 index 3e20699..0000000 --- a/ProjectPage/DbPanel/DbPanelView.xaml.vb +++ /dev/null @@ -1,3 +0,0 @@ -Public Class DbPanelView - -End Class diff --git a/ProjectPage/DoorsPanel/DoorsPanelView.xaml.vb b/ProjectPage/DoorsPanel/DoorsPanelView.xaml.vb deleted file mode 100644 index ab0307b..0000000 --- a/ProjectPage/DoorsPanel/DoorsPanelView.xaml.vb +++ /dev/null @@ -1,3 +0,0 @@ -Public Class DoorsPanelView - -End Class diff --git a/ProjectPage/DrawPanel/DrawPanelView.xaml.vb b/ProjectPage/DrawPanel/DrawPanelView.xaml.vb deleted file mode 100644 index e5c4b29..0000000 --- a/ProjectPage/DrawPanel/DrawPanelView.xaml.vb +++ /dev/null @@ -1,3 +0,0 @@ -Public Class DrawPanelView - -End Class diff --git a/ProjectPage/ExecutePanel/ExecutePanelView.xaml.vb b/ProjectPage/ExecutePanel/ExecutePanelView.xaml.vb deleted file mode 100644 index b137b4c..0000000 --- a/ProjectPage/ExecutePanel/ExecutePanelView.xaml.vb +++ /dev/null @@ -1,3 +0,0 @@ -Public Class ExecutePanelView - -End Class diff --git a/ProjectPage/GridPanel/GridPanelView.xaml.vb b/ProjectPage/GridPanel/GridPanelView.xaml.vb deleted file mode 100644 index 5fa9792..0000000 --- a/ProjectPage/GridPanel/GridPanelView.xaml.vb +++ /dev/null @@ -1,3 +0,0 @@ -Public Class GridPanelView - -End Class diff --git a/ProjectPage/GunStockPanel/GunStockPanelView.xaml.vb b/ProjectPage/GunStockPanel/GunStockPanelView.xaml.vb deleted file mode 100644 index 7c02809..0000000 --- a/ProjectPage/GunStockPanel/GunStockPanelView.xaml.vb +++ /dev/null @@ -1,3 +0,0 @@ -Public Class GunStockPanelView - -End Class diff --git a/ProjectPage/InstrumentPanel/InstrumentPanelView.xaml.vb b/ProjectPage/InstrumentPanel/InstrumentPanelView.xaml.vb deleted file mode 100644 index fb813f4..0000000 --- a/ProjectPage/InstrumentPanel/InstrumentPanelView.xaml.vb +++ /dev/null @@ -1,3 +0,0 @@ -Public Class InstrumentPanelView - -End Class diff --git a/ProjectPage/MachGroupPanel/MachGroupPanelView.xaml.vb b/ProjectPage/MachGroupPanel/MachGroupPanelView.xaml.vb deleted file mode 100644 index a2e979d..0000000 --- a/ProjectPage/MachGroupPanel/MachGroupPanelView.xaml.vb +++ /dev/null @@ -1,3 +0,0 @@ -Public Class MachGroupPanelView - -End Class diff --git a/ProjectPage/PopUpGridPanel/PopUpGridPanelView.xaml.vb b/ProjectPage/PopUpGridPanel/PopUpGridPanelView.xaml.vb deleted file mode 100644 index 53fd179..0000000 --- a/ProjectPage/PopUpGridPanel/PopUpGridPanelView.xaml.vb +++ /dev/null @@ -1,3 +0,0 @@ -Public Class PopUpGridPanelView - -End Class diff --git a/ProjectPage/PopUpViewPanel/PopUpViewPanelView.xaml.vb b/ProjectPage/PopUpViewPanel/PopUpViewPanelView.xaml.vb deleted file mode 100644 index 36ca756..0000000 --- a/ProjectPage/PopUpViewPanel/PopUpViewPanelView.xaml.vb +++ /dev/null @@ -1,3 +0,0 @@ -Public Class PopUpViewPanelView - -End Class diff --git a/ProjectPage/ShowPanel/ShowPanelView.xaml.vb b/ProjectPage/ShowPanel/ShowPanelView.xaml.vb deleted file mode 100644 index 1677643..0000000 --- a/ProjectPage/ShowPanel/ShowPanelView.xaml.vb +++ /dev/null @@ -1,3 +0,0 @@ -Public Class ShowPanelView - -End Class diff --git a/ProjectPage/SpecialPanel/SpecialPanelView.xaml.vb b/ProjectPage/SpecialPanel/SpecialPanelView.xaml.vb deleted file mode 100644 index 4cc7668..0000000 --- a/ProjectPage/SpecialPanel/SpecialPanelView.xaml.vb +++ /dev/null @@ -1,3 +0,0 @@ -Public Class SpecialPanelView - -End Class diff --git a/ProjectPage/ViewPanel/ViewPanelView.xaml.vb b/ProjectPage/ViewPanel/ViewPanelView.xaml.vb deleted file mode 100644 index 6845fe3..0000000 --- a/ProjectPage/ViewPanel/ViewPanelView.xaml.vb +++ /dev/null @@ -1,3 +0,0 @@ -Public Class GridViewPanelView - -End Class diff --git a/SetUpWindow/SetUpView.xaml b/SetUpWindow/SetUpV.xaml similarity index 97% rename from SetUpWindow/SetUpView.xaml rename to SetUpWindow/SetUpV.xaml index 94070ab..60a5620 100644 --- a/SetUpWindow/SetUpView.xaml +++ b/SetUpWindow/SetUpV.xaml @@ -1,4 +1,4 @@ - diff --git a/ShowPanel/ShowPanelV.xaml.vb b/ShowPanel/ShowPanelV.xaml.vb new file mode 100644 index 0000000..25dc4d5 --- /dev/null +++ b/ShowPanel/ShowPanelV.xaml.vb @@ -0,0 +1,3 @@ +Public Class ShowPanelV + +End Class diff --git a/ProjectPage/ShowPanel/ShowPanelViewModel.vb b/ShowPanel/ShowPanelVM.vb similarity index 91% rename from ProjectPage/ShowPanel/ShowPanelViewModel.vb rename to ShowPanel/ShowPanelVM.vb index ec44a7b..81bbdfa 100644 --- a/ProjectPage/ShowPanel/ShowPanelViewModel.vb +++ b/ShowPanel/ShowPanelVM.vb @@ -2,7 +2,7 @@ Namespace EgtCAM5 - Public Class ShowPanelViewModel + Public Class ShowPanelVM Inherits ViewModelBase #Region "FIELDS & PROPERTIES" @@ -48,7 +48,7 @@ Namespace EgtCAM5 If value <> m_WireframeIsChecked Then m_WireframeIsChecked = value If value Then - EgtCAM5Map.refProjectVM.GetScene.WireFrame() + Map.refProjectVM.GetScene.WireFrame() OnPropertyChanged("WireframeIsChecked") End If End If @@ -64,7 +64,7 @@ Namespace EgtCAM5 If value <> m_HiddenLineIsChecked Then m_HiddenLineIsChecked = value If value Then - EgtCAM5Map.refProjectVM.GetScene.HiddenLine() + Map.refProjectVM.GetScene.HiddenLine() OnPropertyChanged("HiddenLineIsChecked") End If End If @@ -80,7 +80,7 @@ Namespace EgtCAM5 If value <> m_ShadingIsChecked Then m_ShadingIsChecked = value If value Then - EgtCAM5Map.refProjectVM.GetScene.Shading() + Map.refProjectVM.GetScene.Shading() OnPropertyChanged("ShadingIsChecked") End If End If diff --git a/Special/GunStock.vb b/Special/GunStock.vb index 9acae5d..f5dadd3 100644 --- a/Special/GunStock.vb +++ b/Special/GunStock.vb @@ -209,8 +209,8 @@ Module GunStock Private Function UpdatePezParams(bNewFile As Boolean) As Boolean ' Scelta parametri pezzo - Dim GunStockWnd As New GunStockWndView - Dim GunStockWndViewModel As New GunStockWndViewModel + Dim GunStockWnd As New GunStockWndV + Dim GunStockWndViewModel As New GunStockWndVM GunStockWnd.DataContext = GunStockWndViewModel GunStockWnd.Owner = Application.Current.MainWindow ' Creo lista dei valori diff --git a/Special/GunStockWindow/GunStockWndView.xaml b/Special/GunStockWindow/GunStockWndV.xaml similarity index 96% rename from Special/GunStockWindow/GunStockWndView.xaml rename to Special/GunStockWindow/GunStockWndV.xaml index 4cb2022..a48efa7 100644 --- a/Special/GunStockWindow/GunStockWndView.xaml +++ b/Special/GunStockWindow/GunStockWndV.xaml @@ -1,4 +1,4 @@ - diff --git a/SpecialPanel/SpecialPanelV.xaml.vb b/SpecialPanel/SpecialPanelV.xaml.vb new file mode 100644 index 0000000..7a919f4 --- /dev/null +++ b/SpecialPanel/SpecialPanelV.xaml.vb @@ -0,0 +1,3 @@ +Public Class SpecialPanelV + +End Class diff --git a/ProjectPage/SpecialPanel/SpecialPanelViewModel.vb b/SpecialPanel/SpecialPanelVM.vb similarity index 94% rename from ProjectPage/SpecialPanel/SpecialPanelViewModel.vb rename to SpecialPanel/SpecialPanelVM.vb index 3e3a4ed..7531933 100644 --- a/ProjectPage/SpecialPanel/SpecialPanelViewModel.vb +++ b/SpecialPanel/SpecialPanelVM.vb @@ -3,7 +3,7 @@ Imports EgtUILib Namespace EgtCAM5 - Public Class SpecialPanelViewModel + Public Class SpecialPanelVM Private m_ButtonList As New List(Of ButtonItem) Public ReadOnly Property ButtonList As List(Of ButtonItem) diff --git a/StatusBar/StatusBarView.xaml b/StatusBar/StatusBarV.xaml similarity index 97% rename from StatusBar/StatusBarView.xaml rename to StatusBar/StatusBarV.xaml index 19cbbdb..7a4a469 100644 --- a/StatusBar/StatusBarView.xaml +++ b/StatusBar/StatusBarV.xaml @@ -1,4 +1,4 @@ - diff --git a/TopCommandBar/TopCommandBarV.xaml.vb b/TopCommandBar/TopCommandBarV.xaml.vb new file mode 100644 index 0000000..9b62367 --- /dev/null +++ b/TopCommandBar/TopCommandBarV.xaml.vb @@ -0,0 +1,3 @@ +Public Class TopCommandBarV + +End Class diff --git a/TopCommandBar/TopCommandBarViewModel.vb b/TopCommandBar/TopCommandBarVM.vb similarity index 95% rename from TopCommandBar/TopCommandBarViewModel.vb rename to TopCommandBar/TopCommandBarVM.vb index 6c72575..12c1bc9 100644 --- a/TopCommandBar/TopCommandBarViewModel.vb +++ b/TopCommandBar/TopCommandBarVM.vb @@ -4,7 +4,7 @@ Imports EgtUILib Namespace EgtCAM5 - Public Class TopCommandBarViewModel + Public Class TopCommandBarVM Inherits ViewModelBase #Region "FIELDS & PROPERTIES" @@ -192,7 +192,7 @@ Namespace EgtCAM5 Sub New() ' Creo riferimento a questa classe in EgtCAM5Map - EgtCAM5Map.SetRefTopCommandBarVM(Me) + Map.SetRefTopCommandBarVM(Me) ' Inizializzo la selezione della modilità Draw all'apertura del programma DrawIsChecked = True Application.Msn.Register(Application.SETMACHININGMODE, Sub() @@ -246,7 +246,7 @@ Namespace EgtCAM5 ''' Execute the New. This method is invoked by the NewCommand. ''' Friend Sub NewCmd() - EgtCAM5Map.refProjectVM.GetController.NewProject(True) + Map.refProjectVM.GetController.NewProject(True) Application.Msn.NotifyColleagues(Application.SELECTIDINOBJTREENOMARK, EgtGetCurrLayer()) OnPropertyChanged("MruFileNames") End Sub @@ -278,9 +278,9 @@ Namespace EgtCAM5 If String.IsNullOrEmpty(sFilePath) Then Dim sDir As String = String.Empty GetPrivateProfileString(S_GENERAL, K_LASTNGEDIR, "", sDir) - EgtCAM5Map.refProjectVM.GetController.OpenProject(sDir) + Map.refProjectVM.GetController.OpenProject(sDir) Else - EgtCAM5Map.refProjectVM.GetController.OpenProject(sFilePath, False) + Map.refProjectVM.GetController.OpenProject(sFilePath, False) End If Application.Msn.NotifyColleagues(Application.SELECTIDINOBJTREENOMARK, EgtGetCurrLayer()) End Sub @@ -443,10 +443,10 @@ Namespace EgtCAM5 ''' Execute the Export. This method is invoked by the ExportCommand. ''' Public Sub Options(ByVal param As Object) - Dim OptionsWindow As New OptionsV + Dim OptionsWindow As New OptionWindowV OptionsWindow.Height = 614 OptionsWindow.Width = 1024 - OptionsWindow.DataContext = New OptionsVM + OptionsWindow.DataContext = New OptionWindowVM OptionsWindow.Owner = Application.Current.MainWindow OptionsWindow.ShowDialog() End Sub @@ -491,7 +491,7 @@ Namespace EgtCAM5 Application.Msn.NotifyColleagues(Application.SAVEPROJECT) End If EgtGetCurrFilePath(sCurrProject) - ' se modificato, chiedo se si vuole salvare + ' se modificato, chiedo se si vuole salvare Else If EgtGetModified() Then If MessageBox.Show(EgtMsg(MSG_TOPCOMMANDBAR + 11), "", MessageBoxButton.YesNo, MessageBoxImage.Question) = MessageBoxResult.Yes Then diff --git a/TopCommandBar/TopCommandBarView.xaml.vb b/TopCommandBar/TopCommandBarView.xaml.vb deleted file mode 100644 index 8dc9a15..0000000 --- a/TopCommandBar/TopCommandBarView.xaml.vb +++ /dev/null @@ -1,3 +0,0 @@ -Public Class TopCommandBarView - -End Class diff --git a/EgtCAM5Resources.xaml b/Utility/Dictionary.xaml similarity index 96% rename from EgtCAM5Resources.xaml rename to Utility/Dictionary.xaml index 1e4440e..183ebdd 100644 --- a/EgtCAM5Resources.xaml +++ b/Utility/Dictionary.xaml @@ -3,6 +3,7 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:sys="clr-namespace:System;assembly=mscorlib" xmlns:local="clr-namespace:EgtCAM5" + xmlns:EgtCAM5="clr-namespace:EgtCAM5" xmlns:ViewModel="clr-namespace:EgtCAM5.EgtCAM5" xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"> @@ -12,37 +13,37 @@ This template applies a ProjectView to an instance of the ProjectViewModel class shown in the main window. --> - - + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - + + @@ -785,22 +786,22 @@ --> diff --git a/IniFile.vb b/Utility/IniFile.vb similarity index 100% rename from IniFile.vb rename to Utility/IniFile.vb diff --git a/MachineModel.vb b/Utility/MachineModel.vb similarity index 100% rename from MachineModel.vb rename to Utility/MachineModel.vb diff --git a/EgtCAM5Map.vb b/Utility/Map.vb similarity index 75% rename from EgtCAM5Map.vb rename to Utility/Map.vb index eb5e436..e22662d 100644 --- a/EgtCAM5Map.vb +++ b/Utility/Map.vb @@ -1,30 +1,30 @@ -Module EgtCAM5Map +Module Map #Region "Program ViewModel Map" - Private m_refMainWindowVM As EgtCAM5.MainWindowViewModel - Private m_refStatusBarVM As EgtCAM5.StatusBarViewModel - Private m_refTopCommandBarVM As EgtCAM5.TopCommandBarViewModel - Private m_refProjectVM As EgtCAM5.ProjectViewModel + Private m_refMainWindowVM As EgtCAM5.MainWindowVM + Private m_refStatusBarVM As EgtCAM5.StatusBarVM + Private m_refTopCommandBarVM As EgtCAM5.TopCommandBarVM + Private m_refProjectVM As EgtCAM5.ProjectVM #Region "Get" - Public ReadOnly Property refMainWindowVM As EgtCAM5.MainWindowViewModel + Public ReadOnly Property refMainWindowVM As EgtCAM5.MainWindowVM Get Return m_refMainWindowVM End Get End Property - Public ReadOnly Property refStatusBarVM As EgtCAM5.StatusBarViewModel + Public ReadOnly Property refStatusBarVM As EgtCAM5.StatusBarVM Get Return m_refStatusBarVM End Get End Property - Public ReadOnly Property refTopCommandBarVM As EgtCAM5.TopCommandBarViewModel + Public ReadOnly Property refTopCommandBarVM As EgtCAM5.TopCommandBarVM Get Return m_refTopCommandBarVM End Get End Property - Public ReadOnly Property refProjectVM As EgtCAM5.ProjectViewModel + Public ReadOnly Property refProjectVM As EgtCAM5.ProjectVM Get Return m_refProjectVM End Get @@ -34,15 +34,15 @@ #Region "Set" - Friend Function SetRefStatusBarVM(StatusBarVM As EgtCAM5.StatusBarViewModel) As Boolean + Friend Function SetRefStatusBarVM(StatusBarVM As EgtCAM5.StatusBarVM) As Boolean m_refStatusBarVM = StatusBarVM Return Not IsNothing(m_refStatusBarVM) End Function - Friend Function SetRefTopCommandBarVM(TopCommandBarVM As EgtCAM5.TopCommandBarViewModel) As Boolean + Friend Function SetRefTopCommandBarVM(TopCommandBarVM As EgtCAM5.TopCommandBarVM) As Boolean m_refTopCommandBarVM = TopCommandBarVM Return Not IsNothing(m_refTopCommandBarVM) End Function - Friend Function SetRefProjectVM(ProjectVM As EgtCAM5.ProjectViewModel) As Boolean + Friend Function SetRefProjectVM(ProjectVM As EgtCAM5.ProjectVM) As Boolean m_refProjectVM = ProjectVM Return Not IsNothing(m_refProjectVM) End Function @@ -51,7 +51,7 @@ #Region "Init" - Friend Function BeginInit(MainWindowVM As EgtCAM5.MainWindowViewModel) As Boolean + Friend Function BeginInit(MainWindowVM As EgtCAM5.MainWindowVM) As Boolean m_refMainWindowVM = MainWindowVM Return Not IsNothing(m_refMainWindowVM) End Function diff --git a/SharedFieldsClass.vb b/Utility/TMDbParamVisibility.vb similarity index 98% rename from SharedFieldsClass.vb rename to Utility/TMDbParamVisibility.vb index d24f072..3f376a1 100644 --- a/SharedFieldsClass.vb +++ b/Utility/TMDbParamVisibility.vb @@ -1,4 +1,4 @@ -Module SharedFieldsClass +Module TMDbParamVisibility ' Variabile utilizzata per eseguire il costruttore all'inizio del programma Friend bFirst As Boolean = True diff --git a/Utility.vb b/Utility/Utility.vb similarity index 100% rename from Utility.vb rename to Utility/Utility.vb diff --git a/ProjectPage/ViewPanel/ViewPanelView.xaml b/ViewPanel/ViewPanelV.xaml similarity index 96% rename from ProjectPage/ViewPanel/ViewPanelView.xaml rename to ViewPanel/ViewPanelV.xaml index ccc601b..e7b906a 100644 --- a/ProjectPage/ViewPanel/ViewPanelView.xaml +++ b/ViewPanel/ViewPanelV.xaml @@ -1,4 +1,4 @@ - diff --git a/ViewPanel/ViewPanelV.xaml.vb b/ViewPanel/ViewPanelV.xaml.vb new file mode 100644 index 0000000..c6bf7ab --- /dev/null +++ b/ViewPanel/ViewPanelV.xaml.vb @@ -0,0 +1,3 @@ +Public Class ViewPanelV + +End Class diff --git a/ProjectPage/ViewPanel/ViewPanelViewModel.vb b/ViewPanel/ViewPanelVM.vb similarity index 90% rename from ProjectPage/ViewPanel/ViewPanelViewModel.vb rename to ViewPanel/ViewPanelVM.vb index 9a77d6f..9a4b41b 100644 --- a/ProjectPage/ViewPanel/ViewPanelViewModel.vb +++ b/ViewPanel/ViewPanelVM.vb @@ -2,7 +2,7 @@ Namespace EgtCAM5 - Public Class ViewPanelViewModel + Public Class ViewPanelVM Inherits ViewModelBase #Region "FIELDS & PROPERTIES" @@ -84,7 +84,7 @@ Namespace EgtCAM5 ''' Execute the ZoomAll. This method is invoked by the ZoomAllCommand. ''' Public Sub ZoomAll(ByVal param As Object) - EgtCAM5Map.refProjectVM.GetScene.ZoomAll() + Map.refProjectVM.GetScene.ZoomAll() End Sub #End Region ' ZoomAllCommand @@ -107,7 +107,7 @@ Namespace EgtCAM5 ''' Execute the TopView. This method is invoked by the TopViewCommand. ''' Public Sub TopView(ByVal param As Object) - EgtCAM5Map.refProjectVM.GetScene.TopView() + Map.refProjectVM.GetScene.TopView() End Sub #End Region ' TopViewCommand @@ -130,7 +130,7 @@ Namespace EgtCAM5 ''' Execute the FrontView. This method is invoked by the FrontViewCommand. ''' Public Sub FrontView(ByVal param As Object) - EgtCAM5Map.refProjectVM.GetScene.FrontView() + Map.refProjectVM.GetScene.FrontView() End Sub #End Region ' FrontViewCommand @@ -153,7 +153,7 @@ Namespace EgtCAM5 ''' Execute the LeftView. This method is invoked by the LeftViewCommand. ''' Public Sub LeftView(ByVal param As Object) - EgtCAM5Map.refProjectVM.GetScene.LeftView() + Map.refProjectVM.GetScene.LeftView() End Sub #End Region ' LeftViewCommand @@ -176,7 +176,7 @@ Namespace EgtCAM5 ''' Execute the BackView. This method is invoked by the BackViewCommand. ''' Public Sub BackView(ByVal param As Object) - EgtCAM5Map.refProjectVM.GetScene.BackView() + Map.refProjectVM.GetScene.BackView() End Sub #End Region ' BackViewCommand @@ -199,7 +199,7 @@ Namespace EgtCAM5 ''' Execute the RightView. This method is invoked by the RightViewCommand. ''' Public Sub RightView(ByVal param As Object) - EgtCAM5Map.refProjectVM.GetScene.RightView() + Map.refProjectVM.GetScene.RightView() End Sub #End Region ' RightViewCommand @@ -222,7 +222,7 @@ Namespace EgtCAM5 ''' Execute the IsoViewSW. This method is invoked by the IsoViewSWCommand. ''' Public Sub IsoViewSW(ByVal param As Object) - EgtCAM5Map.refProjectVM.GetScene.IsoViewSW() + Map.refProjectVM.GetScene.IsoViewSW() End Sub #End Region ' IsoViewSWCommand