From d6d91f42fc9686bf2d9c2e07e704d5d716983691 Mon Sep 17 00:00:00 2001 From: Dario Sassi Date: Thu, 15 Dec 2016 10:14:30 +0000 Subject: [PATCH] EgtCAM5 1.6x3 : - piccole correzioni per Gunstock. --- My Project/AssemblyInfo.vb | 4 ++-- ProjectPage/ProjectViewModel.vb | 2 +- Special/GunStock.vb | 10 ++++++---- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/My Project/AssemblyInfo.vb b/My Project/AssemblyInfo.vb index 74d4979..0ce40da 100644 --- a/My Project/AssemblyInfo.vb +++ b/My Project/AssemblyInfo.vb @@ -70,5 +70,5 @@ Imports System.Windows ' by using the '*' as shown below: ' - - + + diff --git a/ProjectPage/ProjectViewModel.vb b/ProjectPage/ProjectViewModel.vb index f4fb46d..afc6376 100644 --- a/ProjectPage/ProjectViewModel.vb +++ b/ProjectPage/ProjectViewModel.vb @@ -733,7 +733,7 @@ Namespace EgtCAM5 Else IniFile.m_MruNewGunStock.Remove(IniFile.m_MODFilePath) Try - Dim sErrFilePath As String = Path.ChangeExtension(IniFile.m_MODFilePath, ".txt") + Dim sErrFilePath As String = Path.ChangeExtension(IniFile.m_PEZFilePath, ".txt") Dim fileReader As String = My.Computer.FileSystem.ReadAllText(sErrFilePath) Dim Lines() As String = fileReader.Split(ControlChars.CrLf.ToCharArray(), StringSplitOptions.RemoveEmptyEntries) Dim values() As String = Lines(0).Split(CChar("=")).ToArray diff --git a/Special/GunStock.vb b/Special/GunStock.vb index 6a2b309..9acae5d 100644 --- a/Special/GunStock.vb +++ b/Special/GunStock.vb @@ -61,6 +61,7 @@ Module GunStock End If ' Lettura dei parametri dal modello + m_sDescription = String.Empty If Not ReadModParams() Then MessageBox.Show(EgtMsg(MSG_GUNSTOCKERRORS + 3), EgtMsg(MSG_GUNSTOCKERRORS + 1), MessageBoxButton.OK, MessageBoxImage.Error) EgtOutLog("Error in ReadModParams") @@ -70,7 +71,6 @@ Module GunStock ' Calcolo path per file PEZ m_sPezFile = System.IO.Path.GetDirectoryName(System.IO.Path.GetDirectoryName(m_sModFile)) & "\PEZ\" & System.IO.Path.GetFileNameWithoutExtension(m_sModFile) & ".pez" - m_sDescription = String.Empty If Not UpdatePezParams(True) Then Return True End If @@ -98,7 +98,7 @@ Module GunStock EgtZoom(ZM.ALL) scene.Cursor = System.Windows.Forms.Cursors.Default - Return True + Return bOk End Function Function ExecGunStockPez(ByRef scene As Scene, sFilePath As String) As Boolean @@ -164,7 +164,7 @@ Module GunStock EgtZoom(ZM.ALL) scene.Cursor = System.Windows.Forms.Cursors.Default - Return True + Return bOk End Function Private Function LoadGunStock() As Boolean @@ -187,6 +187,7 @@ Module GunStock EgtOutLog("Gunstock Err=" & nErr.ToString()) If Not bOk Then Return False ' Acquisisco i valori letti + EgtLuaGetGlobStringVar("GGD.MODNAME", m_sDescription) Dim nParTot As Integer = 0 EgtLuaGetGlobIntVar("GGD.PARTOT", nParTot) Array.Resize(m_vParams, nParTot) @@ -256,7 +257,8 @@ Module GunStock EgtLuaGetGlobNumVar(sParMaxI, m_vParams(i - 1).dMax) Dim sParDefI As String = "GGD.PARDEF" & i.ToString() EgtLuaGetGlobNumVar(sParDefI, m_vParams(i - 1).dDef) - m_vParams(i - 1).dVal = m_vParams(i - 1).dDef + Dim sParValI As String = "GGD.PARVAL" & i.ToString() + EgtLuaGetGlobNumVar(sParValI, m_vParams(i - 1).dVal) Dim sParVarI As String = "GGD.PARVAR" & i.ToString() EgtLuaGetGlobStringVar(sParVarI, m_vParams(i - 1).sVar) Next