Correzione avvio MachiningDBWindow

- gestiti i popup alla chiusura della finestra VeinMatching.

CompoWindow/CompoManager/CompoManagerVM.vb

@@ -295,6 +295,8 @@ Public Class CompoManagerVM
       If Not CompoWindowMap.refCompoWindowVM.m_bDrawOk Then
          Return
       End If
+      ' per il CABINET ridisegno le figure piane e non creo i solidi
+      CompoWindowMap.refCompoWindowVM.UpdateViewForCabinet()
       ' Leggo numero di pezzi da inserire
       Dim InsNbr As Integer
       StringToInt(m_PartNum, InsNbr)

CompoWindow/CompoWindowVM.vb

@@ -144,7 +144,8 @@ Public Class CompoWindowVM
 
 #Region "METHODS"
 
-   Friend Function MakePreview(ByRef sMsg As String) As Boolean
+   Friend Function MakePreview(ByRef sMsg As String, Optional bDrawSolid As Boolean = True) As Boolean
+      EgtLuaSetGlobBoolVar("CMP.DrawSolid", bDrawSolid)
       If Not EgtLuaExecLine(LUA_CMP_DRAW & "(true)") Then
          sMsg = "Error in component execution"
          m_bDrawOk = False
@@ -170,20 +171,32 @@ Public Class CompoWindowVM
       Return EgtLuaExecFile(sPath)
    End Function
 
-   Friend Sub UpdateView()
+   Friend Sub UpdateView(Optional bDrawSolid As Boolean = True)
       ' verifico ci sia un componente corrente
       If IsNothing(m_SelCompo) Then
          Return
       End If
       ' aggiorno le variabili dalla griglia
       CompoWindowMap.refCompoParamPageVM.UpdateVariables()
+      Dim bResetView As Boolean = True
+      EgtLuaGetGlobBoolVar("CMP.ResetView", bResetView)
       ' ricalcolo il disegno
       Dim sMsg As String = String.Empty
-      MakePreview(sMsg)
+      MakePreview(sMsg, bDrawSolid)
       CompoWindowMap.refCompoParamPageVM.SetOutputMessage(sMsg, If(m_bDrawOk, MSG_TYPE.INFO, MSG_TYPE.ERROR_))
       ' aggiorno visualizzazione
-      EgtSetView(VT.TOP, False)
+      If bResetView Then
-      EgtZoom(ZM.ALL)
+         EgtSetView(VT.TOP, False)
+         EgtZoom(ZM.ALL)
+      Else
+         EgtDraw()
+      End If
+   End Sub
+
+   Friend Sub UpdateViewForCabinet(Optional bDrawSolid As Boolean = True)
+      Dim bIsCabinet As Boolean = False
+      EgtLuaGetGlobBoolVar("CMP.IsCabinet", bIsCabinet)
+      If bIsCabinet Then UpdateView(False)
    End Sub
 
    Friend Function MakeInsert(ByVal nNbr As Integer, sName As String) As Boolean
@@ -366,7 +379,8 @@ Public Class CompoWindowVM
 
       ' identificativo univoico del gruppo di pezzi, se più di un pezzo
       Dim sGUICode As String = String.Empty
-
+      ' cancello eventuale layer delle etichette e dimensioni
+      EgtErase(EgtGetFirstNameInGroup(GDB_ID.ROOT, "Dimensions"))
       While Pz <> -1
          ' imposto il contesto corrente
          EgtSetCurrentContext(CompoWindowMap.refCompoSceneHostV.CompoScene.GetCtx())
@@ -380,6 +394,10 @@ Public Class CompoWindowVM
          EgtErase(EgtGetFirstNameInGroup(Pz, "Etichette"))
          EgtErase(EgtGetFirstNameInGroup(Pz, "Quotature"))
          EgtErase(EgtGetFirstNameInGroup(Pz, "Box"))
+         ' elimino il solido corrispondente
+         Dim nChild As Integer = GDB_ID.NULL
+         EgtGetInfo(Pz, "Child", nChild)
+         EgtErase(nChild)
 
          ' Cancello layer etichette dei componenti interni (buchi)
          Dim nHLId As Integer = EgtGetFirstNameInGroup(Pz, "HoleLabels")

Constants/ConstGen.vb

@@ -48,6 +48,10 @@ Module ConstGen
       ENABLE_POLISHING = CUInt(2 ^ 18)           '  262144
       OFFICE_TYPE = CUInt(2 ^ 19)                '  524288 - Solo per OmagCUT
       REGISTRATION = CUInt(2 ^ 20)               ' 1048576 - Solo per OmagCUT
+      ' ---
+      ' ---
+      ' ---
+      VEIN_MATCH_3D = CInt(2 ^ 24)               ' 16777216 - Solo per OmagOFFICE
    End Enum
 
    ' File di log generale

DxfImportWindow/DxfImportWindowVM.vb

@@ -15,6 +15,9 @@ Public Class DxfImportWindowVM
    Private m_nFileType As Integer = FT.NULL
    Private m_bEnableTrf As Boolean = False
 
+   ' in "LoadCurrFile" imposto il valore del parametro per import nge
+   Private bImportSTD As Boolean = True
+
    Private m_sCad2dName As String
    Private m_sCad2dPath As String
 
@@ -707,13 +710,23 @@ Public Class DxfImportWindowVM
             EgtScale(GDB_ID.SEL, Frame3d.GLOB, 1, 1, 0)
             EgtDeselectAll()
          Case FT.NGE
-         ' Carico Nge
+            ' Carico Nge
-         If Not EgtOpenFile(m_sFilePath) Then Return False
+            If Not EgtOpenFile(m_sFilePath) Then Return False
-         ' Filtro Nge
+            bImportSTD = True
-         EstProject.FilterNge()
+            ' Leggo nel file se il progetto arriva dal programma EgtSTONE3D -> bImportSTD = False
-      Case FT_TRF
+            Dim idGroupStone As Integer = GDB_ID.NULL
-         ' Carico Trf
+            idGroupStone = EgtGetFirstNameInGroup(GDB_ID.ROOT, "EgtStone3D")
-         If Not ImportTrf(m_sFilePath) Then Return False
+            If idGroupStone <> GDB_ID.NULL Then
+               bImportSTD = False
+               EgtErase(idGroupStone)
+            End If
+            ' Filtro Nge SOLO se importazione STANDARD
+            If bImportSTD Then
+               EstProject.FilterNge()
+            End If
+         Case FT_TRF
+            ' Carico Trf
+            If Not ImportTrf(m_sFilePath) Then Return False
       Case Else
          Return False
       End Select
@@ -1075,18 +1088,20 @@ Public Class DxfImportWindowVM
 
    Public Sub UseRegion(ByVal param As Object)
       ' Creo i pezzi
-      Dim nType As Integer = If(m_nFileType = FT.NGE, FPC_TYPE.NGE, FPC_TYPE.REGION)
+      If bImportSTD Then
-      Dim dToler As Double = GetPrivateProfileDouble(S_FLATPARTS, K_FLPTOLERANCE, 0.1, IniFile.m_sIniFile)
+         Dim nType As Integer = If(m_nFileType = FT.NGE, FPC_TYPE.NGE, FPC_TYPE.REGION)
-      EgtCreateAdjustFlatParts(nType, dToler)
+         Dim dToler As Double = GetPrivateProfileDouble(S_FLATPARTS, K_FLPTOLERANCE, 0.1, IniFile.m_sIniFile)
-      ' Se prevista gestione colore->angolo di fianco
+         EgtCreateAdjustFlatParts(nType, dToler)
-      If GetPrivateProfileInt(S_COLORTOSIDEANG, K_CTSA_ENABLE, 0, IniFile.m_sIniFile) <> 0 Then
+         ' Se prevista gestione colore->angolo di fianco
-         SideEntityControlVM.ColorToSideAngle(DxfImportWindowMap.refDxfImportSceneHostV.ImportDxfScene.GetCtx())
+         If GetPrivateProfileInt(S_COLORTOSIDEANG, K_CTSA_ENABLE, 0, IniFile.m_sIniFile) <> 0 Then
+            SideEntityControlVM.ColorToSideAngle(DxfImportWindowMap.refDxfImportSceneHostV.ImportDxfScene.GetCtx())
+         End If
+         ' Se prevista gestione colore->incisioni
+         If GetPrivateProfileInt(S_COLORTOENGRAVE, K_CTE_ENABLE, 0, IniFile.m_sIniFile) <> 0 Then
+            SideEntityControlVM.ColorToEngrave(DxfImportWindowMap.refDxfImportSceneHostV.ImportDxfScene.GetCtx())
+         End If
+         ColorRegion(DxfImportWindowMap.refDxfImportSceneHostV.ImportDxfScene.GetCtx())
       End If
-      ' Se prevista gestione colore->incisioni
-      If GetPrivateProfileInt(S_COLORTOENGRAVE, K_CTE_ENABLE, 0, IniFile.m_sIniFile) <> 0 Then
-         SideEntityControlVM.ColorToEngrave(DxfImportWindowMap.refDxfImportSceneHostV.ImportDxfScene.GetCtx())
-      End If
-      ColorRegion(DxfImportWindowMap.refDxfImportSceneHostV.ImportDxfScene.GetCtx())
       ' Eseguo zoom
       EgtZoom(ZM.ALL)
       ' disabilito bottoni UseLayer e UseRegion, abilito bottoni Reset e Insert

EgtStoneLib/CamAuto.vb

@@ -975,6 +975,27 @@ Friend Module CamAuto
       End If
    End Function
 
+   Friend Function GetRawHeightFromPart(CurrIdPart As Integer, VeinCtx As Integer, MachCtx As Integer) As Double
+      Dim H As Double = 5
+      EgtSetCurrentContext(MachCtx)
+      Dim IdRaw As Integer = EgtGetFirstRawPart()
+      While IdRaw <> GDB_ID.NULL
+         Dim IdPart As Integer = EgtGetFirstPartInRawPart(IdRaw)
+         While IdPart <> GDB_ID.NULL
+            If IdPart = CurrIdPart Then
+               Dim ptRawMin, ptRawMax As Point3d
+               EgtGetRawPartBBox(GetCurrentRaw(), ptRawMin, ptRawMax)
+               EgtSetCurrentContext(VeinCtx)
+               Return ptRawMax.z - ptRawMin.z
+            End If
+            IdPart = EgtGetNextPartInRawPart(IdPart)
+         End While
+         IdRaw = EgtGetNextRawPart(IdRaw)
+      End While
+      EgtSetCurrentContext(VeinCtx)
+      Return H
+   End Function
+
    Friend Function UpdateAllRawsZ(dDeltaZ As Double) As Boolean
       For i As Integer = 1 To EgtGetPhaseCount()
          EgtSetCurrPhase(i)

EgtStoneLib/VeinMatchingWindow.xaml

@@ -1,36 +0,0 @@
-<Window x:Class="VeinMatchingWindow"
-   xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-   Height="500" Width="500" ShowInTaskbar="False" Initialized="Window_Initialized" MinWidth="300" MinHeight="300">
-
-   <Grid Name="VeinMatchingGrid" Background="{StaticResource Omag_Gray}">
-      <Grid.ColumnDefinitions>
-         <ColumnDefinition Width="91"/>
-         <ColumnDefinition Width="1*"/>
-      </Grid.ColumnDefinitions>
-
-      <StackPanel Orientation="Vertical">
-         <ToggleButton Name="ShowTextBtn" Height="40" Width="80"
-                       Margin="0,5,0,0"
-                       Content="ShowText"/>
-         <ToggleButton Name="EditBtn" Height="40" Width="80"
-                       Margin="0,5,0,0"
-                       Content="Edit"/>
-         <ToggleButton Name="VerifyBtn" Height="40" Width="80"
-                       Margin="0,5,0,0"
-                       Content="Verify"/>
-         <ToggleButton Name="MagneticBtn" Height="40" Width="80"
-                       Visibility="Collapsed"
-                       Margin="0,5,0,0"
-                       Content="Magnetic"/>
-         <Button Name="ExportBtn" Height="40" Width="80"
-                 Margin="0,5,0,0"
-                 Content="Export"/>
-         <Button Name="AssemblyBtn" Height="40" Width="80"
-                 Margin="0,5,0,0"
-                 Content="3D"/>
-        </StackPanel> 
-
-   </Grid>
-
-</Window>

MachinePanel/MyMachinePanelVM.vb

@@ -105,7 +105,7 @@ Public Class MyMachinePanelVM
       ' procedo ad inizializzare la classe → carico la lista "MachineList" che visualizzo per l'inserimento di nuovi MachGroup
       Machine.MachineListInit(sMchRoots, MachineList)
       ' Inizializzo valori visibilità parametri Db utensili e lavorazioni
-      OmagOFFICETMDbParamVisibility.Init()
+      ' OmagOFFICETMDbParamVisibility.Init()
    End Sub
 
    ''' <summary>

MainWindow/MainWindowM.vb

@@ -381,6 +381,7 @@ Public Class MainWindowM
    End Sub
 
    Friend Function GetKeyOption(nKeyOpt As KEY_OPT) As Boolean
+      Dim int As UInteger = m_nKeyOptions And nKeyOpt
       Return ((m_nKeyOptions And nKeyOpt) <> 0)
    End Function
 

MyMachiningDbWindow/MyMachiningDbWindowV.xaml

@@ -18,7 +18,7 @@
    </EgtWPFLib5:EgtCustomWindow.InputBindings>
 
    <EgtWPFLib5:EgtCustomWindow.Resources>
-      <EgtWPFLib5:MachiningParamVisibilityConverter x:Key="MachiningParamVisibilityConverter"/>
+      <!--<EgtWPFLib5:MachiningParamVisibilityConverter x:Key="MachiningParamVisibilityConverter"/>-->
       <EgtWPFLib5:DepthUnitConverter x:Key="DepthUnitConverter"/>
       <EgtWPFLib5:ErrorVisibilityConverter x:Key="ErrorVisibilityConverter"/>
       <sys:Int32 x:Key="Invert">0</sys:Int32>

MyToolDbWindow/MyToolDbWindowV.xaml

@@ -16,7 +16,7 @@
     </EgtWPFLib5:EgtCustomWindow.InputBindings>
 
     <EgtWPFLib5:EgtCustomWindow.Resources>
-        <EgtWPFLib5:ToolParamVisibilityConverter x:Key="ToolParamVisibilityConverter"/>
+        <!--<EgtWPFLib5:ToolParamVisibilityConverter x:Key="ToolParamVisibilityConverter"/>-->
         <EgtWPFLib5:ToolDrawUUIDConverter x:Key="ToolDrawUUIDConverter"/>
         <EgtWPFLib5:ErrorVisibilityConverter x:Key="ErrorVisibilityConverter"/>
         <sys:Int32 x:Key="Corr">0</sys:Int32>

MyVeinMatch/PairInputDataVeinMatch.xaml

@@ -0,0 +1,73 @@
+<Window x:Class="PairInputDataVeinMatch"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:local="clr-namespace:OmagOFFICE"
+        mc:Ignorable="d"
+        ShowInTaskbar="False"
+        WindowStyle="None"
+        Title="PairInputDataVeinMatch" Height="auto" Width="300"
+        Background="{StaticResource Omag_DarkGray}">
+   <StackPanel Name ="WinPair" Orientation="Vertical" VerticalAlignment="Center">
+      <TextBlock Name="TopBar"
+      Text="Seleziona dal primo Part il lato che vuoi accoppiare" HorizontalAlignment="Center"
+      Width="Auto"
+      TextWrapping="Wrap"
+      Margin="0,0,0,10"
+      FontSize="20"/>
+      <ComboBox Name="PairOption"
+          Style="{StaticResource Raw_ComboBox}"
+          Margin="1,5,1,0"
+          IsEnabled="True"
+          Visibility="Collapsed"/>
+      <!--<CheckBox Name="InvertOption" Margin="1,5,1,0" 
+          Foreground="{DynamicResource Omag_White}"
+          IsEnabled="True"
+          Visibility="Collapsed">Invert</CheckBox>-->
+      <CheckBox Name="FlipOption1" Margin="1,5,1,0" 
+          Foreground="{DynamicResource Omag_White}"
+          IsEnabled="True"
+          Visibility="Collapsed">Flip ∥</CheckBox>
+      <CheckBox Name="FlipOption2" Margin="1,5,1,0" 
+          Foreground="{DynamicResource Omag_White}"
+          IsEnabled="True"
+          Visibility="Collapsed">Flip ⟂</CheckBox>
+
+      <!--<Grid>
+         <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="1*"/>
+            <ColumnDefinition Width="2*"/>
+         </Grid.ColumnDefinitions>
+         <TextBlock Name="Testo" Height="26"
+      Foreground="{DynamicResource Omag_White}"
+      Background="{DynamicResource Omag_Black}"
+      Margin="1,5,1,0"
+      Text="Angolo"
+      TextAlignment="Center"
+      Grid.Column="0"
+      IsEnabled="True"/>
+         <TextBox Name="RotInputData" Height="26"
+      Foreground="{DynamicResource Omag_White}"
+      Background="{DynamicResource Omag_Black}"
+      Margin="1,5,1,0"
+      Grid.Column="1"
+      Text="0"
+      HorizontalContentAlignment="Right"
+      VerticalContentAlignment="Center"
+      IsEnabled="False"/>
+      </Grid>-->
+      <Grid>
+         <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="1*"/>
+            <ColumnDefinition Width="2*"/>
+         </Grid.ColumnDefinitions>
+         <Button Name="Conferma"
+      Grid.Column="0"
+      Content="Conferma"/>
+         <Button Name="Annulla"
+      Grid.Column="1"
+      Content="Annulla"/>
+      </Grid>
+   </StackPanel>
+</Window>

MyVeinMatch/PairInputDataVeinMatch.xaml.vb

@@ -0,0 +1,62 @@
+Imports EgtUILib.EgtInterface
+
+Public Class PairInputDataVeinMatch
+   Private Ref As VeinMatchingWindow
+   Public Sub New(ByVal MVD As Window)
+      Owner = MVD
+      Ref = DirectCast(MVD, VeinMatchingWindow)
+
+      ' La chiamata è richiesta dalla finestra di progettazione.
+      InitializeComponent()
+
+      PairOption.ItemsSource = New List(Of String)({"Start-Start", "Start-End", "End-Start", "End-End", "Middle-Middle"})
+      PairOption.SelectedIndex = 1
+   End Sub
+   Public Sub ConfirmBtn_click() Handles Conferma.Click
+      OmagOFFICEMap.refVeinMatchingWindow.bInputDone = True
+      OmagOFFICEMap.refVeinMatchingWindow.TgBtn_Pair.IsChecked = False
+      Me.Close()
+   End Sub
+   Public Sub CancelBtn_click() Handles Annulla.Click
+      OmagOFFICEMap.refVeinMatchingWindow.bInputDone = False
+      OmagOFFICEMap.refVeinMatchingWindow.ResetPairing()
+      OmagOFFICEMap.refVeinMatchingWindow.TgBtn_Pair.IsChecked = False
+      Me.Close()
+   End Sub
+
+   Private Sub PairOption_Changed() Handles PairOption.SelectionChanged
+      OmagOFFICEMap.refVeinMatchingWindow.PairOption_Changed()
+   End Sub
+
+   'Private Sub InvertOption_Changed() Handles InvertOption.Click
+   '   OmagOFFICEMap.refVeinMatchingWindow.InvertOption_Changed()
+   'End Sub
+
+   Private Sub FlipParallel_Changed() Handles FlipOption1.Click
+      OmagOFFICEMap.refVeinMatchingWindow.InvertOption_Changed()
+   End Sub
+
+   Private Sub FlipPerpendicular_Changed() Handles FlipOption2.Click
+      OmagOFFICEMap.refVeinMatchingWindow.FlipPerpendicular_Changed()
+   End Sub
+
+   Private m_MouseLeftPressed As Boolean = False
+   ' qui dovrebbe funzionare quando entrambe le condizioni sono attive, non solo 
+   Private Sub TopCommandBar_pressed() Handles TopBar.MouseLeftButtonDown
+      m_MouseLeftPressed = True
+   End Sub
+
+   Private Sub TopCommandBar_released() Handles TopBar.MouseLeftButtonUp
+      m_MouseLeftPressed = False
+   End Sub
+
+   Private Sub TopCommandBar_Drag() Handles TopBar.MouseMove
+      If m_MouseLeftPressed Then
+         Try
+            Me.DragMove()
+         Catch e As Exception
+         End Try
+         m_MouseLeftPressed = False ' non si sa perché, ma è l'UNICO modo con cui funziona
+      End If
+   End Sub
+End Class

MyVeinMatch/RotationInputDataVeinMatch.xaml

@@ -0,0 +1,57 @@
+<Window x:Class="RotationInputDataVeinMatch"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:local="clr-namespace:OmagOFFICE"
+        mc:Ignorable="d"
+        ShowInTaskbar="False"
+        WindowStyle="None"
+        Title="InputDataVeinMatch" Height="100" Width="200"
+        Background="{StaticResource Omag_DarkGray}">
+
+   <!--<local:RotateUC></local:RotateUC>-->
+   <!--<UserControl Name="MyUserControl"  Content="{Binding ControlUC}"></UserControl>-->
+   <StackPanel Name ="WinRotate" Orientation="Vertical" VerticalAlignment="Center">
+      <Label Name="TopBar"
+         Content="Seleziona l'asse di rotazione" HorizontalAlignment="Center"
+             Width="Auto"/>
+
+      <Grid>
+         <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="1*"/>
+            <ColumnDefinition Width="2*"/>
+         </Grid.ColumnDefinitions>
+         <TextBlock Name="Testo" Height="26"
+         Foreground="{DynamicResource Omag_White}"
+         Background="{DynamicResource Omag_Black}"
+         Margin="1,5,1,0"
+         Text="Angolo"
+         TextAlignment="Center"
+         Grid.Column="0"
+         IsEnabled="True"/>
+         <TextBox Name="RotInputData" Height="26"
+         Foreground="{DynamicResource Omag_White}"
+         Background="{DynamicResource Omag_Black}"
+         Margin="1,5,1,0"
+         Grid.Column="1"
+         Text="0"
+         HorizontalContentAlignment="Right"
+         VerticalContentAlignment="Center"
+         IsEnabled="False"/>
+      </Grid>
+      <Grid>
+         <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="1*"/>
+            <ColumnDefinition Width="2*"/>
+         </Grid.ColumnDefinitions>
+         <Button Name="Conferma"
+         Grid.Column="0"
+         Content="Conferma"/>
+         <Button Name="Annulla"
+         Grid.Column="1"
+         Content="Annulla"/>
+      </Grid>
+   </StackPanel>
+
+</Window>

MyVeinMatch/RotationInputDataVeinMatch.xaml.vb

@@ -0,0 +1,73 @@
+Imports System.IO
+Imports System.Windows.Interop
+Imports System.Collections.ObjectModel
+Imports System.Windows.Forms
+Imports OmagOFFICE.VeinMatchingWindow
+Imports MS.Internal
+
+Public Class RotationInputDataVeinMatch
+   Private Ref As VeinMatchingWindow
+   Public Sub New(ByVal MVD As Window)
+      Owner = MVD
+      Ref = DirectCast(MVD, VeinMatchingWindow)
+
+      ' La chiamata è richiesta dalla finestra di progettazione.
+      InitializeComponent()
+
+      '' Aggiungere le eventuali istruzioni di inizializzazione dopo la chiamata a InitializeComponent().
+      'AddHandler Ref.eAxisSelected, AddressOf MainWindow_MyVariableChanged
+   End Sub
+
+   '' Subscribe to the event
+   'Private Sub MainWindow_MyVariableChanged(sender As Object, e As EventHandler(Of AxisSelectedEventArgs))
+   '   ' Call a method in the user control
+   '   MyUserControl.HandleMyVariableChanged(e.newValue)
+   'End Sub
+
+   'Public Sub Key_Press(sender As Object, e As System.Windows.Forms.KeyPressEventHandler) Handles Me.KeyDown
+
+   '   'If e.KeyChar = ChrW(System.Windows.Forms.Keys.Escape) Then
+   '   '   Dim a As Integer = 10
+   '   'End If
+   'End Sub
+
+   Public Sub TextValueChanged() Handles RotInputData.TextChanged
+      OmagOFFICEMap.refVeinMatchingWindow.sInputAng = RotInputData.Text
+      OmagOFFICEMap.refVeinMatchingWindow.AngText_Changed()
+   End Sub
+
+   Public Sub ConfirmBtn_click() Handles Conferma.Click
+      OmagOFFICEMap.refVeinMatchingWindow.bInputDone = True
+      OmagOFFICEMap.refVeinMatchingWindow.TgBtn_Rotation.IsChecked = False
+      Me.Close()
+   End Sub
+   Public Sub CancelBtn_click() Handles Annulla.Click
+      OmagOFFICEMap.refVeinMatchingWindow.sInputAng = ""
+      OmagOFFICEMap.refVeinMatchingWindow.bInputDone = False
+      OmagOFFICEMap.refVeinMatchingWindow.ResetRotation(True, True)
+      OmagOFFICEMap.refVeinMatchingWindow.TgBtn_Rotation.IsChecked = False
+      OmagOFFICEMap.refVeinMatchingWindow.MyMsgTxBl.Text = ""
+      Me.Close()
+   End Sub
+
+   Private m_MouseLeftPressed As Boolean = False
+   ' qui dovrebbe funzionare quando entrambe le condizioni sono attive, non solo 
+   Private Sub TopCommandBar_pressed() Handles TopBar.MouseLeftButtonDown
+      m_MouseLeftPressed = True
+   End Sub
+
+   Private Sub TopCommandBar_released() Handles TopBar.MouseLeftButtonUp
+      m_MouseLeftPressed = False
+   End Sub
+
+   Private Sub TopCommandBar_Drag() Handles TopBar.MouseMove
+      If m_MouseLeftPressed Then
+         Try
+            Me.DragMove()
+         Catch e As Exception
+         End Try
+         m_MouseLeftPressed = False ' non si sa perché, ma è l'UNICO modo con cui funziona
+      End If
+   End Sub
+
+End Class

MyVeinMatch/RotationInputDataVeinMatchVM.vb

@@ -0,0 +1,14 @@
+Public Class RotationInputDataVeinMatchVM
+   'Private m_ControlUC As Control
+   'Public Property ControlUC As Control
+   '   Get
+   '      Return m_ControlUC
+   '   End Get
+   '   Set(value As Control)
+   '      m_ControlUC = value
+   '   End Set
+   'End Property
+   'Sub New(CurrentUC As Control)
+   '   m_ControlUC = CurrentUC
+   'End Sub
+End Class

MyVeinMatch/SolidInputDataVeinMatch.xaml

@@ -0,0 +1,52 @@
+<Window x:Class="SolidInputDataVeinMatch"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             xmlns:local="clr-namespace:OmagOFFICE"
+             mc:Ignorable="d"
+             ShowInTaskbar="False"
+             WindowStyle="None"
+             Title="InputDataVeinMatch" Height="100" Width="200"
+             Background="{StaticResource Omag_DarkGray}">
+   <StackPanel>
+      <Label Name="TopBar"
+         Content="Inserisci lo spessore dei solidi" HorizontalAlignment="Center"
+             Width="Auto"/>
+      
+      <Grid>
+         <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="1*"/>
+            <ColumnDefinition Width="2*"/>
+         </Grid.ColumnDefinitions>
+         <TextBlock Name="Testo" Height="26"
+         Foreground="{DynamicResource Omag_White}"
+         Background="{DynamicResource Omag_Black}"
+         Margin="1,5,1,0"
+         Text="Spessore"
+         Grid.Column="0"
+         IsEnabled="True"/>
+         <TextBox Name="InputData" Height="26"
+         Foreground="{DynamicResource Omag_White}"
+         Background="{DynamicResource Omag_Black}"
+         Margin="1,5,1,0"
+         Grid.Column="1"
+         Text="0"
+         HorizontalContentAlignment="Right"
+         VerticalContentAlignment="Center"
+         IsEnabled="True"/>
+      </Grid>
+      <Grid>
+         <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="1*"/>
+            <ColumnDefinition Width="2*"/>
+         </Grid.ColumnDefinitions>
+         <Button Name="Conferma"
+         Grid.Column="0"
+         Content="Conferma"/>
+         <Button Name="Annulla"
+         Grid.Column="1"
+         Content="Annulla"/>
+      </Grid>
+   </StackPanel>
+</Window>

MyVeinMatch/SolidInputDataVeinMatch.xaml.vb

@@ -0,0 +1,41 @@
+Public Class SolidInputDataVeinMatch
+   Private m_Ref As Window
+   Sub New(RefWindow As Window)
+      m_Ref = RefWindow
+      ' La chiamata è richiesta dalla finestra di progettazione.
+      InitializeComponent()
+
+      ' Aggiungere le eventuali istruzioni di inizializzazione dopo la chiamata a InitializeComponent().
+
+   End Sub
+   Public Sub ConfirmBtn_click() Handles Conferma.Click
+      OmagOFFICEMap.refVeinMatchingWindow.sInputThick = InputData.Text
+      OmagOFFICEMap.refVeinMatchingWindow.bInputDone = True
+      Me.Close()
+   End Sub
+   Public Sub CancelBtn_click() Handles Annulla.Click
+      OmagOFFICEMap.refVeinMatchingWindow.sInputThick = ""
+      OmagOFFICEMap.refVeinMatchingWindow.bInputDone = False
+      Me.Close()
+   End Sub
+
+   Private m_MouseLeftPressed As Boolean = False
+   ' qui dovrebbe funzionare quando entrambe le condizioni sono attive, non solo 
+   Private Sub TopCommandBar_pressed() Handles TopBar.MouseLeftButtonDown
+      m_MouseLeftPressed = True
+   End Sub
+
+   Private Sub TopCommandBar_released() Handles TopBar.MouseLeftButtonUp
+      m_MouseLeftPressed = False
+   End Sub
+
+   Private Sub TopCommandBar_Drag() Handles TopBar.MouseMove
+      If m_MouseLeftPressed Then
+         Try
+            Me.DragMove()
+         Catch e As Exception
+         End Try
+         m_MouseLeftPressed = False ' non si sa perché, ma è l'UNICO modo con cui funziona
+      End If
+   End Sub
+End Class

MyVeinMatch/TopBarVeinMatch.xaml

@@ -0,0 +1,11 @@
+<DockPanel x:Class="TopBarVeinMatch"
+          xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+          xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"  >
+   <Button Name="Riduci"
+           DockPanel.Dock="Right"
+              Style="{StaticResource VeinMatchWindow_Button}"
+              Margin="0,0,0,0"
+              ToolTip="Crea solido del part selezionato">
+      <Image Source="/Resources/VeinMatchNewIcon/cube.png" Stretch="Uniform"/>
+   </Button>
+</DockPanel>

MyVeinMatch/TopBarVeinMatch.xaml.vb

@@ -0,0 +1,12 @@
+Public Class TopBarVeinMatch
+   Public Sub RiduciBtn_click() Handles Riduci.Click
+      OmagOFFICEMap.refVeinMatchPanelVM.SetVeinMatchIsChecked(False)
+      ' chiudo anche i popup del TreeView
+      'ClosePopUps()
+   End Sub
+
+   'Public Sub ClosePopUps()
+   '   Popup_LeftPanel.IsOpen = False
+   '   TreeViewWnd.RiduciInfo()
+   'End Sub
+End Class

MyVeinMatch/VeinMatchingInfo.xaml

@@ -0,0 +1,54 @@
+<UserControl x:Class="VeinMatchingInfo"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:local="clr-namespace:OmagOFFICE"
+             mc:Ignorable="d" 
+             d:DesignHeight="450" d:DesignWidth="800">
+    <!--<Grid>
+        <TextBlock x:Name="InfoPart" Text="La mia prima volta"/>
+    </Grid>-->
+
+   <Grid>
+      <DataGrid x:Name ="InfoGrid"
+                Background="{DynamicResource Omag_Black}"
+                Foreground="{DynamicResource Omag_Black}" ColumnWidth="*" HeadersVisibility = "Column"
+                HorizontalScrollBarVisibility="Hidden"
+                BorderThickness="0">
+            <DataGrid.Resources>
+               <Style TargetType="{x:Type DataGridColumnHeader}" BasedOn="{StaticResource {x:Type DataGridColumnHeader}}">
+                  <Setter Property="Background" Value="{StaticResource Omag_Black}"/>
+                  <Setter Property="Foreground" Value="{StaticResource Omag_White}"/>
+                  <Setter Property="BorderBrush" Value="{StaticResource Omag_Yellow}"/>
+                  <Setter Property="BorderThickness" Value="0.75"/>
+                  <Setter Property="FontWeight" Value="Bold"/>
+                  <Setter Property="Margin" Value="0"/>
+                  <Setter Property="Opacity" Value="1"/>
+                  <Setter Property="VerticalContentAlignment" Value="Center"/>
+                  <Setter Property="HorizontalContentAlignment" Value="Center"/>
+                  <Setter Property="FontSize" Value="15"/>
+               </Style>
+            <Style TargetType="{x:Type DataGridRow}">
+               <Setter Property="Background" Value="{StaticResource Omag_Black}"/>
+               <Setter Property="Foreground" Value="{StaticResource Omag_White}"/>
+               <Setter Property="BorderBrush" Value="{StaticResource Omag_Yellow}"/>
+               <Setter Property="BorderThickness" Value="0.75"/>
+            </Style>
+            <Style TargetType="{x:Type DataGridCell}">
+               <Setter Property="BorderBrush" Value="{StaticResource Omag_Yellow}"/>
+                  <Setter Property="BorderThickness" Value="0"/>
+                  <Setter Property="HorizontalAlignment" Value="Center"/>
+                  <Style.Triggers>
+                     <Trigger Property="IsSelected" Value="True">
+                        <Setter Property="Background" Value="{StaticResource Omag_DarkGray}"/>
+                        <Setter Property="Foreground" Value="{StaticResource Omag_White}"/>
+                        <Setter Property="BorderBrush" Value="{StaticResource Omag_DarkGray}"/>
+                     </Trigger>
+                  </Style.Triggers>
+               </Style>
+            </DataGrid.Resources>
+         </DataGrid>
+   </Grid>
+   
+</UserControl>

MyVeinMatch/VeinMatchingInfo.xaml.vb

@@ -0,0 +1,79 @@
+Imports System.Collections.ObjectModel
+Imports EgtUILib
+
+Public Class VeinMatchingInfo
+
+   Sub New()
+
+      ' La chiamata è richiesta dalla finestra di progettazione.
+      InitializeComponent()
+
+      ' Aggiungere le eventuali istruzioni di inizializzazione dopo la chiamata a InitializeComponent().
+
+   End Sub
+
+   Private m_RefVeinMatchingWindow As VeinMatchingWindow
+   Sub LoadRef(vmw As VeinMatchingWindow)
+      m_RefVeinMatchingWindow = vmw
+   End Sub
+
+   Sub UpdateText(nIdPart As Integer)
+      'InfoPart.Text = sText
+      Dim EdgesList As New ObservableCollection(Of Edge)
+      EgtSetCurrentContext(m_RefVeinMatchingWindow.VeinMatchingScene.GetCtx())
+      Dim nEdge As Integer = EgtGetFirstInGroup(EgtGetFirstNameInGroup(nIdPart, "OutLoop"))
+      Dim nSideAngVal As Integer = 0
+      Dim nHeelVal As Integer = 0
+      Dim sName As String = String.Empty
+      While nEdge <> GDB_ID.NULL
+         nSideAngVal = 0
+         nHeelVal = 0
+         EgtGetName(nEdge, sName)
+         EgtGetInfo(nEdge, "SideAng", nSideAngVal)
+         EgtGetInfo(nEdge, "Heel", nHeelVal)
+         Dim EdgeTemp As New Edge(sName, nSideAngVal, nHeelVal)
+         EdgesList.Add(EdgeTemp)
+         nEdge = EgtGetNext(nEdge)
+      End While
+      InfoGrid.ItemsSource = EdgesList
+   End Sub
+
+End Class
+
+Public Class Edge
+   Private m_EdgeNum As String = String.Empty
+
+   Public Property Edge As String
+      Get
+         Return m_EdgeNum
+      End Get
+      Set(value As String)
+         m_EdgeNum = value
+      End Set
+   End Property
+   Private m_SideAng As Integer = 0
+   Public Property Ang As Integer
+      Get
+         Return m_SideAng
+      End Get
+      Set(value As Integer)
+         m_SideAng = value
+      End Set
+   End Property
+   Private m_Heel As Integer = 0
+   Public Property Heel As Integer
+      Get
+         Return m_Heel
+      End Get
+      Set(value As Integer)
+         m_Heel = value
+      End Set
+   End Property
+   Sub New(sName As String, nAng As Integer, nHeel As Integer)
+      m_EdgeNum = sName
+      m_SideAng = nAng
+      m_Heel = nHeel
+   End Sub
+
+End Class
+

MyVeinMatch/VeinMatchingTree.xaml

@@ -0,0 +1,39 @@
+<UserControl x:Class="VeinMatchingTree"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:OmagOFFICE="clr-namespace:OmagOFFICE"
+             mc:Ignorable="d" 
+             Background="Transparent"
+             d:DesignHeight="450" d:DesignWidth="800">
+    <StackPanel Orientation="Vertical" Background="Transparent">
+        <TreeView x:Name="PartInScene"
+                  BorderThickness="0"
+                  Background="Transparent"
+                  Foreground="{DynamicResource Omag_White}"
+                  Margin="10"
+                  SelectedItemChanged="OnTVSelectedItemChanged"
+                  Focusable="False">
+           <TreeView.ItemContainerStyle>
+                <Style TargetType="{x:Type TreeViewItem}" BasedOn="{StaticResource TreeViewItem_Part3D}">
+                 <Setter Property="FontSize" Value="18" />
+                 <Setter Property="Foreground" Value="{StaticResource Omag_White}" />
+                 <Setter Property="Background" Value="Transparent"/>
+                 <Setter Property="IsSelected" Value="{Binding IsSelected, Mode=TwoWay}" />
+                 <Setter Property="IsExpanded" Value="{Binding IsExpanded, Mode=TwoWay}" />
+                 <Setter Property="IsEnabled" Value="{Binding IsEnabled, Mode=TwoWay}" />
+                </Style>
+           </TreeView.ItemContainerStyle>
+         </TreeView>
+        <Popup x:Name="Popup_CurrPart" PlacementTarget="{Binding ElementName=TreeViewItem_CurrPart}" Placement="Right" AllowsTransparency="True">
+            <!--<TextBlock x:Name="Popup_Text" Text="Placement=Left" FontSize="14" Background="LightGreen"></TextBlock>-->
+            <OmagOFFICE:VeinMatchingInfo x:Name="Info2PartWnd"/>
+        </Popup>  
+        
+         <TextBlock Name="Info"  Text="" FontSize="18" HorizontalAlignment="Right"
+                    Margin="0,0,10,0"
+                    Background="Transparent"
+                    Foreground="{StaticResource Omag_Yellow}"/>
+    </StackPanel>
+</UserControl>

MyVeinMatch/VeinMatchingTree.xaml.vb

@@ -0,0 +1,121 @@
+Imports System.IO.Ports
+Imports System.Windows.Forms
+Imports EgtUILib
+
+Public Class VeinMatchingTree
+
+   Private m_RefVeinMatchingInfo As VeinMatchingInfo
+   Private m_RefVeinMatchingWindow As VeinMatchingWindow
+   Sub New()
+
+      ' La chiamata è richiesta dalla finestra di progettazione.
+      InitializeComponent()
+
+      ' Aggiungere le eventuali istruzioni di inizializzazione dopo la chiamata a InitializeComponent().
+
+   End Sub
+
+   Public Sub LoadRef(vmiRef As VeinMatchingInfo)
+      m_RefVeinMatchingInfo = vmiRef
+   End Sub
+
+   Sub LoadRef(vmwRef As VeinMatchingWindow)
+      m_RefVeinMatchingWindow = vmwRef
+   End Sub
+
+   Public Sub RiduciInfo()
+      Popup_CurrPart.IsOpen = False
+   End Sub
+
+   Public Sub AdjustInfoPosition()
+      ' spostando l'offset e rimettendolo al valore originale il pop up viene riposizionato correttamente rispetto relativamente
+      ' alla finestra che l'ha creato
+      Dim offset As Double = Popup_CurrPart.HorizontalOffset
+      Popup_CurrPart.HorizontalOffset = offset + 1
+      Popup_CurrPart.HorizontalOffset = offset
+   End Sub
+
+   Private Sub SetStackPanelTextFromTreeView(tItem As TreeViewItem, ByRef PartId As Integer, ByRef sNamePart As String)
+      If IsNothing(tItem) Then Return
+      Dim Pan As StackPanel = DirectCast(tItem.Header, StackPanel)
+      sNamePart = String.Empty
+      For Each PanItem In Pan.Children
+         If TypeOf (PanItem) Is TextBlock Then
+            sNamePart = DirectCast(PanItem, TextBlock).Text
+            Exit For
+         End If
+      Next
+      PartId = CInt(Val(New Text.StringBuilder((From ch In sNamePart.ToString.ToCharArray Where IsNumeric(ch)).ToArray).ToString))
+   End Sub
+
+   Private Sub SelectItem_Click() Handles PartInScene.SelectedItemChanged
+      Dim tItem As TreeViewItem = CType(PartInScene.SelectedItem, TreeViewItem)
+      If IsNothing(tItem) Then Return
+      'Dim Pan As StackPanel = DirectCast(tItem.Header, StackPanel)
+      'Dim sNamepart As String = String.Empty
+      'For Each PanItem In Pan.Children
+      '   If TypeOf (PanItem) Is TextBlock Then
+      '      sNamepart = DirectCast(PanItem, TextBlock).Text
+      '      Exit For
+      '   End If
+      'Next
+      'Dim nPartId As Integer = CInt(Val(New Text.StringBuilder((From ch In sNamepart.ToString.ToCharArray Where IsNumeric(ch)).ToArray).ToString))
+      Dim nPartId As Integer = -1
+      Dim sNamePart As String = String.Empty
+      SetStackPanelTextFromTreeView(tItem, nPartId, sNamePart)
+      Info.Text = sNamePart.ToString
+      m_RefVeinMatchingInfo.UpdateText(nPartId)
+   End Sub
+
+   Private m_InfoPart As VeinMatchingInfo
+   Private Sub FaiQualcosa() Handles PartInScene.MouseRightButtonUp
+      Dim tItem As TreeViewItem = CType(PartInScene.SelectedItem, TreeViewItem)
+      If IsNothing(tItem) Then Return
+      Dim nPartId As Integer = -1
+      Dim sNamePart As String = String.Empty
+      SetStackPanelTextFromTreeView(tItem, nPartId, sNamePart)
+      Popup_CurrPart.IsOpen = Not Popup_CurrPart.IsOpen
+      Popup_CurrPart.PlacementTarget = tItem
+      Popup_CurrPart.MaxWidth = 175
+      m_InfoPart = Info2PartWnd
+
+      m_InfoPart.LoadRef(m_RefVeinMatchingWindow)
+      m_InfoPart.UpdateText(nPartId)
+      'Popup_Text.Text = sNamePart
+   End Sub
+
+   Private Sub OnTVSelectedItemChanged(sender As Object, e As RoutedPropertyChangedEventArgs(Of Object))
+      If (Keyboard.Modifiers And ModifierKeys.Shift) > 0 Then
+         'C#
+         'MyTextBlock.Text = ( (TreeViewItem) ( (TreeView) sender ).SelectedItem ).Header.ToString()
+         SelectInVeinMatchScene()
+
+      End If
+   End Sub
+
+   Public Sub HighlightItem() Handles PartInScene.MouseDoubleClick
+      SelectInVeinMatchScene()
+   End Sub
+
+   Private Sub SelectInVeinMatchScene()
+      ' prima deseleziono tutto
+      m_RefVeinMatchingWindow.DeselectAll()
+
+      'Dim nPartId As Integer = CInt(Val(New Text.StringBuilder((From ch In tItem.Header.ToString.ToCharArray Where IsNumeric(ch)).ToArray).ToString))
+
+      Dim tItem As TreeViewItem = CType(PartInScene.SelectedItem, TreeViewItem)
+      If IsNothing(tItem) Then Return
+      Dim nPartId As Integer = -1
+      Dim sNamePart As String = String.Empty
+      SetStackPanelTextFromTreeView(tItem, nPartId, sNamePart)
+
+      EgtSetCurrentContext(m_RefVeinMatchingWindow.VeinMatchingScene.GetCtx())
+      For Each PartSolidSel In m_RefVeinMatchingWindow.m_PartSolidList
+         If PartSolidSel.PartId = nPartId Then
+            PartSolidSel.SelectPart()
+         End If
+      Next
+      EgtDraw()
+   End Sub
+
+End Class

MyVeinMatch/VeinMatchingWindow.xaml

@@ -0,0 +1,573 @@
+<EgtWPFLib5:EgtCustomWindow x:Class="VeinMatchingWindow"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:OmagOFFICE="clr-namespace:OmagOFFICE"
+        xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
+        Background="{StaticResource Omag_DarkGray}"
+        Height="800" Width="500" ShowInTaskbar="False" 
+        Initialized="Window_Initialized"
+        MinWidth="300" MinHeight="300"
+        Title="VeinMatching"
+        WindowStyle="None"
+        IsClosable="False"
+        IsMinimizable="False"
+        IsResizable="True"
+        Style="{DynamicResource VeinMatchStyle}">
+
+   <EgtWPFLib5:EgtCustomWindow.TitlePanel>
+      <OmagOFFICE:TopBarVeinMatch HorizontalAlignment="Right"/>
+   </EgtWPFLib5:EgtCustomWindow.TitlePanel>
+
+   <!--<Window.Resources>
+      <Style TargetType="{x:Type Window}">
+         <Setter Property="Template">
+            <Setter.Value>
+               <ControlTemplate TargetType="{x:Type Window}">
+                  <ContentPresenter/>
+               </ControlTemplate>
+            </Setter.Value>
+         </Setter>
+         <Setter Property="Background" Value="Transparent"></Setter>
+      </Style>
+   </Window.Resources>-->
+
+   <!--<Window.CommandBindings>
+      <CommandBinding Command="OmagOFFICE:MoveItCommand.MoveIt"
+                   Executed="CommandBinding_Executed"
+                   CanExecute="CommandBinding_CanExecute"/>
+   </Window.CommandBindings>-->
+
+   <DockPanel x:Name="DockPanelVeinMatching" Background="Transparent" VirtualizingStackPanel.IsVirtualizing="True">
+      <StackPanel Name="TopCommandBar1"
+         DockPanel.Dock="Top" HorizontalAlignment="Right" Orientation="Horizontal"
+         Background="Transparent">
+         <!--<Label Name ="TopCommandBar" Content="" Width="{Binding ActualWidth, ElementName=DockPanelVeinMatching}"/>-->
+         <!--<Button Name="Riduci"
+              Style="{StaticResource VeinMatchWindow_Button}"
+              Margin="0,0,0,0"
+              ToolTip="Crea solido del part selezionato">
+            <Image Source="/Resources/VeinMatchNewIcon/cube.png" Stretch="Uniform"/>
+         </Button>-->
+      </StackPanel>
+      <TabControl DockPanel.Dock="Left"
+                  x:Name="MyTabCtrl"
+                  Background="Transparent" 
+                  Margin="2,0,0,0"
+                  BorderThickness="0"
+                  Width="125">
+         <TabItem Name="TabItem2"
+                  Background="Transparent"
+                  Foreground="{DynamicResource Omag_Yellow}"
+                  HorizontalContentAlignment="Center"
+                  Style="{StaticResource TabItemVeinMatch}"
+                  Padding="0"
+                  Margin="0,0,0,0">
+            <TabItem.Header>
+               <StackPanel Orientation="Horizontal">
+                  <TextBlock Text="🌐" 
+                             FontSize="18"/>
+               </StackPanel>
+            </TabItem.Header>
+            <StackPanel Orientation="Vertical">
+               <Border Style="{StaticResource Border}" Margin="0,1,0,5">
+                  <Expander Foreground="{DynamicResource Omag_White}"
+                            HorizontalAlignment="Stretch" 
+                            Header="Options"
+                            ExpandDirection="Down" 
+                            IsExpanded="False">
+                     <StackPanel>
+                        <ComboBox Name="OptionColor" 
+                                          Style="{StaticResource Raw_ComboBox}"
+                                          Margin="1,5,1,0"/>
+                        <ComboBox Name="SelType" 
+                                          Style="{StaticResource Raw_ComboBox}"
+                                          Margin="1,5,1,0"/>
+                        <ComboBox Name="RefType" 
+                                          Style="{StaticResource Raw_ComboBox}"
+                                          Margin="1,5,1,0"/>
+                     </StackPanel>
+                  </Expander>
+               </Border>
+
+               <Border Style="{StaticResource Border}" Margin="0,1,0,5">
+                  <Expander Foreground="{DynamicResource Omag_White}"
+                            HorizontalAlignment="Stretch" 
+                            Header="RESET"
+                            ExpandDirection="Down" 
+                            IsExpanded="False">
+                     <UniformGrid Columns="3" Margin="2">
+                        <Button Name="Btn01"
+                                Style="{StaticResource VeinMatchWindow_Button}"
+                                Margin="1,5,1,0"
+                                Content="🚀"
+                                ToolTip="Crea Part Solid"/>
+                        <Button Name="Btn02"
+                                Style="{StaticResource VeinMatchWindow_Button}"
+                                Margin="1,5,1,0"
+                                Content="👾"
+                                ToolTip="Resetta Part Solid"/>
+                     </UniformGrid>
+                  </Expander>
+               </Border>
+
+               <Border Style="{StaticResource Border}" Margin="0,1,0,5">
+                  <Expander Foreground="{DynamicResource Omag_White}"
+                            HorizontalAlignment="Stretch" 
+                            Header="SOLID"
+                            ExpandDirection="Down" 
+                            IsExpanded="True">
+                     <StackPanel>
+                        <Grid >
+                           <Grid.ColumnDefinitions>
+                              <ColumnDefinition Width="1*"/>
+                              <ColumnDefinition Width="1*"/>
+                              <ColumnDefinition Width="1*"/>
+                           </Grid.ColumnDefinitions>
+                           <Grid.RowDefinitions>
+                              <RowDefinition Height="1*"/>
+                              <RowDefinition Height="1*"/>
+                           </Grid.RowDefinitions>
+                           <Button Name="CreateCurrSolidBtn" Grid.Row="0" Grid.Column="0"
+                                Style="{StaticResource VeinMatchWindow_Button}"
+                                Margin="1,5,1,0"
+                                ToolTip="Crea solido del part selezionato">
+                              <Image Source="/Resources/VeinMatchNewIcon/cube.png" Stretch="Uniform"/>
+                           </Button>
+                           <Button Name="CreateAllSolidsBtn" Grid.Row="0" Grid.Column="1"
+                                Style="{StaticResource VeinMatchWindow_Button}"
+                                Margin="1,5,1,0"
+                                ToolTip="Crea tutti i solidi">
+                              <Image Source="/Resources/VeinMatchNewIcon/cubes.png" Stretch="Uniform"/>
+                           </Button>
+                           <Button Name="ResetAllSolidsBtn" Grid.Row="0" Grid.Column="2"
+                                Style="{StaticResource VeinMatchWindow_Button}"
+                                Margin="1,5,1,0"
+                                ToolTip="Resetta i solidi">
+                              <Image Source="/Resources/VeinMatchNewIcon/reset cubes.png" Stretch="Uniform"/>
+                           </Button>
+                           <Button Name="ExplodeBtn" Grid.Row="1" Grid.Column="0"
+                                Style="{StaticResource VeinMatchWindow_Button}"
+                                Margin="1,5,1,0"
+                                ToolTip="Esplodi assemblato"
+                                IsEnabled="True">
+                              <Image Source="/Resources/VeinMatchNewIcon/explode.png" Stretch="Uniform"/>
+                           </Button>
+                           <Button Name="CollapseBtn" Grid.Row="1" Grid.Column="1"
+                                Style="{StaticResource VeinMatchWindow_Button}"
+                                Margin="1,5,1,0"
+                                ToolTip="Ricomponi assemblato"
+                                IsEnabled="False">
+                              <Image Source="/Resources/VeinMatchNewIcon/collapse.png" Stretch="Uniform"/>
+                           </Button>
+                           <Button Name="ExplodeNormalsBtn" Grid.Row="1" Grid.Column="2"
+                                Style="{StaticResource VeinMatchWindow_Button}"
+                                Margin="0,5,1,0"
+                                ToolTip="Esplodi assemblato lungo le normali"
+                                HorizontalAlignment="Right" Width="35"
+                                IsEnabled="True">
+                              <Image Source="/Resources/VeinMatchNewIcon/explode_normals.png" Stretch="Uniform"/>
+                           </Button>
+                        </Grid>
+                        <!--<Grid>
+                           <Grid.ColumnDefinitions>
+                              <ColumnDefinition Width="0.5*"/>
+                              <ColumnDefinition Width="1.5*"/>
+                           </Grid.ColumnDefinitions>
+                           <UniformGrid>
+                              <TextBlock Name="Spessore" Height="20"
+                                 Foreground="{DynamicResource Omag_White}"
+                                 Background="Transparent"
+                                 Margin="1,5,1,0"
+                                 Text="Thick"
+                                 HorizontalAlignment="Center"
+                                 VerticalAlignment="Center"/>
+                           </UniformGrid>
+                           <UniformGrid Columns="1" Grid.Column="1">
+                              <TextBox Name="TB_Thick" Height="26"
+                                 Foreground="{DynamicResource Omag_White}"
+                                 Background="{DynamicResource Omag_Black}"
+                                 Margin="1,5,1,0"
+                                 Text="0"
+                                 HorizontalContentAlignment="Right"
+                                 VerticalContentAlignment="Center"
+                                 IsEnabled="True"/>
+                           </UniformGrid>
+                        </Grid>-->
+                     </StackPanel>
+                  </Expander>
+               </Border>
+
+               <Border Style="{StaticResource Border}" Margin="0,1,0,5">
+                  <Expander Foreground="{DynamicResource Omag_White}"
+                            HorizontalAlignment="Stretch" 
+                            Header="ROTATE"
+                            ExpandDirection="Down" 
+                            IsExpanded="True">
+                     <StackPanel>
+                        <UniformGrid Columns="3">
+                           <ToggleButton Name="TgBtn_Rotation"
+                                         Style="{StaticResource VeinMatchWindow_ToggleButton}"
+                                         Margin="1,5,1,0"
+                                         ToolTip="Attiva/Conferma Rotazione"
+                                         IsEnabled="True">
+                              <Image Source="/Resources/VeinMatchNewIcon/rotate.png" Stretch="Uniform"/>
+                           </ToggleButton>
+                           <Button Name="ResetRotationBtn"
+                                   Style="{StaticResource VeinMatchWindow_Button}"
+                                   Margin="1,5,1,0"
+                                   ToolTip="Resetta Rotazione"
+                                   IsEnabled="False">
+                              <Image Source="/Resources/VeinMatchNewIcon/reset rotation.png" Stretch="Uniform"/>
+                           </Button>
+                        </UniformGrid>
+                        <!--<Grid>
+                           <Grid.ColumnDefinitions>
+                              <ColumnDefinition Width="0.5*"/>
+                              <ColumnDefinition Width="1.5*"/>
+                           </Grid.ColumnDefinitions>
+                           <UniformGrid>
+                              <TextBlock Name="Angolo" Height="20"
+                                 Foreground="{DynamicResource Omag_White}"
+                                 Background="Transparent"
+                                 Margin="1,5,1,0"
+                                 Text="Ang"
+                                 HorizontalAlignment="Center"
+                                 VerticalAlignment="Center"/>
+                           </UniformGrid>
+                           <UniformGrid Columns="1" Grid.Column="1">
+                              <TextBox Name="AngText" Height="26"
+                                       Foreground="{DynamicResource Omag_White}"
+                                       Background="{DynamicResource Omag_Black}"
+                                       Margin="1,5,1,0"
+                                       Text="0"
+                                       HorizontalContentAlignment="Right"
+                                       VerticalContentAlignment="Center"
+                                       IsEnabled="False"/>
+                           </UniformGrid>
+                        </Grid>-->
+
+                        <!--<CheckBox Name="AllOption_Rotate" Margin="1,5,1,0" 
+                                  Foreground="{DynamicResource Omag_White}"
+                                  IsEnabled="False">All Selected</CheckBox>-->
+                     </StackPanel>
+                  </Expander>
+               </Border>
+
+               <Border Style="{StaticResource Border}" Margin="0,1,0,5">
+                  <Expander Foreground="{DynamicResource Omag_White}"
+                            HorizontalAlignment="Stretch" 
+                            Header="PAIR"
+                            ExpandDirection="Down" 
+                            IsExpanded="True">
+                     <StackPanel>
+                        <UniformGrid Columns="3">
+                           <ToggleButton Name="TgBtn_Pair"
+                                         Style="{StaticResource VeinMatchWindow_ToggleButton}"
+                                         Margin="1,5,1,0"
+                                         ToolTip="Attiva/Conferma Accoppiamento">
+                              <Image Source="/Resources/VeinMatchNewIcon/pair.png" Stretch="Uniform"/>
+                           </ToggleButton>
+                           <Button Name="ResetPairBtn"
+                                   Style="{StaticResource VeinMatchWindow_Button}"
+                                   Margin="1,5,1,0"
+                                   ToolTip="Resetta Accoppiamento"
+                                   IsEnabled="False">
+                              <Image Source="/Resources/VeinMatchNewIcon/reset pair.png" Stretch="Uniform"/>
+                           </Button>
+                           <Button Name="PairAllBtn"
+                                   Style="{StaticResource VeinMatchWindow_Button}"
+                                   Margin="1,5,1,0"
+                                   ToolTip="Accoppiamento automatico"
+                                   IsEnabled="True">
+                              <Image Source="/Resources/VeinMatchNewIcon/autopair.png" Stretch="Uniform"/>
+                           </Button>
+                        </UniformGrid>
+                        <ComboBox Name="PairOption" 
+                                  Style="{StaticResource Raw_ComboBox}"
+                                  Margin="1,5,1,0"
+                                  
+                                  IsEnabled="False"
+                                  Visibility="Collapsed"/>
+                        <CheckBox Name="InvertOption" Margin="1,5,1,0" 
+                                  Foreground="{DynamicResource Omag_White}"
+                                  IsEnabled="False"
+                                  Visibility="Collapsed">Invert</CheckBox>
+                        <CheckBox Name="FlipOption1" Margin="1,5,1,0" 
+                                  Foreground="{DynamicResource Omag_White}"
+                                  IsEnabled="False"
+                                  Visibility="Collapsed">Flip ∥</CheckBox>
+                        <CheckBox Name="FlipOption2" Margin="1,5,1,0" 
+                                  Foreground="{DynamicResource Omag_White}"
+                                  IsEnabled="False"
+                                  Visibility="Collapsed">Flip ⟂</CheckBox>
+                     </StackPanel>
+                  </Expander>
+               </Border>
+
+               <Border Style="{StaticResource Border}" Margin="0,1,0,5">
+                  <Expander Foreground="{DynamicResource Omag_White}"
+                            HorizontalAlignment="Stretch" 
+                            Header="MISURA"
+                            ExpandDirection="Down" 
+                            IsExpanded="False">
+                     <Grid>
+                        <Grid.ColumnDefinitions>
+                           <ColumnDefinition Width="1*"/>
+                           <ColumnDefinition Width="2*"/>
+                        </Grid.ColumnDefinitions>
+                        <ToggleButton Name="TgBtn_Measure"
+                                      Style="{StaticResource VeinMatchWindow_ToggleButton}"
+                                      Margin="1,5,1,0"
+                                      ToolTip="Attiva misura">
+                           <Image Source="/Resources/VeinMatchNewIcon/ruler.png" Stretch="Uniform"/>
+                        </ToggleButton>
+                        <ComboBox Grid.Column="2"
+                                  Name="MeasureOption"
+                                  Style="{StaticResource Raw_ComboBox}"
+                                  Margin="1,5,1,0"
+                                  IsEnabled="False"/>
+                     </Grid>
+                  </Expander>
+               </Border>
+
+               <Border Style="{StaticResource Border}" Margin="0,1,0,5">
+                  <Expander Foreground="{DynamicResource Omag_White}" 
+                            Header="IMPORT"
+                            ExpandDirection="Down" 
+                            IsExpanded="False">
+                     <Grid >
+                        <Grid.ColumnDefinitions>
+                           <ColumnDefinition Width="1*"/>
+                           <ColumnDefinition Width="2*"/>
+                        </Grid.ColumnDefinitions>
+                        <Button Name="ImportBtn"
+                                Style="{StaticResource VeinMatchWindow_Button}"
+                                Margin="1,5,1,0"
+                                ToolTip="Importa oggetto 3D">
+                           <Image Source="/Resources/VeinMatchNewIcon/import.png" Stretch="Uniform"/>
+                        </Button>
+                     </Grid>
+                  </Expander>
+               </Border>
+
+               <UniformGrid Columns="3">
+                  <ToggleButton Name="TgBtn_Inters" 
+                                Style="{StaticResource VeinMatchWindow_ToggleButton}"             
+                                Margin="1,5,1,0"
+                                ToolTip="Impedisci intersezioni">
+                     <Image Source="/Resources/VeinMatchNewIcon/avoid intersection.png" Stretch="Uniform"/>
+                  </ToggleButton>
+                  <Button Name="ResetIntersBtn"
+                          Style="{StaticResource VeinMatchWindow_Button}"
+                          Margin="1,5,1,0"
+                          ToolTip="Spegni intersezioni"
+                          IsEnabled="False">
+                     <Image Source="/Resources/VeinMatchNewIcon/hide intersections.png" Stretch="Uniform"/>
+                  </Button>
+                  <Button Name="UnpairBtn"
+                          Style="{StaticResource VeinMatchWindow_Button}"
+                          Margin="1,5,1,0"
+                          ToolTip="Disaccoppia"
+                          IsEnabled="False">
+                     <Image Source="/Resources/VeinMatchNewIcon/unpair.png" Stretch="Uniform"/>
+                  </Button>
+               </UniformGrid>
+               <UniformGrid Columns="3">
+                  <Button Name="UndoBtn"
+                     Style="{StaticResource VeinMatchWindow_Button}"
+                     Margin="1,5,1,0"
+                     ToolTip="Annulla ultima operazione"
+                     IsEnabled="False">
+                     <Image Source="/Resources/VeinMatchNewIcon/undo.png" Stretch="Uniform"/>
+                  </Button>
+                  <Button Name="RedoBtn"
+                     Style="{StaticResource VeinMatchWindow_Button}"
+                     Margin="1,5,1,0"
+                     ToolTip="Ripeti ultima operazione annullata"
+                     IsEnabled="False">
+                     <Image Source="/Resources/VeinMatchNewIcon/redo.png" Stretch="Uniform"/>
+                  </Button>
+               </UniformGrid>
+
+               <Border Style="{StaticResource Border}" Margin="0,1,0,5">
+                  <Expander Foreground="{DynamicResource Omag_White}" 
+             Header="MOVE"
+             ExpandDirection="Down" 
+             IsExpanded="False"
+             Name="MoveExpander"
+             IsEnabled="False">
+                     <StackPanel>
+                        <Grid>
+                           <Grid.ColumnDefinitions>
+                              <ColumnDefinition Width="0.5*"/>
+                              <ColumnDefinition Width="1.5*"/>
+                           </Grid.ColumnDefinitions>
+                           <UniformGrid Columns="1" Grid.Column="0" Margin="0,0,0,0">
+                              <TextBlock Name="TextBlX" Height="20"
+                                 Foreground="{DynamicResource Omag_White}"
+                                 Background="Transparent"
+                                 Margin="1,0,1,0"
+                                 Text="X"
+                                 HorizontalAlignment="Center"
+                                 VerticalAlignment="Center"/>
+                              <TextBlock Name="TextBlY" Height="20"
+                                 Foreground="{DynamicResource Omag_White}"
+                                 Background="Transparent"
+                                 Margin="1,0,1,0"
+                                 Text="Y"
+                                 HorizontalAlignment="Center"
+                                 VerticalAlignment="Center"/>
+                              <TextBlock Name="TextBlZ" Height="20"
+                                 Foreground="{DynamicResource Omag_White}"
+                                 Background="Transparent"
+                                 Margin="1,0,1,0"
+                                 Text="Z"
+                                 HorizontalAlignment="Center"
+                                 VerticalAlignment="Center"/>
+                           </UniformGrid>
+                           <UniformGrid Columns="1" Grid.Column="1">
+                              <TextBox Name="TextX" Height="26"
+                                 Foreground="{DynamicResource Omag_White}"
+                                 Background="{DynamicResource Omag_Black}"
+                                 Margin="1,0,1,0"
+                                 Text="0"
+                                 HorizontalContentAlignment="Right"
+                                 VerticalContentAlignment="Center"/>
+                              <TextBox Name="TextY" Height="26"
+                                 Foreground="{DynamicResource Omag_White}"
+                                 Background="{DynamicResource Omag_Black}"
+                                 Margin="1,0,1,0"
+                                 Text="0"
+                                 HorizontalContentAlignment="Right"
+                                 VerticalContentAlignment="Center"/>
+                              <TextBox Name="TextZ" Height="26"
+                                 Foreground="{DynamicResource Omag_White}"
+                                 Background="{DynamicResource Omag_Black}"
+                                 Margin="1,0,1,0"
+                                 Text="0"
+                                 HorizontalContentAlignment="Right"
+                                 VerticalContentAlignment="Center"/>
+                           </UniformGrid>
+                        </Grid>
+                        <UniformGrid Columns="3">
+                           <Button Name="MovePreviewBtn"
+                              Style="{StaticResource VeinMatchWindow_Button}"
+                              Margin="1,5,1,0"
+                              ToolTip="Preview dello spostamento">
+                              <Image Source="/Resources/VeinMatchNewIcon/move.png" Stretch="Uniform"/>
+                           </Button>
+                           <Button Name="ConfirmMoveBtn"
+                              Style="{StaticResource VeinMatchWindow_Button}"
+                              Margin="1,5,1,0"
+                              ToolTip="Conferma spostamento">
+                              <Image Source="/Resources/VeinMatchNewIcon/confirm move.png" Stretch="Uniform"/>
+                           </Button>
+                           <Button Name="ResetMoveBtn"
+                              Style="{StaticResource VeinMatchWindow_Button}"
+                              Margin="1,5,1,0"
+                              ToolTip="Resetta spostamento"
+                              IsEnabled="False">
+                              <Image Source="/Resources/VeinMatchNewIcon/reset move.png" Stretch="Uniform"/>
+                           </Button>
+                        </UniformGrid>
+                        <CheckBox Name="AllOption_Move" Margin="1,5,1,0" 
+                                  Foreground="{DynamicResource Omag_White}">All Selected</CheckBox>
+                     </StackPanel>
+                  </Expander>
+               </Border>
+
+               <Border Style="{StaticResource Border}" Margin="0,1,0,5">
+                  <Expander Foreground="{DynamicResource Omag_White}"
+                        HorizontalAlignment="Stretch" 
+                        Header="SELECTION"
+                        ExpandDirection="Down" 
+                        IsExpanded="False"
+                        Name="SelectExpander"
+                        IsEnabled="True">
+                     <UniformGrid Columns="3">
+                        <Button Name="SelectAllBtn"
+                              Style="{StaticResource VeinMatchWindow_Button}"
+                              Margin="1,5,1,0"
+                              ToolTip="Seleziona tutti i pezzi">
+                           <Image Source="/Resources/VeinMatchNewIcon/select all.png" Stretch="Uniform"/>
+                        </Button>
+                        <Button Name="DeselectAllBtn"
+                           Style="{StaticResource VeinMatchWindow_Button}"
+                           Margin="1,5,1,0"
+                           ToolTip="Deseleziona tutti i pezzi">
+                           <Image Source="/Resources/VeinMatchNewIcon/deselect all.png" Stretch="Uniform"/>
+                        </Button>
+                        <ToggleButton Name="TgBtn_MultiSel" 
+                           Style="{StaticResource VeinMatchWindow_ToggleButton}"             
+                           Margin="1,5,1,0"
+                           ToolTip="Attiva selezione multipla">
+                           <Image Source="/Resources/VeinMatchNewIcon/multi sel.png" Stretch="Uniform"/>
+                        </ToggleButton>
+                     </UniformGrid>
+                  </Expander>
+               </Border>
+
+
+            </StackPanel>
+         </TabItem>
+
+         <TabItem Name="TabItem1"
+                  Background="Transparent"
+                  Foreground="{DynamicResource Omag_Yellow}"
+                  Style="{StaticResource TabItemVeinMatch}"
+                  HorizontalContentAlignment="Center"
+                  Margin="0,0,0,0">
+            <TabItem.Header>
+               <StackPanel Orientation="Horizontal">
+                  <TextBlock Text="🗺" FontSize="18"/>
+               </StackPanel>
+            </TabItem.Header>
+            <StackPanel Orientation="Vertical" Grid.Row="0">
+               <ToggleButton Name="ShowTextBtn" Height="40" Width="80"
+                             Margin="0,5,0,0"
+                             Content="ShowText"/>
+               <ToggleButton Name="EditBtn" Height="40" Width="80"
+                             Margin="0,5,0,0"
+                             Content="Edit"/>
+               <ToggleButton Name="VerifyBtn" Height="40" Width="80"
+                             Margin="0,5,0,0"
+                             Content="Verify"/>
+               <ToggleButton Name="MagneticBtn" Height="40" Width="80"
+                             Visibility="Collapsed"
+                             Margin="0,5,0,0"
+                             Content="Magnetic"/>
+               <Button Name="ExportBtn" Height="40" Width="80"
+                       Margin="0,5,0,0"
+                       Content="Export"/>
+               <Button Name="AssemblyBtn" Height="40" Width="80"
+                       Margin="0,5,0,0"
+                       Content="3D"/>
+            </StackPanel>
+         </TabItem>
+      </TabControl>
+
+      <StackPanel DockPanel.Dock="Right" 
+                  Margin="0,1,0,5"
+                  Width="15">
+         <Button x:Name="ShowTreeView" 
+                    Height="15">
+            <Image Source="/Resources/VeinMatchNewIcon/feature-tree.png" Stretch="Uniform"/>
+         </Button>
+         <!--<OmagOFFICE:VeinMatchingTree x:Name="TreeViewWnd" Visibility="Hidden"/>-->
+         <OmagOFFICE:VeinMatchingInfo x:Name="InfoPartWnd" Visibility="Hidden"/>
+         <Popup x:Name="Popup_LeftPanel" PlacementTarget="{Binding ElementName=ShowTreeView}"
+                Placement="Left" AllowsTransparency="True" Focusable="False">
+            <OmagOFFICE:VeinMatchingTree x:Name="TreeViewWnd"/>
+         </Popup>
+      </StackPanel>
+
+      <TextBlock DockPanel.Dock="Bottom"
+                 TextWrapping="WrapWithOverflow" 
+                 Margin="5,2,5,2"
+                 Name="MyMsgTxBl"  
+                 Text="DEMO by Egalware ( N. and D. ) "
+                 Foreground="{DynamicResource Omag_Yellow}"
+                 FontSize="20"
+                 Height="auto"/>
+   </DockPanel>
+</EgtWPFLib5:EgtCustomWindow>

OmagOFFICE.vbproj

@@ -229,7 +229,26 @@
     <Compile Include="EgtStoneLib\GeomCalc.vb" />
     <Compile Include="EgtStoneLib\SplitAuto.vb" />
     <Compile Include="EgtStoneLib\VacuumCups.vb" />
-    <Compile Include="EgtStoneLib\VeinMatchingWindow.xaml.vb">
+    <Compile Include="MyVeinMatch\PairInputDataVeinMatch.xaml.vb">
+      <DependentUpon>PairInputDataVeinMatch.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="MyVeinMatch\RotationInputDataVeinMatch.xaml.vb">
+      <DependentUpon>RotationInputDataVeinMatch.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="MyVeinMatch\RotationInputDataVeinMatchVM.vb" />
+    <Compile Include="MyVeinMatch\SolidInputDataVeinMatch.xaml.vb">
+      <DependentUpon>SolidInputDataVeinMatch.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="MyVeinMatch\TopBarVeinMatch.xaml.vb">
+      <DependentUpon>TopBarVeinMatch.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="MyVeinMatch\VeinMatchingInfo.xaml.vb">
+      <DependentUpon>VeinMatchingInfo.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="MyVeinMatch\VeinMatchingTree.xaml.vb">
+      <DependentUpon>VeinMatchingTree.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="MyVeinMatch\VeinMatchingWindow.xaml.vb">
       <DependentUpon>VeinMatchingWindow.xaml</DependentUpon>
     </Compile>
     <Compile Include="InstrumentPanel\PrintPanelV.xaml.vb">
@@ -421,7 +440,31 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="EgtStoneLib\VeinMatchingWindow.xaml">
+    <Page Include="MyVeinMatch\PairInputDataVeinMatch.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="MyVeinMatch\RotationInputDataVeinMatch.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="MyVeinMatch\SolidInputDataVeinMatch.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="MyVeinMatch\TopBarVeinMatch.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="MyVeinMatch\VeinMatchingInfo.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="MyVeinMatch\VeinMatchingTree.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="MyVeinMatch\VeinMatchingWindow.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
@@ -961,20 +1004,97 @@
     <Resource Include="Resources\NewIcons\Linea-Copia.png" />
   </ItemGroup>
   <ItemGroup>
+    <Resource Include="Resources\TreeView\Import.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\TreeView\PartSolid.png" />
     <Resource Include="Resources\NewIcons\DB-WJ.png" />
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\VeinMatchNewIcon\cube.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\VeinMatchNewIcon\cubes.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\VeinMatchNewIcon\reset cubes.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\VeinMatchNewIcon\explode.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\VeinMatchNewIcon\collapse.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\VeinMatchNewIcon\explode_normals.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\VeinMatchNewIcon\rotate.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\VeinMatchNewIcon\reset rotation.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\VeinMatchNewIcon\import.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\VeinMatchNewIcon\pair.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\VeinMatchNewIcon\unpair.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\VeinMatchNewIcon\feature-tree.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\VeinMatchNewIcon\ruler.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\VeinMatchNewIcon\avoid intersection.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\VeinMatchNewIcon\hide intersections.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\VeinMatchNewIcon\undo.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\VeinMatchNewIcon\redo.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\VeinMatchNewIcon\move.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\VeinMatchNewIcon\confirm move.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\VeinMatchNewIcon\reset move.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\VeinMatchNewIcon\reset pair.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\VeinMatchNewIcon\select all.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\VeinMatchNewIcon\deselect all.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\VeinMatchNewIcon\multi sel.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\VeinMatchNewIcon\reset.png" />
+  </ItemGroup>
   <ItemGroup>
     <Resource Include="Resources\DetailPage\Cancel.png" />
     <Resource Include="Resources\DetailPage\Confirm.png" />
     <Resource Include="Resources\DetailPage\Elimina.png" />
-    <Resource Include="Resources\DetailPage\Pencil.png" />
     <Resource Include="Resources\DetailPage\Photo.png" />
-    <Resource Include="Resources\DetailPage\Polygon.png" />
     <Resource Include="Resources\DetailPage\Print.png" />
-    <Resource Include="Resources\DetailPage\Reset.png" />
-    <Resource Include="Resources\DetailPage\Rubber.png" />
     <Resource Include="Resources\DetailPage\Save.png" />
-    <Resource Include="Resources\DetailPage\ZoomAll.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\VeinMatchNewIcon\autopair.png" />
   </ItemGroup>
   <ItemGroup>
     <Resource Include="Resources\NewIcons\LightArrowOff.png" />

OptionPanel/NestingTab/NestingTabVM.vb

@@ -2170,6 +2170,10 @@ Public Class NestingTabVM
 #Region "EVENTS"
 
    Friend Sub OnMouseDownScene(sender As Object, e As Windows.Forms.MouseEventArgs)
+      Dim nCtx As Integer = EgtGetCurrentContext()
+      Dim x As Integer = EgtGetFirstInGroup(0)
+      Dim y As Integer = EgtGetLastInGroup(0)
+      Dim z As Integer = EgtGetFirstPart()
       ' se in modalità DragRectangle (deformazione delle componenti rettangolari)
       If m_bDragRectangle Then
          OnMyMouseDownSceneSelSideRectangle(sender, e)

SideEntityControl/SideEntityControlVM.vb

@@ -31,7 +31,7 @@ Public Class SideEntityControlVM
    ' Variabile che indica se sono in sideangle o drip
    Friend m_Mode As ModeOpt
 
-   Friend Shared m_SideAngleCheck As Boolean = False
+   Friend Shared m_SideAngleCheck As Boolean = True
 
    ' Lista di tutte le entità (inclinabili) presenti nel progetto
    Private m_SideEntityList As ObservableCollection(Of SideEntity)
@@ -102,7 +102,8 @@ Public Class SideEntityControlVM
       Get
          If m_Mode = ModeOpt.SIDEANGLE Then
             If m_SideAngleCheck Then
-               Return Visibility.Visible
+               'Return Visibility.Visible
+               Return Visibility.Collapsed
             Else
                Return Visibility.Collapsed
             End If
@@ -568,8 +569,10 @@ Public Class SideEntityControlVM
       '------------------ VISIBILITA' PARAMETRI
       ' Gestisco visualizzazione dei parametri (sotto l'elenco dei parametri)
       If m_Mode = ModeOpt.SIDEANGLE Then
-         Parameter23_Visibility = Windows.Visibility.Hidden
+         Parameter23_Visibility = Visibility.Hidden
-         Parameter2_Visibility = Visibility.Visible
+         '' Prima dell'inserimento della nuova gestione
+         'Parameter2_Visibility = Visibility.Visible
+         Parameter2_Visibility = Visibility.Hidden
          Parameter2ab_Visibility = Visibility.Hidden
          Parameter4_Visibility = Visibility.Hidden
          Parameter5_Visibility = Visibility.Hidden
@@ -2116,7 +2119,10 @@ Public MustInherit Class SideEntity
       Get
          If m_Mode = SideEntityControlVM.ModeOpt.SIDEANGLE Then
             If SideEntityControlVM.m_SideAngleCheck Then
-               Return Visibility.Collapsed
+               '' Per ogni lato della compo visulizzo solo la CheckBox 
+               'Return Visibility.Collapsed
+               ' Per ogni lato della compo visulizzo campi Ang a Hill
+               Return Visibility.Visible
             Else
                Return Visibility.Visible
             End If

Utility/OmagOFFICEMap.vb

@@ -35,6 +35,7 @@ Module OmagOFFICEMap
    Private m_refSimulTabVM As SimulTabVM
 
    Private m_refSceneHostVM As SceneHostVM
+   Private m_refVeinMatchingWindow As VeinMatchingWindow
 
 #Region "Get"
 
@@ -168,6 +169,12 @@ Module OmagOFFICEMap
       End Get
    End Property
 
+   Public ReadOnly Property refVeinMatchingWindow As VeinMatchingWindow
+      Get
+         Return m_refVeinMatchingWindow
+      End Get
+   End Property
+
 #End Region    ' Get
 
 #Region "Set"
@@ -284,6 +291,11 @@ Module OmagOFFICEMap
       Return m_HeightProjectV
    End Function
 
+   Friend Function SetRefVeinMatchingWindow(_VeinMatchingWindow As VeinMatchingWindow) As Boolean
+      m_refVeinMatchingWindow = _VeinMatchingWindow
+      Return Not IsNothing(m_refVeinMatchingWindow)
+   End Function
+
 #End Region    ' Set
 
 #Region "Init"

VeinMatchPanel/VeinMatchPanelVM.vb

@@ -32,6 +32,7 @@ Public Class VeinMatchPanelVM
             VeinMatchingWnd.Show()
          Else
             VeinMatchingWnd.Hide()
+            'VeinMatchingWnd.ClosePopUps()
          End If
          EgtSetCurrentContext(OmagOFFICEMap.refSceneHostVM.MainScene.GetCtx())
       End Set