Egalware/EgtCAM5
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

EgtCAM5 :

Browse Source 
- Cambiati nomi classi e file.
This commit is contained in:
Emmanuele Sassi
2018-04-10 17:08:35 +00:00
parent 4e2801a1c4
commit a4b5cd4834
144 changed files with 517 additions and 521 deletions
Download Patch File Download Diff File Expand all files Collapse all files
AboutBoxWindow/AboutBoxView.xaml
+1 -1
View File
@@ -1,4 +1,4 @@
<Window x:Class="AboutBoxView"
<Window x:Class="AboutBoxWndV"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
Title="AboutBox" Height="320" Width="300" WindowStyle="None" ResizeMode="NoResize"
AboutBoxWindow/AboutBoxView.xaml.vb
+1 -1
View File
@@ -1,6 +1,6 @@
Imports EgtUILib
Public Class AboutBoxView
Public Class AboutBoxWndV
Private Sub AboutBoxWD_Loaded(sender As Object, e As RoutedEventArgs) Handles Me.Loaded
DescriptionLbl.Text = My.Application.Info.Description.ToString()
Application.xaml
+1 -1
View File
@@ -3,7 +3,7 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<Application.Resources>
<ResourceDictionary Source="EgtCAM5Resources.xaml" />
<ResourceDictionary Source="Utility/Dictionary.xaml" />
</Application.Resources>
</Application>
Application.xaml.vb
+2 -2
View File
@@ -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
ProjectPage/DoorsPanel/DoorsPanelView.xaml → DoorsPanel/DoorPanelV.xaml
+1 -1
View File
@@ -1,4 +1,4 @@
<UserControl x:Class="DoorsPanelView"
<UserControl x:Class="DoorPanelV"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
DoorsPanel/DoorPanelV.xaml.vb
+3
View File
@@ -0,0 +1,3 @@
Public Class DoorPanelV
End Class
ProjectPage/DoorsPanel/DoorsPanelViewModel.vb → DoorsPanel/DoorPanelVM.vb
+1 -1
View File
@@ -3,7 +3,7 @@ Imports EgtUILib
Namespace EgtCAM5
Public Class DoorsPanelViewModel
Public Class DoorPanelVM
Inherits ViewModelBase
Public ReadOnly Property MruDoorNames As ObservableCollection(Of String)
ProjectPage/DrawPanel/DrawPanelView.xaml → DrawPanel/DrawPanelV.xaml
+1 -1
View File
@@ -1,4 +1,4 @@
<UserControl x:Class="DrawPanelView"
<UserControl x:Class="DrawPanelV"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:Interactivity="clr-namespace:System.Windows.Interactivity;assembly=System.Windows.Interactivity"
DrawPanel/DrawPanelV.xaml.vb
+3
View File
@@ -0,0 +1,3 @@
Public Class DrawPanelV
End Class
ProjectPage/DrawPanel/DrawPanelViewModel.vb → DrawPanel/DrawPanelVM.vb
+57 -57
View File
@@ -2,7 +2,7 @@
Namespace EgtCAM5
Public Class DrawPanelViewModel
Public Class DrawPanelVM
Inherits ViewModelBase
Private WithEvents IdleTimer As New System.Windows.Threading.DispatcherTimer(TimeSpan.FromMilliseconds(200), Windows.Threading.DispatcherPriority.ApplicationIdle, AddressOf OnIdle, Application.Current.Dispatcher)
@@ -426,11 +426,11 @@ Namespace EgtCAM5
''' </summary>
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
''' </summary>
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
''' </summary>
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.
''' </summary>
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.
''' </summary>
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.
''' </summary>
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.
''' </summary>
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.
''' </summary>
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.
''' </summary>
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.
''' </summary>
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.
''' </summary>
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.
''' </summary>
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
''' </summary>
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
''' </summary>
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.
''' </summary>
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.
''' </summary>
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.
''' </summary>
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.
''' </summary>
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.
''' </summary>
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.
''' </summary>
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.
''' </summary>
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.
''' </summary>
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
''' </summary>
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.
''' </summary>
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.
''' </summary>
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.
''' </summary>
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.
''' </summary>
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.
''' </summary>
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.
''' </summary>
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.
''' </summary>
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.
''' </summary>
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
''' </summary>
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.
''' </summary>
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.
''' </summary>
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.
''' </summary>
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.
''' </summary>
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.
''' </summary>
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.
''' </summary>
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.
''' </summary>
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.
''' </summary>
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.
''' </summary>
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.
''' </summary>
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
EgtCAM5.vbproj
+140 -141
View File
@@ -151,15 +151,15 @@
<Compile Include="Constants\ConstIni.vb" />
<Compile Include="Constants\ConstMachIni.vb" />
<Compile Include="Constants\ConstMsg.vb" />
<Compile Include="EgtCAM5Map.vb" />
<Compile Include="Utility\Map.vb" />
<Compile Include="Internals\MruList.vb" />
<Compile Include="MachineModel.vb" />
<Compile Include="MachiningsDbWindow\MachiningTreeView.vb" />
<Compile Include="Utility\MachineModel.vb" />
<Compile Include="MachiningDbWindow\MachiningTreeView.vb" />
<Compile Include="MachOptionsWindow\MachOptionModule.vb" />
<Compile Include="MachOptionsWindow\MachOptionsView.xaml.vb">
<DependentUpon>MachOptionsView.xaml</DependentUpon>
<Compile Include="MachOptionsWindow\MachOptionV.xaml.vb">
<DependentUpon>MachOptionV.xaml</DependentUpon>
</Compile>
<Compile Include="MachOptionsWindow\MachOptionsViewModel.vb" />
<Compile Include="MachOptionsWindow\MachOptionVM.vb" />
<Compile Include="MTableDb\MTableDbV.xaml.vb">
<DependentUpon>MTableDbV.xaml</DependentUpon>
</Compile>
@@ -167,162 +167,161 @@
<Compile Include="MTableDb\MTableListBox.vb" />
<Compile Include="MTableDb\TableUtility.vb" />
<Compile Include="OptionsWindow\OptionModule.vb" />
<Compile Include="OptionsWindow\OptionsV.xaml.vb">
<DependentUpon>OptionsV.xaml</DependentUpon>
<Compile Include="OptionsWindow\OptionWindowV.xaml.vb">
<DependentUpon>OptionWindowV.xaml</DependentUpon>
</Compile>
<Compile Include="OptionsWindow\OptionsVM.vb" />
<Compile Include="ProjectPage\DbPanel\DbPanelView.xaml.vb">
<DependentUpon>DbPanelView.xaml</DependentUpon>
<Compile Include="OptionsWindow\OptionWindowVM.vb" />
<Compile Include="MachinePanel\MachinePanelV.xaml.vb">
<DependentUpon>MachinePanelV.xaml</DependentUpon>
</Compile>
<Compile Include="ProjectPage\DbPanel\DbPanelViewModel.vb" />
<Compile Include="ProjectPage\DoorsPanel\DoorsPanelView.xaml.vb">
<DependentUpon>DoorsPanelView.xaml</DependentUpon>
<Compile Include="MachinePanel\MachinePanelVM.vb" />
<Compile Include="DoorsPanel\DoorPanelV.xaml.vb">
<DependentUpon>DoorPanelV.xaml</DependentUpon>
</Compile>
<Compile Include="ProjectPage\DoorsPanel\DoorsPanelViewModel.vb" />
<Compile Include="EgtCAM5Params.vb" />
<Compile Include="MachiningsDbWindow\MachiningsDbView.xaml.vb">
<DependentUpon>MachiningsDbView.xaml</DependentUpon>
<Compile Include="DoorsPanel\DoorPanelVM.vb" />
<Compile Include="MachiningDbWindow\MachiningDbV.xaml.vb">
<DependentUpon>MachiningDbV.xaml</DependentUpon>
</Compile>
<Compile Include="MachiningsDbWindow\MachiningsDbViewModel.vb" />
<Compile Include="MainWindow\MainWindowViewModel.vb" />
<Compile Include="MachiningDbWindow\MachiningDbVM.vb" />
<Compile Include="MainWindow\MainWindowVM.vb" />
<Compile Include="Messenger.vb" />
<Compile Include="ProjectPage\DrawPanel\DrawPanelView.xaml.vb">
<DependentUpon>DrawPanelView.xaml</DependentUpon>
<Compile Include="DrawPanel\DrawPanelV.xaml.vb">
<DependentUpon>DrawPanelV.xaml</DependentUpon>
</Compile>
<Compile Include="ProjectPage\DrawPanel\DrawPanelViewModel.vb" />
<Compile Include="ProjectPage\ExecutePanel\ExecutePanelView.xaml.vb">
<DependentUpon>ExecutePanelView.xaml</DependentUpon>
<Compile Include="DrawPanel\DrawPanelVM.vb" />
<Compile Include="ExecutePanel\ExecutePanelV.xaml.vb">
<DependentUpon>ExecutePanelV.xaml</DependentUpon>
</Compile>
<Compile Include="ProjectPage\ExecutePanel\ExecutePanelViewModel.vb" />
<Compile Include="ProjectPage\GridPanel\GridPanelView.xaml.vb">
<DependentUpon>GridPanelView.xaml</DependentUpon>
<Compile Include="ExecutePanel\ExecutePanelVM.vb" />
<Compile Include="GridPanel\GridPanelV.xaml.vb">
<DependentUpon>GridPanelV.xaml</DependentUpon>
</Compile>
<Compile Include="ProjectPage\GridPanel\GridPanelViewModel.vb" />
<Compile Include="ProjectPage\GunStockPanel\GunStockPanelView.xaml.vb">
<DependentUpon>GunStockPanelView.xaml</DependentUpon>
<Compile Include="GridPanel\GridPanelVM.vb" />
<Compile Include="GunStockPanel\GunStockPanelV.xaml.vb">
<DependentUpon>GunStockPanelV.xaml</DependentUpon>
<SubType>Code</SubType>
</Compile>
<Compile Include="ProjectPage\GunStockPanel\GunStockPanelViewModel.vb" />
<Compile Include="ProjectPage\MachGroupPanel\MachGroupPanelView.xaml.vb">
<DependentUpon>MachGroupPanelView.xaml</DependentUpon>
<Compile Include="GunStockPanel\GunStockPanelVM.vb" />
<Compile Include="MachGroupPanel\MachGroupPanelV.xaml.vb">
<DependentUpon>MachGroupPanelV.xaml</DependentUpon>
</Compile>
<Compile Include="ProjectPage\MachGroupPanel\MachGroupPanelViewModel.vb" />
<Compile Include="ProjectPage\OptionPanel\MachiningOptionPanel\MachiningsTreeViewExpander\MachiningTreeExpanderView.xaml.vb">
<Compile Include="MachGroupPanel\MachGroupPanelVM.vb" />
<Compile Include="OptionPanel\MachiningOptionPanel\MachiningsTreeViewExpander\MachiningTreeExpanderView.xaml.vb">
<DependentUpon>MachiningTreeExpanderView.xaml</DependentUpon>
</Compile>
<Compile Include="ProjectPage\OptionPanel\MachiningOptionPanel\OperationExpander\DispositionParameterExpander\FixtureParameters\FixtureParametersView.xaml.vb">
<Compile Include="OptionPanel\MachiningOptionPanel\OperationExpander\DispositionParameterExpander\FixtureParameters\FixtureParametersView.xaml.vb">
<DependentUpon>FixtureParametersView.xaml</DependentUpon>
</Compile>
<Compile Include="ProjectPage\OptionPanel\MachiningOptionPanel\OperationExpander\DispositionParameterExpander\FixtureParameters\FixtureParametersViewModel.vb" />
<Compile Include="ProjectPage\OptionPanel\MachiningOptionPanel\OperationExpander\DispositionParameterExpander\RawPartOption\RawPartOptionView.xaml.vb">
<Compile Include="OptionPanel\MachiningOptionPanel\OperationExpander\DispositionParameterExpander\FixtureParameters\FixtureParametersViewModel.vb" />
<Compile Include="OptionPanel\MachiningOptionPanel\OperationExpander\DispositionParameterExpander\RawPartOption\RawPartOptionView.xaml.vb">
<DependentUpon>RawPartOptionView.xaml</DependentUpon>
</Compile>
<Compile Include="ProjectPage\OptionPanel\MachiningOptionPanel\OperationExpander\DispositionParameterExpander\RawPartOption\RawPartOptionViewModel.vb" />
<Compile Include="ProjectPage\OptionPanel\MachiningOptionPanel\OperationExpander\MachiningParameterExpander\MachiningParameterExpanderViewModel.vb" />
<Compile Include="ProjectPage\OptionPanel\MachiningOptionPanel\OperationExpander\OperationListBoxItem\DispositionOpListBoxItem.vb" />
<Compile Include="ProjectPage\OptionPanel\MachiningOptionPanel\OperationExpander\DispositionParameterExpander\DispositionParameterExpanderViewModel.vb" />
<Compile Include="ProjectPage\OptionPanel\MachiningOptionPanel\OperationExpander\DispositionParameterExpander\DispositionParameterExpanderView.xaml.vb">
<Compile Include="OptionPanel\MachiningOptionPanel\OperationExpander\DispositionParameterExpander\RawPartOption\RawPartOptionViewModel.vb" />
<Compile Include="OptionPanel\MachiningOptionPanel\OperationExpander\MachiningParameterExpander\MachiningParameterExpanderViewModel.vb" />
<Compile Include="OptionPanel\MachiningOptionPanel\OperationExpander\OperationListBoxItem\DispositionOpListBoxItem.vb" />
<Compile Include="OptionPanel\MachiningOptionPanel\OperationExpander\DispositionParameterExpander\DispositionParameterExpanderViewModel.vb" />
<Compile Include="OptionPanel\MachiningOptionPanel\OperationExpander\DispositionParameterExpander\DispositionParameterExpanderView.xaml.vb">
<DependentUpon>DispositionParameterExpanderView.xaml</DependentUpon>
</Compile>
<Compile Include="ProjectPage\OptionPanel\MachiningOptionPanel\OperationExpander\OperationListBoxItem\MachiningOpListBoxItem.vb" />
<Compile Include="ProjectPage\OptionPanel\MachiningOptionPanel\OperationExpander\MachiningParameterExpander\MachiningParameterExpanderView.xaml.vb">
<Compile Include="OptionPanel\MachiningOptionPanel\OperationExpander\OperationListBoxItem\MachiningOpListBoxItem.vb" />
<Compile Include="OptionPanel\MachiningOptionPanel\OperationExpander\MachiningParameterExpander\MachiningParameterExpanderView.xaml.vb">
<DependentUpon>MachiningParameterExpanderView.xaml</DependentUpon>
</Compile>
<Compile Include="ProjectPage\OptionPanel\MachiningOptionPanel\OperationExpander\OperationListBoxItem\OperationListBoxItem.vb" />
<Compile Include="ProjectPage\OptionPanel\MachiningOptionPanel\SimulationExpander\MachineAxis.vb" />
<Compile Include="ProjectPage\PopUpGridPanel\PopUpGridPanelView.xaml.vb">
<DependentUpon>PopUpGridPanelView.xaml</DependentUpon>
<Compile Include="OptionPanel\MachiningOptionPanel\OperationExpander\OperationListBoxItem\OperationListBoxItem.vb" />
<Compile Include="OptionPanel\MachiningOptionPanel\SimulationExpander\MachineAxis.vb" />
<Compile Include="PopUpGridPanel\PopUpGridPanelV.xaml.vb">
<DependentUpon>PopUpGridPanelV.xaml</DependentUpon>
</Compile>
<Compile Include="ProjectPage\PopUpGridPanel\PopUpGridPanelViewModel.vb" />
<Compile Include="ProjectPage\PopUpViewPanel\PopUpViewPanelView.xaml.vb">
<DependentUpon>PopUpViewPanelView.xaml</DependentUpon>
<Compile Include="PopUpGridPanel\PopUpGridPanelViewModel.vb" />
<Compile Include="PopUpViewPanel\PopUpViewPanelV.xaml.vb">
<DependentUpon>PopUpViewPanelV.xaml</DependentUpon>
</Compile>
<Compile Include="ProjectPage\PopUpViewPanel\PopUpViewPanelViewModel.vb" />
<Compile Include="ProjectPage\SpecialPanel\SpecialPanelView.xaml.vb">
<DependentUpon>SpecialPanelView.xaml</DependentUpon>
<Compile Include="PopUpViewPanel\PopUpViewPanelVM.vb" />
<Compile Include="SpecialPanel\SpecialPanelV.xaml.vb">
<DependentUpon>SpecialPanelV.xaml</DependentUpon>
</Compile>
<Compile Include="ProjectPage\SpecialPanel\SpecialPanelViewModel.vb" />
<Compile Include="ProjectPage\ViewPanel\ViewPanelView.xaml.vb">
<DependentUpon>ViewPanelView.xaml</DependentUpon>
<Compile Include="SpecialPanel\SpecialPanelVM.vb" />
<Compile Include="ViewPanel\ViewPanelV.xaml.vb">
<DependentUpon>ViewPanelV.xaml</DependentUpon>
</Compile>
<Compile Include="ProjectPage\ViewPanel\ViewPanelViewModel.vb" />
<Compile Include="IniFile.vb" />
<Compile Include="ProjectPage\InstrumentPanel\InstrumentPanelView.xaml.vb">
<DependentUpon>InstrumentPanelView.xaml</DependentUpon>
<Compile Include="ViewPanel\ViewPanelVM.vb" />
<Compile Include="Utility\IniFile.vb" />
<Compile Include="InstrumentPanel\InstrumentPanelV.xaml.vb">
<DependentUpon>InstrumentPanelV.xaml</DependentUpon>
</Compile>
<Compile Include="ProjectPage\InstrumentPanel\InstrumentPanelViewModel.vb" />
<Compile Include="ProjectPage\OptionPanel\OptionPanelView.xaml.vb">
<DependentUpon>OptionPanelView.xaml</DependentUpon>
<Compile Include="InstrumentPanel\InstrumentPanelVM.vb" />
<Compile Include="OptionPanel\OptionPanelV.xaml.vb">
<DependentUpon>OptionPanelV.xaml</DependentUpon>
</Compile>
<Compile Include="ProjectPage\OptionPanel\OptionPanelViewModel.vb" />
<Compile Include="ProjectPage\OptionPanel\DrawOptionPanel\InfoExpander\InfoExpanderView.xaml.vb">
<Compile Include="OptionPanel\OptionPanelVM.vb" />
<Compile Include="OptionPanel\DrawOptionPanel\InfoExpander\InfoExpanderView.xaml.vb">
<DependentUpon>InfoExpanderView.xaml</DependentUpon>
</Compile>
<Compile Include="ProjectPage\OptionPanel\DrawOptionPanel\InfoExpander\InfoExpanderViewModel.vb" />
<Compile Include="ProjectPage\OptionPanel\DrawOptionPanel\InputExpander\InputExpanderView.xaml.vb">
<Compile Include="OptionPanel\DrawOptionPanel\InfoExpander\InfoExpanderViewModel.vb" />
<Compile Include="OptionPanel\DrawOptionPanel\InputExpander\InputExpanderView.xaml.vb">
<DependentUpon>InputExpanderView.xaml</DependentUpon>
</Compile>
<Compile Include="ProjectPage\OptionPanel\DrawOptionPanel\InputExpander\InputExpanderViewModel.vb" />
<Compile Include="ProjectPage\OptionPanel\MachiningOptionPanel\MachiningsTreeViewExpander\MachiningTreeExpanderViewModel.vb" />
<Compile Include="ProjectPage\OptionPanel\DrawOptionPanel\ManageLayerExpander\LayerTreeView.vb" />
<Compile Include="ProjectPage\OptionPanel\DrawOptionPanel\ManageLayerExpander\ManageLayerExpanderView.xaml.vb">
<Compile Include="OptionPanel\DrawOptionPanel\InputExpander\InputExpanderViewModel.vb" />
<Compile Include="OptionPanel\MachiningOptionPanel\MachiningsTreeViewExpander\MachiningTreeExpanderViewModel.vb" />
<Compile Include="OptionPanel\DrawOptionPanel\ManageLayerExpander\LayerTreeView.vb" />
<Compile Include="OptionPanel\DrawOptionPanel\ManageLayerExpander\ManageLayerExpanderView.xaml.vb">
<DependentUpon>ManageLayerExpanderView.xaml</DependentUpon>
</Compile>
<Compile Include="ProjectPage\OptionPanel\DrawOptionPanel\ManageLayerExpander\ManageLayerExpanderViewModel.vb" />
<Compile Include="ProjectPage\OptionPanel\MachiningOptionPanel\MachiningsTreeViewExpander\MachiningTreeViewExpander.vb" />
<Compile Include="ProjectPage\OptionPanel\MachiningOptionPanel\OperationExpander\OperationExpanderView.xaml.vb">
<Compile Include="OptionPanel\DrawOptionPanel\ManageLayerExpander\ManageLayerExpanderViewModel.vb" />
<Compile Include="OptionPanel\MachiningOptionPanel\MachiningsTreeViewExpander\MachiningTreeViewExpander.vb" />
<Compile Include="OptionPanel\MachiningOptionPanel\OperationExpander\OperationExpanderView.xaml.vb">
<DependentUpon>OperationExpanderView.xaml</DependentUpon>
</Compile>
<Compile Include="ProjectPage\OptionPanel\MachiningOptionPanel\OperationExpander\OperationExpanderViewModel.vb" />
<Compile Include="ProjectPage\OptionPanel\MachiningOptionPanel\SimulationExpander\SimulationExpanderView.xaml.vb">
<Compile Include="OptionPanel\MachiningOptionPanel\OperationExpander\OperationExpanderViewModel.vb" />
<Compile Include="OptionPanel\MachiningOptionPanel\SimulationExpander\SimulationExpanderView.xaml.vb">
<DependentUpon>SimulationExpanderView.xaml</DependentUpon>
</Compile>
<Compile Include="ProjectPage\OptionPanel\MachiningOptionPanel\SimulationExpander\SimulationExpanderViewModel.vb" />
<Compile Include="ProjectPage\ProjectView.xaml.vb">
<DependentUpon>ProjectView.xaml</DependentUpon>
<Compile Include="OptionPanel\MachiningOptionPanel\SimulationExpander\SimulationExpanderViewModel.vb" />
<Compile Include="Project\ProjectV.xaml.vb">
<DependentUpon>ProjectV.xaml</DependentUpon>
</Compile>
<Compile Include="ProjectPage\ProjectViewModel.vb" />
<Compile Include="ProjectPage\ShowPanel\ShowPanelView.xaml.vb">
<DependentUpon>ShowPanelView.xaml</DependentUpon>
<Compile Include="Project\ProjectVM.vb" />
<Compile Include="ShowPanel\ShowPanelV.xaml.vb">
<DependentUpon>ShowPanelV.xaml</DependentUpon>
</Compile>
<Compile Include="ProjectPage\ShowPanel\ShowPanelViewModel.vb" />
<Compile Include="SetUpWindow\SetUpView.xaml.vb">
<DependentUpon>SetUpView.xaml</DependentUpon>
<Compile Include="ShowPanel\ShowPanelVM.vb" />
<Compile Include="SetUpWindow\SetUpV.xaml.vb">
<DependentUpon>SetUpV.xaml</DependentUpon>
</Compile>
<Compile Include="SetUpWindow\SetUpViewModel.vb" />
<Compile Include="SetUpWindow\SetUpVM.vb" />
<Compile Include="Special\Doors.vb" />
<Compile Include="Special\GunStock.vb" />
<Compile Include="Special\GunStockWindow\GunStockParamListItem.vb" />
<Compile Include="Special\GunStockWindow\GunStockWndView.xaml.vb">
<DependentUpon>GunStockWndView.xaml</DependentUpon>
<Compile Include="Special\GunStockWindow\GunStockWndV.xaml.vb">
<DependentUpon>GunStockWndV.xaml</DependentUpon>
</Compile>
<Compile Include="Special\GunStockWindow\GunStockWndViewModel.vb" />
<Compile Include="StatusBar\StatusBarView.xaml.vb">
<DependentUpon>StatusBarView.xaml</DependentUpon>
<Compile Include="Special\GunStockWindow\GunStockWndVM.vb" />
<Compile Include="StatusBar\StatusBarV.xaml.vb">
<DependentUpon>StatusBarV.xaml</DependentUpon>
</Compile>
<Compile Include="StatusBar\StatusBarViewModel.vb" />
<Compile Include="SharedFieldsClass.vb" />
<Compile Include="StatusBar\StatusBarVM.vb" />
<Compile Include="Utility\TMDbParamVisibility.vb" />
<Compile Include="StructureDataForMessenger.vb" />
<Compile Include="ProjectPage\OptionPanel\MachiningOptionPanel\OperationExpander\DispositionParameterExpander\DispositionUtility.vb" />
<Compile Include="OptionPanel\MachiningOptionPanel\OperationExpander\DispositionParameterExpander\DispositionUtility.vb" />
<Compile Include="ToolsDbWindow\ToolDraw.vb" />
<Compile Include="ToolsDbWindow\ToolsDbView.xaml.vb">
<DependentUpon>ToolsDbView.xaml</DependentUpon>
<Compile Include="ToolsDbWindow\ToolsDbV.xaml.vb">
<DependentUpon>ToolsDbV.xaml</DependentUpon>
</Compile>
<Compile Include="ToolsDbWindow\ToolsDbViewModel.vb" />
<Compile Include="ToolsDbWindow\ToolsDbVM.vb" />
<Compile Include="ToolsDbWindow\ToolsUpdate.vb" />
<Compile Include="ToolsDbWindow\ToolTreeView.vb" />
<Compile Include="TopCommandBar\TopCommandBarView.xaml.vb">
<DependentUpon>TopCommandBarView.xaml</DependentUpon>
<Compile Include="TopCommandBar\TopCommandBarV.xaml.vb">
<DependentUpon>TopCommandBarV.xaml</DependentUpon>
</Compile>
<Compile Include="TopCommandBar\TopCommandBarViewModel.vb" />
<Compile Include="Utility.vb" />
<Compile Include="TopCommandBar\TopCommandBarVM.vb" />
<Compile Include="Utility\Utility.vb" />
<Compile Include="Utility\VMBase.vb" />
<Compile Include="ValidationGroup.vb" />
<Page Include="AboutBoxWindow\AboutBoxView.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="MachOptionsWindow\MachOptionsView.xaml">
<Page Include="MachOptionsWindow\MachOptionV.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
@@ -330,23 +329,23 @@
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="OptionsWindow\OptionsV.xaml">
<Page Include="OptionsWindow\OptionWindowV.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="ProjectPage\DbPanel\DbPanelView.xaml">
<Page Include="MachinePanel\MachinePanelV.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="ProjectPage\DoorsPanel\DoorsPanelView.xaml">
<Page Include="DoorsPanel\DoorPanelV.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="MachiningsDbWindow\MachiningsDbView.xaml">
<Page Include="MachiningDbWindow\MachiningDbV.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="MainWindow\MainWindow.xaml">
<Page Include="MainWindow\MainWindowV.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
@@ -354,123 +353,123 @@
<DependentUpon>Application.xaml</DependentUpon>
<SubType>Code</SubType>
</Compile>
<Compile Include="MainWindow\MainWindow.xaml.vb">
<DependentUpon>MainWindow.xaml</DependentUpon>
<Compile Include="MainWindow\MainWindowV.xaml.vb">
<DependentUpon>MainWindowV.xaml</DependentUpon>
<SubType>Code</SubType>
</Compile>
<Page Include="EgtCAM5Resources.xaml">
<Page Include="Utility\Dictionary.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="ProjectPage\DrawPanel\DrawPanelView.xaml">
<Page Include="DrawPanel\DrawPanelV.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="ProjectPage\ExecutePanel\ExecutePanelView.xaml">
<Page Include="ExecutePanel\ExecutePanelV.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="ProjectPage\GridPanel\GridPanelView.xaml">
<Page Include="GridPanel\GridPanelV.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="ProjectPage\GunStockPanel\GunStockPanelView.xaml">
<Page Include="GunStockPanel\GunStockPanelV.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="ProjectPage\MachGroupPanel\MachGroupPanelView.xaml">
<Page Include="MachGroupPanel\MachGroupPanelV.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="ProjectPage\OptionPanel\MachiningOptionPanel\OperationExpander\DispositionParameterExpander\DispositionParameterExpanderView.xaml">
<Page Include="OptionPanel\MachiningOptionPanel\OperationExpander\DispositionParameterExpander\DispositionParameterExpanderView.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="ProjectPage\OptionPanel\MachiningOptionPanel\OperationExpander\DispositionParameterExpander\FixtureParameters\FixtureParametersView.xaml">
<Page Include="OptionPanel\MachiningOptionPanel\OperationExpander\DispositionParameterExpander\FixtureParameters\FixtureParametersView.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="ProjectPage\OptionPanel\MachiningOptionPanel\OperationExpander\DispositionParameterExpander\RawPartOption\RawPartOptionView.xaml">
<Page Include="OptionPanel\MachiningOptionPanel\OperationExpander\DispositionParameterExpander\RawPartOption\RawPartOptionView.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="ProjectPage\OptionPanel\MachiningOptionPanel\OperationExpander\MachiningParameterExpander\MachiningParameterExpanderView.xaml">
<Page Include="OptionPanel\MachiningOptionPanel\OperationExpander\MachiningParameterExpander\MachiningParameterExpanderView.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="ProjectPage\PopUpGridPanel\PopUpGridPanelView.xaml">
<Page Include="PopUpGridPanel\PopUpGridPanelV.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="ProjectPage\PopUpViewPanel\PopUpViewPanelView.xaml">
<Page Include="PopUpViewPanel\PopUpViewPanelV.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="ProjectPage\SpecialPanel\SpecialPanelView.xaml">
<Page Include="SpecialPanel\SpecialPanelV.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="ProjectPage\ViewPanel\ViewPanelView.xaml">
<Page Include="ViewPanel\ViewPanelV.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="ProjectPage\InstrumentPanel\InstrumentPanelView.xaml">
<Page Include="InstrumentPanel\InstrumentPanelV.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="ProjectPage\OptionPanel\OptionPanelView.xaml">
<Page Include="OptionPanel\OptionPanelV.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="ProjectPage\OptionPanel\DrawOptionPanel\InfoExpander\InfoExpanderView.xaml">
<Page Include="OptionPanel\DrawOptionPanel\InfoExpander\InfoExpanderView.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="ProjectPage\OptionPanel\DrawOptionPanel\InputExpander\InputExpanderView.xaml">
<Page Include="OptionPanel\DrawOptionPanel\InputExpander\InputExpanderView.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="ProjectPage\OptionPanel\DrawOptionPanel\ManageLayerExpander\ManageLayerExpanderView.xaml">
<Page Include="OptionPanel\DrawOptionPanel\ManageLayerExpander\ManageLayerExpanderView.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="ProjectPage\OptionPanel\MachiningOptionPanel\MachiningsTreeViewExpander\MachiningTreeExpanderView.xaml">
<Page Include="OptionPanel\MachiningOptionPanel\MachiningsTreeViewExpander\MachiningTreeExpanderView.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="ProjectPage\OptionPanel\MachiningOptionPanel\OperationExpander\OperationExpanderView.xaml">
<Page Include="OptionPanel\MachiningOptionPanel\OperationExpander\OperationExpanderView.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="ProjectPage\OptionPanel\MachiningOptionPanel\SimulationExpander\SimulationExpanderView.xaml">
<Page Include="OptionPanel\MachiningOptionPanel\SimulationExpander\SimulationExpanderView.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="ProjectPage\ProjectView.xaml">
<Page Include="Project\ProjectV.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="ProjectPage\ShowPanel\ShowPanelView.xaml">
<Page Include="ShowPanel\ShowPanelV.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="SetUpWindow\SetUpView.xaml">
<Page Include="SetUpWindow\SetUpV.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="Special\GunStockWindow\GunStockWndView.xaml">
<Page Include="Special\GunStockWindow\GunStockWndV.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="StatusBar\StatusBarView.xaml">
<Page Include="StatusBar\StatusBarV.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="ToolsDbWindow\ToolsDbView.xaml">
<Page Include="ToolsDbWindow\ToolsDbV.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="TopCommandBar\TopCommandBarView.xaml">
<Page Include="TopCommandBar\TopCommandBarV.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
EgtCAM5Params.vb
-4
View File
@@ -1,4 +0,0 @@
Module EgtCAM5Params
End Module
ProjectPage/ExecutePanel/ExecutePanelView.xaml → ExecutePanel/ExecutePanelV.xaml
+1 -1
View File
@@ -1,4 +1,4 @@
<UserControl x:Class="ExecutePanelView"
<UserControl x:Class="ExecutePanelV"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
ExecutePanel/ExecutePanelV.xaml.vb
+3
View File
@@ -0,0 +1,3 @@
Public Class ExecutePanelV
End Class
ProjectPage/ExecutePanel/ExecutePanelViewModel.vb → ExecutePanel/ExecutePanelVM.vb
+1 -1
View File
@@ -3,7 +3,7 @@ Imports EgtUILib
Namespace EgtCAM5
Public Class ExecutePanelViewModel
Public Class ExecutePanelVM
Inherits ViewModelBase
#Region "FIELDS & PROPERTIES"
ProjectPage/GridPanel/GridPanelView.xaml → GridPanel/GridPanelV.xaml
+1 -1
View File
@@ -1,4 +1,4 @@
<UserControl x:Class="GridPanelView"
<UserControl x:Class="GridPanelV"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
GridPanel/GridPanelV.xaml.vb
+3
View File
@@ -0,0 +1,3 @@
Public Class GridPanelV
End Class
ProjectPage/GridPanel/GridPanelViewModel.vb → GridPanel/GridPanelVM.vb
+15 -15
View File
@@ -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.
''' </summary>
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.
''' </summary>
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.
''' </summary>
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.
''' </summary>
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.
''' </summary>
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.
''' </summary>
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.
''' </summary>
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.
''' </summary>
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
ProjectPage/GunStockPanel/GunStockPanelView.xaml → GunStockPanel/GunStockPanelV.xaml
+1 -1
View File
@@ -1,4 +1,4 @@
<UserControl x:Class="GunStockPanelView"
<UserControl x:Class="GunStockPanelV"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
GunStockPanel/GunStockPanelV.xaml.vb
+3
View File
@@ -0,0 +1,3 @@
Public Class GunStockPanelV
End Class
ProjectPage/GunStockPanel/GunStockPanelViewModel.vb → GunStockPanel/GunStockPanelVM.vb
+1 -1
View File
@@ -3,7 +3,7 @@ Imports EgtUILib
Namespace EgtCAM5
Public Class GunStockPanelViewModel
Public Class GunStockPanelVM
Inherits ViewModelBase
Public ReadOnly Property MruNewGunStockNames As ObservableCollection(Of String)
ProjectPage/InstrumentPanel/InstrumentPanelView.xaml → InstrumentPanel/InstrumentPanelV.xaml
+1 -1
View File
@@ -1,4 +1,4 @@
<EgtFloating:EgtFloatingPanel x:Class="InstrumentPanelView"
<EgtFloating:EgtFloatingPanel x:Class="InstrumentPanelV"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:EgtFloating="clr-namespace:EgtWPFLib5.EgtFloating;assembly=EgtWPFLib5"
InstrumentPanel/InstrumentPanelV.xaml.vb
+3
View File
@@ -0,0 +1,3 @@
Public Class InstrumentPanelV
End Class
ProjectPage/InstrumentPanel/InstrumentPanelViewModel.vb → InstrumentPanel/InstrumentPanelVM.vb
+5 -5
View File
@@ -2,7 +2,7 @@
Namespace EgtCAM5
Public Class InstrumentPanelViewModel
Public Class InstrumentPanelVM
Inherits ViewModelBase
#Region "FIELDS & PROPERTIES"
@@ -31,9 +31,9 @@ Namespace EgtCAM5
If value <> 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")
ProjectPage/MachGroupPanel/MachGroupPanelView.xaml → MachGroupPanel/MachGroupPanelV.xaml
+1 -1
View File
@@ -1,4 +1,4 @@
<UserControl x:Class="MachGroupPanelView"
<UserControl x:Class="MachGroupPanelV"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:EgtFloating="clr-namespace:EgtWPFLib5.EgtFloating;assembly=EgtWPFLib5">
MachGroupPanel/MachGroupPanelV.xaml.vb
+3
View File
@@ -0,0 +1,3 @@
Public Class MachGroupPanelV
End Class
ProjectPage/MachGroupPanel/MachGroupPanelViewModel.vb → MachGroupPanel/MachGroupPanelVM.vb
+2 -2
View File
@@ -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
MachOptionsWindow/MachOptionsView.xaml → MachOptionsWindow/MachOptionV.xaml
+1 -1
View File
@@ -1,4 +1,4 @@
<EgtWPFLib5:EgtCustomWindow x:Class="MachOptionsView"
<EgtWPFLib5:EgtCustomWindow x:Class="MachOptionV"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:local="clr-namespace:EgtCAM5"
MachOptionsWindow/MachOptionV.xaml.vb
+3
View File
@@ -0,0 +1,3 @@
Public Class MachOptionV
End Class
MachOptionsWindow/MachOptionsViewModel.vb → MachOptionsWindow/MachOptionVM.vb
+3 -3
View File
@@ -3,7 +3,7 @@ Imports EgtUILib
Namespace EgtCAM5
Public Class MachOptionsViewModel
Public Class MachOptionVM
Private m_sSafeZ As String
Public Property SafeZ As String
@@ -185,8 +185,8 @@ Namespace EgtCAM5
Public Sub CloseMachOptions()
' Chiusura finestra
For Each Window In Application.Current.Windows
If TypeOf Window Is MachOptionsView Then
Dim MachOptionsWindow As MachOptionsView = DirectCast(Window, MachOptionsView)
If TypeOf Window Is MachOptionV Then
Dim MachOptionsWindow As MachOptionV = DirectCast(Window, MachOptionV)
MachOptionsWindow.Close()
End If
Next
MachOptionsWindow/MachOptionsView.xaml.vb
-3
View File
@@ -1,3 +0,0 @@
Public Class MachOptionView
End Class
ProjectPage/DbPanel/DbPanelView.xaml → MachinePanel/MachinePanelV.xaml
+1 -1
View File
@@ -1,4 +1,4 @@
<UserControl x:Class="DbPanelView"
<UserControl x:Class="MachinePanelV"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
MachinePanel/MachinePanelV.xaml.vb
+3
View File
@@ -0,0 +1,3 @@
Public Class MachinePanelV
End Class
ProjectPage/DbPanel/DbPanelViewModel.vb → MachinePanel/MachinePanelVM.vb
+7 -7
View File
@@ -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.
''' </summary>
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
MachiningsDbWindow/MachiningsDbView.xaml → MachiningDbWindow/MachiningDbV.xaml
+1 -1
View File
@@ -1,4 +1,4 @@
<EgtWPFLib5:EgtCustomWindow x:Class="MachiningsDbView"
<EgtWPFLib5:EgtCustomWindow x:Class="MachiningDbV"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:sys="clr-namespace:System;assembly=mscorlib"
MachiningDbWindow/MachiningDbV.xaml.vb
+3
View File
@@ -0,0 +1,3 @@
Public Class MachiningDbV
End Class
MachiningsDbWindow/MachiningsDbViewModel.vb → MachiningDbWindow/MachiningDbVM.vb
+4 -4
View File
@@ -5,7 +5,7 @@ Imports EgtUILib
Namespace EgtCAM5
Public Class MachiningsDbViewModel
Public Class MachiningDbVM
Inherits TabViewModel
Friend Shared m_bActive As Boolean = False
@@ -484,7 +484,7 @@ Namespace EgtCAM5
NewMachiningItem.IsSelected = True
NewMachiningItem.NotifyPropertyChanged("IsSelected")
End If
' Verifico se sia selezionata una lavorazione
' Verifico se sia selezionata una lavorazione
ElseIf TypeOf param Is MachiningTreeViewItem Then
Dim MachiningCopied As MachiningTreeViewItem = DirectCast(param, MachiningTreeViewItem)
Dim NewName As String = MachiningCopied.Name
@@ -675,8 +675,8 @@ Namespace EgtCAM5
MachiningTreeViewItem.m_delIsEnabledBtns = Nothing
FamilyMachiningTreeViewItem.m_delIsEnabledBtns = Nothing
For Each Window In Application.Current.Windows
If TypeOf Window Is MachiningsDbView Then
Dim MachiningsDbWindow As MachiningsDbView = DirectCast(Window, MachiningsDbView)
If TypeOf Window Is MachiningDbV Then
Dim MachiningsDbWindow As MachiningDbV = DirectCast(Window, MachiningDbV)
MachiningsDbWindow.DataContext = Nothing
MachiningsDbWindow.Close()
End If
MachiningsDbWindow/MachiningTreeView.vb → MachiningDbWindow/MachiningTreeView.vb
+9 -9
View File
@@ -2222,23 +2222,23 @@ Public Class MachiningParamVisibilityConverter
Case MCH_MY.NONE
Return Visibility.Hidden
Case MCH_MY.DRILLING
Return SharedFieldsClass.Drilling(CInt(parameter))
Return TMDbParamVisibility.Drilling(CInt(parameter))
Case MCH_MY.SAWING
Return SharedFieldsClass.Sawing(CInt(parameter))
Return TMDbParamVisibility.Sawing(CInt(parameter))
Case MCH_MY.MILLING
Return SharedFieldsClass.Milling(CInt(parameter))
Return TMDbParamVisibility.Milling(CInt(parameter))
Case MCH_MY.POCKETING
Return SharedFieldsClass.Pocketing(CInt(parameter))
Return TMDbParamVisibility.Pocketing(CInt(parameter))
Case MCH_MY.MORTISING
Return SharedFieldsClass.Mortising(CInt(parameter))
Return TMDbParamVisibility.Mortising(CInt(parameter))
Case MCH_MY.SAWROUGHING
Return SharedFieldsClass.Sawroughing(CInt(parameter))
Return TMDbParamVisibility.Sawroughing(CInt(parameter))
Case MCH_MY.SAWFINISHING
Return SharedFieldsClass.Sawfinishing(CInt(parameter))
Return TMDbParamVisibility.Sawfinishing(CInt(parameter))
Case MCH_MY.GENMACHINING
Return SharedFieldsClass.GenMachining(CInt(parameter))
Return TMDbParamVisibility.GenMachining(CInt(parameter))
Case MCH_MY.CHISELING
Return SharedFieldsClass.Chiseling(CInt(parameter))
Return TMDbParamVisibility.Chiseling(CInt(parameter))
Case Else
Return Visibility.Hidden
End Select
MachiningsDbWindow/MachiningsDbView.xaml.vb
-3
View File
@@ -1,3 +0,0 @@
Public Class MachiningsDbView
End Class
MainWindow/MainWindow.xaml → MainWindow/MainWindowV.xaml
+2 -2
View File
@@ -1,4 +1,4 @@
<EgtWPFLib5:EgtCustomWindow x:Class="MainWindow"
<EgtWPFLib5:EgtCustomWindow x:Class="MainWindowV"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:interactivity="clr-namespace:System.Windows.Interactivity;assembly=System.Windows.Interactivity"
@@ -13,7 +13,7 @@
AllowDrop="True" Drop="MainWindow_Drop"
CloseCommand="{Binding CloseApplicationCommand,Mode=OneWay,UpdateSourceTrigger=PropertyChanged}">
<EgtWPFLib5:EgtCustomWindow.TitlePanel>
<local:TopCommandBarView DataContext="{StaticResource TopCommandBarViewModel}"/>
<local:TopCommandBarV DataContext="{StaticResource TopCommandBarViewModel}"/>
</EgtWPFLib5:EgtCustomWindow.TitlePanel>
<interactivity:Interaction.Triggers>
MainWindow/MainWindow.xaml.vb → MainWindow/MainWindowV.xaml.vb
+9 -9
View File
@@ -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
MainWindow/MainWindowViewModel.vb → MainWindow/MainWindowVM.vb
+31 -31
View File
@@ -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
My Project/AssemblyInfo.vb
+2 -2
View File
@@ -70,5 +70,5 @@ Imports System.Windows
' by using the '*' as shown below:
' <Assembly: AssemblyVersion("1.0.*")>
<Assembly: AssemblyVersion("1.9.4.1")>
<Assembly: AssemblyFileVersion("1.9.4.1")>
<Assembly: AssemblyVersion("1.9.4.2")>
<Assembly: AssemblyFileVersion("1.9.4.2")>
ProjectPage/OptionPanel/DrawOptionPanel/InfoExpander/InfoExpanderView.xaml → OptionPanel/DrawOptionPanel/InfoExpander/InfoExpanderView.xaml
View File
ProjectPage/OptionPanel/DrawOptionPanel/InfoExpander/InfoExpanderView.xaml.vb → OptionPanel/DrawOptionPanel/InfoExpander/InfoExpanderView.xaml.vb
View File
ProjectPage/OptionPanel/DrawOptionPanel/InfoExpander/InfoExpanderViewModel.vb → OptionPanel/DrawOptionPanel/InfoExpander/InfoExpanderViewModel.vb
View File
ProjectPage/OptionPanel/DrawOptionPanel/InputExpander/InputExpanderView.xaml → OptionPanel/DrawOptionPanel/InputExpander/InputExpanderView.xaml
View File
ProjectPage/OptionPanel/DrawOptionPanel/InputExpander/InputExpanderView.xaml.vb → OptionPanel/DrawOptionPanel/InputExpander/InputExpanderView.xaml.vb
View File
ProjectPage/OptionPanel/DrawOptionPanel/InputExpander/InputExpanderViewModel.vb → OptionPanel/DrawOptionPanel/InputExpander/InputExpanderViewModel.vb
View File
ProjectPage/OptionPanel/DrawOptionPanel/ManageLayerExpander/LayerTreeView.vb → OptionPanel/DrawOptionPanel/ManageLayerExpander/LayerTreeView.vb
View File
ProjectPage/OptionPanel/DrawOptionPanel/ManageLayerExpander/ManageLayerExpanderView.xaml → OptionPanel/DrawOptionPanel/ManageLayerExpander/ManageLayerExpanderView.xaml
View File
ProjectPage/OptionPanel/DrawOptionPanel/ManageLayerExpander/ManageLayerExpanderView.xaml.vb → OptionPanel/DrawOptionPanel/ManageLayerExpander/ManageLayerExpanderView.xaml.vb
View File
ProjectPage/OptionPanel/DrawOptionPanel/ManageLayerExpander/ManageLayerExpanderViewModel.vb → OptionPanel/DrawOptionPanel/ManageLayerExpander/ManageLayerExpanderViewModel.vb
View File
ProjectPage/OptionPanel/MachiningOptionPanel/MachiningsTreeViewExpander/MachiningTreeExpanderView.xaml → OptionPanel/MachiningOptionPanel/MachiningsTreeViewExpander/MachiningTreeExpanderView.xaml
View File
ProjectPage/OptionPanel/MachiningOptionPanel/MachiningsTreeViewExpander/MachiningTreeExpanderView.xaml.vb → OptionPanel/MachiningOptionPanel/MachiningsTreeViewExpander/MachiningTreeExpanderView.xaml.vb
View File
ProjectPage/OptionPanel/MachiningOptionPanel/MachiningsTreeViewExpander/MachiningTreeExpanderViewModel.vb → OptionPanel/MachiningOptionPanel/MachiningsTreeViewExpander/MachiningTreeExpanderViewModel.vb
View File
ProjectPage/OptionPanel/MachiningOptionPanel/MachiningsTreeViewExpander/MachiningTreeViewExpander.vb → OptionPanel/MachiningOptionPanel/MachiningsTreeViewExpander/MachiningTreeViewExpander.vb
View File
ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/DispositionParameterExpander/DispositionParameterExpanderView.xaml → OptionPanel/MachiningOptionPanel/OperationExpander/DispositionParameterExpander/DispositionParameterExpanderView.xaml
View File
ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/DispositionParameterExpander/DispositionParameterExpanderView.xaml.vb → OptionPanel/MachiningOptionPanel/OperationExpander/DispositionParameterExpander/DispositionParameterExpanderView.xaml.vb
View File
ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/DispositionParameterExpander/DispositionParameterExpanderViewModel.vb → OptionPanel/MachiningOptionPanel/OperationExpander/DispositionParameterExpander/DispositionParameterExpanderViewModel.vb
View File
ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/DispositionParameterExpander/DispositionUtility.vb → OptionPanel/MachiningOptionPanel/OperationExpander/DispositionParameterExpander/DispositionUtility.vb
View File
ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/DispositionParameterExpander/FixtureParameters/FixtureParametersView.xaml → OptionPanel/MachiningOptionPanel/OperationExpander/DispositionParameterExpander/FixtureParameters/FixtureParametersView.xaml
View File
ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/DispositionParameterExpander/FixtureParameters/FixtureParametersView.xaml.vb → OptionPanel/MachiningOptionPanel/OperationExpander/DispositionParameterExpander/FixtureParameters/FixtureParametersView.xaml.vb
View File
ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/DispositionParameterExpander/FixtureParameters/FixtureParametersViewModel.vb → OptionPanel/MachiningOptionPanel/OperationExpander/DispositionParameterExpander/FixtureParameters/FixtureParametersViewModel.vb
View File
ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/DispositionParameterExpander/RawPartOption/RawPartOptionView.xaml → OptionPanel/MachiningOptionPanel/OperationExpander/DispositionParameterExpander/RawPartOption/RawPartOptionView.xaml
View File
ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/DispositionParameterExpander/RawPartOption/RawPartOptionView.xaml.vb → OptionPanel/MachiningOptionPanel/OperationExpander/DispositionParameterExpander/RawPartOption/RawPartOptionView.xaml.vb
View File
ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/DispositionParameterExpander/RawPartOption/RawPartOptionViewModel.vb → OptionPanel/MachiningOptionPanel/OperationExpander/DispositionParameterExpander/RawPartOption/RawPartOptionViewModel.vb
View File
ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/MachiningParameterExpanderView.xaml → OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/MachiningParameterExpanderView.xaml
View File
ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/MachiningParameterExpanderView.xaml.vb → OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/MachiningParameterExpanderView.xaml.vb
View File
ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/MachiningParameterExpanderViewModel.vb → OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/MachiningParameterExpanderViewModel.vb
+10 -10
View File
@@ -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
ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/OperationExpanderView.xaml → OptionPanel/MachiningOptionPanel/OperationExpander/OperationExpanderView.xaml
View File
ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/OperationExpanderView.xaml.vb → OptionPanel/MachiningOptionPanel/OperationExpander/OperationExpanderView.xaml.vb
View File
ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/OperationExpanderViewModel.vb → OptionPanel/MachiningOptionPanel/OperationExpander/OperationExpanderViewModel.vb
+2 -2
View File
@@ -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)
ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/OperationListBoxItem/DispositionOpListBoxItem.vb → OptionPanel/MachiningOptionPanel/OperationExpander/OperationListBoxItem/DispositionOpListBoxItem.vb
View File
ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/OperationListBoxItem/MachiningOpListBoxItem.vb → OptionPanel/MachiningOptionPanel/OperationExpander/OperationListBoxItem/MachiningOpListBoxItem.vb
View File
ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/OperationListBoxItem/OperationListBoxItem.vb → OptionPanel/MachiningOptionPanel/OperationExpander/OperationListBoxItem/OperationListBoxItem.vb
View File
ProjectPage/OptionPanel/MachiningOptionPanel/SimulationExpander/MachineAxis.vb → OptionPanel/MachiningOptionPanel/SimulationExpander/MachineAxis.vb
View File
ProjectPage/OptionPanel/MachiningOptionPanel/SimulationExpander/SimulationExpanderView.xaml → OptionPanel/MachiningOptionPanel/SimulationExpander/SimulationExpanderView.xaml
View File
ProjectPage/OptionPanel/MachiningOptionPanel/SimulationExpander/SimulationExpanderView.xaml.vb → OptionPanel/MachiningOptionPanel/SimulationExpander/SimulationExpanderView.xaml.vb
View File
ProjectPage/OptionPanel/MachiningOptionPanel/SimulationExpander/SimulationExpanderViewModel.vb → OptionPanel/MachiningOptionPanel/SimulationExpander/SimulationExpanderViewModel.vb
+2 -2
View File
@@ -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)
ProjectPage/OptionPanel/OptionPanelView.xaml → OptionPanel/OptionPanelV.xaml
+1 -1
View File
@@ -1,4 +1,4 @@
<UserControl x:Class="OptionPanelView"
<UserControl x:Class="OptionPanelV"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Width="250"
xmlns:EgtFloating="clr-namespace:EgtWPFLib5.EgtFloating;assembly=EgtWPFLib5"
ProjectPage/OptionPanel/OptionPanelView.xaml.vb → OptionPanel/OptionPanelV.xaml.vb
+1 -1
View File
@@ -1,4 +1,4 @@
Public Class OptionPanelView
Public Class OptionPanelV
Private Sub Me_Loaded(sender As Object, e As System.Windows.RoutedEventArgs) Handles Me.Loaded
Dim x = ciao.MaxHeight
ProjectPage/OptionPanel/OptionPanelViewModel.vb → OptionPanel/OptionPanelVM.vb
+1 -1
View File
@@ -2,7 +2,7 @@
Namespace EgtCAM5
Public Class OptionPanelViewModel
Public Class OptionPanelVM
Inherits ViewModelBase
Private m_DrawIsChecked As Boolean = True
OptionsWindow/OptionsV.xaml → OptionsWindow/OptionWindowV.xaml
+1 -1
View File
@@ -1,4 +1,4 @@
<EgtWPFLib5:EgtCustomWindow x:Class="OptionsV"
<EgtWPFLib5:EgtCustomWindow x:Class="OptionWindowV"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:local="clr-namespace:EgtCAM5"
OptionsWindow/OptionWindowV.xaml.vb
+3
View File
@@ -0,0 +1,3 @@
Public Class OptionWindowV
End Class
OptionsWindow/OptionsVM.vb → OptionsWindow/OptionWindowVM.vb
+3 -3
View File
@@ -3,7 +3,7 @@ Imports EgtUILib
Namespace EgtCAM5
Public Class OptionsVM
Public Class OptionWindowVM
Public ReadOnly Property LanguageList As ObservableCollection(Of Language)
Get
@@ -159,8 +159,8 @@ Namespace EgtCAM5
Public Sub CloseOptions()
' Chiusura finestra
For Each Window In Application.Current.Windows
If TypeOf Window Is OptionsV Then
Dim OptionsWindow As OptionsV = DirectCast(Window, OptionsV)
If TypeOf Window Is OptionWindowV Then
Dim OptionsWindow As OptionWindowV = DirectCast(Window, OptionWindowV)
OptionsWindow.Close()
End If
Next
OptionsWindow/OptionsV.xaml.vb
-3
View File
@@ -1,3 +0,0 @@
Public Class OptionsV
End Class
ProjectPage/PopUpGridPanel/PopUpGridPanelView.xaml → PopUpGridPanel/PopUpGridPanelV.xaml
+1 -1
View File
@@ -1,4 +1,4 @@
<UserControl x:Class="PopUpGridPanelView"
<UserControl x:Class="PopUpGridPanelV"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
PopUpGridPanel/PopUpGridPanelV.xaml.vb
+3
View File
@@ -0,0 +1,3 @@
Public Class PopUpGridPanelV
End Class
ProjectPage/PopUpGridPanel/PopUpGridPanelViewModel.vb → PopUpGridPanel/PopUpGridPanelViewModel.vb
+8 -8
View File
@@ -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.
''' </summary>
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
''' </summary>
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.
''' </summary>
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.
''' </summary>
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.
''' </summary>
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
ProjectPage/PopUpViewPanel/PopUpViewPanelView.xaml → PopUpViewPanel/PopUpViewPanelV.xaml
+1 -1
View File
@@ -1,4 +1,4 @@
<UserControl x:Class="PopUpViewPanelView"
<UserControl x:Class="PopUpViewPanelV"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
PopUpViewPanel/PopUpViewPanelV.xaml.vb
+3
View File
@@ -0,0 +1,3 @@
Public Class PopUpViewPanelV
End Class
ProjectPage/PopUpViewPanel/PopUpViewPanelViewModel.vb → PopUpViewPanel/PopUpViewPanelVM.vb
+7 -7
View File
@@ -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.
''' </summary>
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.
''' </summary>
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.
''' </summary>
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.
''' </summary>
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.
''' </summary>
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.
''' </summary>
Public Sub ViewToCPlane(ByVal param As Object)
EgtCAM5Map.refProjectVM.GetScene.CPlaneView()
Map.refProjectVM.GetScene.CPlaneView()
End Sub
#End Region ' ViewToCPlaneCommand
ProjectPage/ProjectView.xaml → Project/ProjectV.xaml
+15 -15
View File
@@ -1,4 +1,4 @@
<UserControl x:Class="ProjectView"
<UserControl x:Class="ProjectV"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:local="clr-namespace:EgtCAM5"
@@ -16,60 +16,60 @@
<EgtFloating:EgtFloatingTray x:Name="TOPTRAY" DockPanel.Dock="Top">
<EgtFloating:EgtFloatingPanel Name="ShowPanel"
IsTopDockable="True" IsBottomDockable="True" IsLeftDockable="False" IsRightDockable="False">
<local:ShowPanelView DataContext="{StaticResource ShowPanelViewModel}"/>
<local:ShowPanelV DataContext="{StaticResource ShowPanelViewModel}"/>
</EgtFloating:EgtFloatingPanel>
<EgtFloating:EgtFloatingPanel Name="ViewPanel"
IsTopDockable="True" IsBottomDockable="True" IsLeftDockable="False" IsRightDockable="False">
<local:ViewPanelView DataContext="{StaticResource ViewPanelViewModel}"/>
<local:PopUpViewPanelView DataContext="{StaticResource PopUpViewPanelViewModel}" EgtFloating:EgtFloatingPanel.IsInPopUp="True"/>
<local:ViewPanelV DataContext="{StaticResource ViewPanelViewModel}"/>
<local:PopUpViewPanelV DataContext="{StaticResource PopUpViewPanelViewModel}" EgtFloating:EgtFloatingPanel.IsInPopUp="True"/>
</EgtFloating:EgtFloatingPanel>
<!--<EgtFloating:EgtFloatingPanel Name="InstrumentPanel"
IsTopDockable="True" IsBottomDockable="True" IsLeftDockable="False" IsRightDockable="False">-->
<local:InstrumentPanelView DataContext="{StaticResource InstrumentPanelViewModel}"/>
<local:InstrumentPanelV DataContext="{StaticResource InstrumentPanelViewModel}"/>
<!--</EgtFloating:EgtFloatingPanel>-->
<EgtFloating:EgtFloatingPanel Name="GridPanel"
IsTopDockable="True" IsBottomDockable="True" IsLeftDockable="False" IsRightDockable="False">
<local:GridPanelView DataContext="{StaticResource GridPanelViewModel}"/>
<local:PopUpGridPanelView DataContext="{StaticResource PopUpGridPanelViewModel}" EgtFloating:EgtFloatingPanel.IsInPopUp="True"/>
<local:GridPanelV DataContext="{StaticResource GridPanelViewModel}"/>
<local:PopUpGridPanelV DataContext="{StaticResource PopUpGridPanelViewModel}" EgtFloating:EgtFloatingPanel.IsInPopUp="True"/>
</EgtFloating:EgtFloatingPanel>
<EgtFloating:EgtFloatingPanel Name="DbPanel"
IsTopDockable="True" IsBottomDockable="True" IsLeftDockable="False" IsRightDockable="False">
<local:DbPanelView DataContext="{StaticResource DbPanelViewModel}"/>
<local:MachinePanelV DataContext="{StaticResource DbPanelViewModel}"/>
</EgtFloating:EgtFloatingPanel>
<EgtFloating:EgtFloatingPanel Name="ExecutePanel"
IsTopDockable="True" IsBottomDockable="True" IsLeftDockable="False" IsRightDockable="False">
<local:ExecutePanelView DataContext="{StaticResource ExecutePanelViewModel}"/>
<local:ExecutePanelV DataContext="{StaticResource ExecutePanelViewModel}"/>
</EgtFloating:EgtFloatingPanel>
<EgtFloating:EgtFloatingPanel Name="SpecialPanel"
IsTopDockable="True" IsBottomDockable="True" IsLeftDockable="False" IsRightDockable="False">
<local:SpecialPanelView DataContext="{StaticResource SpecialPanelViewModel}"/>
<local:SpecialPanelV DataContext="{StaticResource SpecialPanelViewModel}"/>
</EgtFloating:EgtFloatingPanel>
<EgtFloating:EgtFloatingPanel Name="DoorsPanel"
IsTopDockable="True" IsBottomDockable="True" IsLeftDockable="False" IsRightDockable="False">
<local:DoorsPanelView DataContext="{StaticResource DoorsPanelViewModel}"/>
<local:DoorPanelV DataContext="{StaticResource DoorsPanelViewModel}"/>
</EgtFloating:EgtFloatingPanel>
<EgtFloating:EgtFloatingPanel Name="GunStockPanel"
IsTopDockable="True" IsBottomDockable="True" IsLeftDockable="False" IsRightDockable="False">
<local:GunStockPanelView DataContext="{StaticResource GunStockPanelViewModel}"/>
<local:GunStockPanelV DataContext="{StaticResource GunStockPanelViewModel}"/>
</EgtFloating:EgtFloatingPanel>
</EgtFloating:EgtFloatingTray>
<EgtFloating:EgtFloatingTray x:Name="LEFTTRAY" DockPanel.Dock="Left">
<EgtFloating:EgtFloatingPanel Name="DrawPanel" TitleBarOrientation="Vertical"
IsTopDockable="False" IsBottomDockable="False" IsLeftDockable="True" IsRightDockable="True">
<local:DrawPanelView DataContext="{StaticResource DrawPanelViewModel}"/>
<local:DrawPanelV DataContext="{StaticResource DrawPanelViewModel}"/>
</EgtFloating:EgtFloatingPanel>
</EgtFloating:EgtFloatingTray>
<EgtFloating:EgtFloatingTray x:Name="RIGHTTRAY" DockPanel.Dock="Right">
<EgtFloating:EgtFloatingPanel Name="OptionPanel" TitleBarOrientation="Vertical"
IsTopDockable="False" IsBottomDockable="False" IsLeftDockable="True" IsRightDockable="True">
<local:OptionPanelView DataContext="{StaticResource OptionPanelViewModel}"/>
<local:OptionPanelV DataContext="{StaticResource OptionPanelViewModel}"/>
</EgtFloating:EgtFloatingPanel>
</EgtFloating:EgtFloatingTray>
<EgtFloating:EgtFloatingTray x:Name="BOTTOMTRAY" DockPanel.Dock="Bottom">
<EgtFloating:EgtFloatingPanel Name="MachGroupPanel"
IsToolBar="False"
IsTopDockable="True" IsBottomDockable="True" IsLeftDockable="False" IsRightDockable="False">
<local:MachGroupPanelView DataContext="{StaticResource MachGroupPanelViewModel}"/>
<local:MachGroupPanelV DataContext="{StaticResource MachGroupPanelViewModel}"/>
</EgtFloating:EgtFloatingPanel>
</EgtFloating:EgtFloatingTray>
<!--ContentControl che ospita la scena restituita sotto forma di WindowsFormsHost-->
ProjectPage/ProjectView.xaml.vb → Project/ProjectV.xaml.vb
+1 -1
View File
@@ -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
ProjectPage/ProjectViewModel.vb → Project/ProjectVM.vb
+9 -9
View File
@@ -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
ProjectPage/DbPanel/DbPanelView.xaml.vb
-3
View File
@@ -1,3 +0,0 @@
Public Class DbPanelView
End Class
ProjectPage/DoorsPanel/DoorsPanelView.xaml.vb
-3
View File
@@ -1,3 +0,0 @@
Public Class DoorsPanelView
End Class
ProjectPage/DrawPanel/DrawPanelView.xaml.vb
-3
View File
@@ -1,3 +0,0 @@
Public Class DrawPanelView
End Class
ProjectPage/ExecutePanel/ExecutePanelView.xaml.vb
-3
View File
@@ -1,3 +0,0 @@
Public Class ExecutePanelView
End Class

Some files were not shown because too many files have changed in this diff Show More