From 2a056bc9be5dffeb4581a42f91b1f4eac0074978 Mon Sep 17 00:00:00 2001
From: Dario Sassi <dario.sassi@egalware.com>
Date: Thu, 14 Mar 2024 20:08:31 +0100
Subject: [PATCH] =?UTF-8?q?EgtCAM5=20:=20-=20aggiunti=20bottoni=20toolbar?=
 =?UTF-8?q?=20per=20quotature=20angolari=20e=20diametrali/radiali=20-=20co?=
 =?UTF-8?q?rretta=20gestione=20DecDigit=20di=20quotature=20in=20pagina=20O?=
 =?UTF-8?q?pzioni=20(valore=20pu=C3=B2=20essere=20negativo).?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 DrawPanel/DrawPanelV.xaml                  |  22 +++++--
 DrawPanel/DrawPanelVM.vb                   |  70 ++++++++++++++++++++-
 EgtCAM5.vbproj                             |   6 ++
 OptionsWindow/OptionWindowVM.vb            |   2 +-
 Resources/DrawPanel/AngularDimension.png   | Bin 0 -> 470 bytes
 Resources/DrawPanel/DiametralDimension.png | Bin 0 -> 395 bytes
 6 files changed, 91 insertions(+), 9 deletions(-)
 create mode 100644 Resources/DrawPanel/AngularDimension.png
 create mode 100644 Resources/DrawPanel/DiametralDimension.png

diff --git a/DrawPanel/DrawPanelV.xaml b/DrawPanel/DrawPanelV.xaml
index ea843cd..1f2b439 100644
--- a/DrawPanel/DrawPanelV.xaml
+++ b/DrawPanel/DrawPanelV.xaml
@@ -74,17 +74,27 @@
                Command="{Binding PolygonSideCommand}" IsEnabled="{Binding bLayerOk}">
                <Image Source="/Resources/DrawPanel/PolygonSide.png" Stretch="Uniform"/>
             </Button>
-            <Button ToolTip="{Binding TextToolTip}" Style="{StaticResource DrawPanelButton}"
-               ToolTipService.ShowOnDisabled="True"
-               Command="{Binding TextCommand}" IsEnabled="{Binding bLayerOk}">
-               <Image Source="/Resources/DrawPanel/Text.png" Stretch="Uniform"/>
-            </Button>
             <Button ToolTip="{Binding LinearDimensionToolTip}" Style="{StaticResource DrawPanelButton}"
                ToolTipService.ShowOnDisabled="True"
                Command="{Binding LinearDimensionCommand}" IsEnabled="{Binding bLayerOk}">
                <Image Source="/Resources/DrawPanel/LinearDimension.png" Stretch="Uniform"/>
             </Button>
-            </UniformGrid>
+            <Button ToolTip="{Binding AngularDimensionToolTip}" Style="{StaticResource DrawPanelButton}"
+               ToolTipService.ShowOnDisabled="True"
+               Command="{Binding AngularDimensionCommand}" IsEnabled="{Binding bLayerOk}">
+               <Image Source="/Resources/DrawPanel/AngularDimension.png" Stretch="Uniform"/>
+            </Button>
+            <Button ToolTip="{Binding DiamRadDimensionToolTip}" Style="{StaticResource DrawPanelButton}"
+               ToolTipService.ShowOnDisabled="True"
+               Command="{Binding DiamRadDimensionCommand}" IsEnabled="{Binding bLayerOk}">
+               <Image Source="/Resources/DrawPanel/DiametralDimension.png" Stretch="Uniform"/>
+            </Button>
+            <Button ToolTip="{Binding TextToolTip}" Style="{StaticResource DrawPanelButton}"
+               ToolTipService.ShowOnDisabled="True"
+               Command="{Binding TextCommand}" IsEnabled="{Binding bLayerOk}">
+               <Image Source="/Resources/DrawPanel/Text.png" Stretch="Uniform"/>
+            </Button>
+         </UniformGrid>
       </Expander>
       <Expander Name="Draw3D" Style="{StaticResource ExpanderStyle}" Grid.Row="1"
                 Visibility="{Binding Draw3DVisibility}" IsExpanded="{Binding Draw3DIsExpanded}">
diff --git a/DrawPanel/DrawPanelVM.vb b/DrawPanel/DrawPanelVM.vb
index c4ea23b..7dbc221 100644
--- a/DrawPanel/DrawPanelVM.vb
+++ b/DrawPanel/DrawPanelVM.vb
@@ -97,12 +97,22 @@ Public Class DrawPanelVM
    End Property
    Public ReadOnly Property TextToolTip As String
       Get
-         Return EgtMsg( 5214)
+         Return EgtMsg( 5214)       ' Testo<br/>Testo Avanzato (Shift)
       End Get
    End Property
    Public ReadOnly Property LinearDimensionToolTip As String
       Get
-         Return EgtMsg( 5155)
+         Return EgtMsg( 5155)       ' Quota Lineare<br/>Quota Allineata (Shift)
+      End Get
+   End Property
+   Public ReadOnly Property AngularDimensionToolTip As String
+      Get
+         Return EgtMsg( 5167)       ' Quota Angolare<br/>Quota Angolare Avanzata (Shift)
+      End Get
+   End Property
+   Public ReadOnly Property DiamRadDimensionToolTip As String
+      Get
+         Return EgtMsg( 5168)       ' Quota Diametrale<br/>Quota Radiale (Shift)
       End Get
    End Property
 
@@ -460,6 +470,8 @@ Public Class DrawPanelVM
    Private m_cmdPolygonSide As ICommand
    Private m_cmdText As ICommand
    Private m_cmdLinDim As ICommand
+   Private m_cmdAngDim As ICommand
+   Private m_cmdDiamRadDim As ICommand
    Private m_cmdModifyCurve As ICommand
    Private m_cmdAddPointCurve As ICommand
    Private m_cmdPlane As ICommand
@@ -878,6 +890,60 @@ Public Class DrawPanelVM
 
 #End Region ' LinearDimensionCommand
 
+#Region "AngularDimensionCommand"
+
+   ''' <summary>
+   ''' Returns a command that do Angular Dimension.
+   ''' </summary>
+   Public ReadOnly Property AngularDimensionCommand As ICommand
+      Get
+         If m_cmdAngDim Is Nothing Then
+            m_cmdAngDim = New RelayCommand(AddressOf AngularDimension)
+         End If
+         Return m_cmdAngDim
+      End Get
+   End Property
+
+   ''' <summary>
+   ''' Execute the AngularDimension.  This method is invoked by the AngDimCommand.
+   ''' </summary>
+   Public Sub AngularDimension(ByVal param As Object)
+      If (Keyboard.Modifiers And ModifierKeys.Shift) = ModifierKeys.Shift Then
+         Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.ANGULARDIMENSIONPLUS)
+      Else
+         Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.ANGULARDIMENSION)
+      End If
+   End Sub
+
+#End Region ' AngularDimensionCommand
+
+#Region "DiamRadDimensionCommand"
+
+   ''' <summary>
+   ''' Returns a command that do DiamRad Dimension.
+   ''' </summary>
+   Public ReadOnly Property DiamRadDimensionCommand As ICommand
+      Get
+         If m_cmdDiamRadDim Is Nothing Then
+            m_cmdDiamRadDim = New RelayCommand(AddressOf DiamRadDimension)
+         End If
+         Return m_cmdDiamRadDim
+      End Get
+   End Property
+
+   ''' <summary>
+   ''' Execute the DiamRadDimension.  This method is invoked by the DiamRadDimCommand.
+   ''' </summary>
+   Public Sub DiamRadDimension(ByVal param As Object)
+      If (Keyboard.Modifiers And ModifierKeys.Shift) = ModifierKeys.Shift Then
+         Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.RADIALDIMENSION)
+      Else
+         Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.DIAMETRALDIMENSION)
+      End If
+   End Sub
+
+#End Region ' DiamRadDimensionCommand
+
 #Region "ModifyCurve"
 
    ''' <summary>
diff --git a/EgtCAM5.vbproj b/EgtCAM5.vbproj
index 09364cc..71905cc 100644
--- a/EgtCAM5.vbproj
+++ b/EgtCAM5.vbproj
@@ -1005,6 +1005,12 @@
   <ItemGroup>
     <Resource Include="Resources\DrawPanel\StmMoveVertex.png" />
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\DrawPanel\AngularDimension.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\DrawPanel\DiametralDimension.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/OptionsWindow/OptionWindowVM.vb b/OptionsWindow/OptionWindowVM.vb
index e421938..53fa86c 100644
--- a/OptionsWindow/OptionWindowVM.vb
+++ b/OptionsWindow/OptionWindowVM.vb
@@ -386,7 +386,7 @@ Public Class OptionWindowVM
       End Get
       Set(value As String)
          Dim nVal As Integer = 0
-         If Integer.TryParse(value, nVal) AndAlso nVal > 0 Then
+         If Integer.TryParse(value, nVal) Then
             OptionModule.m_nDecDigit = nVal
             EgtSetCurrDimensionStyle(m_dExtLineLen, m_dArrowLen, m_dTextDist, m_nLenIsMM, m_nDecDigit, m_sFont, m_dTextHeight)
             WritePrivateProfileString(S_DIMENSIONSTYLE, K_DECDIGIT, OptionModule.m_nDecDigit.ToString())
diff --git a/Resources/DrawPanel/AngularDimension.png b/Resources/DrawPanel/AngularDimension.png
new file mode 100644
index 0000000000000000000000000000000000000000..b8bed05193c2c0e2f2a0e561c9af521274249a14
GIT binary patch
literal 470
zcmeAS@N?(olHy`uVBq!ia0vp^svyk43?x4}TrdPujKx9jP7LeL$-D$|SkfJR9T^xl
z_H+M9WCijQ0(?STmo8nJkdQEW^5nL*HU|fX=H}+k&d!x9SJv0pH#9VKbaVg}b{~4F
zyXs+6Q&VGO<J75B`}+E3&6?HH(lX)TQ_EGiI}X1zTl3I-&BKKY7pAADm+pSvwExBI
z*|W=bKL_glzwn$VkWwfK@(cctA27tkNWTTD<t*@sEM{QfI|9OtQ?>b|fr6JkT^vI!
z{O?YBDAc6D)3A1ffrGZDuJ*nEy0bUDH2C!AviyGQ_uD?+<-23Fy`?nbW?FY3*QPS1
z^1S*3Ib4xJ9^oCzX~8p8S!ZO<P(8r3LBKGo<q+5N-P41-q<d3UO7&CExFn0!EbVtR
zI_A!@J*M>2#(8f|7xZ@BpRlE&HEhY>O^^P(zqYd_UMIEkpiORQ;-W>zYBsFdBJs85
zruYoQ*Qa#XZ+w<<SL$-q?e#1d-@DiHFHbQw*j0AN@R6Y3$yW!e-1b&|3b&Ab_ti|+
hP4mR8^uN=J<%?S;ym)&gsQ~Cb22WQ%mvv4FO#meb+vWfO

literal 0
HcmV?d00001

diff --git a/Resources/DrawPanel/DiametralDimension.png b/Resources/DrawPanel/DiametralDimension.png
new file mode 100644
index 0000000000000000000000000000000000000000..7e8705e6567049cdb692ef8bcea077d9c138abb4
GIT binary patch
literal 395
zcmeAS@N?(olHy`uVBq!ia0vp^svyk43?x4}TrdPujKx9jP7LeL$-D$|SkfJR9T^xl
z_H+M9WCij?1AIbU4;(m9UtbU8IXE~>y7H7^(F-8^`2Vg%AjMu1<QM!O3>c)mncaXw
zoCO|{#S9F5M?jcysy3fAQ1FeXi(`m||Ix|0!iN-inr~M8{BM6#<!yxHvyYDF@9b=Q
zwsFDjpxYPkuPmAIY+HEOiOg9CZZ~h7G3hhIs}QHA8`sRf%9TqxTvmHfby$1hi2%mU
zo0^o;!gUTu?(R6*5!K(cZl9k21R=3yGFPL{#jtM_)X0q&3)xvF$U0jwb?vn*H(lvx
zB5IbbCk(fFE%7T;aoqY#EB(&$`2p3>t@`|W_X`Sg*1nMcuOAikh12(zf|=6R^6jOY
zSk3G#rM4aTB__9a!*=zk8x>{-<%`*?(%Z~+dHCa>TQrHp_UsAzw$7`-`O#I^3A1j;
e*}tw1$<`0wDamx>cyJNW-wd9velF{r5}E)nZJeC|

literal 0
HcmV?d00001