EgtCAM5 :

- aggiunto bottone per comando GRID_INVERT.

AboutBoxWindow/AboutBoxView.xaml.vb

@@ -14,11 +14,23 @@ Public Class AboutBoxWndV
       Dim sLeftDays As String = ""
       Dim nLeftDays As Integer 
       if EgtGetKeyLeftDays( nLeftDays) AndAlso nLeftDays < 500 Then sLeftDays= " (" & nLeftDays.ToString() & ")"
+      Dim sAssStatus As String = " discontinued"
+      Dim nAssLeftDays As Integer
+      If EgtGetKeyAssLeftDays( nAssLeftDays) And nAssLeftDays >= 0 Then
+         If nAssLeftDays > 30 then
+            sAssStatus = "expires within " & nAssLeftDays.ToString() & " days"
+         Else If nAssLeftDays > 0 then
+            sAssStatus = "to be renewed within " & nAssLeftDays.ToString() & " days"
+         Else  
+            sAssStatus = "to be renewed by today"
+         End If
+      End If
       sInfo = If( EgtIsDebug(), "*** Debug Libraries ***" & Environment.NewLine, "") 
       sInfo &= "User " & Environment.MachineName & "\" & Environment.UserName &
                "  Inst" & IniFile.m_nInstance.ToString() &
                " Ulv" & IniFile.m_nUserLevel.ToString() & " Dbg" &  Map.refMainWindowVM.DebugLevel().ToString() & Environment.NewLine
       sInfo &= sKey & " - " & sKlev & " - " & sOpts & sLeftDays & Environment.NewLine
+      sInfo &= "SupportPlane " & sAssStatus & Environment.NewLine
       sInfo &= "DataRoot " & IniFile.m_sDataRoot & Environment.NewLine
       If IniFile.m_ProjectMode <> ProjectModeOpt.ONLYDRAW Then
          sInfo &= "MachinesRoot " & IniFile.m_sMachinesRoot & Environment.NewLine

Constants/ConstIni.vb

@@ -47,7 +47,6 @@ Module ConstIni
 
    Public Const S_LUA As String = "Lua"
    Public Const K_LIBSDIR As String = "LibsDir"
-   Public Const K_LIBSDIR64 As String = "LibsDir64"
    Public Const K_BASELIB As String = "BaseLib"
    Public Const K_BWSIM As String = "BWSim"
 
@@ -109,6 +108,7 @@ Module ConstIni
    Public Const K_CNCFLAG As String = "CncFlag"
    Public Const K_BTLFLAG As String = "BtlFlag"
    Public Const K_BTLAUXDIR As String = "BtlAuxDir"
+   Public Const K_ADVFLAG As String = "AdvFlag"
 
    Public Const S_EXPORT As String = "Export"
    Public Const K_DXFFLAG As String = "DxfFlag"
@@ -123,7 +123,6 @@ Module ConstIni
    Public Const S_BEAM As String = "Beam"
    Public Const K_BEAMENABLE As String = "BtlEnable"
    Public Const K_BEAMBASEDIR As String = "BaseDir"
-   Public Const K_BEAMBASEDIR64 As String = "BaseDir64"
    Public Const K_BEAMBTLEXEC As String = "BtlExec"
    Public Const K_BEAMBWEEXEC As String = "BweExec"
    Public Const K_BEAMMACHINES As String = "Machines"
@@ -132,7 +131,6 @@ Module ConstIni
    Public Const S_WALL As String = "Wall"
    Public Const K_WALLENABLE As String = "BtlEnable"
    Public Const K_WALLBASEDIR As String = "BaseDir"
-   Public Const K_WALLBASEDIR64 As String = "BaseDir64"
    Public Const K_WALLBTLEXEC As String = "BtlExec"
    Public Const K_WALLBWEEXEC As String = "BweExec"
    Public Const K_WALLBUTTON As String = "Button"
@@ -172,7 +170,6 @@ Module ConstIni
    Public Const S_MACH As String = "Mach"
    Public Const K_MACHINESDIR As String = "MachinesDir"
    Public Const K_TOOLMAKERSDIR As String = "ToolMakersDir"
-   Public Const K_TOOLMAKERSDIR64 As String = "ToolMakersDir64"
    Public Const K_CURRMACH As String = "CurrMach"
    Public Const K_SELGEOMSAWING As String = "SelGeomSawing"
    Public Const K_SELGEOMDRILLING As String = "SelGeomDrilling"

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}">
@@ -177,6 +187,11 @@
                Command="{Binding ApproxSurfCommand}" IsEnabled="{Binding bSelOk}">
                <Image Source="/Resources/DrawPanel/ApproxSurf.png" Stretch="Uniform"/>
             </Button>
+            <Button ToolTip="{Binding StmMoveVertexFacetToolTip}" Style="{StaticResource DrawPanelButton}"
+               ToolTipService.ShowOnDisabled="True"
+               Command="{Binding MoveStmVertexFacetCommand}" IsEnabled="{Binding bSelOk}">
+               <Image Source="/Resources/DrawPanel/StmMoveVertex.png" Stretch="Uniform"/>
+            </Button>
          </UniformGrid>
       </Expander>
       <Expander Name="Modify" Style="{StaticResource ExpanderStyle}" Grid.Row="2" IsExpanded="{Binding ModifyIsExpanded}">
@@ -194,8 +209,11 @@
                Command="{Binding ChangeLayerCommand}" IsEnabled="{Binding bSelOk}">
                <Image Source="/Resources/DrawPanel/ChangeLayer.png" Stretch="Uniform"/>
             </Button>
-            <Button Style="{StaticResource DrawPanelButton}"
-                    Visibility="Hidden"/>
+            <Button ToolTip="{Binding ChangeStatusToolTip}" Style="{StaticResource DrawPanelButton}"
+               ToolTipService.ShowOnDisabled="True"
+               Command="{Binding ChangeStatusCommand}" IsEnabled="{Binding bSelOk}">
+               <Image Source="/Resources/DrawPanel/ChangeStatus.png" Stretch="Uniform"/>
+            </Button>
             <Button ToolTip="{Binding ChangeColorToolTip}" Style="{StaticResource DrawPanelButton}"
                ToolTipService.ShowOnDisabled="True"
                Command="{Binding ChangeColorCommand}" IsEnabled="{Binding bSelOk}">

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
 
@@ -151,6 +161,11 @@ Public Class DrawPanelVM
          Return EgtMsg( 5165)         'Approssima Superfici e Regioni Piane
       End Get
    End Property
+   Public ReadOnly Property StmMoveVertexFacetToolTip As String
+      Get
+         Return EgtMsg( 5166)         'Muovi Vertice di Superficie<br/>Muovi Faccia di Superficie (Shift)
+      End Get
+   End Property
    Public ReadOnly Property ExtractSurfFacetToolTip As String
       Get
          Return EgtMsg( 5158)         'Estrai Faccia da Superficie
@@ -202,6 +217,12 @@ Public Class DrawPanelVM
          Return EgtMsg(MSG_DRAWPANEL + 24)
       End Get
    End Property
+   Public ReadOnly Property ChangeStatusToolTip As String
+      Get
+         Return EgtMsg(5250)
+      End Get
+   End Property
+
    Public ReadOnly Property ChangeAlphaToolTip As String
       Get
          Return EgtMsg(MSG_DRAWPANEL + 25)
@@ -455,6 +476,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
@@ -466,6 +489,7 @@ Public Class DrawPanelVM
    Private m_cmdMergeSurf As ICommand
    Private m_cmdExplodeSurf As ICommand
    Private m_cmdApproxSurf As ICommand
+   Private m_cmdMoveStmVertexFacet As ICommand
    Private m_cmdExtractSurfFacet As ICommand
    Private m_cmdInvertSurf As ICommand
    Private m_cmdExtractLoops As ICommand
@@ -476,6 +500,7 @@ Public Class DrawPanelVM
    Private m_cmdIntersectSurfSurf As ICommand
    Private m_cmdDelete As ICommand
    Private m_cmdChangeLayer As ICommand
+   Private m_cmdChangeStatus As ICommand
    Private m_cmdChangeAlpha As ICommand
    Private m_cmdResetColor As ICommand
    Private m_cmdChangeColor As ICommand
@@ -714,7 +739,11 @@ Public Class DrawPanelVM
    ''' Execute the Arc3P.  This method is invoked by the Arc3PCommand.
    ''' </summary>
    Public Sub Arc3P(ByVal param As Object)
-      Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.ARC3P)
+      If (Keyboard.Modifiers And ModifierKeys.Shift) = ModifierKeys.Shift Then
+         Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.ARC2PR)
+      Else
+         Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.ARC3P)
+      End If
    End Sub
 
 #End Region ' Arc3PCommand
@@ -737,13 +766,12 @@ Public Class DrawPanelVM
    ''' Execute the ArcPDP.  This method is invoked by the ArcPDPCommand.
    ''' </summary>
    Public Sub ArcPDP(ByVal param As Object)
-      If (Keyboard.Modifiers And ModifierKeys.Shift) <> ModifierKeys.Shift Then
-         If (Keyboard.Modifiers And ModifierKeys.Control) = ModifierKeys.Control Then
-            Map.refProjectVM.GetController.SetContinue()
-         End If
-         Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.ARCPDP)
-      Else
+      If (Keyboard.Modifiers And ModifierKeys.Shift) = ModifierKeys.Shift Then
          Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.ARCPVP)
+      ElseIf (Keyboard.Modifiers And ModifierKeys.Control) = ModifierKeys.Control Then
+         Map.refProjectVM.GetController.SetContinue()
+      Else
+         Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.ARCPDP)
       End If
    End Sub
 
@@ -872,6 +900,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>
@@ -1195,6 +1277,33 @@ Public Class DrawPanelVM
 
 #End Region ' ApproxSurfCommand
 
+#Region "MoveStmVertexFacetCommand"
+
+   ''' <summary>
+   ''' Returns a command that do MoveStmVertex.
+   ''' </summary>
+   Public ReadOnly Property MoveStmVertexFacetCommand As ICommand
+      Get
+         If m_cmdMoveStmVertexFacet Is Nothing Then
+            m_cmdMoveStmVertexFacet = New RelayCommand(AddressOf MoveStmVertexFacet)
+         End If
+         Return m_cmdMoveStmVertexFacet
+      End Get
+   End Property
+
+   ''' <summary>
+   ''' Execute the MoveStmVertexFacet.  This method is invoked by the MoveStmVertexFacetCommand.
+   ''' </summary>
+   Public Sub MoveStmVertexFacet(ByVal param As Object)
+      If (Keyboard.Modifiers And ModifierKeys.Shift) = ModifierKeys.Shift Then
+         Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.MOVESURFFACET)
+      Else
+         Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.MOVESURFVERTEX)
+      End If
+   End Sub
+
+#End Region ' MoveStmVertexFacetCommand
+
 #Region "ExtractSurfFacetCommand"
 
    ''' <summary>
@@ -1438,6 +1547,41 @@ Public Class DrawPanelVM
 
 #End Region ' ChangeLayerCommand
 
+#Region "ChangeStatusCommand"
+
+   ''' <summary>
+   ''' Returns a command that do ChangeStatus.
+   ''' </summary>
+   Public ReadOnly Property ChangeStatusCommand As ICommand
+      Get
+         If m_cmdChangeStatus Is Nothing Then
+            m_cmdChangeStatus = New RelayCommand(AddressOf ChangeStatus)
+         End If
+         Return m_cmdChangeStatus
+      End Get
+   End Property
+
+   ''' <summary>
+   ''' Execute the ChangeStatus.  This method is invoked by the ChangeStatusCommand.
+   ''' </summary>
+   Public Sub ChangeStatus(ByVal param As Object)
+      If (Keyboard.Modifiers And ModifierKeys.Control) = ModifierKeys.Control Then
+         Map.refProjectVM.GetController.SetLastInteger( GDB_ID.SELPART)
+         Map.refProjectVM.GetController.SetLastBoolean( True)
+         Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.CHANGESTATUS)
+      ElseIf (Keyboard.Modifiers And ModifierKeys.Shift) = ModifierKeys.Shift Then
+         Map.refProjectVM.GetController.SetLastInteger( GDB_ID.SELLAYER)
+         Map.refProjectVM.GetController.SetLastBoolean( True)
+         Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.CHANGESTATUS)
+      Else
+         Map.refProjectVM.GetController.SetLastInteger( GDB_ID.SEL)
+         Map.refProjectVM.GetController.SetLastBoolean( False)
+         Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.CHANGESTATUS)
+      End If
+   End Sub
+
+#End Region ' ChangeStatusCommand
+
 #Region "ChangeAlphaCommand"
 
    ''' <summary>

EgtCAM5.vbproj

@@ -1002,6 +1002,21 @@
   <ItemGroup>
     <Resource Include="Resources\EgtCAM5_64.ico" />
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\DrawPanel\StmMoveVertex.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\DrawPanel\AngularDimension.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\DrawPanel\DiametralDimension.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\DrawPanel\ChangeStatus.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\GridViewPanel\CplaneINVERT.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
   <PropertyGroup>
     <PostBuildEvent>IF "$(PlatformName)"=="x86" IF "$(ConfigurationName)" == "Release" copy $(TargetPath) c:\EgtProg\EgtCAM5\EgtCAM5R32.exe

GridPanel/GridPanelVM.vb

@@ -12,13 +12,8 @@ Public Class GridPanelVM
    Private m_cmdCPlaneBack As ICommand
    Private m_cmdCPlaneLeft As ICommand
    Private m_cmdCPlaneBottom As ICommand
-   Private m_cmdCPlaneView As ICommand
    Private m_cmdCPlaneElevation As ICommand
    Private m_cmdCPlaneOrigin As ICommand
-   Private m_cmdCPlaneRotate As ICommand
-   Private m_cmdCPlane3P As ICommand
-   Private m_cmdCPlanePerpObj As ICommand
-   Private m_cmdCPlaneObj As ICommand
 
 #Region "ToolTip"
 

MachGroupPanel/MyMachGroupPanelVM.vb

@@ -118,10 +118,12 @@ Public Class MyMachGroupPanelVM
       End If
    End Function
 
-   Private Function ExecScript(sScriptPath As String, nGroupId As Integer, nPartId As Integer) As Boolean
+   Private Function ExecScript(sScriptPath As String, nGroupId As Integer, nPartId As Integer, nInd As Integer, sParts As String) As Boolean
       EgtLuaCreateGlobTable("DISP")
       EgtLuaSetGlobIntVar("DISP.GROUPID", nGroupId)
       EgtLuaSetGlobIntVar("DISP.PARTID", nPartId)
+      EgtLuaSetGlobIntVar("DISP.IND", nInd)
+      EgtLuaSetGlobStringVar("DISP.PARTS", sParts)
       If Not EgtLuaExecFile(sScriptPath) Then
          EgtOutLog("Error executing disposition init script " & sScriptPath)
          MessageBox.Show(EgtMsg(MSG_DISPOSITIONERRORS + 2) & " " & sScriptPath, EgtMsg(MSG_DISPOSITIONERRORS + 1), MessageBoxButton.OK, MessageBoxImage.Error)
@@ -164,10 +166,25 @@ Public Class MyMachGroupPanelVM
       If bWithScript Then
          ' Rendo corrente il gruppo di lavoro
          EgtSetCurrMachGroup(nGroupId)
-         ' Creo grezzo e posiziono i pezzi
+         ' Recupero i pezzi già inseriti
+         Dim sParts As String = ""
+         Dim nInd As Integer = 0
+         Dim nRawId As Integer = EgtGetFirstRawPart()
+         While nRawId <> GDB_ID.NULL
+            Dim nPartId As Integer = EgtGetFirstPartInRawPart( nRawId)
+            While nPartId <> GDB_ID.NULL
+               nInd += 1
+               sParts &= nInd.ToString() & ","
+               nPartId = EgtGetNextPartInRawPart( nPartId)
+            End While
+            nRawId = EgtGetNextRawPart( nRawId)
+         End While 
+         ' Creo grezzi e posiziono i pezzi
          Dim bOk As Boolean = True
+         sParts &= String.Join( ",", PartList)
          For Each Part In PartList
-            If Not ExecScript(sInitScriptPath, nGroupId, Part) Then bOk = False
+            nInd += 1
+            If Not ExecScript(sInitScriptPath, nGroupId, Part, nInd, sParts) Then bOk = False
          Next
          Return bOk
       Else
@@ -196,14 +213,18 @@ Public Class MyMachGroupPanelVM
             Return False
          End If
          If bWithScript Then
-            ' Creo grezzo e posiziono i pezzi
             Dim bOk As Boolean = True
-            For Each Part In PartList
-               If Not ExecScript(sInitScriptPath, nGroupId, Part) Then bOk = False
-            Next
-            ' Gestione ingresso senza pezzi
-            If PartList.Count() = 0 Then
-               If Not ExecScript(sInitScriptPath, nGroupId, GDB_ID.NULL) Then bOk = False
+            ' Creo grezzi e posiziono i pezzi
+            If PartList.Count() > 0 then
+               Dim nInd As Integer = 0
+               Dim sParts As String = String.Join( ",", PartList)
+               For Each Part In PartList
+                  nInd += 1
+                  If Not ExecScript(sInitScriptPath, nGroupId, Part, nInd, sParts) Then bOk = False
+               Next
+            ' altrimenti, ingresso senza pezzi
+            Else
+               If Not ExecScript(sInitScriptPath, nGroupId, GDB_ID.NULL, 0, "") Then bOk = False
             End If
             If Not bOk Then
                EgtResetCurrMachGroup()

MachOptionsWindow/MachOptionV.xaml

@@ -15,7 +15,7 @@
    </EgtWPFLib5:EgtCustomWindow.Resources>
 
    <Grid Margin="10">
-      <Grid.ColumnDefinitions>
+      <Grid.ColumnDefinitions>          
          <ColumnDefinition Width="1*"/>
          <ColumnDefinition Width="1*"/>
          <ColumnDefinition Width="1*"/>
@@ -27,6 +27,7 @@
          <RowDefinition Height="Auto"/>
          <RowDefinition Height="Auto"/>
          <RowDefinition Height="Auto"/>
+         <RowDefinition Height="Auto"/>
       </Grid.RowDefinitions>
 
       <UniformGrid Grid.Row="0" Columns="2" Margin="0,0,0,5">
@@ -56,7 +57,12 @@
          </ComboBox>
       </UniformGrid>
 
-      <UniformGrid Grid.Row="4" Columns="2">
+      <UniformGrid Grid.Row="4" Columns="2" Margin="0,0,0,5">
+         <TextBlock Text="{Binding ApproxLinTolMsg}" VerticalAlignment="Center"/>
+         <TextBox Text="{Binding ApproxLinTol}" Height="25" Margin="10,0,0,0"/>
+      </UniformGrid>
+
+      <UniformGrid Grid.Row="5" Columns="2">
          <TextBlock Text="{Binding DefaultSetUpMsg}" VerticalAlignment="Center"/>
          <ComboBox ItemsSource="{Binding ArchivedSetUpList}" Height="25" Margin="10,0,0,0"
             SelectedItem="{Binding SelectedDefaultSetUp}" IsEnabled="{Binding IsActiveDefaultSetUp}"/>

MachOptionsWindow/MachOptionVM.vb

@@ -48,6 +48,21 @@ Public Class MachOptionVM
       End Set
    End Property
 
+   Private m_sApproxLinTol As String
+   Public Property ApproxLinTol As String
+      Get
+         Return m_sApproxLinTol
+      End Get
+      Set(value As String)
+         Dim dApproxLinTol As Double = 0
+         If StringToLen(value, dApproxLinTol) Then
+            EgtMdbSetGeneralParam(MCH_GP.APPROXLINTOL, dApproxLinTol)
+            EgtMdbSave()
+            m_sApproxLinTol = value
+         End If
+      End Set
+   End Property
+
    Private m_SplitArcsList As New List(Of MCH_SA)({MCH_SA.NEVER, MCH_SA.GEN_PLANE, MCH_SA.NO_XY_PLANE, MCH_SA.ALWAYS})
    Public ReadOnly Property SplitArcsList As List(Of MCH_SA)
       Get
@@ -106,6 +121,11 @@ Public Class MachOptionVM
          Return EgtMsg(MSG_MACHININGOPTIONPAGE + 9)
       End Get
    End Property
+   Public ReadOnly Property ApproxLinTolMsg As String
+      Get
+         Return EgtMsg(6410)         ' Tolleranza di approssimazione
+      End Get
+   End Property
 
    Public ReadOnly Property SplitArcsMsg As String
       Get
@@ -141,6 +161,10 @@ Public Class MachOptionVM
       Dim nVal As Integer = 0
       EgtMdbGetGeneralParam(MCH_GP.SPLITARCS, nVal)
       m_SelectedSplitArcs = DirectCast(nVal, MCH_SA)
+      ' Leggo tolleranza lineare di approssimazione
+      dVal = 0
+      EgtMdbGetGeneralParam(MCH_GP.APPROXLINTOL, dVal)
+      m_sApproxLinTol = LenToString(dVal, 4)
       ' Riempio lista attrezzaggi salvati
       m_ArchivedSetUpList.Add(String.Empty)
       If Directory.Exists(IniFile.m_sCurrMachSetUpDirPath) Then

MainWindow/MainWindowVM.vb

@@ -357,9 +357,6 @@ Public Class MainWindowVM
       ' Impostazione direttorio toolmakers
       Dim sToolMakersDir As String = String.Empty
       GetPrivateProfileString(S_MACH, K_TOOLMAKERSDIR, "", sToolMakersDir)
-#If PLATFORM = "x64" Then
-         GetPrivateProfileString(S_MACH, K_TOOLMAKERSDIR64, sToolMakersDir, sToolMakersDir)
-#End If
       If Not String.IsNullOrWhiteSpace(sToolMakersDir) Then
          IniFile.m_sToolMakersDir = sToolMakersDir
       Else
@@ -388,8 +385,8 @@ Public Class MainWindowVM
          EgtSetLockId(sLockId)
       End If
       ' Recupero livello e opzioni della chiave
-      Dim bKey As Boolean = EgtGetKeyLevel(3279, 2512, 1, IniFile.m_nKeyLevel) And
-                            EgtGetKeyOptions(3279, 2512, 1, IniFile.m_nKeyOptions)
+      Dim bKey As Boolean = EgtGetKeyLevel(3279, 2604, 1, IniFile.m_nKeyLevel) And
+                            EgtGetKeyOptions(3279, 2604, 1, IniFile.m_nKeyOptions)
       ' Leggo e imposto livello utilizzatore
       IniFile.m_nUserLevel = Math.Min(IniFile.m_nKeyLevel, GetPrivateProfileInt(S_GENERAL, K_USERLEVEL, 1))
       ' Imposto abilitazione lavorazioni avanzate
@@ -403,7 +400,7 @@ Public Class MainWindowVM
       IniFile.m_sLogFile = m_sTempDir & "\" & GENLOG_FILE_NAME.Replace("#", IniFile.m_nInstance.ToString())
       Dim sLogMsg As String = "User " & Environment.MachineName & "\" & Environment.UserName &
                               "  Inst" & IniFile.m_nInstance.ToString() &
-" Ulv" & IniFile.m_nUserLevel.ToString() & " Dbg" & DebugLevel().ToString() & vbLf &
+                              " Ulv" & IniFile.m_nUserLevel.ToString() & " Dbg" & DebugLevel().ToString() & vbLf &
                               My.Application.Info.Title.ToString() & " ver. " & m_sVersion
       EgtInit(m_nDebug, IniFile.m_sLogFile, sLogMsg)
       EgtSetOnTerminateProcess( m_OnTerminateProcessCallback)
@@ -436,9 +433,6 @@ Public Class MainWindowVM
       ' Imposto dir di default per libreria Lua e lancio libreria di base
       Dim sLuaLibsDir As String = String.Empty
       GetPrivateProfileString(S_LUA, K_LIBSDIR, "", sLuaLibsDir)
-#If PLATFORM = "x64" Then
-         GetPrivateProfileString(S_LUA, K_LIBSDIR64, sLuaLibsDir, sLuaLibsDir)
-#End If
       EgtSetLuaLibs(sLuaLibsDir)
       Dim sLuaBaseLib As String = String.Empty
       GetPrivateProfileString(S_LUA, K_BASELIB, "EgtBase", sLuaBaseLib)

My Project/AssemblyInfo.vb

@@ -30,7 +30,7 @@ Imports System.Windows
 #End If
 <Assembly: AssemblyCompany("Egalware s.r.l.")> 
 <Assembly: AssemblyProduct("EgtCAM5")>
-<Assembly: AssemblyCopyright("Copyright ©  2016-2023 by Egalware s.r.l.")>
+<Assembly: AssemblyCopyright("Copyright ©  2016-2024 by Egalware s.r.l.")>
 <Assembly: AssemblyTrademark("")> 
 <Assembly: ComVisible(false)>
 
@@ -70,6 +70,6 @@ Imports System.Windows
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("2.5.12.3")>
-<Assembly: AssemblyFileVersion("2.5.12.3")>
+<Assembly: AssemblyVersion("2.6.4.2")>
+<Assembly: AssemblyFileVersion("2.6.4.2")>
 

OptionPanel/DrawOptionPanel/ManageLayerExpander/LayerTreeView.vb

@@ -93,7 +93,7 @@ Public Class LayerTreeViewItem
                      EgtGetStatus(Node.Id, nStat)
                      If value AndAlso nStat <> GDB_ST.ON_ Then
                         EgtSetStatus(Node.Id, GDB_ST.ON_)
-                     ElseIf nStat <> GDB_ST.OFF Then
+                     ElseIf Not value AndAlso nStat <> GDB_ST.OFF Then
                         EgtSetStatus(Node.Id, GDB_ST.OFF)
                      End If
                   End If

OptionPanel/MachiningOptionPanel/SimulationExpander/SimulationExpanderVM.vb

@@ -254,6 +254,7 @@ Public Class SimulationExpanderVM
          Else
             MessageBox.Show(EgtMsg(MSG_MESSAGEBOX + 10), EgtMsg(MSG_SIMULATION + 5), MessageBoxButton.OK, MessageBoxImage.Error)    'Errore sconosciuto - ERRORE
          End If
+         SetSimulationStatus(MCH_SIM_ST.UI_STOP)
       End If
       Dim nShowDataCounter As Integer = 0
       While GetStatus() <> MCH_SIM_ST.UI_STOP

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())

PopUpGridPanel/PopUpGridPanelV.xaml

@@ -6,6 +6,9 @@
       <Button Command="{Binding CPlaneViewCommand}" ToolTip="{Binding CPlaneViewToolTip}" Style="{StaticResource GridViewPanelButton}">
          <Image Source="/Resources/GridViewPanel/CplaneView.png" Stretch="Uniform"/>
       </Button>
+      <Button Command="{Binding CPlaneInvertCommand}" ToolTip="{Binding CPlaneInvertToolTip}" Style="{StaticResource GridViewPanelButton}">
+         <Image Source="/Resources/GridViewPanel/CplaneInvert.png" Stretch="Uniform"/>
+      </Button>
       <Button Command="{Binding CPlaneRotateCommand}" ToolTip="{Binding CPlaneRotateToolTip}" Style="{StaticResource GridViewPanelButton}">
          <Image Source="/Resources/GridViewPanel/CplaneROTATE.png" Stretch="Uniform"/>
       </Button>

PopUpGridPanel/PopUpGridPanelViewModel.vb

@@ -7,6 +7,7 @@ Public Class PopUpGridPanelVM
 
    ' Definizione comandi
    Private m_cmdCPlaneView As ICommand
+   Private m_cmdCPlaneInvert As ICommand
    Private m_cmdCPlaneRotate As ICommand
    Private m_cmdCPlane3P As ICommand
    Private m_cmdCPlanePerpObj As ICommand
@@ -19,6 +20,11 @@ Public Class PopUpGridPanelVM
          Return EgtMsg(MSG_GRIDVIEWPANEL + 25)
       End Get
    End Property
+   Public ReadOnly Property CPlaneInvertToolTip As String
+      Get
+         Return EgtMsg(5285)
+      End Get
+   End Property
    Public ReadOnly Property CPlaneRotateToolTip As String
       Get
          Return EgtMsg(MSG_GRIDVIEWPANEL + 28)
@@ -70,6 +76,29 @@ Public Class PopUpGridPanelVM
 
 #End Region ' CPlaneViewCommand
 
+#Region "CPlaneInvertCommand"
+
+   ''' <summary>
+   ''' Returns a command that do CPlaneInvert.
+   ''' </summary>
+   Public ReadOnly Property CPlaneInvertCommand As ICommand
+      Get
+         If m_cmdCPlaneInvert Is Nothing Then
+            m_cmdCPlaneInvert = New RelayCommand(AddressOf CPlaneInvert)
+         End If
+         Return m_cmdCPlaneInvert
+      End Get
+   End Property
+
+   ''' <summary>
+   ''' Execute the CPlaneInvert.  This method is invoked by the CPlaneInvertCommand.
+   ''' </summary>
+   Public Sub CPlaneInvert(ByVal param As Object)
+      Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.GRID_INVERT)
+   End Sub
+
+#End Region
+
 #Region "CPlaneRotateCommand"
 
    ''' <summary>

PopUpViewPanel/PopUpViewPanelV.xaml

@@ -12,9 +12,6 @@
       <Button ToolTip="{Binding ZoomSelToolTip}" Style="{StaticResource GridViewPanelButton}" Command="{Binding ZoomSelCommand}">
          <Image Source="/Resources/GridViewPanel/ZoomSel.png" Stretch="Uniform"/>
       </Button>
-      <Button ToolTip="{Binding LookFromIso_SEToolTip}" Style="{StaticResource GridViewPanelButton}" Command="{Binding IsoViewSECommand}">
-         <Image Source="/Resources/GridViewPanel/LookFromISO_SE.png" Stretch="Uniform"/>
-      </Button>
       <Button ToolTip="{Binding LookFromIso_NEToolTip}" Style="{StaticResource GridViewPanelButton}" Command="{Binding IsoViewNECommand}">
          <Image Source="/Resources/GridViewPanel/LookFromISO_NE.png" Stretch="Uniform"/>
       </Button>

PopUpViewPanel/PopUpViewPanelVM.vb

@@ -9,7 +9,6 @@ Public Class PopUpViewPanelVM
    Private m_cmdZoomIn As ICommand
    Private m_cmdZoomOut As ICommand
    Private m_cmdZoomSel As ICommand
-   Private m_cmdIsoViewSE As ICommand
    Private m_cmdIsoViewNE As ICommand
    Private m_cmdIsoViewNW As ICommand
    Private m_cmdViewToCPlane As ICommand
@@ -34,12 +33,6 @@ Public Class PopUpViewPanelVM
       End Get
    End Property
 
-   Public ReadOnly Property LookFromIso_SEToolTip As String
-      Get
-         Return EgtMsg(MSG_GRIDVIEWPANEL + 13)
-      End Get
-   End Property
-
    Public ReadOnly Property LookFromIso_NEToolTip As String
       Get
          Return EgtMsg(MSG_GRIDVIEWPANEL + 14)
@@ -133,29 +126,6 @@ Public Class PopUpViewPanelVM
 
 #End Region ' ZoomOutCommand
 
-#Region "IsoViewSECommand"
-
-   ''' <summary>
-   ''' Returns a command that do IsoViewSE.
-   ''' </summary>
-   Public ReadOnly Property IsoViewSECommand As ICommand
-      Get
-         If m_cmdIsoViewSE Is Nothing Then
-            m_cmdIsoViewSE = New RelayCommand(AddressOf IsoViewSE)
-         End If
-         Return m_cmdIsoViewSE
-      End Get
-   End Property
-
-   ''' <summary>
-   ''' Execute the IsoViewSE.  This method is invoked by the IsoViewSECommand.
-   ''' </summary>
-   Public Sub IsoViewSE(ByVal param As Object)
-      Map.refProjectVM.GetScene.IsoViewSE()
-   End Sub
-
-#End Region ' IsoViewSECommand
-
 #Region "IsoViewNECommand"
 
    ''' <summary>

Project/ProjectVM.vb

@@ -231,18 +231,33 @@ Public Class ProjectVM
       SceneHost.Child = Nothing
       ' Se manca la chiave
       If IniFile.m_nKeyLevel = -1 Or IniFile.m_nKeyLevel = -2 Then
-         EgtOutLog("Missing Dongle")
-         ' Box di avviso chiave mancante : "Chiave non presente. \n Inserirla e riavviare il programma."  "Errore"
-         Dim sText As String = EgtMsg(MSG_MISSINGKEYWD + 2) & vbCrLf & EgtMsg(MSG_MISSINGKEYWD + 3)
-         Dim sTitle As String = EgtMsg(MSG_MISSINGKEYWD + 1)
+         If Not EgtGetNetHwKey() Then
+            EgtOutLog("Missing Dongle")
+            ' Box di avviso chiave mancante : "Chiave non presente. \n Inserirla e riavviare il programma."  "Errore"
+            Dim sText As String = EgtMsg(10102) & vbCrLf & EgtMsg(10103)
+            Dim sTitle As String = EgtMsg(10101)
+            MessageBox.Show(sText, sTitle, MessageBoxButton.OK, MessageBoxImage.Error)
+         Else
+            EgtOutLog("NetDongle is full")
+            ' Box di avviso slot chiave di rete occupato : "Chiave di Rete completamente occupata. \n Uscire dal programma su un altro PC."  "Errore"
+            Dim sText As String = EgtMsg(10110) & vbCrLf & EgtMsg(10111)
+            Dim sTitle As String = EgtMsg(10101)
+            MessageBox.Show(sText, sTitle, MessageBoxButton.OK, MessageBoxImage.Error)
+         End If
+      ' Se altrimenti manca il collegamento con la chiave di rete
+      ElseIf IniFile.m_nKeyLevel = -9 Then
+         EgtOutLog("Missing Link with Net Dongle")
+         ' Box di avviso chiave mancante : "Collegamento con la Chiave di rete non riuscito. \n Verificare la connessione."  "Errore"
+         Dim sText As String = EgtMsg(10108) & vbCrLf & EgtMsg(10109)
+         Dim sTitle As String = EgtMsg(10101)
          MessageBox.Show(sText, sTitle, MessageBoxButton.OK, MessageBoxImage.Error)
-         ' Altrimenti manca la licenza
+      ' Altrimenti manca la licenza
       Else
          EgtOutLog("Problems with Licence")
          ' Box di avviso licenza con problemi : sKeyInfo \n "Programma senza licenza. \n Caricala e riavvia il programma."  "Errore"
          Dim sKeyInfo As String = "" : EgtGetKeyInfo(sKeyInfo)
-         Dim sText As String = sKeyInfo & vbCrLf & EgtMsg(MSG_MISSINGKEYWD + 5) & vbCrLf & EgtMsg(MSG_MISSINGKEYWD + 6)
-         Dim sTitle As String = EgtMsg(MSG_MISSINGKEYWD + 1)
+         Dim sText As String = sKeyInfo & vbCrLf & EgtMsg(10105) & vbCrLf & EgtMsg(10106)
+         Dim sTitle As String = EgtMsg(10101)
          If MessageBox.Show(sText, sTitle, MessageBoxButton.OKCancel, MessageBoxImage.Error) = MessageBoxResult.OK Then
             ' Apro dialogo per richiesta file licenza
             Dim LicDlg As New Microsoft.Win32.OpenFileDialog() With {
@@ -1462,6 +1477,15 @@ Public Class ProjectVM
       End If
    End Sub
 
+   Private Sub OnInsertingProject(ByVal sender As Object, nType As Integer, ByRef nFlag As Integer) Handles m_Controller.OnInsertingProject
+      If nType = FT.OBJ Or nType = FT.IGES Or nType = FT.STEP_ Or nType = FT.ACIS Or
+         nType = FT.PARASOLID Or nType = FT.JT Or nType = FT.VRML Or nType = FT.C3D Then
+         nFlag = GetMainPrivateProfileInt(S_IMPORT, K_ADVFLAG, 0)
+      Else
+         nFlag = 0
+      End If
+   End Sub
+
    Private Sub OnInsertedProject(ByVal sender As Object, ByVal sFile As String, ByVal bOk As Boolean) Handles m_Controller.OnInsertedProject
       EgtZoom(ZM.ALL)
       WritePrivateProfileString(S_GENERAL, K_LASTNGEINSDIR, Path.GetDirectoryName(sFile))
@@ -1502,6 +1526,9 @@ Public Class ProjectVM
             nFlag = GetPrivateProfileInt(S_IMPORT, K_CNCFLAG, EIC_FL.NONE)
          ElseIf nType = FT.BTL Or nType = FT.BTLX Then
             nFlag = GetPrivateProfileInt(S_IMPORT, K_BTLFLAG, EIB_FL.NONE)
+         ElseIf nType = FT.OBJ Or nType = FT.IGES Or nType = FT.STEP_ Or nType = FT.ACIS Or
+                nType = FT.PARASOLID Or nType = FT.JT Or nType = FT.VRML Or nType = FT.C3D Then
+            nFlag = GetPrivateProfileInt(S_IMPORT, K_ADVFLAG, 0)
          Else
             nFlag = 0
          End If

SetUp/SetUpVM.vb

@@ -409,18 +409,18 @@ Public Class SetUpVM
                               ' verifico se la testa è diversa
                               If TempPosition.Head <> sHead Then
                                  ' altrimenti la sovrascrivo
-                                 TempPosition.Head = sHead
+                                 TempPosition.SetHead( sHead)
                                  ' la metto anche come testa originale
                                  If bOriginal Then TempPosition.OrigHead = sHead
                                  ' e verifico il numero di uscite
                                  For ExitIndex = TempPosition.ExitToolAssociationList.Count + 1 To EgtGetHeadExitCount(sHead)
-                                       TempPosition.ExitToolAssociationList.Add(New ExitToolAssociation(ExitIndex.ToString, TempPosition))
-                                    Next
-                                    For ExitIndex = TempPosition.ExitToolAssociationList.Count - 1 To EgtGetHeadExitCount(sHead) Step -1
-                                       TempPosition.ExitToolAssociationList.RemoveAt(ExitIndex)
-                                    Next
-                                 End If
-                                 For ExitIndex = 0 To TempPosition.ExitToolAssociationList.Count - 1
+                                    TempPosition.ExitToolAssociationList.Add(New ExitToolAssociation(ExitIndex.ToString, TempPosition))
+                                 Next
+                                 For ExitIndex = TempPosition.ExitToolAssociationList.Count - 1 To EgtGetHeadExitCount(sHead) Step -1
+                                    TempPosition.ExitToolAssociationList.RemoveAt(ExitIndex)
+                                 Next
+                              End If
+                              For ExitIndex = 0 To TempPosition.ExitToolAssociationList.Count - 1
                                  Dim CurrExitToolAss As ExitToolAssociation = TempPosition.ExitToolAssociationList(ExitIndex)
                                  If CurrExitToolAss.ExitPar = sExitList(ToolIndex) Then
                                     ' vi metto l'utensile e segno l'uscita come occupata

TopCommandBar/TopCommandBarVM.vb

@@ -653,7 +653,7 @@ Public Class TopCommandBarVM
       While nMchGrpId <> GDB_ID.NULL
          Dim sMachineName As String = String.Empty
          EgtGetMachGroupMachineName(nMchGrpId, sMachineName)
-         If Not String.IsNullOrWhiteSpace(sMachineName) Then
+         If Not String.IsNullOrWhiteSpace(sMachineName) AndAlso Not Machines.Contains( sMachineName) Then
             Machines.Add(sMachineName)
          End If
          nMchGrpId = EgtGetNextMachGroup(nMchGrpId)
@@ -839,7 +839,7 @@ Public Class TopCommandBarVM
       Map.refBeamPanelVM.SetBeamPanelVisibility(False)
       Map.refWallPanelVM.SetWallPanelVisibility(False)
       Map.refBeamWallPanelVM.SetBeamWallPanelVisibility(False)
-      Map.refDoorPanelVM.SetDoorPanelVisibility(False)
+      Map.refDoorPanelVM.SetDoorPanelVisibility(IniFile.IsActiveDoors())
       Map.refGunStockPanelVM.SetGunStockPanelVisibility(False)
       If Not IsNothing(Map.refDrawPanelVM) Then Map.refDrawPanelVM.SetDrawPanelVisibility(False)
       Map.refMachGroupPanelVM.SetMachGroupPanelVisibility(IniFile.m_bMachiningGroup)

Utility/IniFile.vb

@@ -263,9 +263,6 @@ Public Module IniFile
       If bIsActive Then
           Dim sTemp As String = ""
           GetPrivateProfileString(S_BEAM, K_BEAMBASEDIR, "", sTemp)
-          #If PLATFORM = "x64" Then
-             GetPrivateProfileString(S_BEAM, K_BEAMBASEDIR64, sTemp, sTemp)
-          #End If
           m_sBeamDirPath = sTemp.TrimEnd( "\"c)
       End If
       Return bIsActive
@@ -276,9 +273,6 @@ Public Module IniFile
       If bIsActive Then
           Dim sTemp As String = ""
           GetPrivateProfileString(S_WALL, K_WALLBASEDIR, "", sTemp)
-          #If PLATFORM = "x64" Then
-             GetPrivateProfileString(S_WALL, K_WALLBASEDIR64, sTemp, sTemp)
-          #End If
           m_sWallDirPath = sTemp.TrimEnd( "\"c)
       End If
       Return bIsActive

ViewPanel/ViewPanelV.xaml

@@ -27,6 +27,9 @@
       <Button ToolTip="{Binding LookFromIso_SWToolTip}" Style="{StaticResource GridViewPanelButton}" Command="{Binding IsoViewSWCommand}">
          <Image Source="/Resources/GridViewPanel/LookFromISO_SW.png" Stretch="Uniform"/>
       </Button>
+      <Button ToolTip="{Binding LookFromIso_SEToolTip}" Style="{StaticResource GridViewPanelButton}" Command="{Binding IsoViewSECommand}">
+         <Image Source="/Resources/GridViewPanel/LookFromISO_SE.png" Stretch="Uniform"/>
+      </Button>
    </StackPanel>
 
 </UserControl>

ViewPanel/ViewPanelVM.vb

@@ -14,6 +14,7 @@ Public Class ViewPanelVM
    Private m_cmdBackView As ICommand
    Private m_cmdRightView As ICommand
    Private m_cmdIsoViewSW As ICommand
+   Private m_cmdIsoViewSE As ICommand
 
 #Region "ToolTip"
 
@@ -64,6 +65,12 @@ Public Class ViewPanelVM
       End Get
    End Property
 
+   Public ReadOnly Property LookFromIso_SEToolTip As String
+      Get
+         Return EgtMsg(MSG_GRIDVIEWPANEL + 13)
+      End Get
+   End Property
+
 #End Region    ' ToolTip
 
 #End Region    ' FIELDS & PROPERTIES
@@ -254,6 +261,29 @@ Public Class ViewPanelVM
 
 #End Region ' IsoViewSWCommand
 
+#Region "IsoViewSECommand"
+
+   ''' <summary>
+   ''' Returns a command that do IsoViewSE.
+   ''' </summary>
+   Public ReadOnly Property IsoViewSECommand As ICommand
+      Get
+         If m_cmdIsoViewSE Is Nothing Then
+            m_cmdIsoViewSE = New RelayCommand(AddressOf IsoViewSE)
+         End If
+         Return m_cmdIsoViewSE
+      End Get
+   End Property
+
+   ''' <summary>
+   ''' Execute the IsoViewSE.  This method is invoked by the IsoViewSECommand.
+   ''' </summary>
+   Public Sub IsoViewSE(ByVal param As Object)
+      Map.refProjectVM.GetScene.IsoViewSE()
+   End Sub
+
+#End Region ' IsoViewSECommand
+
 #End Region    ' COMMANDS
 
 End Class