Merge commit 'cf978712bae6c9217370feb1c0fc08bcdc4d7f61' into features/NewProjectGrid

InstrumentPanel/InstrumentPanelVM.vb

@@ -32,7 +32,7 @@ Public Class InstrumentPanelVM
                Map.refProjectVM.GetScene.SetStatusAnalyze()
             Else
                Map.refProjectVM.GetScene.ResetStatusAnalyze()
-               'Map.refManageLayerExpanderVM.SelectIdInObjTree(GDB_ID.NULL)
+               Map.refManageLayerExpanderVM.SelectIdInObjTree(GDB_ID.NULL)
                Map.refStatusBarVM.NotifyStatusOutput("")
                Analyze.EraseAnalyzeGroup()
                EgtDraw()

MachinePanel/MachinePanelV.xaml

@@ -7,14 +7,14 @@
    <StackPanel Orientation="Horizontal">
       <!--Combobox per selezionare la macchina corrente-->
       <ComboBox ItemsSource="{Binding Path=MachinesList}" DisplayMemberPath="Name"
-                SelectedItem="{Binding Path=SelectedMachine}" SelectedValuePath="Name"
-                Height="22" Width="175" IsEnabled="{Binding MachineListIsEnabled}" Margin="2,0"/>
+          SelectedItem="{Binding Path=SelectedMachine}" SelectedValuePath="Name"
+          Height="22" Width="150" IsEnabled="{Binding MachineListIsEnabled}" Margin="2,0"/>
       <Button Content="{Binding ToolDBMsg}"
-              Command="{Binding ToolDbCommand}"
-              IsEnabled="{Binding ToolDb_IsEnabled}"
-              Width="55"
-              ToolTip="{Binding ToolDBToolTip}"
-              Style="{StaticResource GridViewPanelButton}"/>
+            Command="{Binding ToolDbCommand}"
+            IsEnabled="{Binding ToolDb_IsEnabled}"
+            Width="55"
+            ToolTip="{Binding ToolDBToolTip}"
+            Style="{StaticResource GridViewPanelButton}"/>
       <Button Content="{Binding MachiningDbMsg}"
               Command="{Binding MachDbCommand}"
               IsEnabled="{Binding MachDb_IsEnabled}"
@@ -28,10 +28,10 @@
               ToolTip="{Binding SetUpDbToolTip}"
               Style="{StaticResource GridViewPanelButton}"/>
       <Button Command="{Binding MachOptionsCommand}"
-              ToolTip="{Binding MachOptionsToolTip}">
-         <Image Source="/Resources/MachinePanel/MachineOptions.png"
-                Height="22" />
+            ToolTip="{Binding MachOptionsToolTip}">
+          <Image Source="/Resources/MachinePanel/MachineOptions.png"
+              Height="22" />
       </Button>
-   </StackPanel>
+    </StackPanel>
 
 </EgtFloating:EgtFloatingPanel>

MainWindow/MainWindowV.xaml.vb

@@ -4,13 +4,13 @@ Imports EgtWPFLib5
 Class MainWindowV
    Inherits EgtCustomWindow
 
-   Private Sub MainWindow_Initialized(sender As Object, e As EventArgs) Handles Me.Initialized
+   Private Sub Me_Initialized(sender As Object, e As EventArgs) Handles Me.Initialized
       If Not ProjectVM.GetAppToShow() Then
          Me.ShowInTaskbar = False
       End If
    End Sub
 
-   Private Sub MainWindow_Loaded(sender As Object, e As RoutedEventArgs) Handles Me.Loaded
+   Private Sub EgtCustomWindow_Loaded(sender As Object, e As RoutedEventArgs) Handles Me.Loaded
       ' Posizione e dimensioni del Form
       Dim WinPos As New WinPos
       If ProjectVM.GetAppToShow() Then
@@ -21,13 +21,6 @@ Class MainWindowV
       WinPosToWindow(Me, WinPos)
    End Sub
 
-   Private Sub MainWindowV_Closing(sender As Object, e As System.ComponentModel.CancelEventArgs) Handles Me.Closing 
-      If (Keyboard.Modifiers And ModifierKeys.Alt) = ModifierKeys.Alt AndAlso Keyboard.IsKeyDown(Key.F4) Then
-         e.Cancel = True
-         Return
-      End If
-   End Sub
-
    Private Sub MainWindow_Drop(sender As Object, e As DragEventArgs)
       ' Se drag di file
       If e.Data.GetDataPresent(DataFormats.FileDrop) Then

MainWindow/MainWindowVM.vb

@@ -171,6 +171,7 @@ Public Class MainWindowVM
    Public Sub CloseApplication(ByVal param As Object)
       If IniFile.m_bScriptRunning Then
          If Not IniFile.m_bFailedRun Then
+            'MessageBox.Show("Can't exit now. Wait until the end of the script execution", "", MessageBoxButton.OK, MessageBoxImage.Stop)
             Return
          End If
       End If
@@ -378,8 +379,8 @@ Public Class MainWindowVM
          EgtSetLockId(sLockId)
       End If
       ' Recupero livello e opzioni della chiave
-      Dim bKey As Boolean = EgtGetKeyLevel(3279, 3106, 1, IniFile.m_nKeyLevel) And
-                            EgtGetKeyOptions(3279, 3106, 1, IniFile.m_nKeyOptions)
+      Dim bKey As Boolean = EgtGetKeyLevel(3279, 3104, 1, IniFile.m_nKeyLevel) And
+                            EgtGetKeyOptions(3279, 3104, 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
@@ -608,13 +609,11 @@ Public Class MainWindowVM
             Map.refMachiningParameterExpanderVM.CurrOperation.SetShowNoteListCombo_IsEnable(True)
          End If
       ElseIf (e.Key = Key.Left OrElse e.Key = Key.Right) AndAlso Map.refTopCommandBarVM.MachiningIsChecked AndAlso Map.refOperationParametersExpanderVM.OperationParameters.IsEnabled Then
-         If Map.refMachiningParameterExpanderVM.CurrOperation.AdvancedParamIsExpander Then Map.refMachiningParameterExpanderVM.CurrOperation.AdvancedParamIsExpander = True
          Map.refMachiningParameterExpanderVM.FocusSlider()
          Dim nStep As Integer = If(e.Key = Key.Right, 1, -1)
          Map.refMachiningParameterExpanderVM.SetSliderValue(nStep)
          e.Handled = True
       ElseIf (e.Key = Key.Up OrElse e.Key = Key.Down) AndAlso Map.refTopCommandBarVM.MachiningIsChecked AndAlso Map.refOperationParametersExpanderVM.OperationParameters.IsEnabled Then
-         If Map.refMachiningParameterExpanderVM.CurrOperation.AdvancedParamIsExpander Then Map.refMachiningParameterExpanderVM.CurrOperation.AdvancedParamIsExpander = True
          Map.refMachiningParameterExpanderVM.FocusButtonPreview()
          If e.Key = Key.Down Then
             Map.refMachiningParameterExpanderVM.RevertPreviewMachiningTool()

My Project/AssemblyInfo.vb

@@ -70,6 +70,6 @@ Imports System.Windows
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("3.1.6.4")>
-<Assembly: AssemblyFileVersion("3.1.6.4")>
+<Assembly: AssemblyVersion("3.1.4.1")>
+<Assembly: AssemblyFileVersion("3.1.4.1")>
 

OptionPanel/DrawOptionPanel/ManageLayerExpander/ManageLayerExpanderV.xaml

@@ -55,10 +55,10 @@
                      </Grid.ColumnDefinitions>
 
                      <ToggleButton Style="{StaticResource EgtCAM5_LampToggleButton}" Grid.Column="0" 
-                                   IsChecked="{Binding OnOff}" Visibility="{Binding IsHidden}" Focusable="False" Height="15" Width="15" Margin="0,0,5,0"/>
-                     <Image Grid.Column="1" Source="{Binding PictureString}" Focusable="False" Height="15" Margin="0,0,5,0"/>
-                     <TextBlock Grid.Column="2" Text="{Binding Name}" Focusable="False" Margin="0,0,5,0"/>
-                     <Ellipse Grid.Column="3" Height="10" Width="10" Focusable="False" Fill="{Binding LayerColor}" />
+                                   IsChecked="{Binding OnOff}" Visibility="{Binding IsHidden}" Focusable="True" Height="15" Width="15" Margin="0,0,5,0"/>
+                     <Image Grid.Column="1" Source="{Binding PictureString}" Height="15" Margin="0,0,5,0"/>
+                     <TextBlock Grid.Column="2" Text="{Binding Name}" Margin="0,0,5,0"/>
+                     <Ellipse Grid.Column="3" Height="10" Width="10" Fill="{Binding LayerColor}" />
 
                   </Grid>
                </HierarchicalDataTemplate>

OptionPanel/MachiningOptionPanel/OperationExpander/DispositionParameterExpander/DispositionParameterExpanderVM.vb

@@ -322,7 +322,7 @@ Public Class DispositionParameterExpanderVM
                   StringToLen(Values(2), dSupp)
                End If
             Else
-               m_InputErrorMsg = "Il valore non è un punto X,Y o X,Y,Z"
+               m_InputErrorMsg = "Il valore non è un punto X,Y"
                OnPropertyChanged("InputErrorMsg")
                Return
             End If
@@ -429,29 +429,6 @@ Public Class DispositionParameterExpanderVM
                Select Case m_ActiveObject
                   Case ObjectType.RAWPART
                      If EgtRotateRawPart(nSelId, vtRotAx, InputAngle) Then
-                        ' Se rotazione attorno ad asse diverso da Z
-                        If Math.Abs( InputAngle) > EPS_ANG_ZERO  AndAlso
-                           ( Math.Abs( vtRotAx.x) > EPS_ZERO  OrElse Math.Abs( vtRotAx.y) > EPS_ZERO) Then
-                           ' Elimino eventuale vecchio supporto
-                           Dim nOldSuppId As Integer = EgtGetFirstNameInGroup(nSelId, SUPPORT)
-                           EgtErase( nOldSuppId)
-                           ' Se necessario, aggiungo nuovo supporto
-                           Dim ptRawRefPoint As Point3d = DispositionUtility.GetRawPartRefPoint(nSelId, m_RawRefPosition)
-                           Dim dSupp As Double = ptRawRefPoint.z
-                           If dSupp > EPS_SMALL Then
-                              Dim nNewSuppId As Integer = GDB_ID.NULL
-                              Dim nRawOutLnId As Integer = EgtGetFirstNameInGroup(nSelId, RAWOUTLINE)
-                              If nRawOutLnId <> GDB_ID.NULL Then
-                                 Dim vtExtr As New Vector3d( 0, 0, -dSupp)
-                                 nNewSuppId = EgtCreateSurfTmByRegionExtrusion( nSelId, 1, {nRawOutLnId}, vtExtr, 0.05, GDB_RT.GLOB)
-                              End If
-                              If nNewSuppId <> GDB_ID.NULL Then
-                                 EgtSetName( nNewSuppId, SUPPORT)
-                                 EgtSetColor( nNewSuppId, New Color3d(150, 75, 0))
-                                 If nOldSuppId <> GDB_ID.NULL Then EgtChangeId( nNewSuppId, nOldSuppId)
-                              End If
-                           End If
-                        End If  
                         Dim vtOrigMove As Vector3d = Vector3d.NULL()
                         Dim vtRefMove As Vector3d = Vector3d.NULL()
                         DispositionUtility.VerifyRawPosition(nSelId, vtOrigMove, vtRefMove)

OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/MachiningParameterExpanderVM.vb

@@ -119,7 +119,11 @@ Public Class MachiningParameterExpanderVM
       End Set
    End Property
    Friend Sub ResetSliderValue()
-      m_nPtEntId = EgtPreviewMachiningTool(GDB_ID.NULL, MCH_PTM.AFTER)
+      If m_nPreviewMachiningTool = MCH_LOOK.TAB_TOOL OrElse m_nPreviewMachiningTool = MCH_LOOK.TAB_HEAD Then
+         m_nPtEntId = EgtPreviewMachiningTool(GDB_ID.NULL, MCH_PTM.AFTER)
+      Else
+         m_nPtEntId = GDB_ID.NULL
+      End If
       m_SliderValue = 1
       NotifyPropertyChanged(NameOf(SliderValue))
    End Sub
@@ -184,11 +188,7 @@ Public Class MachiningParameterExpanderVM
          Dim nType As Integer
          EgtGetMachiningParam(MCH_MP.NAME, sName)
          EgtGetMachiningParam(MCH_MP.TYPE, nType)
-         Dim oldValue As Boolean = If(Not IsNothing(m_CurrOperation), m_CurrOperation.AdvancedParamIsExpander, False)
-         Dim oldOperation As MachiningTreeViewItem = If(Not IsNothing(m_CurrOperation), m_CurrOperation, Nothing)
-
          m_CurrOperation = New MachiningTreeViewItem(sName, DirectCast(nType, MCH_MY))
-         m_CurrOperation.AdvancedParamIsExpander = oldValue
 
          m_CurrOperation.ReadOperationParam()
 
@@ -251,7 +251,8 @@ Public Class MachiningParameterExpanderVM
                If MatType = MaterialType.STONE5 Then
                   ' se macchina di tipo STONE ricavo il tipo di utensile
                   Dim sMachiningToolName = String.Empty
-                  EgtGetMachiningParam(MCH_MP.TOOL, sMachiningToolName)
+                  EgtMdbSetCurrMachining(sName)
+                  EgtMdbGetCurrMachiningParam(MCH_MP.TOOL, sMachiningToolName)
                   EgtTdbSetCurrTool(sMachiningToolName)
                   Dim dValue As Double = 0
                   Dim nToolType As Integer

OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/PocketingParameterExpanderV.xaml

@@ -129,8 +129,13 @@
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}" 
                                         Style="{DynamicResource StringParamV_Margin}"/>
-               <EgtWPFLib5:StringParamV ParamTxBl="{Binding SideAngleTxBl}" 
-                                        ParamTxBx="{Binding Path=SideAngle,
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding OffsetSrTxBl}" 
+                                        ParamTxBx="{Binding Path=OffSr,
+                                                            UpdateSourceTrigger=PropertyChanged,
+                                                            ValidatesOnDataErrors=True}" 
+                                        Style="{DynamicResource StringParamV_Margin}"/>
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding OffsetSlTxBl}" 
+                                        ParamTxBx="{Binding Path=OffSl,
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}" 
                                         Style="{DynamicResource StringParamV_Margin}"/>
@@ -146,13 +151,8 @@
                                                             ValidatesOnDataErrors=True}" 
                                         Style="{DynamicResource StringParamV_Margin}"
                                         Visibility="{Binding Epicycles_Visibility}"/>
-               <EgtWPFLib5:StringParamV ParamTxBl="{Binding OffsetSrTxBl}" 
-                                        ParamTxBx="{Binding Path=OffSr,
-                                                            UpdateSourceTrigger=PropertyChanged,
-                                                            ValidatesOnDataErrors=True}" 
-                                        Style="{DynamicResource StringParamV_Margin}"/>
-               <EgtWPFLib5:StringParamV ParamTxBl="{Binding OffsetSlTxBl}" 
-                                        ParamTxBx="{Binding Path=OffSl,
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding SideAngleTxBl}" 
+                                        ParamTxBx="{Binding Path=SideAngle,
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}" 
                                         Style="{DynamicResource StringParamV_Margin}"/>

OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/StoneMillingParameterExpanderV.xaml

@@ -119,21 +119,24 @@
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}" 
                                         Style="{DynamicResource StringParamV_Margin}"/>
+               <EgtWPFLib5:ComboParamV ParamTxBl="{Binding LeadInTypeTxBl}" 
+                                       ParamCmBxList="{Binding Path=LeadInTypeList,
+                                                               UpdateSourceTrigger=PropertyChanged,
+                                                               ValidatesOnDataErrors=True}"
+                                       ParamCmBxSelIndex="{Binding Path=SelectedLeadInType}" 
+                                       Style="{DynamicResource ComboParamV_Margin}"/>
+               <EgtWPFLib5:ComboParamV ParamTxBl="{Binding LeadOutTypeTxBl}" 
+                                       ParamCmBxList="{Binding Path=LeadOutTypeList,
+                                                               UpdateSourceTrigger=PropertyChanged,
+                                                               ValidatesOnDataErrors=True}"
+                                       ParamCmBxSelIndex="{Binding Path=SelectedLeadOutType}"
+                                       Style="{DynamicResource ComboParamV_Margin}"/>
                <EgtWPFLib5:StringParamV ParamTxBl="{Binding StepParTxBl}" 
                                         ParamTxBx="{Binding Path=StepPar,
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}" 
                                         Style="{DynamicResource StringParamV_Margin}"/>
-               <EgtWPFLib5:StringParamV ParamTxBl="{Binding OffsetSrTxBl}" 
-                                        ParamTxBx="{Binding Path=OffSr,
-                                                            UpdateSourceTrigger=PropertyChanged,
-                                                            ValidatesOnDataErrors=True}" 
-                                        Style="{DynamicResource StringParamV_Margin}"/>
-               <EgtWPFLib5:StringParamV ParamTxBl="{Binding OffsetSlTxBl}" 
-                                        ParamTxBx="{Binding Path=OffSl,
-                                                            UpdateSourceTrigger=PropertyChanged,
-                                                            ValidatesOnDataErrors=True}" 
-                                        Style="{DynamicResource StringParamV_Margin}"/>
+
             </StackPanel>
          </Expander>
 
@@ -249,62 +252,6 @@
             </Grid>
          </Expander>
 
-         <Expander Style="{StaticResource ExpanderStyle}">
-            <Expander.Header>
-               <EgtWPFLib5:ComboParamV ParamTxBl="{Binding LeadInTypeTxBl}" 
-                                       ParamCmBxList="{Binding Path=LeadInTypeList,
-                                                               UpdateSourceTrigger=PropertyChanged,
-                                                               ValidatesOnDataErrors=True}"
-                                       ParamCmBxSelIndex="{Binding Path=SelectedLeadInType}" 
-                                       Style="{DynamicResource ComboParamV_Margin}"/>
-            </Expander.Header>
-            <StackPanel>
-               <EgtWPFLib5:StringParamV ParamTxBl="{Binding StartAddLenTxBl}" 
-                                        ParamTxBx="{Binding Path=StartAddLen,
-                                                            UpdateSourceTrigger=PropertyChanged,
-                                                            ValidatesOnDataErrors=True}" 
-                                        Style="{DynamicResource StringParamV_Margin}"/>
-               <EgtWPFLib5:StringParamV ParamTxBl="{Binding LiTangTxBl}" 
-                                        ParamTxBx="{Binding Path=LiTang,
-                                                            UpdateSourceTrigger=PropertyChanged,
-                                                            ValidatesOnDataErrors=True}" 
-                                        Style="{DynamicResource StringParamV_Margin}"/>
-               <EgtWPFLib5:StringParamV ParamTxBl="{Binding LiElevTxBl}" 
-                                        ParamTxBx="{Binding Path=LiElev,
-                                                            UpdateSourceTrigger=PropertyChanged,
-                                                            ValidatesOnDataErrors=True}" 
-                                        Style="{DynamicResource StringParamV_Margin}"/>
-            </StackPanel>
-         </Expander>
-
-         <Expander Style="{StaticResource ExpanderStyle}">
-            <Expander.Header>
-               <EgtWPFLib5:ComboParamV ParamTxBl="{Binding LeadOutTypeTxBl}" 
-                                       ParamCmBxList="{Binding Path=LeadOutTypeList,
-                                                               UpdateSourceTrigger=PropertyChanged,
-                                                               ValidatesOnDataErrors=True}"
-                                       ParamCmBxSelIndex="{Binding Path=SelectedLeadOutType}"
-                                       Style="{DynamicResource ComboParamV_Margin}"/>
-            </Expander.Header>
-            <StackPanel>
-               <EgtWPFLib5:StringParamV ParamTxBl="{Binding EndAddLenTxBl}" 
-                                        ParamTxBx="{Binding Path=EndAddLen,
-                                                            UpdateSourceTrigger=PropertyChanged,
-                                                            ValidatesOnDataErrors=True}" 
-                                        Style="{DynamicResource StringParamV_Margin}"/>
-               <EgtWPFLib5:StringParamV ParamTxBl="{Binding LoTangTxBl}" 
-                                        ParamTxBx="{Binding Path=LoTang,
-                                                            UpdateSourceTrigger=PropertyChanged,
-                                                            ValidatesOnDataErrors=True}" 
-                                        Style="{DynamicResource StringParamV_Margin}"/>
-               <EgtWPFLib5:StringParamV ParamTxBl="{Binding LoElevTxBl}" 
-                                        ParamTxBx="{Binding Path=LoElev,
-                                                            UpdateSourceTrigger=PropertyChanged,
-                                                            ValidatesOnDataErrors=True}" 
-                                        Style="{DynamicResource StringParamV_Margin}"/>
-            </StackPanel>
-         </Expander>
-
          <Expander Style="{StaticResource ExpanderStyle}">
             <Expander.Header>
                <TextBlock Text="{Binding ToolExpanderHeader}"/>

OptionPanel/MachiningOptionPanel/OperationParametersExpander/OperationParametersExpanderVM.vb

@@ -179,6 +179,9 @@ Public Class OperationParametersExpanderVM
                Map.refProjectVM.SceneSelMode = OptionModule.m_SelGeomProbing
          End Select
          ' Imposto visualizzazione utensile
+         'Map.refMachiningParameterExpanderVM.SetPreviewMachiningTool(MCH_LOOK.TAB_TOOL)
+         'Map.refMachiningParameterExpanderVM.SetToolPreview_Image("pack://application:,,,/Resources/ToolPreview/Tool.png")
+         'Map.refMachiningParameterExpanderVM.SetSlider_IsEnable(True)
          EgtPreparePreviewMachiningTool()
          Map.refMachiningParameterExpanderVM.PreviewMachiningTool()
          EgtDraw()

OptionPanel/MachiningOptionPanel/OperationsListExpander/OperationsListExpanderVM.vb

@@ -780,10 +780,6 @@ Public Class OperationsListExpanderVM
       End If
       ' Ricarico la lista operazioni aggiornata
       LoadOperationList(MachiningId)
-      ' Aggiunto controllo visibilita' pulsante aggiungi note
-      If Map.refMachiningParameterExpanderVM.CurrOperation.NotesListCombo.Count > 0 Then
-         Map.refMachiningParameterExpanderVM.CurrOperation.SetShowNoteListCombo_Visibility(Visibility.Visible)
-      End If
    End Sub
 
 #End Region ' DuplicateMachCommand

OptionPanel/MachiningOptionPanel/SimulationExpander/SimulationExpanderVM.vb

@@ -91,41 +91,17 @@ Public Class SimulationExpanderVM
       ' Verifico se richiesta anche visualizzazione del CN
       Dim bNcView As Boolean = ((Keyboard.Modifiers And ModifierKeys.Shift) = ModifierKeys.Shift)
 
-      ' Verifico se richiesto anche nome del CN
-      Dim bNcName As Boolean = ((Keyboard.Modifiers And ModifierKeys.Control) = ModifierKeys.Control)
-
       ' Recupero la fase corrente
-      Dim nPhase As Integer = Math.Max( EgtGetCurrPhase(), 1)
-
+      Dim nPhase As Integer = EgtGetCurrPhase()
       ' Aggiorno le lavorazioni
       If Not UpdateAllMachinings() Then
-         EgtSetCurrPhase(nPhase, True)
+         EgtSetCurrPhase(If(nPhase = 0, 1, nPhase), True)
          Return
       End If
-      
       ' Recupero nome file CN (dopo aver verificato salvataggio progetto)
       Dim sCncFile As String = ""
       Dim sInfo As String = ""
-      If Not GetCncFileName(True, sCncFile, sInfo) Then
-         EgtSetCurrPhase(nPhase, True)
-         Return
-      End If
-      ' Se richiesta scelta del nome file
-      If bNcName Then
-         Dim sExt As String = Path.GetExtension( sCncFile)
-         Dim NewSaveFileDialog As New Windows.Forms.SaveFileDialog With {.Title = "PartProgram File Name",
-                                                     .Filter = "|*" & sExt,
-                                                     .FilterIndex = 1,
-                                                     .InitialDirectory = System.IO.Path.GetDirectoryName(sCncFile),
-                                                     .FileName = sCncFile,
-                                                     .CreatePrompt = True,
-                                                     .OverwritePrompt = True,
-                                                     .ValidateNames = False}
-         If NewSaveFileDialog.ShowDialog() = Forms.DialogResult.Ok Then
-            sCncFile = NewSaveFileDialog.FileName
-         End If
-      End If
-
+      If Not GetCncFileName(True, sCncFile, sInfo) Then Return
       ' Eseguo
       If Not EgtGenerate(sCncFile, sInfo) Then
          Dim nErr As Integer = EgtGetLastMachMgrErrorId()
@@ -144,7 +120,7 @@ Public Class SimulationExpanderVM
          Map.refStatusBarVM.NotifyStatusOutput(EgtMsg(5332) & "  (" & sCncFile & ")")
       End If
       ' Torno alla fase originale (o alla prima se non definita)
-      EgtSetCurrPhase(nPhase, True)
+      EgtSetCurrPhase(If(nPhase = 0, 1, nPhase), True)
 
       ' Se richiesta anche la visualizzazione del CN corrente, procedo
       If bNcView Then
@@ -483,7 +459,7 @@ Public Class SimulationExpanderVM
                sInfo &= "-" & sMGrpName
             End If
          End If
-         Dim sExt As String = ".cnc"
+         Dim sExt As String =  ".cnc"
          EgtUILib.GetPrivateProfileString(S_PARTPROGRAM, K_EXTENSION, sExt, sExt, IniFile.m_sCurrMachIniFilePath)
          sCncFile = Path.ChangeExtension(sCncFile, sExt)
       End If

OptionPanel/MachiningOptionPanelV.xaml

@@ -6,7 +6,7 @@
 
    <Grid x:Name="MachiningGrid" Background="Transparent" MaxHeight="{Binding MaxHeight,RelativeSource={RelativeSource AncestorType={x:Type EgtFloating:EgtFloatingPanel}}}">
       <Grid.RowDefinitions>
-         <RowDefinition MinHeight="100" Height="400" MaxHeight="600" 
+         <RowDefinition MinHeight="100" Height="400" MaxHeight="800" 
                         EgtCAM5:MachiningOptionPanelVM.IsExpanded="{Binding OperationsListRowIsExpanded}"
                         EgtCAM5:MachiningOptionPanelVM.TargetSplitter="{Binding ElementName=MachiningGridSplitter}"/>
          <RowDefinition Height="Auto"/>

Project/ProjectVM.vb

@@ -1159,7 +1159,6 @@ Public Class ProjectVM
       ' Per default no drag
       m_bDrag = False
       Dim nSel As Integer
-      EgtSetObjFilterForSelWin(True, True, True, True, True)
       EgtSelect(e.Location, Scene.DIM_SEL, Scene.DIM_SEL, nSel)
       Dim nId As Integer = EgtGetFirstObjInSelWin()
       While nId <> GDB_ID.NULL
@@ -1468,7 +1467,7 @@ Public Class ProjectVM
          ' Visualizzo numerazione
          Analyze.CreateAnalyzeGroup()
          Analyze.CreateCurveCompoPntNbrs(nId)
-      ' Se superficie trimesh, visualizzo dati faccetta toccata
+         ' Se superficie trimesh, visualizzo dati faccetta toccata
       ElseIf EgtGetType(nId) = GDB_TY.SRF_MESH Then
          Dim nFac As Integer = EgtSurfTmFacetFromTria(nId, nSub)
          If nFac >= 0 Then
@@ -1495,7 +1494,7 @@ Public Class ProjectVM
             End If
             Map.refStatusBarVM.NotifyStatusOutput(sOut)
          End If
-      ' Se Regione, visualizzo dati parte toccata
+         ' Se Regione, visualizzo dati parte toccata
       ElseIf EgtGetType(nId) = GDB_TY.SRF_FRGN Then
          Dim nChk As Integer = nSub
          If nChk >= 0 AndAlso nChk < EgtSurfFrChunkCount(nId) Then
@@ -1516,7 +1515,7 @@ Public Class ProjectVM
                                  " / φ=" + DoubleToString(dPhi, 2) + " θ=" + DoubleToString(dTheta, 2)
             Map.refStatusBarVM.NotifyStatusOutput(sOut)
          End If
-      ' Se Superficie di Bezier
+         ' Se Superficie di Bezier
       ElseIf EgtGetType(nId) = GDB_TY.SRF_BEZ Then
          ' Visualizzo il punto selezionato, la normale e le tangenti nelle direzioni dei parametri
          Analyze.CreateAnalyzeGroup()

TopCommandBar/TopCommandBarV.xaml

@@ -1,7 +1,7 @@
 <StackPanel x:Class="TopCommandBarV"
-            xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-            xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-            Orientation="Horizontal">
+   xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+   Orientation="Horizontal">
 
    <!--Barra superiore dei comandi-->
    <UniformGrid Rows="1"

Utility/Analyze.vb

@@ -122,28 +122,6 @@ Module Analyze
       Dim dStart, dEnd As Double
       EgtCurveDomain( nId, dStart, dEnd)
       Dim nCount As Integer = CInt( dEnd - dStart) - 1
-      ' Gestione OPEN/OPEN2
-      Const PCK_KEY_OPEN As String = "OPEN"
-      Const PCK_KEY_OPEN2 As String = "OPEN2"
-      Dim vOpen(nCount) As Integer
-      Dim sInfo As String = ""
-      If EgtGetInfo( nId, PCK_KEY_OPEN, sInfo) Then
-         Dim vInfo() As String = sInfo.Split( ","C)
-         For Each sInd As String In vInfo
-            Dim nInd As Integer = -1
-            If StringToInt( sInd, nInd) AndAlso nInd >= 0 AndAlso nInd <= nCount Then
-               vOpen(nInd) = 1
-            End If
-         Next
-      ElseIf EgtGetInfo( nId, PCK_KEY_OPEN2, sInfo) Then
-         Dim vInfo() As String = sInfo.Split( ","C)
-         For Each sInd As String In vInfo
-            Dim nInd As Integer = -1
-            If StringToInt( sInd, nInd) AndAlso nInd >= 0 AndAlso nInd <= nCount Then
-               vOpen(nInd) = 2
-            End If
-         Next
-      End If
       ' Ciclo sulle curve semplici
       For i As Integer = 0 To nCount
          ' Scrivo il punto iniziale di ogni curva componente
@@ -157,13 +135,7 @@ Module Analyze
          Dim dLen As Double = 2 * Point3d.Dist( ptS, ptP)
          Dim dH As Double = Math.Min( 0.25 * dLen, 10)
          Dim nTxtId As Integer = EgtCreateTextAdv( m_AnaGrpId, ptP, 0, i.ToString(), "", 100, False, dH, 1, 0, INS_POS.MC, GDB_RT.GRID)
-         If vOpen(i) = 1 Then
-            EgtSetColor( nTxtId, New Color3d(0, 0, 192))
-         ElseIf vOpen(i) = 2 Then
-            EgtSetColor( nTxtId, New Color3d(128, 0, 128))
-         Else
-            EgtSetColor( nTxtId, New Color3d(255, 0, 0))
-         End If
+         EgtSetColor( nTxtId, New Color3d( 255, 0,0))
       Next
       ' Se curva aperta aggiungo il punto finale
       If Not EgtCurveIsClosed( nId) Then