From 5ea4c63d62e5ad901901ef390ae3fe993591a2e8 Mon Sep 17 00:00:00 2001
From: Dario Sassi <dario.s@egaltech.com>
Date: Mon, 6 May 2019 06:33:05 +0000
Subject: [PATCH] EgtCAM5 2.1e1 : - aggiunto disegno superfici Swept - corretta
 interfaccia lavorazioni Sgrossatura e Finitura con Lama.

---
 Application.xaml.vb                           |   1 +
 DrawPanel/DrawPanelV.xaml                     |   5 +++
 DrawPanel/DrawPanelVM.vb                      |  29 ++++++++++++++++++
 EgtCAM5.vbproj                                |   3 ++
 My Project/AssemblyInfo.vb                    |   4 +--
 .../InputExpander/InputExpanderV.xaml         |   6 ++--
 .../InputExpander/InputExpanderVM.vb          |  21 +++++++++++--
 .../MachiningParameterExpanderV.xaml          |   9 ++++++
 .../MachiningParameterExpanderVM.vb           |   6 ++++
 Resources/DrawPanel/Swept.png                 | Bin 0 -> 2088 bytes
 10 files changed, 78 insertions(+), 6 deletions(-)
 create mode 100644 Resources/DrawPanel/Swept.png

diff --git a/Application.xaml.vb b/Application.xaml.vb
index e556d2e..221308d 100644
--- a/Application.xaml.vb
+++ b/Application.xaml.vb
@@ -103,6 +103,7 @@ Class Application
    Friend Const REVOLVE As String = "Revolve"
    Friend Const SCREW As String = "Screw"
    Friend Const RULED As String = "Ruled"
+   Friend Const SWEPT As String = "Swept"
    Friend Const MERGESURF As String = "MergeSurf"
    Friend Const EXPLODESURF As String = "ExplodeSurf"
    Friend Const INVERTSURF As String = "InvertSurf"
diff --git a/DrawPanel/DrawPanelV.xaml b/DrawPanel/DrawPanelV.xaml
index 6ec3d7b..63a8225 100644
--- a/DrawPanel/DrawPanelV.xaml
+++ b/DrawPanel/DrawPanelV.xaml
@@ -109,6 +109,11 @@
                Command="{Binding ScrewCommand}" IsEnabled="{Binding bLayerOkAndSelOk}">
                <Image Source="/Resources/DrawPanel/Screw.png" Stretch="Uniform"/>
             </Button>
+            <Button ToolTip="{Binding SweptToolTip}" Style="{StaticResource DrawPanelButton}"
+               ToolTipService.ShowOnDisabled="True"
+               Command="{Binding SweptCommand}" IsEnabled="{Binding bLayerOkAndSelOk}">
+               <Image Source="/Resources/DrawPanel/Swept.png" Stretch="Uniform"/>
+            </Button>
             <Button ToolTip="{Binding RuledToolTip}" Style="{StaticResource DrawPanelButton}"
                ToolTipService.ShowOnDisabled="True"
                Command="{Binding RuledCommand}" IsEnabled="{Binding bLayerOkAndSelOk}">
diff --git a/DrawPanel/DrawPanelVM.vb b/DrawPanel/DrawPanelVM.vb
index 5e13364..72247ba 100644
--- a/DrawPanel/DrawPanelVM.vb
+++ b/DrawPanel/DrawPanelVM.vb
@@ -126,6 +126,11 @@ Public Class DrawPanelVM
          Return EgtMsg(MSG_DRAWPANEL + 18)
       End Get
    End Property
+   Public ReadOnly Property SweptToolTip As String
+      Get
+         Return EgtMsg(MSG_DRAWPANEL + 48)
+      End Get
+   End Property
    Public ReadOnly Property RuledToolTip As String
       Get
          Return EgtMsg(MSG_DRAWPANEL + 19)
@@ -355,6 +360,7 @@ Public Class DrawPanelVM
    Private m_cmdExtrude As ICommand
    Private m_cmdRevolve As ICommand
    Private m_cmdScrew As ICommand
+   Private m_cmdSwept As ICommand
    Private m_cmdRuled As ICommand
    Private m_cmdMergeSurf As ICommand
    Private m_cmdExplodeSurf As ICommand
@@ -847,6 +853,29 @@ Public Class DrawPanelVM
 
 #End Region ' ScrewCommand
 
+#Region "SweptCommand"
+
+   ''' <summary>
+   ''' Returns a command that do Swept.
+   ''' </summary>
+   Public ReadOnly Property SweptCommand As ICommand
+      Get
+         If m_cmdSwept Is Nothing Then
+            m_cmdSwept = New RelayCommand(AddressOf Swept)
+         End If
+         Return m_cmdSwept
+      End Get
+   End Property
+
+   ''' <summary>
+   ''' Execute the Ruled.  This method is invoked by the SweptCommand.
+   ''' </summary>
+   Public Sub Swept(ByVal param As Object)
+      Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.SWEPT)
+   End Sub
+
+#End Region ' SweptCommand
+
 #Region "RuledCommand"
 
    ''' <summary>
diff --git a/EgtCAM5.vbproj b/EgtCAM5.vbproj
index 2e20019..92bf586 100644
--- a/EgtCAM5.vbproj
+++ b/EgtCAM5.vbproj
@@ -721,6 +721,9 @@
   <ItemGroup>
     <Resource Include="Resources\GridViewPanel\ZoomSel.png" />
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\DrawPanel\Swept.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 83b0bd1..6ad28b1 100644
--- a/My Project/AssemblyInfo.vb	
+++ b/My Project/AssemblyInfo.vb	
@@ -70,5 +70,5 @@ Imports System.Windows
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("2.1.4.3")>
-<Assembly: AssemblyFileVersion("2.1.4.3")>
+<Assembly: AssemblyVersion("2.1.5.1")>
+<Assembly: AssemblyFileVersion("2.1.5.1")>
diff --git a/OptionPanel/DrawOptionPanel/InputExpander/InputExpanderV.xaml b/OptionPanel/DrawOptionPanel/InputExpander/InputExpanderV.xaml
index ddebd40..98ec228 100644
--- a/OptionPanel/DrawOptionPanel/InputExpander/InputExpanderV.xaml
+++ b/OptionPanel/DrawOptionPanel/InputExpander/InputExpanderV.xaml
@@ -14,8 +14,10 @@
                </Style.Triggers>
             </Style>
          </StackPanel.Style>
-         <TextBlock Text="{Binding TextBlock}" Margin="5,5,0,5"/>
-         <TextBox Text="{Binding TextBox,UpdateSourceTrigger=PropertyChanged}" Margin="5,0,5,5">
+         <TextBlock Text="{Binding TextBlock}"
+                    Visibility="{Binding TextVisibility}" Margin="5,5,0,5"/>
+         <TextBox Text="{Binding TextBox,UpdateSourceTrigger=PropertyChanged}"
+                  Visibility="{Binding TextVisibility}" Margin="5,0,5,5">
             <TextBox.InputBindings>
                <KeyBinding Key="Enter" Command="{Binding DoneCommand}"/>
                <KeyBinding Key="S" Modifiers="Control" Command="{Binding ShowCommand}"/>
diff --git a/OptionPanel/DrawOptionPanel/InputExpander/InputExpanderVM.vb b/OptionPanel/DrawOptionPanel/InputExpander/InputExpanderVM.vb
index 4bcc267..95275d7 100644
--- a/OptionPanel/DrawOptionPanel/InputExpander/InputExpanderVM.vb
+++ b/OptionPanel/DrawOptionPanel/InputExpander/InputExpanderVM.vb
@@ -65,6 +65,19 @@ Public Class InputExpanderVM
       End Set
    End Property
 
+   Private m_TextVisibility As Visibility
+   Public Property TextVisibility As Visibility
+      Get
+         Return m_TextVisibility
+      End Get
+      Set(value As Visibility)
+         If value <> m_TextVisibility Then
+            m_TextVisibility = value
+            OnPropertyChanged("TextVisibility")
+         End If
+      End Set
+   End Property
+
    Private m_FocusTextBox As Boolean
    Public Property FocusTextBox As Boolean
       Get
@@ -282,8 +295,11 @@ Public Class InputExpanderVM
 
    Private Sub PrepareInputBox(PrepareInputBoxParam As PrepareInputBoxParam)
       Title = PrepareInputBoxParam.sTitle
-      TextBlock = PrepareInputBoxParam.sLabel
-      TextBox = ""
+      If PrepareInputBoxParam.sLabel <> "" Then
+         TextBlock = PrepareInputBoxParam.sLabel
+         TextBox = ""
+         TextVisibility = Visibility.Visible
+      End If
       If PrepareInputBoxParam.sCheckLabel <> "" Then
          CheckBoxText = PrepareInputBoxParam.sCheckLabel
          CheckVisibility = Visibility.Visible
@@ -302,6 +318,7 @@ Public Class InputExpanderVM
 
    Private Sub ResetInputBox()
       Title = EgtMsg(MSG_DRAWOPTION + 5)
+      TextVisibility = Visibility.Collapsed
       CheckVisibility = Visibility.Collapsed
       ComboVisibility = Visibility.Collapsed
       ShowBtnVisibility = Visibility.Collapsed
diff --git a/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/MachiningParameterExpanderV.xaml b/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/MachiningParameterExpanderV.xaml
index 9a26b34..5f0b761 100644
--- a/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/MachiningParameterExpanderV.xaml
+++ b/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/MachiningParameterExpanderV.xaml
@@ -360,6 +360,15 @@
                             IsSynchronizedWithCurrentItem="True">
             </ComboBox>
          </UniformGrid>
+         <UniformGrid Columns="2" Visibility="{Binding Type,
+                                                       Converter={StaticResource OperationParamVisibilityConverter},
+                                                       ConverterParameter={StaticResource LeadLinkType}}">
+            <TextBlock Text="{Binding LeadLinkTypeMsg}"/>
+            <ComboBox ItemsSource="{Binding LeadLinkTypeList, Mode=OneWay}"
+                            SelectedIndex="{Binding SelectedLeadLinkType}"
+                            IsSynchronizedWithCurrentItem="True">
+            </ComboBox>
+         </UniformGrid>
          <Expander Visibility="{Binding Type,
                                         Converter={StaticResource OperationParamVisibilityConverter},
                                         ConverterParameter={StaticResource CurveUse}}"
diff --git a/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/MachiningParameterExpanderVM.vb b/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/MachiningParameterExpanderVM.vb
index 5fde1a0..e237eb5 100644
--- a/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/MachiningParameterExpanderVM.vb
+++ b/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/MachiningParameterExpanderVM.vb
@@ -1518,6 +1518,12 @@ Public Class MachiningParameterExpanderVM
       End Get
    End Property
 
+   Public ReadOnly Property LeadLinkTypeMsg As String
+      Get
+         Return EgtMsg(MSG_MACHININGSDBPAGE + 62)
+      End Get
+   End Property
+
    Public ReadOnly Property StepParMsg As String
       Get
          Return EgtMsg(MSG_MACHININGSDBPAGE + 77)
diff --git a/Resources/DrawPanel/Swept.png b/Resources/DrawPanel/Swept.png
new file mode 100644
index 0000000000000000000000000000000000000000..88f86ee1018b303d21ffbdafd29c95011af0d9dc
GIT binary patch
literal 2088
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
S?kX+-0000<MNUMnLSTYuV(WYW

literal 0
HcmV?d00001