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 @@  @@ -18,7 +18,7 @@ - + @@ -43,7 +43,7 @@ + + ''' Returns a command that do Linear Dimension. + ''' + 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 + + ''' + ''' Execute the LinearDimension. This method is invoked by the LinDimCommand. + ''' + 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" ''' diff --git a/EgtCAM5.vbproj b/EgtCAM5.vbproj index 5e33cbc..2f5951d 100644 --- a/EgtCAM5.vbproj +++ b/EgtCAM5.vbproj @@ -774,6 +774,12 @@ + + + + + + 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 - + @@ -70,5 +70,5 @@ Imports System.Windows ' by using the '*' as shown below: ' - - + + 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 0000000..706c9e8 Binary files /dev/null and b/Resources/DrawPanel/LinearDimension.png differ diff --git a/Resources/TreeView/Dimension.ico b/Resources/TreeView/Dimension.ico new file mode 100644 index 0000000..13fe907 Binary files /dev/null and b/Resources/TreeView/Dimension.ico differ