diff --git a/DrawPanel/DrawPanelV.xaml b/DrawPanel/DrawPanelV.xaml index 12410ac..a00b241 100644 --- a/DrawPanel/DrawPanelV.xaml +++ b/DrawPanel/DrawPanelV.xaml @@ -11,7 +11,7 @@ - + @@ -27,16 +27,6 @@ Command="{Binding LinePDLCommand}" IsEnabled="{Binding bLayerOk}"> - - - - - - @@ -52,15 +42,20 @@ Command="{Binding ArcPDPCommand}" IsEnabled="{Binding bLayerOk}"> - - + Command="{Binding CircleCPCommand}" IsEnabled="{Binding bLayerOk}"> + - - + Command="{Binding Circle3PCommand}" IsEnabled="{Binding bLayerOk}"> + + + + + + + + + + + @@ -94,7 +101,7 @@ - + @@ -140,11 +147,6 @@ Command="{Binding SolidIntersectSurfCommand}" IsEnabled="{Binding bSelOk}"> - - - @@ -155,23 +157,38 @@ Command="{Binding ExtractLoopsCommand}" IsEnabled="{Binding bSelOk}"> + + + + + + + + + - + @@ -182,6 +199,8 @@ Command="{Binding ChangeLayerCommand}" IsEnabled="{Binding bSelOk}"> + @@ -207,6 +226,11 @@ Command="{Binding ChangeStartCurveCommand}" IsEnabled="{Binding bSelOk}"> + + + @@ -232,6 +256,11 @@ Command="{Binding JoinCurveCommand}" IsEnabled="{Binding bLayerOkAndSelOk}"> + + + @@ -247,16 +276,6 @@ Command="{Binding RemovePointCurveCommand}" IsEnabled="{Binding bSelOk}"> - - - - - - @@ -268,7 +287,7 @@ - + @@ -294,6 +313,8 @@ Command="{Binding Mirror3DCommand}" IsEnabled="{Binding bSelOk}"> + @@ -304,11 +325,6 @@ Command="{Binding Scale3DCommand}" IsEnabled="{Binding bSelOk}"> - - - diff --git a/DrawPanel/DrawPanelVM.vb b/DrawPanel/DrawPanelVM.vb index 7f4760d..a67d934 100644 --- a/DrawPanel/DrawPanelVM.vb +++ b/DrawPanel/DrawPanelVM.vb @@ -60,6 +60,11 @@ Public Class DrawPanelVM Return EgtMsg(MSG_DRAWPANEL + 5) End Get End Property + Public ReadOnly Property Circle3PToolTip As String + Get + Return EgtMsg(5156) + End Get + End Property Public ReadOnly Property ArcCSEToolTip As String Get Return EgtMsg(MSG_DRAWPANEL + 6) @@ -148,7 +153,12 @@ Public Class DrawPanelVM End Property Public ReadOnly Property ExplodeSurfToolTip As String Get - Return EgtMsg( 5221) 'Esplodi Superfici e Regioni PianeEstrai Faccia da Superficie (Shift) + Return EgtMsg( 5221) 'Esplodi Superfici e Regioni Piane + End Get + End Property + Public ReadOnly Property ExtractSurfFacetToolTip As String + Get + Return EgtMsg( 5158) 'Estrai Faccia da Superficie End Get End Property Public ReadOnly Property InvertSurfToolTip As String @@ -158,7 +168,12 @@ Public Class DrawPanelVM End Property Public ReadOnly Property ExtractLoopsToolTip As String Get - Return EgtMsg( 5150) 'Estrai Bordi Liberi di SuperficiEstrai Bordi di Faccia di superficie (Shift) + Return EgtMsg( 5150) 'Estrai Bordi Liberi di Superfici e Regioni Piane + End Get + End Property + Public ReadOnly Property ExtractFacetLoopsToolTip As String + Get + Return EgtMsg( 5157) 'Estrai Bordi di Faccia di superficie e di Parti di Regioni Piane End Get End Property Public ReadOnly Property SolidAddSurfToolTip As String @@ -405,6 +420,7 @@ Public Class DrawPanelVM Private m_cmdLinePDL As ICommand Private m_cmdCircleCP As ICommand Private m_cmdCircleCD As ICommand + Private m_cmdCircle3P As ICommand Private m_cmdArcCSE As ICommand Private m_cmdArc3P As ICommand Private m_cmdArcPDP As ICommand @@ -425,8 +441,10 @@ Public Class DrawPanelVM Private m_cmdRuled As ICommand Private m_cmdMergeSurf As ICommand Private m_cmdExplodeSurf As ICommand + Private m_cmdExtractSurfFacet As ICommand Private m_cmdInvertSurf As ICommand Private m_cmdExtractLoops As ICommand + Private m_cmdExtractFacetLoops As ICommand Private m_cmdSolidAddSurf As ICommand Private m_cmdSolidSubtractSurf As ICommand Private m_cmdSolidIntersectSurf As ICommand @@ -601,6 +619,29 @@ Public Class DrawPanelVM #End Region ' CircleCDCommand +#Region "Circle3PCommand" + + ''' + ''' Returns a command that do Circle3P. + ''' + Public ReadOnly Property Circle3PCommand As ICommand + Get + If m_cmdCircle3P Is Nothing Then + m_cmdCircle3P = New RelayCommand(AddressOf Circle3P) + End If + Return m_cmdCircle3P + End Get + End Property + + ''' + ''' Execute the Circle3P. This method is invoked by the Circle3PDCommand. + ''' + Public Sub Circle3P(ByVal param As Object) + Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.CIRCLE3P) + End Sub + +#End Region ' Circle3PCommand + #Region "ArcCSECommand" ''' @@ -642,11 +683,7 @@ Public Class DrawPanelVM ''' Execute the Arc3P. This method is invoked by the Arc3PCommand. ''' Public Sub Arc3P(ByVal param As Object) - If (Keyboard.Modifiers And ModifierKeys.Shift) = ModifierKeys.Shift Then - Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.CIRCLE3P) - Else - Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.ARC3P) - End If + Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.ARC3P) End Sub #End Region ' Arc3PCommand @@ -1111,6 +1148,29 @@ Public Class DrawPanelVM #End Region ' ExplodeSurfCommand +#Region "ExtractSurfFacetCommand" + + ''' + ''' Returns a command that do ExtractSurfFacet. + ''' + Public ReadOnly Property ExtractSurfFacetCommand As ICommand + Get + If m_cmdExtractSurfFacet Is Nothing Then + m_cmdExtractSurfFacet = New RelayCommand(AddressOf ExtractSurfFacet) + End If + Return m_cmdExtractSurfFacet + End Get + End Property + + ''' + ''' Execute the ExtractSurfFacet. This method is invoked by the ExtractSurfFacetCommand. + ''' + Public Sub ExtractSurfFacet(ByVal param As Object) + Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.EXTRACTSURFFACET) + End Sub + +#End Region ' ExplodeSurfCommand + #Region "InvertSurfCommand" ''' @@ -1152,15 +1212,34 @@ Public Class DrawPanelVM ''' Execute the ExtractLoops. This method is invoked by the ExtractLoopsCommand. ''' Public Sub ExtractLoops(ByVal param As Object) - If (Keyboard.Modifiers And ModifierKeys.Shift) = ModifierKeys.Shift Then - Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.EXTRACTSURFFACETLOOPS) - Else - Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.EXTRACTSURFLOOPS) - End If + Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.EXTRACTSURFLOOPS) End Sub #End Region ' ExtractLoopsCommand +#Region "ExtractFacetLoopsCommand" + + ''' + ''' Returns a command that do ExtractFacetLoops. + ''' + Public ReadOnly Property ExtractFacetLoopsCommand As ICommand + Get + If m_cmdExtractFacetLoops Is Nothing Then + m_cmdExtractFacetLoops = New RelayCommand(AddressOf ExtractFacetLoops) + End If + Return m_cmdExtractFacetLoops + End Get + End Property + + ''' + ''' Execute the ExtractFacetLoops. This method is invoked by the ExtractFacetLoopsCommand. + ''' + Public Sub ExtractFacetLoops(ByVal param As Object) + Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.EXTRACTSURFFACETLOOPS) + End Sub + +#End Region ' ExtractFaceLoopsCommand + #Region "SolidAddSurfCommand" ''' diff --git a/EgtCAM5.vbproj b/EgtCAM5.vbproj index 6f5d387..4270dcd 100644 --- a/EgtCAM5.vbproj +++ b/EgtCAM5.vbproj @@ -928,6 +928,15 @@ + + + + + + + + + IF "$(PlatformName)"=="x86" IF "$(ConfigurationName)" == "Release" copy $(TargetPath) c:\EgtProg\EgtCAM5\EgtCAM5R32.exe diff --git a/Resources/DrawPanel/Circle3P.png b/Resources/DrawPanel/Circle3P.png new file mode 100644 index 0000000..ae4f8bd Binary files /dev/null and b/Resources/DrawPanel/Circle3P.png differ diff --git a/Resources/DrawPanel/ExplodeSurf.png b/Resources/DrawPanel/ExplodeSurf.png index 4fa84f0..b62f3e9 100644 Binary files a/Resources/DrawPanel/ExplodeSurf.png and b/Resources/DrawPanel/ExplodeSurf.png differ diff --git a/Resources/DrawPanel/ExtractFacetLoops.png b/Resources/DrawPanel/ExtractFacetLoops.png new file mode 100644 index 0000000..2fd4591 Binary files /dev/null and b/Resources/DrawPanel/ExtractFacetLoops.png differ diff --git a/Resources/DrawPanel/ExtractSurfFacet.png b/Resources/DrawPanel/ExtractSurfFacet.png new file mode 100644 index 0000000..7660171 Binary files /dev/null and b/Resources/DrawPanel/ExtractSurfFacet.png differ diff --git a/Resources/DrawPanel/Offset.png b/Resources/DrawPanel/Offset.png index 34afc2a..81c0be2 100644 Binary files a/Resources/DrawPanel/Offset.png and b/Resources/DrawPanel/Offset.png differ