Merge branch 'develop'

MainWindow/MainWindowM.vb

@@ -228,8 +228,8 @@ Public Class MainWindowM
       ' Verifico abilitazione nesting automatico
       m_bAutoNestOption = Not String.IsNullOrWhiteSpace( sNestKey)
       ' Recupero livello e opzioni della chiave
-      Dim bKey As Boolean = EgtGetKeyLevel(9423, 2604, 1, m_nKeyLevel) And
-                            EgtGetKeyOptions(9423, 2604, 1, m_nKeyOptions)
+      Dim bKey As Boolean = EgtGetKeyLevel(9423, 2610, 1, m_nKeyLevel) And
+                            EgtGetKeyOptions(9423, 2610, 1, m_nKeyOptions)
       ' Verifico abilitazione prodotto
       Dim bProd As Boolean = GetKeyOption(KEY_OPT.OFFICE_BASE)
       ' Inizializzazione generale di EgtInterface
@@ -299,6 +299,7 @@ Public Class MainWindowM
       ' Info su opzioni chiave
       EgtOutLog("KeyOptions : " & bKey.ToString() & " " & m_nKeyOptions.ToString() & " " & bProd.ToString())
       EgtPHOTOLib.MainData.SetConfigDir(m_sConfigDir)
+      EgtPHOTOLib.MainData.SetDebugLevel(m_nDebug)
       EgtPHOTOLib.MainData.SetKeyLevel(m_nKeyLevel)
       EgtPHOTOLib.MainData.SetKeyOptions(CInt(m_nKeyOptions))
       EgtPHOTOLib.MainData.SetPhotoDir(m_sPhotoDir)

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.4.1")>
-<Assembly: AssemblyFileVersion("2.6.4.1")>
+<Assembly: AssemblyVersion("2.6.10.1")>
+<Assembly: AssemblyFileVersion("2.6.10.1")>
 

MySceneHost/MySceneHostVM.vb

@@ -102,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()
@@ -809,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

OmagOFFICE.vbproj

@@ -963,6 +963,19 @@
   <ItemGroup>
     <Resource Include="Resources\NewIcons\DB-WJ.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>
   <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
   <PropertyGroup>
     <PostBuildEvent>IF "$(PlatformName)"=="x86" IF "$(ConfigurationName)" == "Release" copy $(TargetPath) c:\EgtProg\OmagOFFICE\OmagOFFICER32.exe

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

OptionPanel/RawPartTab/OmagPhotoV.xaml

@@ -10,12 +10,10 @@
         d:DesignHeight="300" d:DesignWidth="300"
         Title="OmagPHOTO"
         ResizeMode="NoResize" ShowInTaskbar="False">
-    <EgtPHOTOLib:ProjectSlabV DataContext="{StaticResource ProjectSlabVM}"/>
-    <!--<DockPanel>
-        <Grid>
-            <ContentControl Content="{Binding OmagPhotoContent}"/>
-           
-        </Grid>
-    </DockPanel>-->
+    <DockPanel>
+      
+        <!--Progetto corrente-->
+        <EgtPHOTOLib:ProjectSlabV DataContext="{StaticResource ProjectSlabVM}"/>
 
+    </DockPanel>
 </EgtWPFLib5:EgtCustomWindow>

OptionPanel/RawPartTab/OmagPhotoV.xaml.vb

@@ -2,13 +2,11 @@
 
    'Private m_OmagPhotoVM As OmagPhotoVM
 
-   'Sub New(Owner As Window, OmagPhotoVM As OmagPhotoVM)
+   'Public Sub New(Owner As Window)
    '   MyBase.New(Owner)
-   '   ' This call is required by the designer.
+   '   'This call Is required by the designer.
    '   InitializeComponent()
-   '   Me.DataContext = OmagPhotoVM
-   '   ' Assegno al riferimento locale al VM il VM preso dal DataContext
-   '   m_OmagPhotoVM = OmagPhotoVM
+
    'End Sub
 
 End Class

OptionPanel/RawPartTab/RawPartTabVM.vb

@@ -1091,9 +1091,12 @@ Public Class RawPartTabVM
       ' Creo riferimento a questa classe in OmagOFFICEMap
       OmagOFFICEMap.SetRefRawPartTabVM(Me)
       If OmagOFFICEMap.refMainWindowVM.MainWindowM.m_SlabDB Then
-         'Me.OmagPhoto = New OmagPhotoV(Application.Current.MainWindow(), New OmagPhotoVM)
+         ' Me.OmagPhoto = New OmagPhotoV(Application.Current.MainWindow())
          Me.OmagPhoto = New OmagPhotoV
-         If Not PhotoMap.ContinueApplication Then End
+         If Not PhotoMap.ContinueApplication Then
+            EgtOutLog("Key protection denied to acces to DB photo, set configuration to image directory")
+            End
+         End If
       End If
       ' Aggiungo voci alla lista di tipi di definizione grezzo
       m_TypeList.Add(EgtMsg(MSG_RAWPARTPAGEUC + 1))
@@ -2255,6 +2258,13 @@ Public Class RawPartTabVM
          PhotoMap.refSearchPanelVM.InitSearchPanel()
          ' inizializzo la ricerca a tutti le lastre di tipo "AVAILABLE" (=1)
          PhotoMap.refSearchPanelVM.State = 1
+
+         ' Resetto la data corrente per la prima ricerca 
+         PhotoMap.refSearchPanelVM.StartAddedDate = Nothing
+         PhotoMap.refSearchPanelVM.NotifyPropertyChanged("StartAddedDate")
+         PhotoMap.refSearchPanelVM.EndAddedDate = Nothing
+         PhotoMap.refSearchPanelVM.NotifyPropertyChanged("EndAddedDate")
+
          PhotoMap.refSearchPanelVM.Search()
          ' inserisco in elenco solo i materiali della macchina corrente
          AddHandler PhotoMap.refOptionPanelVM.SlabIsSelectedOFFICE, AddressOf OmagOFFICEMap.refRawPartTabVM.ClosePhotoWnd
@@ -2264,10 +2274,9 @@ Public Class RawPartTabVM
          m_RefreshTimer.Interval = TimeSpan.FromMilliseconds(2000)
          m_RefreshTimer.Start()
 
-         ' apro la finestra per accedere al DB delle lastre
+         ' apro la finestra per accedere al DB delle lastre (Devo crea una nuova istanza perchè la chiusura elimina la stessa)
          Me.OmagPhoto = New OmagPhotoV
-         OmagPhoto.ShowDialog()
-
+         Me.OmagPhoto.ShowDialog()
          m_RefreshTimer.Stop()
 
          EgtSetCurrentContext(EgtPHOTOLib.MainData.PreviousContext)