From 6f9ee8ab5b7683c48a388fe8b72e7629a3d565e9 Mon Sep 17 00:00:00 2001 From: Dario Sassi Date: Mon, 27 Feb 2017 10:17:08 +0000 Subject: [PATCH] EgtCAM5 1.8b9 : - aggiunta impostazione handle finestra principale per dialoghi lua - piccola correzione nei controlli dimensioni utensili. --- My Project/AssemblyInfo.vb | 4 ++-- ProjectPage/ProjectViewModel.vb | 4 ++++ SetUpWindow/SetUpViewModel.vb | 3 --- ToolsDbWindow/ToolTreeView.vb | 41 ++++++++++++++++++--------------- 4 files changed, 29 insertions(+), 23 deletions(-) diff --git a/My Project/AssemblyInfo.vb b/My Project/AssemblyInfo.vb index 15d6f09..900648d 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 6a969fa..27f31c2 100644 --- a/ProjectPage/ProjectViewModel.vb +++ b/ProjectPage/ProjectViewModel.vb @@ -1,4 +1,5 @@ Imports System.Windows.Forms.Integration +Imports System.Windows.Interop Imports System.IO Imports EgtUILib Imports EgtWPFLib5 @@ -147,6 +148,9 @@ Namespace EgtCAM5 Else IniFile.m_ProjectSceneContext = m_ProjectScene.GetCtx PostInitializeScene() + ' Recupero e imposto handle finestra principale + Dim hMainWnd As IntPtr = New WindowInteropHelper(Application.Current.MainWindow).Handle + EgtSetMainWindowHandle(hMainWnd) ' inizializzo gestore lavorazioni EgtInitMachMgr(IniFile.m_sMachinesRoot) ' Apro progetto vuoto diff --git a/SetUpWindow/SetUpViewModel.vb b/SetUpWindow/SetUpViewModel.vb index 9ec29f5..5a0ef55 100644 --- a/SetUpWindow/SetUpViewModel.vb +++ b/SetUpWindow/SetUpViewModel.vb @@ -112,9 +112,6 @@ Namespace EgtCAM5 ExitToolAssociation.sh_PositionGroupList = m_PositionGroupList ' imposto il delegate che attiva e disattiva il bottone applica dall'uscita ExitToolAssociation.m_delIsEnabledBtns = AddressOf IsEnabledBtns - ' '' carico Lua che contiene le funzioni per ottenere le posizioni valide dell'utensile selezionato, - ' '' e testa e uscita dell'utensile attrezzato - ''EgtLuaExecFile(IniFile.m_sCurrMachScriptsDirPath & "\" & SETUP_LUA) ' carico lista utensili LoadMachineTools() ' carico lista posizioni diff --git a/ToolsDbWindow/ToolTreeView.vb b/ToolsDbWindow/ToolTreeView.vb index f8f2f6d..89a3383 100644 --- a/ToolsDbWindow/ToolTreeView.vb +++ b/ToolsDbWindow/ToolTreeView.vb @@ -310,8 +310,8 @@ Public Class ToolTreeViewItem EgtSetCurrentContext(IniFile.m_ProjectSceneContext) EgtTdbGetCurrToolParam(MCH_TP.TOTDIAM, DbTotDiam) StringToLen(value, dValue) - m_IsModifiedTotDiam = Math.Abs(dValue - DbTotDiam) > 10 * EPS_SMALL - If Not GetValidationError("Diam") Or GetValidationError("TotDiam") Then + m_IsModifiedTotDiam = Math.Abs(dValue - DbTotDiam) > 5 * EPS_SMALL + If Not GetValidationError("Diam") Or Not GetValidationError("TotDiam") Then m_delErrorOnTool(True) m_delIsEnabledBtns(False, False, True) Else @@ -340,7 +340,7 @@ Public Class ToolTreeViewItem EgtSetCurrentContext(IniFile.m_ProjectSceneContext) EgtTdbGetCurrToolParam(MCH_TP.FEED, DbFeed) StringToLen(value, dValue) - m_IsModifiedFeed = Math.Abs(dValue - DbFeed) > 10 * EPS_SMALL + m_IsModifiedFeed = Math.Abs(dValue - DbFeed) > 5 * EPS_SMALL m_delIsEnabledBtns(IsValid And Not IsModified, IsValid And (IsModified Or NewTool), True) NotifyPropertyChanged("Feed") End If @@ -364,7 +364,7 @@ Public Class ToolTreeViewItem EgtSetCurrentContext(IniFile.m_ProjectSceneContext) EgtTdbGetCurrToolParam(MCH_TP.ENDFEED, DbEndFeed) StringToLen(value, dValue) - m_IsModifiedEndFeed = Math.Abs(dValue - DbEndFeed) > 10 * EPS_SMALL + m_IsModifiedEndFeed = Math.Abs(dValue - DbEndFeed) > 5 * EPS_SMALL m_delIsEnabledBtns(IsValid And Not IsModified, IsValid And (IsModified Or NewTool), True) NotifyPropertyChanged("EndFeed") End If @@ -388,7 +388,7 @@ Public Class ToolTreeViewItem EgtSetCurrentContext(IniFile.m_ProjectSceneContext) EgtTdbGetCurrToolParam(MCH_TP.STARTFEED, DbStartFeed) StringToLen(value, dValue) - m_IsModifiedStartFeed = Math.Abs(dValue - DbStartFeed) > 10 * EPS_SMALL + m_IsModifiedStartFeed = Math.Abs(dValue - DbStartFeed) > 5 * EPS_SMALL m_delIsEnabledBtns(IsValid And Not IsModified, IsValid And (IsModified Or NewTool), True) NotifyPropertyChanged("StartFeed") End If @@ -412,7 +412,7 @@ Public Class ToolTreeViewItem EgtSetCurrentContext(IniFile.m_ProjectSceneContext) EgtTdbGetCurrToolParam(MCH_TP.TIPFEED, DbTipFeed) StringToLen(value, dValue) - m_IsModifiedTipFeed = Math.Abs(dValue - DbTipFeed) > 10 * EPS_SMALL + m_IsModifiedTipFeed = Math.Abs(dValue - DbTipFeed) > 5 * EPS_SMALL m_delIsEnabledBtns(IsValid And Not IsModified, IsValid And (IsModified Or NewTool), True) NotifyPropertyChanged("TipFeed") ' Se fresa e 0 non può lavorare di testa @@ -444,7 +444,7 @@ Public Class ToolTreeViewItem EgtSetCurrentContext(IniFile.m_ProjectSceneContext) EgtTdbGetCurrToolParam(MCH_TP.LEN, DbLen) StringToLen(value, dValue) - m_IsModifiedLen = Math.Abs(dValue - DbLen) > 10 * EPS_SMALL + m_IsModifiedLen = Math.Abs(dValue - DbLen) > 5 * EPS_SMALL If Not m_SuspendToolDrawUpdate Then UpdateSceneToolDraw() End If @@ -490,7 +490,7 @@ Public Class ToolTreeViewItem EgtSetCurrentContext(IniFile.m_ProjectSceneContext) EgtTdbGetCurrToolParam(MCH_TP.TOTLEN, DbTotLen) StringToLen(value, dValue) - m_IsModifiedTotLen = Math.Abs(dValue - DbTotLen) > 10 * EPS_SMALL + m_IsModifiedTotLen = Math.Abs(dValue - DbTotLen) > 5 * EPS_SMALL If Not m_SuspendToolDrawUpdate Then UpdateSceneToolDraw() End If @@ -535,7 +535,7 @@ Public Class ToolTreeViewItem EgtSetCurrentContext(IniFile.m_ProjectSceneContext) EgtTdbGetCurrToolParam(MCH_TP.MAXMAT, DbMaxMat) StringToLen(value, dValue) - m_IsModifiedMaxMat = Math.Abs(dValue - DbMaxMat) > 10 * EPS_SMALL + m_IsModifiedMaxMat = Math.Abs(dValue - DbMaxMat) > 5 * EPS_SMALL If Not m_SuspendToolDrawUpdate Then UpdateSceneToolDraw() End If @@ -568,7 +568,7 @@ Public Class ToolTreeViewItem EgtSetCurrentContext(IniFile.m_ProjectSceneContext) EgtTdbGetCurrToolParam(MCH_TP.LONOFFSET, DbLonOffset) StringToLen(value, dValue) - m_IsModifiedLonOffset = Math.Abs(dValue - DbLonOffset) > 10 * EPS_SMALL + m_IsModifiedLonOffset = Math.Abs(dValue - DbLonOffset) > 5 * EPS_SMALL m_delIsEnabledBtns(IsValid And Not IsModified, IsValid And (IsModified Or NewTool), True) NotifyPropertyChanged("LonOffset") End If @@ -592,7 +592,7 @@ Public Class ToolTreeViewItem EgtSetCurrentContext(IniFile.m_ProjectSceneContext) EgtTdbGetCurrToolParam(MCH_TP.RADOFFSET, DbRadOffset) StringToLen(value, dValue) - m_IsModifiedRadOffset = Math.Abs(dValue - DbRadOffset) > 10 * EPS_SMALL + m_IsModifiedRadOffset = Math.Abs(dValue - DbRadOffset) > 5 * EPS_SMALL m_delIsEnabledBtns(IsValid And Not IsModified, IsValid And (IsModified Or NewTool), True) NotifyPropertyChanged("RadOffset") End If @@ -700,7 +700,7 @@ Public Class ToolTreeViewItem EgtSetCurrentContext(IniFile.m_ProjectSceneContext) EgtTdbGetCurrToolParam(MCH_TP.THICK, DbThick) StringToLen(value, dValue) - m_IsModifiedThick = Math.Abs(dValue - DbThick) > 10 * EPS_SMALL + m_IsModifiedThick = Math.Abs(dValue - DbThick) > 5 * EPS_SMALL If Not m_SuspendToolDrawUpdate Then UpdateSceneToolDraw() End If @@ -733,7 +733,7 @@ Public Class ToolTreeViewItem EgtSetCurrentContext(IniFile.m_ProjectSceneContext) EgtTdbGetCurrToolParam(MCH_TP.MAXABSORPTION, DbMaxAbsorption) StringToLen(value, dValue) - m_IsModifiedMaxAbsorption = Math.Abs(dValue - DbMaxAbsorption) > 10 * EPS_SMALL + m_IsModifiedMaxAbsorption = Math.Abs(dValue - DbMaxAbsorption) > 5 * EPS_SMALL m_delIsEnabledBtns(IsValid And Not IsModified, IsValid And (IsModified Or NewTool), True) NotifyPropertyChanged("MaxAbsorption") End If @@ -757,7 +757,7 @@ Public Class ToolTreeViewItem EgtSetCurrentContext(IniFile.m_ProjectSceneContext) EgtTdbGetCurrToolParam(MCH_TP.MINFEED, DbMinFeed) StringToLen(value, dValue) - m_IsModifiedMinFeed = Math.Abs(dValue - DbMinFeed) > 10 * EPS_SMALL + m_IsModifiedMinFeed = Math.Abs(dValue - DbMinFeed) > 5 * EPS_SMALL m_delIsEnabledBtns(IsValid And Not IsModified, IsValid And (IsModified Or NewTool), True) NotifyPropertyChanged("MinFeed") End If @@ -1569,10 +1569,15 @@ Public Class ToolTreeViewItem Public ReadOnly Property IsModified() As Boolean Get - Return m_IsModifiedCorr OrElse m_IsModifiedSelectedExit OrElse m_IsModifiedCornRad OrElse m_IsModifiedDiam OrElse m_IsModifiedTotDiam OrElse m_IsModifiedFeed OrElse m_IsModifiedEndFeed _ - OrElse m_IsModifiedStartFeed OrElse m_IsModifiedTipFeed OrElse m_IsModifiedLen OrElse m_IsModifiedTotLen OrElse m_IsModifiedMaxMat OrElse m_IsModifiedLonOffset _ - OrElse m_IsModifiedRadOffset OrElse m_IsModifiedSpeed OrElse m_IsModifiedSideAng OrElse m_IsModifiedMaxSpeed OrElse m_IsModifiedThick OrElse m_IsModifiedMaxAbsorption _ - OrElse m_IsModifiedMinFeed OrElse m_IsModifiedDraw OrElse m_IsModifiedSelectedHead OrElse m_IsModifiedName OrElse m_IsModifiedUserNotes OrElse m_IsModifiedSelectedTcPos + Return m_IsModifiedCorr OrElse m_IsModifiedSelectedExit OrElse m_IsModifiedCornRad OrElse + m_IsModifiedDiam OrElse m_IsModifiedTotDiam OrElse m_IsModifiedFeed OrElse + m_IsModifiedEndFeed OrElse m_IsModifiedStartFeed OrElse m_IsModifiedTipFeed OrElse + m_IsModifiedLen OrElse m_IsModifiedTotLen OrElse m_IsModifiedMaxMat OrElse + m_IsModifiedLonOffset OrElse m_IsModifiedRadOffset OrElse m_IsModifiedSpeed OrElse + m_IsModifiedSideAng OrElse m_IsModifiedMaxSpeed OrElse m_IsModifiedThick OrElse + m_IsModifiedMaxAbsorption OrElse m_IsModifiedMinFeed OrElse m_IsModifiedDraw OrElse + m_IsModifiedSelectedHead OrElse m_IsModifiedName OrElse m_IsModifiedUserNotes OrElse + m_IsModifiedSelectedTcPos End Get End Property