From a2059f6f8dc77ca4c7686eb08f0c22ab614f0690 Mon Sep 17 00:00:00 2001
From: Dario Sassi <dario.s@egaltech.com>
Date: Mon, 30 Dec 2019 19:07:47 +0000
Subject: [PATCH] EgtCAM5 2.2a1 : - in About aggiunte informazioni su CPU -
 aggiunta gestione quotature lineari.

---
 AboutBoxWindow/AboutBoxView.xaml              |   6 +--
 AboutBoxWindow/AboutBoxView.xaml.vb           |   3 ++
 DrawPanel/DrawPanelV.xaml                     |   5 +++
 DrawPanel/DrawPanelVM.vb                      |  35 +++++++++++++++++-
 EgtCAM5.vbproj                                |   6 +++
 My Project/AssemblyInfo.vb                    |   6 +--
 .../ManageLayerExpanderVM.vb                  |   2 +
 Resources/DrawPanel/LinearDimension.png       | Bin 0 -> 921 bytes
 Resources/TreeView/Dimension.ico              | Bin 0 -> 318 bytes
 9 files changed, 56 insertions(+), 7 deletions(-)
 create mode 100644 Resources/DrawPanel/LinearDimension.png
 create mode 100644 Resources/TreeView/Dimension.ico

diff --git a/AboutBoxWindow/AboutBoxView.xaml b/AboutBoxWindow/AboutBoxView.xaml
index 702b54f..cf409be 100644
--- a/AboutBoxWindow/AboutBoxView.xaml
+++ b/AboutBoxWindow/AboutBoxView.xaml
@@ -1,7 +1,7 @@
 <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"
+    Title="AboutBox" Height="400" Width="360" WindowStyle="None" ResizeMode="NoResize"
     ShowInTaskbar="False" WindowStartupLocation="CenterOwner">
 
    <Border BorderThickness="2" BorderBrush="LightBlue">
@@ -18,7 +18,7 @@
             <RowDefinition Height="0.5*"/>
             <RowDefinition Height="0.5*"/>
             <RowDefinition Height="0.5*"/>
-            <RowDefinition Height="2*"/>
+            <RowDefinition Height="2.5*"/>
             <RowDefinition Height="0.35*"/>
             <RowDefinition Height="0.5*"/>
             <RowDefinition Height="0.35*"/>
@@ -43,7 +43,7 @@
          <TextBox Name="InfoLbl" Grid.Column="1" Grid.Row="6" HorizontalAlignment="Stretch"
                VerticalAlignment="Stretch" FontSize="12" IsReadOnly="True" TextWrapping="Wrap"/>
          <Button Name="ExitBtn" Grid.Column="1" Grid.Row="8" IsCancel="True"
-               Margin="1,0"/>
+               Margin="100,0"/>
 
       </Grid>
 
diff --git a/AboutBoxWindow/AboutBoxView.xaml.vb b/AboutBoxWindow/AboutBoxView.xaml.vb
index 45940bf..cebbbf7 100644
--- a/AboutBoxWindow/AboutBoxView.xaml.vb
+++ b/AboutBoxWindow/AboutBoxView.xaml.vb
@@ -28,6 +28,9 @@ Public Class AboutBoxWndV
          sInfo &= "Only Draw Mode" & Environment.NewLine
       End If
       If IniFile.IsActiveDoors() Then sInfo &= "Doors " & IniFile.m_sDoorsDirPath & Environment.NewLine
+      Dim sCPU As String = String.Empty
+      EgtGetCpuInfo( sCPU)
+      sInfo &= sCPU & Environment.NewLine
       Dim sScene As String = String.Empty
       EgtGetSceneInfo(sScene)
       sInfo &= sScene
diff --git a/DrawPanel/DrawPanelV.xaml b/DrawPanel/DrawPanelV.xaml
index 36042cf..78f7364 100644
--- a/DrawPanel/DrawPanelV.xaml
+++ b/DrawPanel/DrawPanelV.xaml
@@ -82,6 +82,11 @@
                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>
       </Expander>
       <Expander Name="Draw3D" Style="{StaticResource ExpanderStyle}" Grid.Row="1"
diff --git a/DrawPanel/DrawPanelVM.vb b/DrawPanel/DrawPanelVM.vb
index 4e7b5d5..30820ad 100644
--- a/DrawPanel/DrawPanelVM.vb
+++ b/DrawPanel/DrawPanelVM.vb
@@ -102,7 +102,12 @@ Public Class DrawPanelVM
    End Property
    Public ReadOnly Property TextToolTip As String
       Get
-         Return EgtMsg(MSG_DRAWPANEL + 14)
+         Return EgtMsg( 5214)
+      End Get
+   End Property
+   Public ReadOnly Property LinearDimensionToolTip As String
+      Get
+         Return EgtMsg( 5155)
       End Get
    End Property
 
@@ -391,6 +396,7 @@ Public Class DrawPanelVM
    Private m_cmdPolygon As ICommand
    Private m_cmdPolygonSide As ICommand
    Private m_cmdText As ICommand
+   Private m_cmdLinDim As ICommand
    Private m_cmdPlane As ICommand
    Private m_cmdExtrude As ICommand
    Private m_cmdRevolve As ICommand
@@ -798,6 +804,33 @@ Public Class DrawPanelVM
 
 #End Region ' TextCommand
 
+#Region "LinearDimensionCommand"
+
+   ''' <summary>
+   ''' Returns a command that do Linear Dimension.
+   ''' </summary>
+   Public ReadOnly Property LinearDimensionCommand As ICommand
+      Get
+         If m_cmdLinDim Is Nothing Then
+            m_cmdLinDim = New RelayCommand(AddressOf LinearDimension)
+         End If
+         Return m_cmdLinDim
+      End Get
+   End Property
+
+   ''' <summary>
+   ''' Execute the LinearDimension.  This method is invoked by the LinDimCommand.
+   ''' </summary>
+   Public Sub LinearDimension(ByVal param As Object)
+      If (Keyboard.Modifiers And ModifierKeys.Shift) <> ModifierKeys.Shift Then
+         Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.LINEARDIMENSION)
+      Else
+         Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.ALIGNEDDIMENSION)
+      End If
+   End Sub
+
+#End Region ' LinearDimensionCommand
+
 #Region "PlaneCommand"
 
    ''' <summary>
diff --git a/EgtCAM5.vbproj b/EgtCAM5.vbproj
index 5e33cbc..2f5951d 100644
--- a/EgtCAM5.vbproj
+++ b/EgtCAM5.vbproj
@@ -774,6 +774,12 @@
   <ItemGroup>
     <Resource Include="Resources\DrawPanel\IntersectSurfSurf.png" />
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\TreeView\Dimension.ico" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\DrawPanel\LinearDimension.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/My Project/AssemblyInfo.vb b/My Project/AssemblyInfo.vb
index 346752d..b062aee 100644
--- a/My Project/AssemblyInfo.vb	
+++ b/My Project/AssemblyInfo.vb	
@@ -30,7 +30,7 @@ Imports System.Windows
 #End If
 <Assembly: AssemblyCompany("EgalTech s.r.l.")> 
 <Assembly: AssemblyProduct("EgtCAM5")> 
-<Assembly: AssemblyCopyright("Copyright ©  2016-2019 by EgalTech s.r.l.")> 
+<Assembly: AssemblyCopyright("Copyright ©  2016-2020 by EgalTech s.r.l.")> 
 <Assembly: AssemblyTrademark("")> 
 <Assembly: ComVisible(false)>
 
@@ -70,5 +70,5 @@ Imports System.Windows
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("2.1.12.7")> 
-<Assembly: AssemblyFileVersion("2.1.12.7")> 
+<Assembly: AssemblyVersion("2.2.1.1")> 
+<Assembly: AssemblyFileVersion("2.2.1.1")> 
diff --git a/OptionPanel/DrawOptionPanel/ManageLayerExpander/ManageLayerExpanderVM.vb b/OptionPanel/DrawOptionPanel/ManageLayerExpander/ManageLayerExpanderVM.vb
index d17edc4..c6c3f8e 100644
--- a/OptionPanel/DrawOptionPanel/ManageLayerExpander/ManageLayerExpanderVM.vb
+++ b/OptionPanel/DrawOptionPanel/ManageLayerExpander/ManageLayerExpanderVM.vb
@@ -747,6 +747,8 @@ Public Class ManageLayerExpanderVM
             Return "/Resources/TreeView/VolZmap.ico"
          Case GDB_TY.EXT_TEXT
             Return "/Resources/TreeView/Text.ico"
+         Case GDB_TY.EXT_DIMENSION
+            Return "/Resources/TreeView/Dimension.ico"
       End Select
       Return ""
    End Function
diff --git a/Resources/DrawPanel/LinearDimension.png b/Resources/DrawPanel/LinearDimension.png
new file mode 100644
index 0000000000000000000000000000000000000000..706c9e82268aadb295158850eb3f64af654fc02d
GIT binary patch
literal 921
zcmV;K17`e*P)<h;3K|Lk000e1NJLTq001Qb001Qj1^@s6#hxGo00001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGf6951U69E94oEQKA11?EKK~z{r?UzkR
zltCEBXEk)!4=63QGPDnqE=8qu)LTM_Fb`!1p^y&Np-vG*ZI`-ssY92-gA`#~LZlR=
zK_9m$Du^-(J?NICw)XC-uiN}*pIP6Tef6DXm-4Vbc$|6W<C*_EUpxBZ@i<#;<Wah+
z$cZu~C(0D%^jVhW3rFml@6+~GDq>A_YmaC9gueJX-9uT{xVfM!5C}|>D^Ns@gd;o0
zXYGN|uvI%WJ;z!r{PxlM;`duCiuX|yfzRiooHzOhjf7{%?|h6@hJMCa>-s|0R#!B<
zySj7-RST5m8=bL(Tu@E_uQ_HdG8PI)^B;Vg+U5K*fPqZS3F7pAo)v-s(%vtBwhPCB
zB5G!Sv6c%;P6LGX{;>SyW`*wYDCH7Jfld@rWrcY!Th<kj$5;`s?buk9+A9OPssofu
zfF;yX_SCnDNJVrZ{((>FhR2gJ)>$2xYux02wr5M}A!;JXWKX>t{r%?kSoFZnF^hFn
z`B__i@dV$qRa7ldL}9S|eFJ5-ZTH#pv4)r(51nj3(yj;2l-qYh{r)w12crv%11FBP
zwovgB7*ID(u(`PznV?&Jrsfqt<?_^*2ELo=xV2f%oajDC5w#k~i83W8%9IpQIFe4}
zG4(>WbDEA@xm&w*X6h2RbBS!)ba6v}BaB4xy9Afr6`n0gl&Ii2B8`f4%F!Qj$X^jp
zQ6%Uxx%rePFG2{xbL8;QWF=DgvJTMlh<=EJc*w7WrznRY34#i{_wdPc2$9bbr0`KL
z+vp-(;-%pF&nN<!bUt<ZEV~xpOWqO}d~eyU8`sHOp25LEYzguE=VZm1qE1QRI}N|`
zcz!s6k8-^&RSR@q$8-5y0wkA@KWkd>9+JZ3`v~Q-4W9*N`Md-HlhYUEfn;Et(&U|k
z2O5MtYAT;Vx~;NAeXu1qyoEm$M-l0^eH2j$KtUEn0b}!&VhJwt)b+?im^3L?8*GI4
zKhIM+OEP|p##2anc@mx68o0gU_1&T*i|}#I@MJ%?r`&q94_H=|Cwd?^OylXXl;uOE
v$zT8jrt=Z$;CfH}Z%j_#KPM;3495Nf7H1i_Q1#x_00000NkvXXu0mjf^7F0a

literal 0
HcmV?d00001

diff --git a/Resources/TreeView/Dimension.ico b/Resources/TreeView/Dimension.ico
new file mode 100644
index 0000000000000000000000000000000000000000..13fe907208c36860db00974f74c831617ca8bfa6
GIT binary patch
literal 318
zcmah_K?;O044lF~peN5BeP;gP(Su*<RVeiAQv@N-w5W)}CY>amOxsW(&|{1Mei#DK
zu^I?5JrT&uti~496Pj6TnpKS=OTv&+qQvWhyDEY%O8Y;ym)*TEmh7IHbG194{H4={
b(tqdobDHDEv;yP8+4&EGYH{=S#ChfbXmzIX

literal 0
HcmV?d00001