From 7ccb7fb96fc95dd0382b96ea78d68ecc07e8adda Mon Sep 17 00:00:00 2001 From: NicolaP Date: Thu, 23 Dec 2021 12:13:16 +0100 Subject: [PATCH] Correzione Import/Export per utensili e lavorazioni --- DirectCuts/FlatteningCut.xaml.vb | 2 - Machine/ImportExportMachiningWindowWD.xaml.vb | 17 ++ Machine/ImportExportToolWD.xaml.vb | 18 ++ Machine/MachiningDbPageUC.xaml | 4 +- Machine/MachiningDbPageUC.xaml.vb | 190 ++++++++++++++++++ Machine/ToolsDbPageUC.xaml | 7 +- Machine/ToolsDbPageUC.xaml.vb | 68 ++++++- OmagCUTDictionary.xaml.vb | 26 ++- 8 files changed, 312 insertions(+), 20 deletions(-) diff --git a/DirectCuts/FlatteningCut.xaml.vb b/DirectCuts/FlatteningCut.xaml.vb index eccbd23..a658486 100644 --- a/DirectCuts/FlatteningCut.xaml.vb +++ b/DirectCuts/FlatteningCut.xaml.vb @@ -671,8 +671,6 @@ Public Class FlatteningCut End If UpdateSimulOkBtn() - - Return m_bCutOk End Function diff --git a/Machine/ImportExportMachiningWindowWD.xaml.vb b/Machine/ImportExportMachiningWindowWD.xaml.vb index 8aa4f5d..f281e60 100644 --- a/Machine/ImportExportMachiningWindowWD.xaml.vb +++ b/Machine/ImportExportMachiningWindowWD.xaml.vb @@ -5,6 +5,13 @@ Public Class ImportExportMachiningWindowWD Private WithEvents m_ImportExportMachiningWindowVM As ImportExportMachiningWindowVM + Private m_OkResult As Boolean = False + Public ReadOnly Property OkResult As Boolean + Get + Return m_OkResult + End Get + End Property + Sub New(Owner As Window, ImportExportToolWindowVM As ImportExportMachiningWindowVM) Me.Owner = Owner ' This call is required by the designer. @@ -13,4 +20,14 @@ Public Class ImportExportMachiningWindowWD ' Assegno al riferimento locale al VM il VM preso dal DataContext m_ImportExportMachiningWindowVM = ImportExportToolWindowVM End Sub + Private Sub OkCloseDialogWD() Handles OkBtn.Click + m_OkResult = True + Me.Close() + End Sub + + Private Sub CancelCloseDialogWD() Handles ExitBtn.Click + m_OkResult = False + Me.Close() + End Sub + End Class diff --git a/Machine/ImportExportToolWD.xaml.vb b/Machine/ImportExportToolWD.xaml.vb index 6a686f3..3341fca 100644 --- a/Machine/ImportExportToolWD.xaml.vb +++ b/Machine/ImportExportToolWD.xaml.vb @@ -5,6 +5,13 @@ Public Class ImportExportToolWD Private WithEvents m_ImportExportToolWindowVM As ImportExportToolWindowVM + Private m_OkResult As Boolean = False + Public ReadOnly Property OkResult As Boolean + Get + Return m_OkResult + End Get + End Property + Sub New(Owner As Window, ImportExportToolWindowVM As ImportExportToolWindowVM) Me.Owner = Owner ' This call is required by the designer. @@ -17,4 +24,15 @@ Public Class ImportExportToolWD 'Private Sub CloseWindow(bDialogResult As Boolean) Handles m_ImportExportToolWindowVM.m_CloseWindow ' Me.DialogResult = bDialogResult 'End Sub + + Private Sub OkCloseDialogWD() Handles OkBtn.Click + m_OkResult = True + Me.Close() + End Sub + + Private Sub CancelCloseDialogWD() Handles ExitBtn.Click + m_OkResult = False + Me.Close() + End Sub + End Class \ No newline at end of file diff --git a/Machine/MachiningDbPageUC.xaml b/Machine/MachiningDbPageUC.xaml index 39b06da..6bd859a 100644 --- a/Machine/MachiningDbPageUC.xaml +++ b/Machine/MachiningDbPageUC.xaml @@ -939,8 +939,8 @@