Correzione DoubleClick OnOff scena

AboutBox/AboutBoxWD.xaml

@@ -36,7 +36,7 @@
                <ColumnDefinition Width="1*"/>
             </Grid.ColumnDefinitions>
             <Border Name="LogoBrd" Grid.Column="1">
-               <Image Source="../Resources/AboutBoxImage.png" Stretch="Uniform"/>
+                    <Image Source="../Resources/NewIcons/Logo-Egalware (3).png" Stretch="Uniform"/>
             </Border>
          </Grid>
          <TextBlock Name="DescriptionLbl" Grid.Column="1" Grid.Row="3" HorizontalAlignment="Center"

CadCuts/NestPageUC.xaml.vb

@@ -220,17 +220,21 @@ Public Class NestPageUC
          m_nCountSpot = 0
          m_nCountSpotCUT = 0
       End If
+      EgtOutLog("Numero di SPOT caricati da OFFICE: " & m_nCountSpot.ToString)
       ' Se nel progetto non sono inseriti punti SpotReg disabilito i comandi
       If m_nCountSpot < 1 Then
          UG0_Reg.IsEnabled = False
          UG1_Reg.IsEnabled = False
+         EgtOutLog("   Abilito comandi gestione SPOT")
       Else
          UG0_Reg.IsEnabled = True
          UG1_Reg.IsEnabled = True
+         EgtOutLog("   Disabilito comandi gestione SPOT")
       End If
       ' Se nel progetto non sono inseriti punti SpotRegCUT provvedo ad aggiungerli
       If m_nCountSpotCUT < 1 Then
          InsertSpotRegistration()
+         EgtOutLog("      Creo SPOT_CUT")
       End If
 
       ' Se necessario riabilito impostazione modificato

CadCuts/SplitAuto.vb

@@ -129,25 +129,6 @@ Public Module SplitAuto
                      If nRes = 0 Then
                         EgtOutLog("Operation ID " & nOperId.ToString & " isn't split cut! verify depth machining.")
                      End If
-
-                  ElseIf (dStartAddLen > -EPS_SMALL Or dEndAddLen > -EPS_SMALL Or Mach.m_bMngLeadInOnIntCorner) And
-                     Mach.m_sLay = NAME_OUTLOOP And
-                     (Mach.m_nInterf = FMI_TYPE.LI Or Mach.m_nInterf = FMI_TYPE.LO Or Mach.m_nInterf = FMI_TYPE.RM) Then
-                     Dim nRes As Integer = EgtVerifyCutAsSplitting(nOperId)
-                     Dim bIn As Boolean = False
-                     Dim bOut As Boolean = False
-                     CanExtendSides(Mach, bIn, bOut)
-                     ' And (nRes And CAR_RES.LI_OK) <> 0 : da aggiungere
-                     Mach.m_bCanStartAll = (dStartAddLen > -EPS_SMALL Or Mach.m_bMngLeadInOnIntCorner) And
-                                           Mach.m_dStartFreeLen > FREELEN_INF And Mach.m_bIsLine And bIn And
-                                           Mach.m_nInterf <> FMI_TYPE.LI
-                     ' And (nRes And CAR_RES.LO_OK) <> 0 : da aggiungere come sopra
-                     Mach.m_bCanEndAll = (dEndAddLen > -EPS_SMALL Or Mach.m_bMngLeadInOnIntCorner) And
-                                         Mach.m_dEndFreeLen > FREELEN_INF And Mach.m_bIsLine And bOut And
-                                         Mach.m_nInterf <> FMI_TYPE.LO
-                     If nRes = 0 Then
-                        EgtOutLog("Operation ID " & nOperId.ToString & " isn't split cut! verify depth machining.")
-                     End If
                   End If
                   ' se trasformabile in taglio di separazione, verifico se lo è
                   If Mach.m_bCanStartAll Or Mach.m_bCanEndAll Then

CadCuts/SplitPageUC.xaml.vb

@@ -571,11 +571,6 @@ Public Class SplitPageUC
          m_nDragInd = -1
          m_nDragType = 0
          m_nSelected = GDB_ID.NULL
-         If Not IsNothing(MachiningLsBx.SelectedItem) Then
-            MarkMachining(MachiningLsBx.SelectedItem.Ind, False)
-            EgtDraw()
-         End If
-         MachiningLsBx.SelectedIndex = -1
       End If
    End Sub
 
@@ -705,11 +700,6 @@ Public Class SplitPageUC
    End Sub
 
    Private Sub MachiningLsBx_SelectionChanged(sender As Object, e As SelectionChangedEventArgs) Handles MachiningLsBx.SelectionChanged
-      ' se non attiva la modifica allora esco
-      If m_bShow Then
-         MachiningLsBx.SelectedIndex = -1
-         Return
-      End If
       If MachiningLsBx.SelectedItems.Count = 0 Then Return
       If MachiningLsBx.SelectedItems.Count = 1 Then m_bAreHomogeneous = True
       ' creo lista ordinata dei selezionati
@@ -751,8 +741,6 @@ Public Class SplitPageUC
    End Sub
 
    Private Sub MachiningLsBx_MouseDoubleClick(sender As Object, e As MouseEventArgs) Handles MachiningLsBx.MouseDoubleClick
-      ' se disabilitata la modifica allora esco
-      If m_bShow Then Return
       If m_IsCtrlKeyDown Or m_IsShiftKeyDown Then Return
       OnOffCut()
    End Sub
@@ -1958,22 +1946,22 @@ Public Class SplitPageUC
          NumberDirectionMachining(nI)
       Next
 
-      ' -------------------- Recupero le lavorazioni indicate come attive -- INIZIO --------------------
+      ' -------------------- Recupero le lavorazioni indicate come attive --------------------
       Dim ActiveMachLst As New List(Of Integer)
       For Each ItemSplitMach As NameIdLsBxItem In m_ItemList
-         If ItemSplitMach.bIsActive Then ActiveMachLst.Add(ItemSplitMach.Ind)
+         ActiveMachLst.Add(ItemSplitMach.Ind)
       Next
-      ' -------------------- Recupero le lavorazioni indicate come attive --  FINE  --------------------
+      ' -------------------- Recupero le lavorazioni indicate come attive --------------------
 
       ' Preparo la lista degli Item
       ShowMachiningList()
 
-      ' -------------------- Riattivo le lavorazioni precedenti -- INIZIO --------------------
+      ' -------------------- Riattivo le lavorazioni precedenti --------------------
+
       For Each Item As SplitMach In m_MachiningList
-         ' spengo tutte le lavorazioni disponibili
          EgtSetInfo(Item.m_nId, INFO_MCH_USER_OFF, True)
       Next
-      ' riattivo solo quelle indicate come attive
+
       For nIndex As Integer = 0 To ActiveMachLst.Count - 1
          For Each ItemSplitMach As NameIdLsBxItem In m_ItemList
             If ItemSplitMach.Ind = ActiveMachLst(nIndex) Then
@@ -1986,7 +1974,7 @@ Public Class SplitPageUC
             End If
          Next
       Next
-      ' -------------------- Riattivo le lavorazioni precedenti --  FINE  --------------------
+      ' -------------------- Riattivo le lavorazioni precedenti --------------------
 
       ' Aggiorno visualizzazione
       EgtDraw()
@@ -2208,8 +2196,6 @@ Public Class SplitPageUC
          VerifyHomogenousMachining(ItemList)
          ' Abilitazione bottone Next
          EnableButtons()
-      Else
-
       End If
    End Sub
 

MainWindow.xaml

@@ -27,7 +27,7 @@
          </Grid.ColumnDefinitions>
 
          <Border Name="LogoBrd" Background="Transparent">
-                <Image Source="{DynamicResource LogoOmagImg}" Stretch="Uniform" Margin="1"/>
+                <Image Source="../Resources/NewIcons/Logo-Egalware (2).png" Stretch="Uniform" Margin="1"/>
          </Border>
 
          <!-- ** Definizione della Grid delle tab ** -->

OmagCUT.vbproj

@@ -1376,6 +1376,13 @@
     <Resource Include="Resources\NewIcons\Move-Spot-Reg.png" />
   </ItemGroup>
   <ItemGroup>
+    <Resource Include="Resources\NewIcons\Logo-Egalware.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\NewIcons\Logo-Egalware %282%29.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\NewIcons\Logo-Egalware %283%29.png" />
     <Resource Include="Resources\NewIcons\RawHeight.png" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />

VeinMatching/VeinMatchingWindow.xaml

@@ -4,77 +4,27 @@
    TextBlock.FontFamily="{DynamicResource OmagCut_Font}"
    Height="500" Width="500" ShowInTaskbar="False" Initialized="Window_Initialized" MinWidth="300" MinHeight="300">
 
-    <Grid Name="VeinMatchingGrid" Background="{DynamicResource OmagCut_Gray}">
-        <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="91"/>
-            <ColumnDefinition Width="1*"/>
-        </Grid.ColumnDefinitions>
-        <DockPanel>
-            <StackPanel Orientation="Vertical" VerticalAlignment="Top" DockPanel.Dock="Top">
-                <Button Name="NewBtn" Height="64"
-                        Style="{DynamicResource OmagCut_YellowTextButton}"
-                        Content="New"/>
-                <Button Name="ExportBtn" Height="64"
-                        Style="{DynamicResource OmagCut_YellowTextButton}"
-                        Content="Export"/>
-                <Button Name="AssemblyBtn" Height="64"
-                        Style="{DynamicResource OmagCut_YellowTextButton}"
-                        Content="3D"/>
-                <Button Name="ImportCurrProjBtn" Height="64"
-                        Style="{DynamicResource OmagCut_YellowTextButton}"
-                        Content="Import"/>
-                <ToggleButton Name="MeasureBtn" Grid.Column="0" Style="{DynamicResource OmagCut_RightGrayYellowIconToggleButton}">
-                    <Image Source="{DynamicResource MeasureImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
-                </ToggleButton>
-            </StackPanel>
-            
-            <StackPanel Name="DistanceStkPnl" Orientation="Vertical" VerticalAlignment="Bottom" DockPanel.Dock="Bottom" Margin="10,0,0,0">
-                <!--Distanza-->
-                <Grid>
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="1*"/>
-                        <ColumnDefinition Width="2*"/>
-                    </Grid.ColumnDefinitions>
-                    <TextBlock Name="MeasureLabTxBl" Height="20" DockPanel.Dock="Bottom" Grid.Column="0" Foreground="{StaticResource Omag_LightGray}" 
-                               Text="Dist=" HorizontalAlignment="Right" />
-                    <TextBlock Name="MeasureValTxBl" Height="20" DockPanel.Dock="Bottom" Grid.Column="1" Foreground="{StaticResource Omag_LightGray}"
-                               HorizontalAlignment="Left"/>
-                </Grid>
-                <!--Proiezione in X-->
-                <Grid>
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="1*"/>
-                        <ColumnDefinition Width="2*"/>
-                    </Grid.ColumnDefinitions>
-                    <TextBlock Name="dXLabTxBl" Height="20" DockPanel.Dock="Bottom" Grid.Column="0" Foreground="{StaticResource Omag_LightGray}" 
-                               Text="dX=" HorizontalAlignment="Right"/>
-                    <TextBlock Name="dXValTxBl" Height="20" DockPanel.Dock="Bottom" Grid.Column="1" Foreground="{StaticResource Omag_LightGray}"
-                               HorizontalAlignment="Left"/>
-                </Grid>
-                <!--Proiezione in Y -->
-                <Grid>
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="1*"/>
-                        <ColumnDefinition Width="2*"/>
-                    </Grid.ColumnDefinitions>
-                    <TextBlock Name="dYLabTxBl" Height="20" DockPanel.Dock="Bottom" Grid.Column="0" Foreground="{StaticResource Omag_LightGray}" 
-                               Text="dY=" HorizontalAlignment="Right"/>
-                    <TextBlock Name="dYValTxBl" Height="20" DockPanel.Dock="Bottom" Grid.Column="1" Foreground="{StaticResource Omag_LightGray}"
-                               HorizontalAlignment="Left"/>
-                </Grid>
-                <!--Proiezione in Z -->
-                <Grid>
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="1*"/>
-                        <ColumnDefinition Width="2*"/>
-                    </Grid.ColumnDefinitions>
-                    <TextBlock Name="dZLabTxBl" Height="20" DockPanel.Dock="Bottom" Grid.Column="0" Foreground="{StaticResource Omag_LightGray}" 
-                               Text="dZ=" HorizontalAlignment="Right"/>
-                    <TextBlock Name="dZValTxBl" Height="20" DockPanel.Dock="Bottom" Grid.Column="1" Foreground="{StaticResource Omag_LightGray}"
-                               HorizontalAlignment="Left"/>
-                </Grid>
-            </StackPanel>
-        </DockPanel>
+   <Grid Name="VeinMatchingGrid" Background="{DynamicResource OmagCut_Gray}">
+      <Grid.ColumnDefinitions>
+         <ColumnDefinition Width="91"/>
+         <ColumnDefinition Width="1*"/>
+      </Grid.ColumnDefinitions>
+
+        <StackPanel Orientation="Vertical">
+            <Button Name="NewBtn" Height="64"
+            Style="{DynamicResource OmagCut_YellowTextButton}"
+            Content="New"/>
+            <Button Name="ExportBtn" Height="64"
+            Style="{DynamicResource OmagCut_YellowTextButton}"
+            Content="Export"/>
+            <Button Name="AssemblyBtn" Height="64"
+            Style="{DynamicResource OmagCut_YellowTextButton}"
+            Content="3D"/>
+            <Button Name="ImportCurrProjBtn" Height="64"
+            Style="{DynamicResource OmagCut_YellowTextButton}"
+            Content="Import"/>
+        </StackPanel>
+
     </Grid>
 
 </Window>

VeinMatching/VeinMatchingWindow.xaml.vb

@@ -82,8 +82,6 @@ Public Class VeinMatchingWindow
          Dim nTxrMaxLinPix As Integer = GetPrivateProfileInt(S_SCENE, K_TEXMAXLINPIX, 4096, m_MainWindow.GetIniFile())
          EgtSetTextureMaxLinPixels(nTxrMaxLinPix)
          m_bFirst = False
-         ' nascondo la visulizzazione dei campi
-         DistanceStkPnl.Visibility = Visibility.Hidden
       End If
       ' inibisco selezione diretta da Scene
       VeinMatchingScene.SetStatusNull()
@@ -196,25 +194,6 @@ Public Class VeinMatchingWindow
       EgtDraw()
    End Sub
 
-   Private Sub OnShowDistanceVector(sender As Object, vtDist As Vector3d) Handles VeinMatchingScene.OnShowDistanceVector
-      Dim sMsg As String = DistToString(vtDist)
-      Dim sItemsMsg As String() = sMsg.Split(vbCrLf)
-      If sItemsMsg.Count > 1 Then
-         ' stampo solo il valore di lunghezza
-         MeasureValTxBl.Text = sItemsMsg(0).Split("="c)(1)
-         sItemsMsg(1) = sItemsMsg(1).Trim
-         Dim sSubItemMsg As String() = sItemsMsg(1).Split(" "c)
-         If sSubItemMsg.Count > 1 Then
-            dXValTxBl.Text = sSubItemMsg(0).Split("="c)(1)
-            dYValTxBl.Text = sSubItemMsg(1).Split("="c)(1)
-            dZValTxBl.Text = sSubItemMsg(2).Split("="c)(1)
-         End If
-      Else
-         MeasureValTxBl.Text = sMsg
-      End If
-      DistanceStkPnl.Visibility = Visibility.Visible
-   End Sub
-
    Private Sub NewBtn_Click(sender As Object, e As RoutedEventArgs) Handles NewBtn.Click
       VeinMatching.Clear()
    End Sub
@@ -232,25 +211,6 @@ Public Class VeinMatchingWindow
       VeinMatching.LoadCurrPartFromProj()
    End Sub
 
-   Private Sub MeasureBtn_Checked(sender As Object, e As RoutedEventArgs) Handles MeasureBtn.Checked
-      VeinMatchingScene.SetStatusGetDistance()
-      Dim ptRef1 As Point3d
-      If EgtGetTableRef(1, ptRef1) Then
-         EgtSetGridFrame(New Frame3d(ptRef1))
-         VeinMatchingScene.SetGridCursorPos(True)
-      End If
-   End Sub
-
-   Private Sub MeasureBtn_Unchecked(sender As Object, e As RoutedEventArgs) Handles MeasureBtn.Unchecked
-      VeinMatchingScene.ResetStatusGetDistance()
-      VeinMatchingScene.SetStatusNull()
-      MeasureValTxBl.Text = ""
-      dXValTxBl.Text = ""
-      dYValTxBl.Text = ""
-      dZValTxBl.Text = ""
-      DistanceStkPnl.Visibility = Visibility.Hidden
-   End Sub
-
 End Class
 
 Friend Module VeinMatching