diff --git a/Constants/ConstIni.vb b/Constants/ConstIni.vb
index a188782..af092be 100644
--- a/Constants/ConstIni.vb
+++ b/Constants/ConstIni.vb
@@ -128,6 +128,7 @@ Module ConstIni
    Public Const K_SELGEOMGENMACHINING As String = "SelGeomGenMachining"
    Public Const K_SELGEOMCHISELING As String = "SelGeomChiseling"
    Public Const K_MACHININGGROUP As String = "MachiningGroup"
+   Public Const K_SHOWONLYTABLE As String = "ShowOnlyTable"
 
    Public Const S_SIMUL As String = "Simul"
    Public Const K_SLIDERX As String = "SliderX"
diff --git a/IniFile.vb b/IniFile.vb
index ff60c69..54002b1 100644
--- a/IniFile.vb
+++ b/IniFile.vb
@@ -96,7 +96,9 @@ Public Module IniFile
    Friend m_bMachiningGroup As Boolean
    ' Variabile che indica se il programma e' riuscito ad avviarsi
    Friend m_bFailedRun As Boolean
-   ' Variabile che contiene il vettore di traslazione dei pezzi nel passaggio da modalità diegna a lavora
+   ' Flag visualizzazione solo tavola in definizione lavorazioni
+   Friend m_bShowOnlyTable As Boolean
+   ' Variabile che contiene il vettore di traslazione dei pezzi nel passaggio da modalità disegna a lavora
    Friend m_vtMachPartsPos As New Vector3d(Vector3d.NULL)
    ' Variabile che contiene stato simulazione per chiusura programma
    Friend m_bSimulStatForClose As Boolean = True
diff --git a/My Project/AssemblyInfo.vb b/My Project/AssemblyInfo.vb
index b8a5988..9021a23 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("1.8.6.5")> 
-<Assembly: AssemblyFileVersion("1.8.6.5")> 
+<Assembly: AssemblyVersion("1.8.6.6")> 
+<Assembly: AssemblyFileVersion("1.8.6.6")> 
diff --git a/ProjectPage/MachGroupPanel/MachGroupPanelViewModel.vb b/ProjectPage/MachGroupPanel/MachGroupPanelViewModel.vb
index cec58f3..9971c58 100644
--- a/ProjectPage/MachGroupPanel/MachGroupPanelViewModel.vb
+++ b/ProjectPage/MachGroupPanel/MachGroupPanelViewModel.vb
@@ -55,7 +55,7 @@ Namespace EgtCAM5
          ' calcolo bbox di tutti i pezzi disegnati
          'Dim bboxAllParts As New BBox3d
          'CalculateAllPartsBbox(bboxAllParts)
-         Dim bOk As Boolean
+         Dim bOk As Boolean = False
          Dim nId = EgtGetFirstMachGroup()
          If nId <> GDB_ID.NULL Then
             bOk = EgtSetCurrMachGroup(nId)
@@ -68,6 +68,7 @@ Namespace EgtCAM5
             LoadMachGroups()
             SelectedMachGroup = MachGroupList(0)
          End If
+         If IniFile.m_bShowOnlyTable Then EgtShowOnlyTable(True)
          Application.Msn.NotifyColleagues(Application.MACHGROUPSRESULT, bOk)
       End Sub
 
diff --git a/ProjectPage/OptionPanel/MachiningOptionPanel/MachiningsTreeViewExpander/MachiningTreeExpanderView.xaml b/ProjectPage/OptionPanel/MachiningOptionPanel/MachiningsTreeViewExpander/MachiningTreeExpanderView.xaml
index 3e82e56..dccbe3c 100644
--- a/ProjectPage/OptionPanel/MachiningOptionPanel/MachiningsTreeViewExpander/MachiningTreeExpanderView.xaml
+++ b/ProjectPage/OptionPanel/MachiningOptionPanel/MachiningsTreeViewExpander/MachiningTreeExpanderView.xaml
@@ -4,7 +4,7 @@
    xmlns:interactivity="clr-namespace:System.Windows.Interactivity;assembly=System.Windows.Interactivity"
    xmlns:local="clr-namespace:EgtCAM5">
 
-   <Expander Header="Machinings List" IsExpanded="{Binding IsEnabled}" IsEnabled="{Binding IsEnabled}"
+   <Expander Header="{Binding MachListHdr}" IsExpanded="{Binding IsEnabled}" IsEnabled="{Binding IsEnabled}"
       Style="{StaticResource ExpanderStyle}">
       <UniformGrid MaxHeight="100">
          <TreeView Name="MachiningsTreeView" Grid.Row="1"
diff --git a/ProjectPage/OptionPanel/MachiningOptionPanel/MachiningsTreeViewExpander/MachiningTreeExpanderViewModel.vb b/ProjectPage/OptionPanel/MachiningOptionPanel/MachiningsTreeViewExpander/MachiningTreeExpanderViewModel.vb
index db7a799..639376b 100644
--- a/ProjectPage/OptionPanel/MachiningOptionPanel/MachiningsTreeViewExpander/MachiningTreeExpanderViewModel.vb
+++ b/ProjectPage/OptionPanel/MachiningOptionPanel/MachiningsTreeViewExpander/MachiningTreeExpanderViewModel.vb
@@ -18,7 +18,7 @@ Namespace EgtCAM5
             If value <> m_IsEnabled Then
                m_IsEnabled = value
                If Not value And Not m_CodeCommand Then
-                  Application.Msn.NotifyColleagues(Application.NEWMACHININGMODEISACTIVE, New NewMachOpParam(False, GDB_ID.NULL))
+                  Application.Msn.NotifyColleagues(Application.CANCELOPERATIONCOMMAND)
                End If
                m_CodeCommand = False
                OnPropertyChanged("IsEnabled")
@@ -40,6 +40,13 @@ Namespace EgtCAM5
       ' Operazione correntemente selezionata, che permette di aggiungere al posto giusto quella nuova
       Private m_nSelectedOperationId As Integer = -1
 
+      Public ReadOnly Property MachListHdr As String
+         Get
+            Return EgtMsg(5412)                      ' Nuove Lavorazioni
+         End Get
+      End Property
+
+
       ' Definizione comandi
       Private m_cmdTreeViewDoubleClick As ICommand
       Private m_cmdCancelNew As ICommand
@@ -116,8 +123,6 @@ Namespace EgtCAM5
             End If
             ' Calcolo la lavorazione con la nuova geometria
             EgtApplyMachining(True)
-            'Aggiorno le lavorazioni successive a quella corrente che appartengono alla  fase corrente
-
             EgtDraw()
             ' Ricarico la lista operazioni per avere quella nuova
             Application.Msn.NotifyColleagues(Application.LOADOPERATIONLIST, -1)
diff --git a/ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/OperationExpanderViewModel.vb b/ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/OperationExpanderViewModel.vb
index 3d27fc3..9cf358c 100644
--- a/ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/OperationExpanderViewModel.vb
+++ b/ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/OperationExpanderViewModel.vb
@@ -236,14 +236,13 @@ Namespace EgtCAM5
                If m_LastMarkedOperationId <> GDB_ID.NULL Then
                   ' La deevidenzio 
                   EgtResetMark(m_LastMarkedOperationId)
+                  'EgtResetMark(EgtGetFirstNameInGroup(m_LastMarkedOperationId, "CL"))
+                  'EgtSetStatus(EgtGetFirstNameInGroup(m_LastMarkedOperationId, "ST"), GDB_ST.OFF)
                   ' Ne deseleziono la geometria
                   EgtDeselectAll()
                End If
                ' Imposto la fase di lavorazione corrente
-               Dim nPhase As Integer = EgtGetOperationPhase(value.Id)
-               If nPhase <> 0 Then
-                  EgtSetCurrPhase(nPhase)
-               End If
+               EgtSetCurrPhase(EgtGetOperationPhase(value.Id))
                ' Verifico se l'operazione è una disposizione
                If EgtGetOperationType(value.Id) = MCH_OY.DISP Then
                   '' Abilito la selezione delle Fixture
@@ -251,7 +250,7 @@ Namespace EgtCAM5
                   '' Abilito la selezione di tutti i tipi di geometria
                   'Application.Msn.NotifyColleagues(Application.SETSCENESELMODE, SceneSelModeOpt.ALL)
 
-                  ' L'operazione è una lavorazione
+               ' L'operazione è una lavorazione
                Else
                   '' Disabilito la selezione di qualunque cosa
                   'Application.Msn.NotifyColleagues(Application.SETSCENESELTYPE, SceneSelTypeOpt.NULL)
@@ -260,6 +259,8 @@ Namespace EgtCAM5
                   EgtSetCurrMachining(value.Id)
                   ' Evidenzio la lavorazione(operazione) selezionata
                   EgtSetMark(value.Id)
+                  'EgtSetMark(EgtGetFirstNameInGroup(value.Id, "CL"))
+                  'EgtSetStatus(EgtGetFirstNameInGroup(value.Id, "ST"), GDB_ST.ON_)
                   ' Seleziono la geometria della lavorazione
                   Dim CountIndex = 0
                   Dim EntityIndex As Integer = 0
@@ -521,7 +522,7 @@ Namespace EgtCAM5
          If m_NewMachining Then
             EndNewMachining(GDB_ID.NULL)
             ListIsExpanded = True
-            ' altrimenti sto cancellandone una vecchia
+         ' altrimenti sto cancellandone una vecchia
          Else
             If Not IsNothing(SelectedOperation) Then
                ' Salvo indice operazione precedente a selezionata
diff --git a/ProjectPage/OptionPanel/MachiningOptionPanel/SimulationExpander/SimulationExpanderView.xaml b/ProjectPage/OptionPanel/MachiningOptionPanel/SimulationExpander/SimulationExpanderView.xaml
index d5c55e9..7b641a5 100644
--- a/ProjectPage/OptionPanel/MachiningOptionPanel/SimulationExpander/SimulationExpanderView.xaml
+++ b/ProjectPage/OptionPanel/MachiningOptionPanel/SimulationExpander/SimulationExpanderView.xaml
@@ -101,7 +101,9 @@
          </StackPanel>
       </Expander>
 
-      <Button Content="{Binding GenerateMsg}" Height="30" Command="{Binding GenerateCommand}"/>
+      <Button Content="{Binding GenerateMsg}" Height="30"
+              IsEnabled="{Binding GenerateIsEnabled}"
+              Command="{Binding GenerateCommand}"/>
 
    </StackPanel>
 
diff --git a/ProjectPage/OptionPanel/MachiningOptionPanel/SimulationExpander/SimulationExpanderViewModel.vb b/ProjectPage/OptionPanel/MachiningOptionPanel/SimulationExpander/SimulationExpanderViewModel.vb
index ecdaec7..d37f41e 100644
--- a/ProjectPage/OptionPanel/MachiningOptionPanel/SimulationExpander/SimulationExpanderViewModel.vb
+++ b/ProjectPage/OptionPanel/MachiningOptionPanel/SimulationExpander/SimulationExpanderViewModel.vb
@@ -67,15 +67,26 @@ Namespace EgtCAM5
                   Application.Msn.NotifyColleagues(Application.REMOVEMARKFROMLASTOPERATION)
                   Application.Msn.NotifyColleagues(Application.GETDISTANCE_ISCHECKED, False)
                   InitializeSimulation()
+                  If IniFile.m_bShowOnlyTable Then
+                     EgtShowOnlyTable(False)
+                     EgtDraw()
+                  End If
                Else
                   CloseSimulation()
+                  If IniFile.m_bShowOnlyTable Then EgtShowOnlyTable(True)
                End If
                m_IsExpanded = value
                Application.Msn.NotifyColleagues(Application.SIMULATIONEXPANDER_GET_ISEXPANDED, value)
                OnPropertyChanged("IsExpanded")
+               OnPropertyChanged("GenerateIsEnabled")
             End If
          End Set
       End Property
+      Public ReadOnly Property GenerateIsEnabled As Boolean
+         Get
+            Return Not m_IsExpanded
+         End Get
+      End Property
 
       ' lista degli assi
       Private m_MachineAxisList As New ObservableCollection(Of MachineAxis)
diff --git a/ProjectPage/ProjectViewModel.vb b/ProjectPage/ProjectViewModel.vb
index b94127f..e5494ff 100644
--- a/ProjectPage/ProjectViewModel.vb
+++ b/ProjectPage/ProjectViewModel.vb
@@ -259,6 +259,8 @@ Namespace EgtCAM5
          ' lettura da ini della variabile che abilita i gruppi di lavorazione
          IniFile.m_bMachiningGroup = (GetPrivateProfileInt(S_MACH, K_MACHININGGROUP, 0) <> 0)
          Application.Msn.NotifyColleagues(Application.DRAWMODE_ISCHECKED)
+         ' lettura flag visualizzazione solo tavola in definizione lavorazioni
+         IniFile.m_bShowOnlyTable = (GetPrivateProfileInt(S_MACH, K_SHOWONLYTABLE, 0) <> 0)
          ' ObjTree non selezionato
          Application.Msn.NotifyColleagues(Application.UPDATEOBJTREEOLDID, GDB_ID.NULL)
          ' nascondo input box