Egalware/omagoffice
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

OmagOFFICE 1.9h1 :

Browse Source 
- corretti problemi di compilazione 64 bit
- controllo versione chiave portato a 19
- aggiunto reset stime se macchina non le prevede.
This commit is contained in:
Dario Sassi
2018-08-10 19:22:10 +00:00
parent 84bddeec9a
commit 9c4a4734de
5 changed files with 13 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
EgtStoneLib/CurrentMachine.vb
-12
View File
@@ -87,7 +87,6 @@ Public Module CurrentMachine
' Variabili che contengono il nome degli utensili disponibili per tipo ' Variabili che contengono il nome degli utensili disponibili per tipo
Private m_sCurrSaw As String = String.Empty Private m_sCurrSaw As String = String.Empty
Private m_sCurrDrill 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_sCurrMill As String = String.Empty
Private m_sCurrDripSaw As String = String.Empty Private m_sCurrDripSaw As String = String.Empty
Private m_sCurrDripDrill As String = String.Empty Private m_sCurrDripDrill As String = String.Empty
@@ -504,17 +503,6 @@ Public Module CurrentMachine
End Set End Set
End Property 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 Public Property sCurrMill As String
Get Get
Return m_sCurrMill Return m_sCurrMill
MainWindow/MainWindowM.vb
+2 -2
View File
@@ -152,8 +152,8 @@ Public Class MainWindowM
EgtUILib.GetPrivateProfileString(S_LICENCE, K_KEY, "", sKey, sLicFile) EgtUILib.GetPrivateProfileString(S_LICENCE, K_KEY, "", sKey, sLicFile)
EgtSetKey(sKey) EgtSetKey(sKey)
' Recupero livello e opzioni della chiave ' Recupero livello e opzioni della chiave
Dim bKey As Boolean = EgtGetKeyLevel(9423, 18, 1, m_nKeyLevel) And Dim bKey As Boolean = EgtGetKeyLevel(9423, 19, 1, m_nKeyLevel) And
EgtGetKeyOptions(9423, 18, 1, m_nKeyOptions) EgtGetKeyOptions(9423, 19, 1, m_nKeyOptions)
' Verifico abilitazione prodotto ' Verifico abilitazione prodotto
Dim bProd As Boolean = GetKeyOption(KEY_OPT.OFFICE_BASE) Dim bProd As Boolean = GetKeyOption(KEY_OPT.OFFICE_BASE)
' Inizializzazione generale di EgtInterface ' Inizializzazione generale di EgtInterface
My Project/AssemblyInfo.vb
+2 -2
View File
@@ -69,5 +69,5 @@ Imports System.Windows
' by using the '*' as shown below: ' by using the '*' as shown below:
' <Assembly: AssemblyVersion("1.0.*")> ' <Assembly: AssemblyVersion("1.0.*")>
<Assembly: AssemblyVersion("1.9.7.1")> <Assembly: AssemblyVersion("1.9.8.1")>
<Assembly: AssemblyFileVersion("1.9.7.1")> <Assembly: AssemblyFileVersion("1.9.8.1")>
OmagOFFICE.sln
+4 -4
View File
@@ -13,12 +13,12 @@ Global
Release|x86 = Release|x86 Release|x86 = Release|x86
EndGlobalSection EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution GlobalSection(ProjectConfigurationPlatforms) = postSolution
{E8825288-E02F-4B17-AC39-142886068D0A}.Debug|x64.ActiveCfg = Debug|x86 {E8825288-E02F-4B17-AC39-142886068D0A}.Debug|x64.ActiveCfg = Debug|x64
{E8825288-E02F-4B17-AC39-142886068D0A}.Debug|x64.Build.0 = Debug|x86 {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.ActiveCfg = Debug|x86
{E8825288-E02F-4B17-AC39-142886068D0A}.Debug|x86.Build.0 = 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.ActiveCfg = Release|x64
{E8825288-E02F-4B17-AC39-142886068D0A}.Release|x64.Build.0 = Release|x86 {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.ActiveCfg = Release|x86
{E8825288-E02F-4B17-AC39-142886068D0A}.Release|x86.Build.0 = Release|x86 {E8825288-E02F-4B17-AC39-142886068D0A}.Release|x86.Build.0 = Release|x86
EndGlobalSection EndGlobalSection
OptionPanel/SimulTab/SimulTabVM.vb
+5 -5
View File
@@ -329,14 +329,14 @@ Public Class SimulTabVM
Estimation_IsEnabled = True Estimation_IsEnabled = True
EgtSetCurrPhase(1) EgtSetCurrPhase(1)
EgtEstimate(OmagOFFICEMap.refMainWindowVM.MainWindowM.sTempDir & "\MachProj.html", "OmagCut ver." & OmagOFFICEMap.refMainWindowVM.MainWindowM.sVersion) 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 Else
Estimation_IsEnabled = False Estimation_IsEnabled = False
End If End If
' Impostazioni box stime
NotifyPropertyChanged("Time")
NotifyPropertyChanged("CutLen")
NotifyPropertyChanged("NetArea")
NotifyPropertyChanged("Usage")
' Nascondo eventuali pezzi in parcheggio ' Nascondo eventuali pezzi in parcheggio
HideParkedParts() HideParkedParts()
' Nascondo eventuale contorno da foto ' Nascondo eventuale contorno da foto