From 9c4a4734de424b1aab145080416779d4b62413a0 Mon Sep 17 00:00:00 2001 From: Dario Sassi Date: Fri, 10 Aug 2018 19:22:10 +0000 Subject: [PATCH] OmagOFFICE 1.9h1 : - corretti problemi di compilazione 64 bit - controllo versione chiave portato a 19 - aggiunto reset stime se macchina non le prevede. --- EgtStoneLib/CurrentMachine.vb | 12 ------------ MainWindow/MainWindowM.vb | 4 ++-- My Project/AssemblyInfo.vb | 4 ++-- OmagOFFICE.sln | 8 ++++---- OptionPanel/SimulTab/SimulTabVM.vb | 10 +++++----- 5 files changed, 13 insertions(+), 25 deletions(-) diff --git a/EgtStoneLib/CurrentMachine.vb b/EgtStoneLib/CurrentMachine.vb index 7a4d009..c7797ef 100644 --- a/EgtStoneLib/CurrentMachine.vb +++ b/EgtStoneLib/CurrentMachine.vb @@ -87,7 +87,6 @@ Public Module CurrentMachine ' Variabili che contengono il nome degli utensili disponibili per tipo Private m_sCurrSaw As String = String.Empty Private m_sCurrDrill As String = String.Empty - Private m_sCurrDripDrill As String = String.Empty Private m_sCurrMill As String = String.Empty Private m_sCurrDripSaw As String = String.Empty Private m_sCurrDripDrill As String = String.Empty @@ -504,17 +503,6 @@ Public Module CurrentMachine End Set End Property - Friend Property sCurrDripDrill As String - Get - Return m_sCurrDripDrill - End Get - Set(value As String) - If WritePrivateProfileString(S_MACH_MACH, K_CURRDRIPDRILL, value, sMachIniFile) Then - m_sCurrDripDrill = value - End If - End Set - End Property - Public Property sCurrMill As String Get Return m_sCurrMill diff --git a/MainWindow/MainWindowM.vb b/MainWindow/MainWindowM.vb index bdbacec..ca53a81 100644 --- a/MainWindow/MainWindowM.vb +++ b/MainWindow/MainWindowM.vb @@ -152,8 +152,8 @@ Public Class MainWindowM EgtUILib.GetPrivateProfileString(S_LICENCE, K_KEY, "", sKey, sLicFile) EgtSetKey(sKey) ' Recupero livello e opzioni della chiave - Dim bKey As Boolean = EgtGetKeyLevel(9423, 18, 1, m_nKeyLevel) And - EgtGetKeyOptions(9423, 18, 1, m_nKeyOptions) + Dim bKey As Boolean = EgtGetKeyLevel(9423, 19, 1, m_nKeyLevel) And + EgtGetKeyOptions(9423, 19, 1, m_nKeyOptions) ' Verifico abilitazione prodotto Dim bProd As Boolean = GetKeyOption(KEY_OPT.OFFICE_BASE) ' Inizializzazione generale di EgtInterface diff --git a/My Project/AssemblyInfo.vb b/My Project/AssemblyInfo.vb index 787916a..7bb1b02 100644 --- a/My Project/AssemblyInfo.vb +++ b/My Project/AssemblyInfo.vb @@ -69,5 +69,5 @@ Imports System.Windows ' by using the '*' as shown below: ' - - + + diff --git a/OmagOFFICE.sln b/OmagOFFICE.sln index ac4ac58..9f0c34c 100644 --- a/OmagOFFICE.sln +++ b/OmagOFFICE.sln @@ -13,12 +13,12 @@ Global Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {E8825288-E02F-4B17-AC39-142886068D0A}.Debug|x64.ActiveCfg = Debug|x86 - {E8825288-E02F-4B17-AC39-142886068D0A}.Debug|x64.Build.0 = Debug|x86 + {E8825288-E02F-4B17-AC39-142886068D0A}.Debug|x64.ActiveCfg = Debug|x64 + {E8825288-E02F-4B17-AC39-142886068D0A}.Debug|x64.Build.0 = Debug|x64 {E8825288-E02F-4B17-AC39-142886068D0A}.Debug|x86.ActiveCfg = Debug|x86 {E8825288-E02F-4B17-AC39-142886068D0A}.Debug|x86.Build.0 = Debug|x86 - {E8825288-E02F-4B17-AC39-142886068D0A}.Release|x64.ActiveCfg = Release|x86 - {E8825288-E02F-4B17-AC39-142886068D0A}.Release|x64.Build.0 = Release|x86 + {E8825288-E02F-4B17-AC39-142886068D0A}.Release|x64.ActiveCfg = Release|x64 + {E8825288-E02F-4B17-AC39-142886068D0A}.Release|x64.Build.0 = Release|x64 {E8825288-E02F-4B17-AC39-142886068D0A}.Release|x86.ActiveCfg = Release|x86 {E8825288-E02F-4B17-AC39-142886068D0A}.Release|x86.Build.0 = Release|x86 EndGlobalSection diff --git a/OptionPanel/SimulTab/SimulTabVM.vb b/OptionPanel/SimulTab/SimulTabVM.vb index 480db7c..99bf6ff 100644 --- a/OptionPanel/SimulTab/SimulTabVM.vb +++ b/OptionPanel/SimulTab/SimulTabVM.vb @@ -329,14 +329,14 @@ Public Class SimulTabVM Estimation_IsEnabled = True EgtSetCurrPhase(1) EgtEstimate(OmagOFFICEMap.refMainWindowVM.MainWindowM.sTempDir & "\MachProj.html", "OmagCut ver." & OmagOFFICEMap.refMainWindowVM.MainWindowM.sVersion) - ' Impostazioni box stime - NotifyPropertyChanged("Time") - NotifyPropertyChanged("CutLen") - NotifyPropertyChanged("NetArea") - NotifyPropertyChanged("Usage") Else Estimation_IsEnabled = False End If + ' Impostazioni box stime + NotifyPropertyChanged("Time") + NotifyPropertyChanged("CutLen") + NotifyPropertyChanged("NetArea") + NotifyPropertyChanged("Usage") ' Nascondo eventuali pezzi in parcheggio HideParkedParts() ' Nascondo eventuale contorno da foto