From 03bef817079c19cdfbc5814516daa5a51a138b7b Mon Sep 17 00:00:00 2001 From: Dario Sassi Date: Mon, 13 Feb 2017 10:45:53 +0000 Subject: [PATCH] EgtCAM5 1.8b7 : - aggiunta gestione export immagini con dimensioni da INI. --- Constants/ConstIni.vb | 4 ++++ My Project/AssemblyInfo.vb | 4 ++-- OptionsWindow/OptionModule.vb | 9 +++++++++ ProjectPage/ProjectViewModel.vb | 2 ++ 4 files changed, 17 insertions(+), 2 deletions(-) diff --git a/Constants/ConstIni.vb b/Constants/ConstIni.vb index 3cb0ab3..266dafd 100644 --- a/Constants/ConstIni.vb +++ b/Constants/ConstIni.vb @@ -84,6 +84,10 @@ Module ConstIni Public Const S_IMPORT As String = "Import" Public Const K_CNCFLAG As String = "CncFlag" + Public Const S_EXPORT As String = "Export" + Public Const K_IMGWIDTH As String = "ImgWidth" + Public Const K_IMGHEIGHT As String = "ImgHeight" + Public Const S_DOORS As String = "Doors" Public Const K_DDFENABLE As String = "DdfEnable" Public Const K_DDFEXEC As String = "DdfExec" diff --git a/My Project/AssemblyInfo.vb b/My Project/AssemblyInfo.vb index e27e996..3fdc0b2 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/OptionsWindow/OptionModule.vb b/OptionsWindow/OptionModule.vb index 39ed2fc..26a768f 100644 --- a/OptionsWindow/OptionModule.vb +++ b/OptionsWindow/OptionModule.vb @@ -6,6 +6,12 @@ Friend Module OptionModule Friend m_LanguageList As New ObservableCollection(Of Language) Friend m_SelectedLanguage As Language + ' Parametri per import + + ' Parametri per export + Friend m_nImgWidth As Integer + Friend m_nImgHeight As Integer + ' Variabili che indicano per ogni tipo di lavorazione quale geometria è selezionabile Friend m_SelGeomSawing As SceneSelModeOpt Friend m_SelGeomDrilling As SceneSelModeOpt @@ -25,6 +31,9 @@ Friend Module OptionModule ' inizializzazione lettura variabili ad inizio programma Friend Sub InitOptionModule() + ' Inizializzo variabili per export + m_nImgWidth = GetPrivateProfileInt(S_EXPORT, K_IMGWIDTH, 400) + m_nImgHeight = GetPrivateProfileInt(S_EXPORT, K_IMGHEIGHT, 300) ' Inizializzo variabili che indicano per ogni tipo di lavorazione quale geometria è selezionabile Dim Temp As Integer = 0 Temp = GetPrivateProfileInt(S_MACH, K_SELGEOMSAWING, -1) diff --git a/ProjectPage/ProjectViewModel.vb b/ProjectPage/ProjectViewModel.vb index 5ed3679..6a969fa 100644 --- a/ProjectPage/ProjectViewModel.vb +++ b/ProjectPage/ProjectViewModel.vb @@ -257,6 +257,8 @@ Namespace EgtCAM5 ' Imposto stato filtro selezione m_ProjectScene.GetObjFilterForSel(m_bSelZeroDim, m_bSelCurve, m_bSelSurf, m_bSelVolume, m_bSelExtra) m_Controller.MouseSetObjFilterForSelect(m_bSelZeroDim, m_bSelCurve, m_bSelSurf, m_bSelVolume, m_bSelExtra) + ' Imposto default per export + m_Controller.SetDefaultForImageExport(OptionModule.m_nImgWidth, OptionModule.m_nImgHeight) End Sub Private Sub ProcessCommandLine()