From 84bddeec9a98be4d2f7ccc732f08ac3c10034643 Mon Sep 17 00:00:00 2001 From: Emmanuele Sassi Date: Fri, 10 Aug 2018 16:40:06 +0000 Subject: [PATCH] OmagOFFICE : - Gestione dati TRF. - Stime tempi e costi. - Lavorazioni da sotto. --- CompoTrfDataWindow/CompoTrfDataWindowV.xaml | 64 ++++++ .../CompoTrfDataWindowV.xaml.vb | 22 +++ CompoTrfDataWindow/CompoTrfDataWindowVM.vb | 127 ++++++++++++ CompoWindow/CompoListPage/CompoListPageV.xaml | 2 +- CompoWindow/CompoListPage/CompoListPageVM.vb | 17 +- CompoWindow/CompoManager/CompoManagerV.xaml | 5 + CompoWindow/CompoManager/CompoManagerVM.vb | 18 ++ .../CompoParamPage/CompoParamPageV.xaml | 4 +- .../CompoParamPage/CompoParamPageVM.vb | 20 ++ CompoWindow/CompoSceneHostV.xaml.vb | 2 +- CompoWindow/CompoWindowVM.vb | 16 ++ Constants/ConstIni.vb | 2 + DxfImportWindow/DxfImportSceneHostV.xaml.vb | 121 +++++++++++- DxfImportWindow/DxfImportWindowMap.vb | 15 +- DxfImportWindow/DxfImportWindowV.xaml | 8 +- DxfImportWindow/DxfImportWindowVM.vb | 178 +++++++++++++---- EgtStoneLib/CamAuto.vb | 5 +- EgtStoneLib/ConstMach.vb | 8 + EgtStoneLib/ConstMachIni.vb | 3 + EgtStoneLib/CurrentMachine.vb | 12 ++ EgtStoneLib/GeomCalc.vb | 5 +- EgtStoneLib/SplitAuto.vb | 27 ++- MainWindow/MainWindowM.vb | 9 + OmagOFFICE.sln | 8 +- OmagOFFICE.vbproj | 16 ++ OptionPanel/MachiningTab/SplitModeV.xaml | 4 +- OptionPanel/MachiningTab/SplitModeVM.vb | 2 +- OptionPanel/OptionPanelV.xaml | 57 +++--- OptionPanel/SimulTab/SimulTabV.xaml | 47 +++++ OptionPanel/SimulTab/SimulTabVM.vb | 187 ++++++++++++++++++ SideEntityControl/SideEntityControlVM.vb | 23 ++- UnderDrillControl/UnderDrillControlV.xaml | 18 ++ UnderDrillControl/UnderDrillControlV.xaml.vb | 13 ++ UnderDrillControl/UnderDrillControlVM.vb | 59 ++++++ 34 files changed, 1027 insertions(+), 97 deletions(-) create mode 100644 CompoTrfDataWindow/CompoTrfDataWindowV.xaml create mode 100644 CompoTrfDataWindow/CompoTrfDataWindowV.xaml.vb create mode 100644 CompoTrfDataWindow/CompoTrfDataWindowVM.vb create mode 100644 UnderDrillControl/UnderDrillControlV.xaml create mode 100644 UnderDrillControl/UnderDrillControlV.xaml.vb create mode 100644 UnderDrillControl/UnderDrillControlVM.vb diff --git a/CompoTrfDataWindow/CompoTrfDataWindowV.xaml b/CompoTrfDataWindow/CompoTrfDataWindowV.xaml new file mode 100644 index 0000000..91f1590 --- /dev/null +++ b/CompoTrfDataWindow/CompoTrfDataWindowV.xaml @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/CompoTrfDataWindow/CompoTrfDataWindowV.xaml.vb b/CompoTrfDataWindow/CompoTrfDataWindowV.xaml.vb new file mode 100644 index 0000000..c799d10 --- /dev/null +++ b/CompoTrfDataWindow/CompoTrfDataWindowV.xaml.vb @@ -0,0 +1,22 @@ +Public Class CompoTrfDataWindowV + + Private m_CompoTrfDataWindowVM As CompoTrfDataWindowVM + + Sub New(Owner As Window, CompoTrfDataWindowVM As CompoTrfDataWindowVM) + MyBase.New(Owner) + ' This call is required by the designer. + InitializeComponent() + Me.DataContext = CompoTrfDataWindowVM + ' Assegno al riferimento locale al VM il VM preso dal DataContext + m_CompoTrfDataWindowVM = CompoTrfDataWindowVM + End Sub + + Private Sub OkBtn_Click(sender As Object, e As RoutedEventArgs) Handles OkBtn.Click + DialogResult = True + End Sub + + Private Sub Cancel_Click(sender As Object, e As RoutedEventArgs) Handles CancelBtn.Click + DialogResult = False + End Sub + +End Class diff --git a/CompoTrfDataWindow/CompoTrfDataWindowVM.vb b/CompoTrfDataWindow/CompoTrfDataWindowVM.vb new file mode 100644 index 0000000..56b888f --- /dev/null +++ b/CompoTrfDataWindow/CompoTrfDataWindowVM.vb @@ -0,0 +1,127 @@ +Imports EgtUILib + +Public Class CompoTrfDataWindowVM + +#Region "FIELDS & PROPERTIES" + + Private m_OrdCode As String + Public Property OrdCode As String + Get + Return m_OrdCode + End Get + Set(value As String) + m_OrdCode = value + End Set + End Property + + Private m_OrdDesc As String + Public Property OrdDesc As String + Get + Return m_OrdDesc + End Get + Set(value As String) + m_OrdDesc = value + End Set + End Property + + Private m_MatCode As String + Public Property MatCode As String + Get + Return m_MatCode + End Get + Set(value As String) + m_MatCode = value + End Set + End Property + + Private m_SurfCode As String + Public Property SurfCode As String + Get + Return m_SurfCode + End Get + Set(value As String) + m_SurfCode = value + End Set + End Property + + Private m_Thickness As Double + Public Property Thickness As Double + Get + Return m_Thickness + End Get + Set(value As Double) + m_Thickness = value + End Set + End Property + +#Region "Messages" + + Public ReadOnly Property TitleMsg As String + Get + Return EgtMsg(MSG_DRAWPAGEUC + 19) + End Get + End Property + + Public ReadOnly Property OrdCodeMsg As String + Get + Return EgtMsg(MSG_DRAWPAGEUC + 10) + End Get + End Property + + Public ReadOnly Property OrdDescMsg As String + Get + Return EgtMsg(MSG_DRAWPAGEUC + 11) + End Get + End Property + + Public ReadOnly Property MatCodeMsg As String + Get + Return EgtMsg(MSG_DRAWPAGEUC + 12) + End Get + End Property + + Public ReadOnly Property SurfCodeMsg As String + Get + Return EgtMsg(MSG_DRAWPAGEUC + 13) + End Get + End Property + + Public ReadOnly Property ThicknessMsg As String + Get + Return EgtMsg(MSG_DRAWPAGEUC + 14) + End Get + End Property + +#End Region ' Messages + +#End Region 'FIELDS & PROPERTIES + +#Region "CONSTRUCTOR" + + Sub New() + + End Sub + +#End Region ' CONSTRUCTOR + +#Region "METHODS" + + Friend Sub SetData(sOrdCode As String, sOrdDesc As String, sMatCode As String, sSurfCode As String, dTh As Double) + OrdCode = sOrdCode + OrdDesc = sOrdDesc + MatCode = sMatCode + SurfCode = sSurfCode + Thickness = LenToString(dTh, 2) + End Sub + + Friend Sub GetData(ByRef sOrdCode As String, ByRef sOrdDesc As String, ByRef sMatCode As String, ByRef sSurfCode As String, ByRef dTh As Double) + sOrdCode = OrdCode + sOrdDesc = OrdDesc + sMatCode = MatCode + sSurfCode = SurfCode + StringToLen(Thickness, dTh) + End Sub + +#End Region + +End Class diff --git a/CompoWindow/CompoListPage/CompoListPageV.xaml b/CompoWindow/CompoListPage/CompoListPageV.xaml index 5601f45..4161803 100644 --- a/CompoWindow/CompoListPage/CompoListPageV.xaml +++ b/CompoWindow/CompoListPage/CompoListPageV.xaml @@ -16,7 +16,7 @@ IsChecked="{Binding Drip_IsChecked}" Style="{StaticResource CompoWindow_ToggleButton}" Margin="2.5,0,0,0" - IsEnabled="False"/> + IsEnabled="True"/> +