From cccf764dca5ee9a3bd3c86ce8ed72cb065de0930 Mon Sep 17 00:00:00 2001
From: Dario Sassi <dario.s@egaltech.com>
Date: Sat, 3 Apr 2021 09:40:52 +0000
Subject: [PATCH] EgtCAM5 : - DrawPanel portato a tre colonne e cambiata
 disposizione alcuni comandi.

---
 DrawPanel/DrawPanelV.xaml                 |  96 +++++++++++---------
 DrawPanel/DrawPanelVM.vb                  | 103 +++++++++++++++++++---
 EgtCAM5.vbproj                            |   9 ++
 Resources/DrawPanel/Circle3P.png          | Bin 0 -> 1300 bytes
 Resources/DrawPanel/ExplodeSurf.png       | Bin 1574 -> 1069 bytes
 Resources/DrawPanel/ExtractFacetLoops.png | Bin 0 -> 1034 bytes
 Resources/DrawPanel/ExtractSurfFacet.png  | Bin 0 -> 1117 bytes
 Resources/DrawPanel/Offset.png            | Bin 440 -> 658 bytes
 8 files changed, 156 insertions(+), 52 deletions(-)
 create mode 100644 Resources/DrawPanel/Circle3P.png
 create mode 100644 Resources/DrawPanel/ExtractFacetLoops.png
 create mode 100644 Resources/DrawPanel/ExtractSurfFacet.png

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 @@
          <Expander.Header>
             <TextBlock Text="{Binding Draw2DMsg}"/>
          </Expander.Header>
-         <UniformGrid Columns="2">
+         <UniformGrid Columns="3">
             <Button ToolTip="{Binding PointToolTip}" Style="{StaticResource DrawPanelButton}"
                ToolTipService.ShowOnDisabled="True"
                Command="{Binding PointCommand}" IsEnabled="{Binding bLayerOk}">
@@ -27,16 +27,6 @@
                Command="{Binding LinePDLCommand}" IsEnabled="{Binding bLayerOk}">
                <Image Source="/Resources/DrawPanel/LinePDL.png" Stretch="Uniform"/>
             </Button>
-            <Button ToolTip="{Binding CirclePDToolTip}" Style="{StaticResource DrawPanelButton}"
-               ToolTipService.ShowOnDisabled="True"
-               Command="{Binding CircleCPCommand}" IsEnabled="{Binding bLayerOk}">
-               <Image Source="/Resources/DrawPanel/CircleCP.png" Stretch="Uniform"/>
-            </Button>
-            <Button ToolTip="{Binding CircleCDToolTip}" Style="{StaticResource DrawPanelButton}"
-               ToolTipService.ShowOnDisabled="True"
-               Command="{Binding CircleCDCommand}" IsEnabled="{Binding bLayerOk}">
-               <Image Source="/Resources/DrawPanel/CircleCD.png" Stretch="Uniform"/>
-            </Button>
             <Button ToolTip="{Binding ArcCSEToolTip}" Style="{StaticResource DrawPanelButton}"
                ToolTipService.ShowOnDisabled="True"
                Command="{Binding ArcCSECommand}" IsEnabled="{Binding bLayerOk}">
@@ -52,15 +42,20 @@
                Command="{Binding ArcPDPCommand}" IsEnabled="{Binding bLayerOk}">
                <Image Source="/Resources/DrawPanel/ArcPDP.png" Stretch="Uniform"/>
             </Button>
-            <Button ToolTip="{Binding FilletToolTip}" Style="{StaticResource DrawPanelButton}"
+            <Button ToolTip="{Binding CirclePDToolTip}" Style="{StaticResource DrawPanelButton}"
                ToolTipService.ShowOnDisabled="True"
-               Command="{Binding FilletCommand}" IsEnabled="{Binding bLayerOk}">
-               <Image Source="/Resources/DrawPanel/Fillet.png" Stretch="Uniform"/>
+               Command="{Binding CircleCPCommand}" IsEnabled="{Binding bLayerOk}">
+               <Image Source="/Resources/DrawPanel/CircleCP.png" Stretch="Uniform"/>
             </Button>
-            <Button ToolTip="{Binding ChamferToolTip}" Style="{StaticResource DrawPanelButton}"
+            <Button ToolTip="{Binding Circle3PToolTip}" Style="{StaticResource DrawPanelButton}"
                ToolTipService.ShowOnDisabled="True"
-               Command="{Binding ChamferCommand}" IsEnabled="{Binding bLayerOk}">
-               <Image Source="/Resources/DrawPanel/Chamfer.png" Stretch="Uniform"/>
+               Command="{Binding Circle3PCommand}" IsEnabled="{Binding bLayerOk}">
+               <Image Source="/Resources/DrawPanel/Circle3P.png" Stretch="Uniform"/>
+            </Button>
+            <Button ToolTip="{Binding CircleCDToolTip}" Style="{StaticResource DrawPanelButton}"
+               ToolTipService.ShowOnDisabled="True"
+               Command="{Binding CircleCDCommand}" IsEnabled="{Binding bLayerOk}">
+               <Image Source="/Resources/DrawPanel/CircleCD.png" Stretch="Uniform"/>
             </Button>
             <Button ToolTip="{Binding Rectangle2PToolTip}" Style="{StaticResource DrawPanelButton}"
                ToolTipService.ShowOnDisabled="True"
@@ -77,6 +72,18 @@
                Command="{Binding PolygonSideCommand}" IsEnabled="{Binding bLayerOk}">
                <Image Source="/Resources/DrawPanel/PolygonSide.png" Stretch="Uniform"/>
             </Button>
+            <Button ToolTip="{Binding FilletToolTip}" Style="{StaticResource DrawPanelButton}"
+               ToolTipService.ShowOnDisabled="True"
+               Command="{Binding FilletCommand}" IsEnabled="{Binding bLayerOk}">
+               <Image Source="/Resources/DrawPanel/Fillet.png" Stretch="Uniform"/>
+            </Button>
+            <Button ToolTip="{Binding ChamferToolTip}" Style="{StaticResource DrawPanelButton}"
+               ToolTipService.ShowOnDisabled="True"
+               Command="{Binding ChamferCommand}" IsEnabled="{Binding bLayerOk}">
+               <Image Source="/Resources/DrawPanel/Chamfer.png" Stretch="Uniform"/>
+            </Button>
+            <Button Style="{StaticResource DrawPanelButton}"
+                    Visibility="Hidden"/>
             <Button ToolTip="{Binding TextToolTip}" Style="{StaticResource DrawPanelButton}"
                ToolTipService.ShowOnDisabled="True"
                Command="{Binding TextCommand}" IsEnabled="{Binding bLayerOk}">
@@ -94,7 +101,7 @@
          <Expander.Header>
             <TextBlock Text="{Binding Draw3DMsg}"/>
          </Expander.Header>
-         <UniformGrid Columns="2">
+         <UniformGrid Columns="3">
             <Button ToolTip="{Binding PlaneToolTip}" Style="{StaticResource DrawPanelButton}"
                ToolTipService.ShowOnDisabled="True"
                Command="{Binding PlaneCommand}" IsEnabled="{Binding bLayerOkAndSelOk}">
@@ -140,11 +147,6 @@
                Command="{Binding SolidIntersectSurfCommand}" IsEnabled="{Binding bSelOk}">
                <Image Source="/Resources/DrawPanel/SolidIntersectSurf.png" Stretch="Uniform"/>
             </Button>
-            <Button ToolTip="{Binding InvertSurfToolTip}" Style="{StaticResource DrawPanelButton}"
-               ToolTipService.ShowOnDisabled="True"
-               Command="{Binding InvertSurfCommand}" IsEnabled="{Binding bSelOk}">
-               <Image Source="/Resources/DrawPanel/InvertSurf.png" Stretch="Uniform"/>
-            </Button>
             <Button ToolTip="{Binding IntersectSurfSurfToolTip}" Style="{StaticResource DrawPanelButton}"
                ToolTipService.ShowOnDisabled="True"
                Command="{Binding IntersectSurfSurfCommand}" IsEnabled="{Binding bSelOk}">
@@ -155,23 +157,38 @@
                Command="{Binding ExtractLoopsCommand}" IsEnabled="{Binding bSelOk}">
                <Image Source="/Resources/DrawPanel/ExtractLoops.png" Stretch="Uniform"/>
             </Button>
+            <Button ToolTip="{Binding ExtractFacetLoopsToolTip}" Style="{StaticResource DrawPanelButton}"
+               ToolTipService.ShowOnDisabled="True"
+               Command="{Binding ExtractFacetLoopsCommand}" IsEnabled="{Binding bSelOk}">
+               <Image Source="/Resources/DrawPanel/ExtractFacetLoops.png" Stretch="Uniform"/>
+            </Button>
             <Button ToolTip="{Binding ExplodeSurfToolTip}" Style="{StaticResource DrawPanelButton}"
                ToolTipService.ShowOnDisabled="True"
                Command="{Binding ExplodeSurfCommand}" IsEnabled="{Binding bSelOk}">
                <Image Source="/Resources/DrawPanel/ExplodeSurf.png" Stretch="Uniform"/>
             </Button>
+            <Button ToolTip="{Binding ExtractSurfFacetToolTip}" Style="{StaticResource DrawPanelButton}"
+               ToolTipService.ShowOnDisabled="True"
+               Command="{Binding ExtractSurfFacetCommand}" IsEnabled="{Binding bSelOk}">
+               <Image Source="/Resources/DrawPanel/ExtractSurfFacet.png" Stretch="Uniform"/>
+            </Button>
             <Button ToolTip="{Binding MergeSurfToolTip}" Style="{StaticResource DrawPanelButton}"
                ToolTipService.ShowOnDisabled="True"
                Command="{Binding MergeSurfCommand}" IsEnabled="{Binding bSelOk}">
                <Image Source="/Resources/DrawPanel/MergeSurf.png" Stretch="Uniform"/>
             </Button>
+            <Button ToolTip="{Binding InvertSurfToolTip}" Style="{StaticResource DrawPanelButton}"
+               ToolTipService.ShowOnDisabled="True"
+               Command="{Binding InvertSurfCommand}" IsEnabled="{Binding bSelOk}">
+               <Image Source="/Resources/DrawPanel/InvertSurf.png" Stretch="Uniform"/>
+            </Button>
          </UniformGrid>
       </Expander>
       <Expander Name="Modify" Style="{StaticResource ExpanderStyle}" Grid.Row="2" IsExpanded="{Binding ModifyIsExpanded}">
          <Expander.Header>
             <TextBlock Text="{Binding ModifyMsg}"/>
          </Expander.Header>
-         <UniformGrid Columns="2">
+         <UniformGrid Columns="3">
             <Button ToolTip="{Binding DeleteToolTip}" Style="{StaticResource DrawPanelButton}"
                ToolTipService.ShowOnDisabled="True"
                Command="{Binding DeleteCommand}" IsEnabled="{Binding bSelOk}">
@@ -182,6 +199,8 @@
                Command="{Binding ChangeLayerCommand}" IsEnabled="{Binding bSelOk}">
                <Image Source="/Resources/DrawPanel/ChangeLayer.png" Stretch="Uniform"/>
             </Button>
+            <Button Style="{StaticResource DrawPanelButton}"
+                    Visibility="Hidden"/>
             <Button ToolTip="{Binding ChangeColorToolTip}" Style="{StaticResource DrawPanelButton}"
                ToolTipService.ShowOnDisabled="True"
                Command="{Binding ChangeColorCommand}" IsEnabled="{Binding bSelOk}">
@@ -207,6 +226,11 @@
                Command="{Binding ChangeStartCurveCommand}" IsEnabled="{Binding bSelOk}">
                <Image Source="/Resources/DrawPanel/ChangeStart.png" Stretch="Uniform"/>
             </Button>
+            <Button ToolTip="{Binding ThickCurveToolTip}" Style="{StaticResource DrawPanelButton}"
+               ToolTipService.ShowOnDisabled="True" 
+               Command="{Binding SetCurveThCommand}" IsEnabled="{Binding bSelOk}">
+               <Image Source="/Resources/DrawPanel/ThickCurve.png" Stretch="Uniform"/>
+            </Button>
             <Button ToolTip="{Binding ExtendCurveToolTip}" Style="{StaticResource DrawPanelButton}"
                ToolTipService.ShowOnDisabled="True"
                Command="{Binding ExtendCurveCommand}" IsEnabled="{Binding bSelOk}">
@@ -232,6 +256,11 @@
                Command="{Binding JoinCurveCommand}" IsEnabled="{Binding bLayerOkAndSelOk}">
                <Image Source="/Resources/DrawPanel/JoinCurve.png" Stretch="Uniform"/>
             </Button>
+            <Button ToolTip="{Binding OffsetToolTip}" Style="{StaticResource DrawPanelButton}"
+               ToolTipService.ShowOnDisabled="True"
+               Command="{Binding OffsetCommand}" IsEnabled="{Binding bSelOk}">
+               <Image Source="/Resources/DrawPanel/Offset.png" Stretch="Uniform"/>
+            </Button>
             <Button ToolTip="{Binding ModifyCurveToolTip}" Style="{StaticResource DrawPanelButton}"
                ToolTipService.ShowOnDisabled="True"
                Command="{Binding ModifyCurveCommand}" IsEnabled="{Binding bSelOk}">
@@ -247,16 +276,6 @@
                 Command="{Binding RemovePointCurveCommand}" IsEnabled="{Binding bSelOk}">
                 <Image Source="/Resources/DrawPanel/RemovePointCurve.png" Stretch="Uniform"/>
              </Button>
-             <Button ToolTip="{Binding ThickCurveToolTip}" Style="{StaticResource DrawPanelButton}"
-               ToolTipService.ShowOnDisabled="True" Visibility="Hidden"
-               Command="{Binding SetCurveThCommand}" IsEnabled="{Binding bSelOk}">
-               <Image Source="/Resources/DrawPanel/ThickCurve.png" Stretch="Uniform"/>
-             </Button>
-             <Button ToolTip="{Binding ThickCurveToolTip}" Style="{StaticResource DrawPanelButton}"
-               ToolTipService.ShowOnDisabled="True" 
-               Command="{Binding SetCurveThCommand}" IsEnabled="{Binding bSelOk}">
-               <Image Source="/Resources/DrawPanel/ThickCurve.png" Stretch="Uniform"/>
-            </Button>
             <Button ToolTip="{Binding ModifyTextToolTip}" Style="{StaticResource DrawPanelButton}"
                ToolTipService.ShowOnDisabled="True"
                Command="{Binding ModifyTextCommand}" IsEnabled="{Binding bSelOk}">
@@ -268,7 +287,7 @@
          <Expander.Header>
             <TextBlock Text="{Binding TransformMsg}"/>
          </Expander.Header>
-         <UniformGrid Columns="2">
+         <UniformGrid Columns="3">
             <Button ToolTip="{Binding MoveToolTip}" Style="{StaticResource DrawPanelButton}"
                ToolTipService.ShowOnDisabled="True"
                Command="{Binding MoveCommand}" IsEnabled="{Binding bSelOk}">
@@ -294,6 +313,8 @@
                Command="{Binding Mirror3DCommand}" IsEnabled="{Binding bSelOk}">
                <Image Source="/Resources/DrawPanel/Mirror3D.png" Stretch="Uniform"/>
             </Button>
+            <Button Style="{StaticResource DrawPanelButton}"
+                    Visibility="Hidden"/>
             <Button ToolTip="{Binding ScaleToolTip}" Style="{StaticResource DrawPanelButton}"
                ToolTipService.ShowOnDisabled="True"
                Command="{Binding ScaleCommand}" IsEnabled="{Binding bSelOk}">
@@ -304,11 +325,6 @@
                Command="{Binding Scale3DCommand}" IsEnabled="{Binding bSelOk}">
                <Image Source="/Resources/DrawPanel/Scale3D.png" Stretch="Uniform"/>
             </Button>
-            <Button ToolTip="{Binding OffsetToolTip}" Style="{StaticResource DrawPanelButton}"
-               ToolTipService.ShowOnDisabled="True"
-               Command="{Binding OffsetCommand}" IsEnabled="{Binding bSelOk}">
-               <Image Source="/Resources/DrawPanel/Offset.png" Stretch="Uniform"/>
-            </Button>
          </UniformGrid>
       </Expander>
       <Interactivity:Interaction.Behaviors>
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 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>
diff --git a/EgtCAM5.vbproj b/EgtCAM5.vbproj
index 6f5d387..4270dcd 100644
--- a/EgtCAM5.vbproj
+++ b/EgtCAM5.vbproj
@@ -928,6 +928,15 @@
   <ItemGroup>
     <Resource Include="Resources\DrawPanel\RemovePointCurve.png" />
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\DrawPanel\Circle3P.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\DrawPanel\ExtractFacetLoops.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\DrawPanel\ExtractSurfFacet.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
   <PropertyGroup>
     <PostBuildEvent>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 0000000000000000000000000000000000000000..ae4f8bdad1a97331db378e37617df05ab27650fc
GIT binary patch
literal 1300
zcmV+v1?&2WP)<h;3K|Lk000e1NJLTq001Qb001Qj1^@s6#hxGo00001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGf6951U69E94oEQKA1gS|xK~z{r?U-9=
z990~~&&=#4>8>W$q(-9MWWCU8b9oW06|7ZIYSAc>qE@Ld`XHjBSVSM<TLq<6P!POq
zpjFeg)|Y}Hnj$EQFR|#Gm#(NtV=%GWkju>YeP`y3GqY!AHU_Z|{lUka`Old%-~7*Q
zb`95c#hHfbAI~Vxnrf9*jVZ%0w&E}hb;^LpEHs67kMU%%{^L0~JPN&f{Lb|!8OvhD
zrhFs2p%JKqF)fBMXO_-AS{*xNwXfeWipXowGtdmor9QM}Q!vwqLk+r420R+jlrP1w
zFs<QYPhX|?;eBFFbx=4<i;kHum}rA9^Bzo{@~Y}-$rKu6R%l3NW*pj&d&6b|&}H2V
zzcyaTb$0DEi)#vu*?-NshA>W8<&Ir2^_i@gK;}UA-|h%RLtjDtFta<!kk3r9r}DJb
zR(gmh&ceK7l{$=>kKXS8=DsU7${J}fQ%M5M5DQdIS4XEX1BV*hpaa{VfA_7c2RGRW
zvBHS%J|%6C0vtn}Nh>l$DL(G5T1PJ)Xn$_|1LgYVo4dw#?%0bkE3n-@-My4HNC8f1
z7C61Nb&{ljDHD?8mPbF#ZfB)q@%xnYK_NKpS)dZ%C@vi#Q<fiM52&`c#@nEh208~f
z8AqiPetE^v(Df(3b0^nb!Yt((^V{R>CF(g*!VZ;y8cV~v>v6?_nOvy5BKY;W3$QR7
zZ%bZ}2dr}Ejg>ubxL98r@oRA<kyIxZXU14)>cXb(TYJM@qivOqqJM0n9gCn$c@~)R
zWypep#Te_GR0?XHW7Z-BreL4|U30<RdmhZ6w@$QI2f7g+L9Fc6h@u_{BixJ^A?Mk{
zkIPuxjLJX^Wh%UxOQb10m@{Jww9j2$TEyNZTzh#L=dVC_&@hfkv_bNTx4%<&Q8$uZ
zjhReTrg-O1(5FT&Ul5Kh3@ewz`4iCl&=M37%fu;U$YBA7ctMs|Lof#XY+ZEv+o^iK
ztM{tK-+q}cT{_f*%`<q2Zj5l2J@WFTEc25@*L6Bjk1u;0^cd>wmq7(@3afBo_2!;?
zo^p*`A((wS(x$y4+-_VTarQ+{f?#Z&QouwoF=!}!O-H!Rut4fM)wCq|FtvoAu@acz
zV8=b)joYTbZ|W+As*{3hS3M_+Y9K5S+4~q^cZIGe5^hH)kh%9Y1(ZPWmB162Dl*P)
zgSh*1c1DP|p@g-p0PWxr)iS>llDdy@vz&v51}nXv<JgUjm5ml53*E<cOrjdo;jde_
zLI-ER_<)9nAhxUDj6v#P#hBrj=aFl#yv+XN&(mKXZ~VO3yYdfd_rp*Lhf&n23CD4S
zX_~)J*2U~6hwrbBO^he~s>z%|Fvd4}(>s&j==_vz>2n6AZgOq=pzGLcu_$}9!d{+7
z`6ZP0!W3tD6KUNik#C6|1d?3|{Q#pisA(e&!|Pw)yJ6SNhX>A=hFotAM)^e?_(Nn~
z1~g=5N`Z&8{=3gpg(pU#C@N3BK3(3lrDT{Umx2js0a;q$bsa66QovkmzmUDmaviE+
z*3tAW5Pyg!W=OGOQ(=6A%u3>a3IB#wnfkBD9O(ZCXHB(+5Pt(WCLd-%4hOja0000<
KMNUMnLSTYA#AojS

literal 0
HcmV?d00001

diff --git a/Resources/DrawPanel/ExplodeSurf.png b/Resources/DrawPanel/ExplodeSurf.png
index 4fa84f03eeb945cec3e62f927efd12cf2ac56fab..b62f3e9d3f1afc4c31cce1533e40f13c8c990a4d 100644
GIT binary patch
delta 1028
zcmV+f1pE7@46O)|BpLy8Qb$4nuFf3k00004XF*Lt006O%3;baPks%j<1Hwr}K~z{r
z?U!FjQ*ji>&z)Otx~7$L5<ym0FKrkm^w(-d3Hc!PpkNO{LeVJeA%dPNBIzI0Lp?-6
zk71BPK_sQ37N|W)6s0s>$ShlwQ)g@L?$<eYzq_t=?>4iQNFO*m=lAdazW3bUy}#cC
z#u&^rbllG<{)<YMzrLn_#)g*UqdSTwd9$tGL-k6gpDCBXgT$a964Q^Cjn;zJjdc`H
z;`cM<5@G|J?=Ic6^`pC;7bOHiaG*PbmVNNR0f*I^WAS=>!&hs&)?#+LsSgTjK-Yrh
zD^!+AEXpM;!rwf!E~(7Pb&g8@@w*)pfloHWx^wlhl%b$I=*rQ5(y6?+stPO?3*5YQ
z3qqk#EzWt8>QU4_bmb_D`o@Sa3bQeso(n_9g|MlpjaRDkv1zX4j|}g5ar^!wM`cAN
z(6xJdd*JEQXQ0>XNf32$V|@Vy<IVFo3c*kt_{N`zes<P;n9(CuUsHIeB&d<%=b43m
zSx{O;q`LqCe!UTYn{!06hPF;e_5Nx&b^0`vmX?CU?tp@VWwIb*8D9Sw1(BCu#>BS)
zh<s(+gmhRZwIZ4eUAPWA@=M;^wtsHS!Yl+R6QV8+7z!p?KQq*1k<9D$g2`k8x7!Wj
za2N~*1DMUxEGpQ^y+>z)S3(*LvTyK^*Qq}~DN`!2Lz7Z}M2qUjY}c4H2*<LrvRz<b
zWd~6dp|7tGIyyUHU|>M%#_7O$*YfyRNYu}khy`{2c_dKTUlB8-(a4I6*RTy6*0cQl
z#Z0HuQG?PN<o;@=S~(rt=G+p-N&RS|LWI(SXb!cpvZ+>1$B3*f%MElxXi71%HL8tM
zn))X}@nMXAfon!{t?_Hf?ef~gmxZ#Gh8D6~t$v@+SBGsCcr7cnYoRGB$2rCeQ9d=9
zqk)RJ*fkV4v#a7!BqJ2iWd;Mh1|VR}guC^-No?HjW748zl;Wa+f;i)3XnZ13Q{Iqs
zw$K_*Eh#upX=fl=QXoqGWta*n5S5sC>xoFQsL7Lm>xBs(#V5t0CO^tBGw>)r|K#x{
zV)lxnFTB<k^gGPnOa+h6DdFKCK~)s}QK;)KhZ@giDDrpW*_@6@8n^_b@nWczmo%Y0
zkE}OiC9ly&Rg^6_IQR8x7cAHN;ez`F^tLZnh?M?m#kPLjT<Opz(UY-~ZOv+gotY1y
zEWJKoCZxu532>ucK%4lAi*FJxzPP(}43}U&zxm$iLT@|ReXUUFe=gz#dfxg2JS7b0
ySs?qvNVKeWl1PH&MEzxE@7wpM`7bIt0KNlZ6;1k%XU1ay0000<MNUMnLSTaY75Z%e

delta 1539
zcmV+e2K@Q02&N2>B#}WBe*hVDMObuGZ)S9NVRB^vL1b@YWgtmyVP|DhWnpA_ami&o
z000HENkl<Zc-rh(X>3$g6#m|OvoBqs0|<eZLRzS#l+v=<LRl?85T&TmL}O^N21A5I
z{`$k1@IwvYlAuNsafu`<HAad^3sfl9f|Rn9))uDHYTFswPG?`<f4koMx}?+T%ydSq
zn0S*jXY%IU`@T8LckaC$Ap{TF;PC*C2NINGvR~-vo|{J19xAdnOuu9PS3N}mF)(+i
zBvCm_rGY+6nlw*w9G6Yi>kPn4<>lEXQ%XW-XMW(&{`w`<I}Jl1i>P{m%E5o!Qxwpb
zRQ*C_E0r}4ha>skf4yGev(LX(8)ulG8f98Rr6^<pMhW*zs!izyyPqw&YBU<i&ayI6
zR$5953kwL(^F*amG45f~I&AN(PA+hr&=c1u+-dteC>nkqclgdM%iY1Ll_hX_7jsh$
z3W!pIur*g(@k1TTO3U!-zJ0h@TMM;XjqdJlw6y#-Jar!Rf8<{J@&nTKK8NgC71ncV
zR1M`>bWmre%}eDnQ%WI<o8XsHp;c=6sR<fk^-{HzSAc=#PmI{QyY8a%NH(-uE!x`J
z5C{aIR4QRG7{@OAD3t?L%)Ayis7{vLs2n%ZDS!e#fA&^lwQqq$5;?uvz^|UK<#QGb
zzU3R>oWCOCe;@F>9grjmjn^9GFo>dvj*bpkES9mRa>W^TlYXieg{{7G>sQrq8B+`S
zRm<QkejdIlb7BsucFHtapFUkBhm7VCIy*aM88f;j#OTBusKU-2@GmKZwyqM|KW@eh
zN=?JIeq9kf9uMm4FX6(4TA0o4viC*}FO}CKR`2MBe_XTg#X$eAw*=X>P3It(Z^5^?
z5bl{-Q2`knPD1EvM@L#Nc0IEVHrqfr(;w+OH%++ralO6b2>UKv1KZ|u2sR56D?bS9
zIhEBc{~j>SL4R>M3=8t{enk~FY}^=RXEK@C+DD=R3iZ^sO?~}uf0Z<zVRFSm^gX^O
z=o#~-fAafd2yECwL8ZcLN`s`*1yy5Lb0ZR`&qDe~Z}hMJ=2UXb4Vid-y_&9;B+rbD
zAS0#20&&Ld&|XHp2`bE6g4YGZ<w|f=!|eh|P61YwVD8X7?xAU___i)u^>I~KTWA8`
zy$S!Eg<%)*rKG_<D+>cFOW<Bq2)@q>NABj}f6gIEnz%qoHLdRob!S7iqCOfLb>mNR
zxFQYaG5x8}VcWhpD2(!0l+9Bfd^%=OYkS(-DbxAK^8`y`F~KC~)_6%D5fCHRj3p4(
zX1*NP&Qr3xyy1*lh*+|-icCI!K+d({oQnjA4d?uoATCc<%!w{1WFWw(-xzVTMw6SL
zf0qx#ua(fd>=dmtBA}7A6ZG2n_UI}_T|z@;)QJqh0Ie=~-H@iwM&gMN<(%VvuJDue
zI#pbt#OmflLUY4}s)U7&Xbl+1du%YQ-M>TA5xzZf>FEmA^kW7^ll?roeLFA_P`XPe
z;mRu>0myk=aHZ#kwHGsUAgs%LCC(!jf9H-maVSiFgK2Pv$0_T?v!9L>z}PX6L%GWr
zSRU6Ai~QN+i@GDQnBmJ<8bljDN*fH2ru8!Pv^fV-7Ywrg=(QD!q_{wFI?YXe>%~G=
z#$iLD)<I=y2WF1pBkDPS&R|FxpE1wLbV8Y)0q2c6bzI>iHpdsrmMhV##Ac27e>>aq
z*ovNmeN_o9fLk*0!XHqwEq2VFT641IFx^|dN52Z=RUAujqS1x)x3MFk?l|~M=Yhs1
z9|XZJTJ3(Qgs%9H?L9sI(V$pj8*9I2XEN9y*&afaiIs=JU8x7T-RUMCzZ*<+>Z@Y2
z^(d|AWB2DS!S3?VPYnaZm|HG)d0PH#7h$YA3RG8#unr6YAfy)>MXlImJ;EsEZy#pE
z-A~m#S$v(#TJSKr(L_tj@00qSZn!A`CErd%af&osKb9N#WZt?EkM~V-?&ospp7Xo4
p*RJiK%!?52|C_x3GN``<7yzHSv>gc|)c^nh002ovPDHLkV1gg`>^lGe

diff --git a/Resources/DrawPanel/ExtractFacetLoops.png b/Resources/DrawPanel/ExtractFacetLoops.png
new file mode 100644
index 0000000000000000000000000000000000000000..2fd459194a866c1edc432fe9d93294632b1fed10
GIT binary patch
literal 1034
zcmV+l1oiugP)<h;3K|Lk000e1NJLTq001Qb001Qj1^@s6#hxGo00001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGf4*&oQ4*`<-1El}}1D{DmK~z{r?U!F@
zTU8u@zne5klm2gLZEIQ9DqCl5la*;Fsk5m#Qd*%nAAFIqfowR%H${CGMSW0M*^9_v
zK4=9MbWE7gIXk*PuvLPKNxIpRwrdx3ZEw?LO>?j3X6YQ5v^PtYJ>-L5&f(s3Pd?7?
z@Vn<qs;cs!VMw<R6a^{06r}XBX;L1Kr#Riso4iVb5GfT+mll%2_^zrXS497?h_8o-
zhnGZqU*seuBpUbZe<K{33^5zJiX556x@89;dn@s32X4b0O6UTSi4gVM+X(wEy(}L4
zE?2><Qd&BmfAhmwWFkl)5F|S3M^zL`96Ko4(!!b2cH%Y7>Cw<=PEuY3TW!!R$(Vv?
z`R&r^T|tMdlaUig%k&6lluD&Vl4O&m7)$-5RJoqvblFZ?>g?QFm53%K;tH&)5~5*k
z21$grNi7DIiXxSVEh<}Cq;mW$k@Kes&rI<_&$GDRd0QKrmGxFio$|a+?fB0W-3YSW
z*pA%%l!#6gvkgTOe=nw1Q!3(Dn?}r45?f?j_;;MwF4GeB(>ZgIZBrqN78AsbM&v_>
z3H0~zbZ>7~v2~?<ul*oWqOvS6P=5V96`^0S%?5}H!6i+w=}D}K6<#@c4EK$5bj<yV
z?ONvSC}snO6@{Cx9wFH4rK`U`KdD8LvNepc1uCwO-WA+mUCzOwq4eD}tzvU+7tvvY
z$3^QjG5JY3j!(x^QniCevkGbCT&I%O3jS*K^2fk?_zxVXr(x{QjXn#E+Ci>^u^RZQ
z3f>YGqfeBtM&q3^I?1beDkf{XC(u@9ml=xJT?AchT1DSX3Q~G0Na>{@rI&(~Uj8>J
z^ISaL+n9_}+5xY)tdfC?A5(eLk4d~aa(;O%iIdhzA#!M5oc!jf|8gpIS-O2Y)viZI
zDRDZC$L0C@N2;wf{P+>hp(8kh-_xMV*o-R1Y?2eJFc>A#yMR&`fq`4_c?_l%<mxIW
zUwDbx7x$$HXD92?WsT#$h&p`5k96e}(^to+ak)u2z0BBKh{Te-f8qf9zWJ6FyBYJJ
z+IPc0L>_Z8-`zuW_Y)-A+mOU}#jcKy4Htbwse3tgE~JiMID>EGCk$pQRh?cAULN7O
zF9uWhlU6J9?k=KkH_ILm>O-}}<8gMnTsdVwC#ic8`_Aid?LIXf@bOt&D~YBiW}2JX
zvv+UK+wWg!Qu#!8cXw%~>-ofeuhf4@p`z=hAf*rZ8%R^eA`o?AUH||907*qoM6N<$
Eg16%1ivR!s

literal 0
HcmV?d00001

diff --git a/Resources/DrawPanel/ExtractSurfFacet.png b/Resources/DrawPanel/ExtractSurfFacet.png
new file mode 100644
index 0000000000000000000000000000000000000000..766017176206fc7cd46e4dff7276321a885fc00e
GIT binary patch
literal 1117
zcmV-j1fu(iP)<h;3K|Lk000e1NJLTq001Qb001Qj1^@s6#hxGo00001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGf6951U69E94oEQKA1M*2kK~z{r?U!w6
zTU8jx|0ikQ%v-xAYw3h;!q}IltOz=xu_fyI!Ggn%iTk?Fi5F4CD)`YaV-uM#RKah;
zlp!b%!6AulC}pzFVJ8enw|22H+e(wzymeho?)5qMo?FwkHFrxgC-eu;eV+5ubN)Q%
z<hi#@Q4~CAn1p|z*c4@y`+leLb33+^d!0=6u9j;t-e1mr%@hgZVy=-jl10fTsgK92
zs9UBOW1ZyQC2M^7$dOLJ-{(mrrivdPJ->&tGs)+Wpl``Vsr><O>(nk&5)*+c=oGmL
zvggQp^7(vIDwQ^${Nl9D-5NW<=Loo{UM(zxXR2y@1$OR7{Eu|MdT`*P+wD>g4-P7W
zhYl&hV7Fp2nG~zl%8!KGRsHV@BTe0l-#eAX&sik*5qkB0<Hsklhw0f$rut~-(5DUA
z1U&g!cy7%h+v@wPkZiHMaPk874-DYVp&|Tq_AEw6M-h&MF*S9CucGq??Rz5sG22b?
zFU(3$hIgDVDM$HW1AkORV#<PTE9UHNn6tLv58F1}%$f1KBZ%vb+mNue;i_|&1?@oU
zm=_L*1Jl#fC>D#bSS)b4++v{>`p8a@#Y_%dBHtw6!WllmshlYibi>+)ORf$?w(P}7
z^D~G$+95N#j&zME*))l-q1~zZ{ciO4KZ`&|0Hsn1Gcz+dH!*>DJg$xl&e6VmM7#z=
zqP9PI1EEwHp>%|N1O>Abk>)-`n?ktY>cWn~6<qW^p-$(b>~=c>fez3;LL!mC>}(ve
zEUV*!)3onC5wF3JC|@Wq8X7zEm(iCxgQt=|Aeb2!y&6wn?k)W|5-m{ZB3tj*eVgnt
z+V@wjxt4npwSrtiGU^3}74__>6sX-^ujjK&Cd<pgR<&a_VcK)Ah}Weq6+L}8`}lzu
zd%_f!v>q(`{r-9K!&E-Hw62Y*sVG^(a%qSyP|DK7Urs*%XUu8NjoCqFo%uTFr?$lB
z=^5RKnu=lyGU?+UFBz}Wj$(TQmV&kw<833<`uMg8Ulp|$#n)T)+rJlTEs9h1n)MJ>
z31_7;RBuswNzhp&b7<kl)LWEUc%6rY|5yHt<EzO3QxyM(`f73?UW>htM>7*J%SAEr
z54=K)DqZ14YK)4aT9&T6f9sO4vmt}y({E#HyuD21c|L`I5$I%vuL|Rz!#Wak9qaif
z*OnMZV15j{Ge4JZJFOx6d&^_=vi&YO?Clpb*TpAgR=z4W;_gM=iNx&e6D;wNL?ua7
zv)X?Lsu-Pmiz<KPlPG!NEhjTAC@^JZxK62BH7W=xr}|8l!~el(^`P;lxLS81q@3D{
jsu7#T(<qywi~;-&I6k(}>4Apl00000NkvXXu0mjf#B3g!

literal 0
HcmV?d00001

diff --git a/Resources/DrawPanel/Offset.png b/Resources/DrawPanel/Offset.png
index 34afc2a0d3f0946522246e5ca7423d848ffe026c..81c0be2532baed4776cb29a55f1b2ecb4d826343 100644
GIT binary patch
delta 614
zcmV-s0-61|1Cj-hBpLy8Qb$4nuFf3k00004XF*Lt006O%3;baPks%j<0w+mCK~z{r
z?Uyl296=a{cViNW2`U-{L6S6rAVNqHEClTo5lM5liGM&&Y%MJ9)ck_fR+1tK*l1%R
z2#0}SrzV<8#T-O1YR>1?{qVq>yE!?B1Mh{0Z`|YD=f0htosDz3TvTm&kkqP5P0BYl
zDc=;l`<f=c^;3jzn&1e3mLYRAJE-xkb3-bQ<ESzHb&BBx*oWs};}{;o<76x>k3gS&
zhDGE)>0r5WNxfy*0g_SvL%vj99?COlgdP|G2`ej*MlN&pr(X(6bua9^VfYG6N+LG@
zBxu-|pTG(1A8+nv_Ybov#%Yk~AC1fDnoH^zL;W+ISdo-n8XY@-OR&!sNo#H$Knrri
z$bDqo2g;bQSiy;Y+ay0oVzbZ-sh_Jq)Uo%VAKCA7DJw2zL2igL1MP@yP}Q*&q)Oh^
zceYM_AAR|SvIKk2n;XWd>Qo=g%?E1HR8&e`&+j~9la%%P&h|Cx+~vV2dY4pZLagZ1
z@Rx2aP<4ln&@Ih>J7?}h$~q=CQZKeSl%ZP<R4uBf@EV*6(J7@3T0x8H<y{EQgpzs+
zx@3oNoQ$0bC8fvCKgfdSRnZ4_C@EXORIe8^M?y)dJDTA3xGI{^oznSiXW>jJDND&q
zr-YXBN+>C9bG&n}rOHYuDce4KC6ts_bM5!FMrl7^G@+zHY?Gz)Rn3a77Y=nvlssn;
zDR!V;l;5xg^Po3rXDa&QP^pBvd}XC3<(DYB0J-m|RZQ5PfB*mh07*qoM6N<$f_`Zo
AD*ylh

delta 397
zcmV;80doG51-Ju{B#}WBe*hVDMObuGZ)S9NVRB^vL1b@YWgtmyVP|DhWnpA_ami&o
z0003+Nkl<Zc-mt8|NlS3U;|7HgAj~5YSdAqjv6SyLX0AT!W|Ak$^n-&5PtyT13-M?
zL%+udN*%>WOyLQ1R0EKzC(_J~K)eCyxCOL!6rqp;VFMu6M-o2>f5Zhq$6cU_qx4ok
zA}0DSe7o`F-kW!yf<TS|Vtye02zA(kfk@~ehc$3%$Q+Wh(h?96;<JN>6v$!ofgznh
z^^hVK07Fy(NKJr-s>7pW*FYf_4-GK~Vxy9(MZ%>}xd%WT0FAx_z)+ij6k-zww44Gu
zYyr$+z^KfFhLk<Af6+*@!V~JS1Hg2agcM2vgP}wRg;oMEwAMlS{=m=@7*I!n(io6>
z01Pc9Abk-kY%mz=z70@^z;d1gRq8$}lwl0e0v4G+ppN=LfIr%v8g<lYbC_1(00BO2
rn=YeiYSdAqjv95;NO2TEfB^s-`(zmWDOno;0000<MNUMn143Ye=CGiS