EgtCAM5 2.1h1 :
- richiesta versione licenza 21 - aggiunto comando ModifyText.
This commit is contained in:
@@ -207,6 +207,11 @@
|
||||
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}">
|
||||
<Image Source="/Resources/DrawPanel/ModifyText.png" Stretch="Uniform"/>
|
||||
</Button>
|
||||
</UniformGrid>
|
||||
</Expander>
|
||||
<Expander Name="Transform" Style="{StaticResource ExpanderStyle}" Grid.Row="3" IsExpanded="{Binding TransformIsExpanded}">
|
||||
|
||||
@@ -204,7 +204,6 @@ Public Class DrawPanelVM
|
||||
Return EgtMsg(MSG_DRAWPANEL + 32)
|
||||
End Get
|
||||
End Property
|
||||
|
||||
Public ReadOnly Property JoinCurveToolTip As String
|
||||
Get
|
||||
Return EgtMsg(MSG_DRAWPANEL + 33)
|
||||
@@ -220,6 +219,11 @@ Public Class DrawPanelVM
|
||||
Return EgtMsg(MSG_DRAWPANEL + 35)
|
||||
End Get
|
||||
End Property
|
||||
Public ReadOnly Property ModifyTextToolTip As String
|
||||
Get
|
||||
Return EgtMsg(MSG_DRAWPANEL + 49)
|
||||
End Get
|
||||
End Property
|
||||
|
||||
Public ReadOnly Property MoveToolTip As String
|
||||
Get
|
||||
@@ -384,6 +388,7 @@ Public Class DrawPanelVM
|
||||
Private m_cmdJoinCurve As ICommand
|
||||
Private m_cmdExplodeCurve As ICommand
|
||||
Private m_cmdSetCurveTh As ICommand
|
||||
Private m_cmdModifyText As ICommand
|
||||
Private m_cmdMove As ICommand
|
||||
Private m_cmdRotate As ICommand
|
||||
Private m_cmdRotate3D As ICommand
|
||||
@@ -1283,6 +1288,29 @@ Public Class DrawPanelVM
|
||||
|
||||
#End Region ' SetCurveThCommand
|
||||
|
||||
#Region "ModifyTextCommand"
|
||||
|
||||
''' <summary>
|
||||
''' Returns a command that do ModifyText.
|
||||
''' </summary>
|
||||
Public ReadOnly Property ModifyTextCommand As ICommand
|
||||
Get
|
||||
If m_cmdModifyText Is Nothing Then
|
||||
m_cmdModifyText = New RelayCommand(AddressOf ModifyText)
|
||||
End If
|
||||
Return m_cmdModifyText
|
||||
End Get
|
||||
End Property
|
||||
|
||||
''' <summary>
|
||||
''' Execute the ModifyText. This method is invoked by the ModifyTextCommand.
|
||||
''' </summary>
|
||||
Public Sub ModifyText(ByVal param As Object)
|
||||
Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.MODIFYTEXT)
|
||||
End Sub
|
||||
|
||||
#End Region ' ModifyTextCommand
|
||||
|
||||
#Region "MoveCommand"
|
||||
|
||||
''' <summary>
|
||||
|
||||
@@ -731,6 +731,9 @@
|
||||
<ItemGroup>
|
||||
<Resource Include="Resources\DrawPanel\Swept.png" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Resource Include="Resources\DrawPanel\ModifyText.png" />
|
||||
</ItemGroup>
|
||||
<Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
|
||||
<PropertyGroup>
|
||||
<PostBuildEvent>IF "$(PlatformName)"=="x86" IF "$(ConfigurationName)" == "Release" copy $(TargetPath) c:\EgtProg\EgtCAM5\EgtCAM5R32.exe
|
||||
|
||||
@@ -326,8 +326,8 @@ Public Class MainWindowVM
|
||||
EgtUILib.GetPrivateProfileString(S_LICENCE, K_KEY, "", sKey, sLicFile)
|
||||
EgtSetKey(sKey)
|
||||
' Recupero livello e opzioni della chiave
|
||||
Dim bKey As Boolean = EgtGetKeyLevel(3279, 19, 1, IniFile.m_nKeyLevel) And
|
||||
EgtGetKeyOptions(3279, 19, 1, IniFile.m_nKeyOptions)
|
||||
Dim bKey As Boolean = EgtGetKeyLevel(3279, 21, 1, IniFile.m_nKeyLevel) And
|
||||
EgtGetKeyOptions(3279, 21, 1, IniFile.m_nKeyOptions)
|
||||
' Inizializzazione generale di EgtInterface
|
||||
m_nDebug = GetPrivateProfileInt(S_GENERAL, K_DEBUG, 0)
|
||||
IniFile.m_sLogFile = m_sTempDir & "\" & GENLOG_FILE_NAME.Replace("#", IniFile.m_nInstance.ToString())
|
||||
|
||||
@@ -70,5 +70,5 @@ Imports System.Windows
|
||||
' by using the '*' as shown below:
|
||||
' <Assembly: AssemblyVersion("1.0.*")>
|
||||
|
||||
<Assembly: AssemblyVersion("2.1.7.8")>
|
||||
<Assembly: AssemblyFileVersion("2.1.7.8")>
|
||||
<Assembly: AssemblyVersion("2.1.8.1")>
|
||||
<Assembly: AssemblyFileVersion("2.1.8.1")>
|
||||
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 749 B |
Reference in New Issue
Block a user