Merge branch 'master' into develop

Constants/ConstGen.vb

@@ -21,6 +21,7 @@ Module ConstGen
    ' File con dati di licenza
    Public Const LIC_FILE_NAME As String = "OmagOFFICE.lic"
    Public Const S_LICENCE As String = "Licence"
+   Public Const K_LOCKID As String = "LockId"
    Public Const K_KEY As String = "Key"
    Public Const K_NESTKEY As String = "NestKey"
 

Constants/ConstIni.vb

@@ -114,6 +114,7 @@ Module ConstIni
    Public Const K_FILOTOPOFFSET As String = "FiloTopOffset"
    Public Const K_FILOTOPDEPTH As String = "FiloTopDepth"
    Public Const K_FILOTOPROUNDOFF As String = "FiloTopRoundOff"
+   Public Const K_TEXTCOLORENT As String = "TextColorEnt"
 
    Public Const S_NEST As String = "Nest"
    Public Const K_DIRECT As String = "Direct"

MainWindow/MainWindowM.vb

@@ -219,12 +219,17 @@ Public Class MainWindowM
       EgtUILib.GetPrivateProfileString( S_LICENCE, K_NESTKEY, "", sNestKey, sLicFile)
       EgtSetNestKey( sNestKey)
       Dim bNetHwKey As Boolean = ( GetMainPrivateProfileInt(S_GENERAL, K_NETKEY, 0) = 1)
-      EgtSetNetHwKey( bNetHwKey)
+      EgtSetNetHwKey(bNetHwKey)
+      Dim sLockId As String = ""
+      EgtUILib.GetPrivateProfileString(S_LICENCE, K_LOCKID, "", sLockId, sLicFile)
+      If Not String.IsNullOrEmpty(sLockId) Then
+         EgtSetLockId(sLockId)
+      End If
       ' Verifico abilitazione nesting automatico
       m_bAutoNestOption = Not String.IsNullOrWhiteSpace( sNestKey)
       ' Recupero livello e opzioni della chiave
-      Dim bKey As Boolean = EgtGetKeyLevel(9423, 2602, 1, m_nKeyLevel) And
-                            EgtGetKeyOptions(9423, 2602, 1, m_nKeyOptions)
+      Dim bKey As Boolean = EgtGetKeyLevel(9423, 2607, 1, m_nKeyLevel) And
+                            EgtGetKeyOptions(9423, 2607, 1, m_nKeyOptions)
       ' Verifico abilitazione prodotto
       Dim bProd As Boolean = GetKeyOption(KEY_OPT.OFFICE_BASE)
       ' Inizializzazione generale di EgtInterface

My Project/AssemblyInfo.vb

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

MySceneHost/MySceneHostVM.vb

@@ -47,12 +47,27 @@ Public Class MySceneHostVM
       ' Problemi
       ' Se manca la chiave
       If OmagOFFICEMap.refMainWindowVM.MainWindowM.nKeyLevel = -1 Or OmagOFFICEMap.refMainWindowVM.MainWindowM.nKeyLevel = -2 Then
-         EgtOutLog("Missing Dongle")
-         ' Box di avviso chiave mancante : "Chiave non presente. \n Inserirla e riavviare il programma."  "Errore"
-         Dim sText As String = EgtMsg(MSG_MISSINGKEYWD + 2) & vbCrLf & EgtMsg(MSG_MISSINGKEYWD + 3)
-         Dim sTitle As String = EgtMsg(MSG_MISSINGKEYWD + 1)
+         If Not EgtGetNetHwKey() Then
+            EgtOutLog("Missing Dongle")
+            ' Box di avviso chiave mancante : "Chiave non presente. \nInserirla e riavviare il programma."  "Errore"
+            Dim sText As String = EgtMsg(10102) & vbCrLf & EgtMsg(10103)
+            Dim sTitle As String = EgtMsg(10101)
+            MessageBox.Show(sText, sTitle, MessageBoxButton.OK, MessageBoxImage.Error)
+         Else
+            EgtOutLog("NetDongle is full")
+            ' Box di avviso slot chiave di rete occupato : "Chiave di Rete completamente occupata. \n Uscire dal programma su un altro PC." "Errore"
+            Dim sText As String = EgtMsg(10110) & vbCrLf & EgtMsg(10111)
+            Dim sTitle As String = EgtMsg(10101)
+            MessageBox.Show(sText, sTitle, MessageBoxButton.OK, MessageBoxImage.Error)
+         End If
+         ' Se altrimenti manca il collegamento con la chiave di rete
+      ElseIf OmagOFFICEMap.refMainWindowVM.MainWindowM.nKeyLevel = -9 Then
+         EgtOutLog("Missing Link with Net Dongle")
+         ' Box di avviso chiave mancante : "Collegamento con la Chiave di rete non riuscito. \n Verificare la connessione." "Errore"
+         Dim sText As String = EgtMsg(10108) & vbCrLf & EgtMsg(10109)
+         Dim sTitle As String = EgtMsg(10101)
          MessageBox.Show(sText, sTitle, MessageBoxButton.OK, MessageBoxImage.Error)
-      ' Altrimenti manca la licenza
+         ' Altrimenti manca la licenza
       Else
          EgtOutLog("Problems with Licence")
          ' Box di avviso licenza con problemi : "Programma senza licenza. \n Caricala e riavvia il programma."  "Errore"
@@ -87,12 +102,14 @@ Public Class MySceneHostVM
 
    Public Overrides Sub InitSceneEvents()
       AddHandler MainScene.OnMouseDownScene, AddressOf OnMouseDownScene
+      'AddHandler OnMouseDownScene_DoubleClick_1, AddressOf OnMouseDownScene_DoubleClick
       AddHandler MainScene.OnMouseMoveScene, AddressOf OnMouseMoveScene
       AddHandler MainScene.OnMouseUpScene, AddressOf OnMouseUpScene
       AddHandler MainScene.KeyDown, AddressOf OnKeyDownScene
       AddHandler MainScene.OnCursorPos, AddressOf OnCursorPos
       AddHandler MainScene.OnShowDistance, AddressOf OnShowDistance
       AddHandler MainScene.OnChangedSnapPointType, AddressOf OnChangedSnapPointType
+
    End Sub
 
    Private Sub PreInitializeScene()
@@ -719,6 +736,8 @@ Public Class MySceneHostVM
    End Sub
 
    Private Sub OnSavingProject(ByVal sender As Object, sFile As String)
+      ' Salvo le info del progetto
+      TopCommandBarVM.SetInfoProj(sFile)
       ' Recupero tutti i file di texture associabili ai gruppi di lavoro del progetto
       Dim sDirToSearch As String = Path.GetDirectoryName(sFile)
       Dim sFileToSearch As String = Path.GetFileNameWithoutExtension(sFile) & "." & PHOTO_NAME & "*"
@@ -792,6 +811,13 @@ Public Class MySceneHostVM
    Private Sub OnMouseDownScene(sender As Object, e As Windows.Forms.MouseEventArgs)
       ' Si può selezionare solo con il tasto sinistro e se stato NULL
       If e.Button <> Windows.Forms.MouseButtons.Left Or Not MainScene.IsStatusNull() Then Return
+      If e.Clicks > 1 Then
+         Select Case OmagOFFICEMap.refOptionPanelVM.SelItem
+            Case OptionPanelVM.Tabs.MACHINING
+               OmagOFFICEMap.refMachiningTabVM.OnMouseDownScene_DoubleClick(sender, e)
+            Case OptionPanelVM.Tabs.SIMUL
+         End Select
+      End If
       ' Chiamo l'opportuno gestore
       Select Case OmagOFFICEMap.refOptionPanelVM.SelItem
          Case OptionPanelVM.Tabs.RAWPART

OptionPanel/MachiningTab/MachiningTabVM.vb

@@ -334,6 +334,12 @@ Public Class MachiningTabVM
       End If
    End Sub
 
+   Friend Sub OnMouseDownScene_DoubleClick(sender As Object, e As Windows.Forms.MouseEventArgs)
+      If m_MachiningMode = MachiningModeOpt.SPLIT Then
+         OmagOFFICEMap.refSplitModeVM.OnMouseDownScene_DoubleClick(sender, e)
+      End If
+   End Sub
+
 #End Region    ' EVENTS
 
 End Class

OptionPanel/MachiningTab/SplitModeV.xaml

@@ -21,8 +21,12 @@
                             <Image Margin="1" Height="20" Width="20"
                                    Source="{Binding SourceImg}">
                             </Image>
-                            <TextBlock Margin="1" Text="{Binding Name}">
-                            </TextBlock>
+                            <TextBlock Margin="1" Text="{Binding Name}"/>
+                            <StackPanel.InputBindings>
+                                <MouseBinding MouseAction="LeftDoubleClick" 
+                                   Command="{Binding Path=DataContext.OnOffCommand,
+                                                     RelativeSource={RelativeSource AncestorType=UserControl, Mode=FindAncestor }}"/>
+                            </StackPanel.InputBindings>
                         </StackPanel>
                     </DataTemplate>
                 </ListBox.ItemTemplate>
@@ -40,6 +44,7 @@
                             </DataTrigger>
                         </Style.Triggers>
                         <Setter Property="IsSelected" Value="{Binding IsSelected, Mode=TwoWay}" />
+                        <Setter Property="HorizontalContentAlignment" Value="Stretch"/>
                     </Style>
                 </ListBox.ItemContainerStyle>
             </ListBox>
@@ -504,7 +509,7 @@
                             Style="{StaticResource ImgButton}"/>
                                 </StackPanel>
                             </Button>
-                            
+
                         </StackPanel>
 
                     </UniformGrid>
@@ -552,7 +557,7 @@
                             </Button>
                         </StackPanel>
 
-                        
+
                         <StackPanel Margin="1,0,0,0">
                             <Button ToolTip="{Binding ModifEndMsg}"
                        Style="{StaticResource Split_Button_Img}"

OptionPanel/MachiningTab/SplitModeVM.vb

@@ -3040,6 +3040,12 @@ Public Class SplitModeVM
       Return bOk
    End Function
 
+   Friend Sub OnMouseDownScene_DoubleClick(sender As Object, e As System.Windows.Forms.MouseEventArgs)
+      OnMouseDownScene(sender, e)
+      If m_nSelected = GDB_ID.NULL Then Return
+      OnOff(Nothing)
+   End Sub
+
    Friend Sub OnMouseDownScene(sender As Object, e As System.Windows.Forms.MouseEventArgs)
       ' Se tasto premuoto allora attivo la selezione multipla da Scena
       Dim bKeyCtrlPressed = (Keyboard.Modifiers And ModifierKeys.Control) > 0

SideEntityControl/SideEntityControlVM.vb

@@ -7,6 +7,8 @@ Public Class SideEntityControlVM
 
    Private Const INFO_ALZFRONT As String = "AF"
 
+   Private ColorText As New Color3d(0, 0, 0)
+
    Public Enum ModeOpt As Integer
       SIDEANGLE = 0   ' inclina lato
       DRIP = 1        ' incidi da sotto
@@ -543,7 +545,7 @@ Public Class SideEntityControlVM
       NotifyPropertyChanged("SideEntityList")
       m_SideAngleCheck = If(GetMainPrivateProfileInt(S_COMPO, K_SIDEMODE, 0) = 0, True, False)
       SideAngleEntity.dMaxSideAng = GetMainPrivateProfileDouble(S_SIDES, K_MAXSIDEANGLE, SideAngleEntity.STD_MAXSIDEANG)
-
+      GetMainPrivateProfileColor(S_SIDES, K_TEXTCOLORENT, ColorText)
       '------------------ DEFINIZIONE LISTA LATI
       ' creo la lista dei parametri 
       If CallingWindow = CallingWindowOpt.COMPO Then
@@ -704,7 +706,7 @@ Public Class SideEntityControlVM
       Else
          TextLayer = EgtCreateGroup(PartId)
          EgtSetName(TextLayer, SIDE_ANGLE_LAYER)
-         EgtSetColor(TextLayer, New Color3d(0, 0, 0))
+         EgtSetColor(TextLayer, ColorText)
       End If
 
       ' Se modalità angoli di inclinazione...
@@ -773,7 +775,7 @@ Public Class SideEntityControlVM
       If TextLayer = GDB_ID.NULL Then
          TextLayer = EgtCreateGroup(PartId)
          EgtSetName(TextLayer, SIDE_ANGLE_LAYER)
-         EgtSetColor(TextLayer, New Color3d(0, 0, 0))
+         EgtSetColor(TextLayer, ColorText)
       End If
 
       Dim PrevLine As Integer = EgtGetLastInGroup(LoopId)
@@ -1515,20 +1517,22 @@ Public Class SideEntityControlVM
    End Sub
 
    Shared Sub WriteSideAngleForNest(nCtx As Integer)
+      Dim LocalColor As New Color3d(0, 0, 0)
+      GetMainPrivateProfileColor(S_SIDES, K_TEXTCOLORENT, LocalColor)
       ' Imposto contesto corrente
       EgtSetCurrentContext(nCtx)
       Dim PartId As Integer = EgtGetFirstPart()
       While PartId <> GDB_ID.NULL
          ' Se richiesti lati paralleli con misura sul top come in TRF, verifico e aggiusto
-         If GetMainPrivateProfileInt( S_SIDES, K_PARSIDE_AS_TRF, 0) <> 0 Then
-            AdjustAsTrfParSides( PartId)
-         End If 
+         If GetMainPrivateProfileInt(S_SIDES, K_PARSIDE_AS_TRF, 0) <> 0 Then
+            AdjustAsTrfParSides(PartId)
+         End If
          ' Elimino eventuale precedente layer per testi
          EgtErase(EgtGetFirstNameInGroup(PartId, SIDE_ANGLE_LAYER))
          ' Creo layer per testi nesting
          Dim TextLayId As Integer = EgtCreateGroup(PartId)
          EgtSetName(TextLayId, SIDE_ANGLE_LAYER)
-         EgtSetColor(TextLayId, New Color3d(0, 0, 128))
+         EgtSetColor(TextLayId, LocalColor)
          ' Opero su geometria esterna pezzo
          WriteSideAngleOnLoop(EgtGetFirstNameInGroup(PartId, NAME_OUTLOOP), TextLayId)
          ' Ciclo su geometria interna pezzo

TopCommandBar/TopCommandBarVM.vb

@@ -74,12 +74,12 @@ Public Class TopCommandBarVM
    End Property
    Public ReadOnly Property ExportToolTip As String
       Get
-         Return EgtMsg( 91505)               'Esporta in macchina
+         Return EgtMsg(91505)               'Esporta in macchina
       End Get
    End Property
    Public ReadOnly Property DxfOutToolTip As String
       Get
-         Return EgtMsg( 91506)               'Esporta DXF
+         Return EgtMsg(91506)               'Esporta DXF
       End Get
    End Property
    Public ReadOnly Property OptionsToolTip As String
@@ -226,6 +226,18 @@ Public Class TopCommandBarVM
    ''' Execute the SaveAs.  This method is invoked by the SaveAsCommand.
    ''' </summary>
    Public Sub SaveAs(ByVal param As Object)
+      'Dim SaveFileDialog As New System.Windows.Forms.SaveFileDialog()
+      'SaveFileDialog.Filter = "(*.nge) |*.nge"
+      'SaveFileDialog.FilterIndex = 2
+      '' avvio la ricerca nell'ultimo direttorio aperto
+      'Dim sFilePath As String = String.Empty
+      'EgtGetCurrFilePath(sFilePath)
+      'SaveFileDialog.InitialDirectory = Path.GetExtension(sFilePath)
+      'SaveFileDialog.FileName = Path.GetFileName(sFilePath)
+      '' apro la finestra di dialogo
+      'Dim bChangeProject As Boolean = True
+      'If SaveFileDialog.ShowDialog() <> System.Windows.Forms.DialogResult.OK Then Return
+      'Dim sNewFilePath As String = SaveFileDialog.FileName
       ' non posso avere la stessa lastra in due progetti -> gestita da DataBase
       OmagOFFICEMap.refSceneHostVM.SaveAsProject()
    End Sub
@@ -238,12 +250,12 @@ Public Class TopCommandBarVM
    ''' Returns a command that do Export.
    ''' </summary>
    Public ReadOnly Property ExportCommand As ICommand
-         Get
-            If m_cmdExport Is Nothing Then
-               m_cmdExport = New Command(AddressOf Export)
-            End If
-            Return m_cmdExport
-         End Get
+      Get
+         If m_cmdExport Is Nothing Then
+            m_cmdExport = New Command(AddressOf Export)
+         End If
+         Return m_cmdExport
+      End Get
    End Property
 
    ''' <summary>
@@ -436,4 +448,42 @@ Public Class TopCommandBarVM
 
 #End Region    ' Commands
 
+   Public Shared Sub SetInfoProj(Optional sFilePath As String = "")
+      EgtOutLog(" *** SAVE PROJECT ***")
+      ' Recupero l'ID della macchinata corrente
+      Dim CurrGrpId As Integer = EgtGetCurrMachGroup()
+      ' Path completa del progetto corrente
+      If String.IsNullOrEmpty(sFilePath) Then EgtGetCurrFilePath(sFilePath)
+      Dim nPartInRawsProj As Integer = 0
+      Dim nGrpId = EgtGetFirstMachGroup()
+
+      While nGrpId <> GDB_ID.NULL
+         ' Imposto la macchinata corrente
+         EgtSetCurrMachGroup(nGrpId)
+         ' recupero il primo grezzo della macchinata corrente
+         Dim nRawId As Integer = EgtGetFirstRawPart()
+         While nRawId <> GDB_ID.NULL
+            nPartInRawsProj += EgtGetPartInRawPartCount(nRawId)
+            nRawId = EgtGetNextRawPart(nRawId)
+         End While
+         nGrpId = EgtGetNextMachGroup(nGrpId)
+      End While
+
+      nGrpId = EgtGetFirstMachGroup()
+      While nGrpId <> GDB_ID.NULL
+         ' percorso progetto
+         EgtSetInfo(nGrpId, "ProjPath", sFilePath)
+         ' Anno/Mese/Giorno/Ora/min di salvataggio
+         EgtSetInfo(nGrpId, "Released", DateTime.Now.ToString("yyyy/MM/dd HH:mm:ss"))
+         ' numero di pezzi presenti nel progetto
+         EgtSetInfo(nGrpId, "NbrProjParts", nPartInRawsProj.ToString)
+         nGrpId = EgtGetNextMachGroup(nGrpId)
+      End While
+      EgtOutLog("     ProjPath:" & sFilePath)
+      EgtOutLog("     Released:" & DateTime.Now.ToString("yyyy/MM/dd HH:mm:ss"))
+      EgtOutLog("     NbrProjParts:" & nPartInRawsProj.ToString)
+      ' Reimposto la macchina corrente
+      EgtSetCurrMachGroup(CurrGrpId)
+   End Sub
+
 End Class