EgtCAM5 :

- DrawPanel portato a tre colonne e cambiata disposizione alcuni comandi.

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 Piane<br/>Estrai 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 Superfici<br/>Estrai 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"
+
+   ''' <summary>
+   ''' Returns a command that do Circle3P.
+   ''' </summary>
+   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
+
+   ''' <summary>
+   ''' Execute the Circle3P.  This method is invoked by the Circle3PDCommand.
+   ''' </summary>
+   Public Sub Circle3P(ByVal param As Object)
+      Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.CIRCLE3P)
+   End Sub
+
+#End Region ' Circle3PCommand
+
 #Region "ArcCSECommand"
 
    ''' <summary>
@@ -642,11 +683,7 @@ Public Class DrawPanelVM
    ''' Execute the Arc3P.  This method is invoked by the Arc3PCommand.
    ''' </summary>
    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"
+
+   ''' <summary>
+   ''' Returns a command that do ExtractSurfFacet.
+   ''' </summary>
+   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
+
+   ''' <summary>
+   ''' Execute the ExtractSurfFacet.  This method is invoked by the ExtractSurfFacetCommand.
+   ''' </summary>
+   Public Sub ExtractSurfFacet(ByVal param As Object)
+      Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.EXTRACTSURFFACET)
+   End Sub
+
+#End Region ' ExplodeSurfCommand
+
 #Region "InvertSurfCommand"
 
    ''' <summary>
@@ -1152,15 +1212,34 @@ Public Class DrawPanelVM
    ''' Execute the ExtractLoops.  This method is invoked by the ExtractLoopsCommand.
    ''' </summary>
    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"
+
+   ''' <summary>
+   ''' Returns a command that do ExtractFacetLoops.
+   ''' </summary>
+   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
+
+   ''' <summary>
+   ''' Execute the ExtractFacetLoops.  This method is invoked by the ExtractFacetLoopsCommand.
+   ''' </summary>
+   Public Sub ExtractFacetLoops(ByVal param As Object)
+      Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.EXTRACTSURFFACETLOOPS)
+   End Sub
+
+#End Region ' ExtractFaceLoopsCommand
+
 #Region "SolidAddSurfCommand"
 
    ''' <summary>