From b331126f8a3aca692afa43af8b783f22ecd80c18 Mon Sep 17 00:00:00 2001 From: DarioS Date: Mon, 19 Jun 2023 08:38:04 +0200 Subject: [PATCH 1/4] EgtBeamWall : - aggiornamento ExtLibs (inutile complicazione che crea problemi e perdita di tempo). --- ExtLibs/EgtWPFLib5.dll | Bin 747520 -> 747520 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/ExtLibs/EgtWPFLib5.dll b/ExtLibs/EgtWPFLib5.dll index efb1e888a7823b23441dcdae46e2a1b79ed1badc..5cf364092779d68f82788bd16e8779789d35f924 100644 GIT binary patch delta 1158 zcmYjRZAep57{0sP{a)6l%#SRaieJm2Ed*&0E)iqXYmpz&4~Hy^G8je>m2T({m037e zoG=jkVNgP4U@t*wlvoo9ivsOiu_OpA2@DDA+`HX-ci?i*^L{+%Iq&;&f^)^ex#EFd z{m^`0IJAR290=cTNFo9PArg261>&bZY)y_>b7n`p1*UL-6hm_0&w}xzW%Hb%^w}qF*aiR0=_3L0SakcdE#w zLWH3ieF?AvjBHRgv*PeT))x9BtwDDRz0PPboJn8H(%?BKecqr#)IGev7h-{ps|dMGlql^oRJFV z1?Enk8X_}~=du^GHIu}Ic3$jDPIl7Y}`GYrlm8;n_#Mu`=GLTVD$o*k=VP>9N(0=~ zs!WX_>f#+~3iJS05RT7`G`e;lzqwuUihytA&QPEiaGgtHUTIQb@&P}X5Ip*twPC a367XKY)#|*0%63YNA`oMRan)9OPK#qZgHys delta 1172 zcmYjRYe*DP6rR2Fp1WDQike!sDw>*$x%MNnhZbeIH5=pug4`9A2#X~MqQ|x*VVFgW z#SM$_k5L(!fgOX&D3J^a3;Urx%&;V=tOyEw-ko)3_720$ch32~`R1I<4G!l8hx1M! zXNNMDg-$F$ZGq6$ikQ*>W>ki*AZEU>AxCVh!%~gfceEb01kj;CD?(|k{{&BbKAhd? zK}{ZHp?CPnf(LQ_ z`uwMS;24w!`BNL<3St4)XsL)YS}QBm4t9+OvsVoZ`2lYjx!76h9a)A>Bbi1?vYs z$7Vo6p`E-rB4Oy5;dAYJ!VRf&gja$I%i@F|q6tGO!nsrv?k^G!a0Voe!*U5U77Ko> z5rdK~!e%J~b7e1ls}SyFhapf`ZbM21wOx3!(4;l=2^|sI(oDrmT0~KX!;b{(e7(dA zA18z>4io-l#k1);RAD?z>^J3!^PXe}u~Zx|W01O2d~PxbbzpCLvDx$=!%(@P+z*r2~serc$@@Dq5O>87Oz7UiaX`G#uidFL&RA^TlM&^yvs66?Z;U;$yX9Et~OP5sVLc;pAUsT_S2pCQp&rZ&uAD;EGssZH*#9`v&Z>km@|V zjVvmbZDh@m@*O-Y6(2{ETzEj^P?J7bSBS?nS3u#oEyhpJ1bsCJNQ@6B(W8Lm`0ylI zRF8W}ObrfT#BdDHAbN2?YVctTU&uI_0+?TmTW8-%cO7;`!XZbZ?8l6i>Rwm{wt75m I3FV9b0Trot9smFU From 7622117281f222491a4a95fb6eb72975bf428d15 Mon Sep 17 00:00:00 2001 From: DarioS Date: Mon, 10 Jul 2023 11:54:15 +0200 Subject: [PATCH 2/4] EgtBEAMWALL 2.5g1 : - corretto mancato aggiornamento pezzi a caduta in ottimizzazione. --- EgtBEAMWALL.Core/MachGroupPanel/PartVM.vb | 3 ++- EgtBEAMWALL.Core/My Project/AssemblyInfo.vb | 4 ++-- EgtBEAMWALL.DataLayer/Properties/AssemblyInfo.cs | 4 ++-- EgtBEAMWALL.Supervisor/My Project/AssemblyInfo.vb | 4 ++-- EgtBEAMWALL.ViewerOptimizer/My Project/AssemblyInfo.vb | 2 +- 5 files changed, 9 insertions(+), 8 deletions(-) diff --git a/EgtBEAMWALL.Core/MachGroupPanel/PartVM.vb b/EgtBEAMWALL.Core/MachGroupPanel/PartVM.vb index f798145b..20a247b9 100644 --- a/EgtBEAMWALL.Core/MachGroupPanel/PartVM.vb +++ b/EgtBEAMWALL.Core/MachGroupPanel/PartVM.vb @@ -562,8 +562,9 @@ Public MustInherit Class PartVM Public Sub CalcFallUpdate(FALL As Integer) EgtSetInfo(nPartId, ITG_PROD_FALL, FALL, True) - m_PartM.nCALC_FALL = 0 + m_PartM.nCALC_FALL = FALL NotifyPropertyChanged(NameOf(nCALC_FALL)) + NotifyPropertyChanged(NameOf(CALC_FALL_Visibility)) End Sub ' funzione che aggiorna lo stato e gli errori dopo calcolo diff --git a/EgtBEAMWALL.Core/My Project/AssemblyInfo.vb b/EgtBEAMWALL.Core/My Project/AssemblyInfo.vb index cad811f9..da2d52c4 100644 --- a/EgtBEAMWALL.Core/My Project/AssemblyInfo.vb +++ b/EgtBEAMWALL.Core/My Project/AssemblyInfo.vb @@ -35,5 +35,5 @@ Imports System.Runtime.InteropServices ' by using the '*' as shown below: ' - - + + diff --git a/EgtBEAMWALL.DataLayer/Properties/AssemblyInfo.cs b/EgtBEAMWALL.DataLayer/Properties/AssemblyInfo.cs index 704a63f0..a34e4e0f 100644 --- a/EgtBEAMWALL.DataLayer/Properties/AssemblyInfo.cs +++ b/EgtBEAMWALL.DataLayer/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("2.5.6.2")] -[assembly: AssemblyFileVersion("2.5.6.2")] +[assembly: AssemblyVersion("2.5.7.1")] +[assembly: AssemblyFileVersion("2.5.7.1")] diff --git a/EgtBEAMWALL.Supervisor/My Project/AssemblyInfo.vb b/EgtBEAMWALL.Supervisor/My Project/AssemblyInfo.vb index 28bb12a8..b46caf6b 100644 --- a/EgtBEAMWALL.Supervisor/My Project/AssemblyInfo.vb +++ b/EgtBEAMWALL.Supervisor/My Project/AssemblyInfo.vb @@ -70,5 +70,5 @@ Imports System.Windows ' by using the '*' as shown below: ' - - + + diff --git a/EgtBEAMWALL.ViewerOptimizer/My Project/AssemblyInfo.vb b/EgtBEAMWALL.ViewerOptimizer/My Project/AssemblyInfo.vb index 1c272c88..863248a7 100644 --- a/EgtBEAMWALL.ViewerOptimizer/My Project/AssemblyInfo.vb +++ b/EgtBEAMWALL.ViewerOptimizer/My Project/AssemblyInfo.vb @@ -71,4 +71,4 @@ Imports System.Windows ' - + From d7ba34527fc380adc7ddfa86cec2225a0cb1a124 Mon Sep 17 00:00:00 2001 From: DarioS Date: Mon, 24 Jul 2023 09:37:26 +0200 Subject: [PATCH 3/4] EgtBEAMWALL : - corretta indicazione versione 2.5g1 - conservazione riferimento di feature anche quando ERROR Impossibile creare una feature con questi valori. --- EgtBEAMWALL.Core/BTLModel/BTLFeatureM.vb | 2 +- EgtBEAMWALL.ViewerOptimizer/My Project/AssemblyInfo.vb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/EgtBEAMWALL.Core/BTLModel/BTLFeatureM.vb b/EgtBEAMWALL.Core/BTLModel/BTLFeatureM.vb index b8881bac..60c01a53 100644 --- a/EgtBEAMWALL.Core/BTLModel/BTLFeatureM.vb +++ b/EgtBEAMWALL.Core/BTLModel/BTLFeatureM.vb @@ -554,7 +554,7 @@ Public Class BTLFeatureM ' Impossibile creare una feature con questi valori - ERRORE MessageBox.Show(EgtMsg(61852), EgtMsg(30007)) nFeatureId = EgtBeamModifyProcess(Me.nFeatureId, Me.nSelGRP, Me.nPRC, Me.nSelSIDE, "", Me.nPRID, - New Frame3d(), vPar, sPar, vParQ, nCrvId, nCrv2Id) + Me.frFRAME, vPar, sPar, vParQ, nCrvId, nCrv2Id) SetFeatureId(nFeatureId) bOk = False End If diff --git a/EgtBEAMWALL.ViewerOptimizer/My Project/AssemblyInfo.vb b/EgtBEAMWALL.ViewerOptimizer/My Project/AssemblyInfo.vb index 863248a7..4524f549 100644 --- a/EgtBEAMWALL.ViewerOptimizer/My Project/AssemblyInfo.vb +++ b/EgtBEAMWALL.ViewerOptimizer/My Project/AssemblyInfo.vb @@ -70,5 +70,5 @@ Imports System.Windows ' by using the '*' as shown below: ' - + From 79db35220be0dd120b541efedd05c6cd2562e410 Mon Sep 17 00:00:00 2001 From: DarioS Date: Wed, 26 Jul 2023 10:11:25 +0200 Subject: [PATCH 4/4] EgtBEAMWALL : - corretto riconoscimento parametri macchina modificati. --- .../ConfigurationPage/ConfigurationPageVM.vb | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/EgtBEAMWALL.ViewerOptimizer/ConfigurationPage/ConfigurationPageVM.vb b/EgtBEAMWALL.ViewerOptimizer/ConfigurationPage/ConfigurationPageVM.vb index 7cd1983b..bbb12ab3 100644 --- a/EgtBEAMWALL.ViewerOptimizer/ConfigurationPage/ConfigurationPageVM.vb +++ b/EgtBEAMWALL.ViewerOptimizer/ConfigurationPage/ConfigurationPageVM.vb @@ -680,21 +680,17 @@ Public Class MachParam Dim dNewValue As Double ' verifico se valore immesso è diverso dall'originale If nParentTable > 0 Then - Dim sOrigValue As String = String.Empty - Dim dOrigValue As Double - MachParamIniFile.GetMachPrivateProfileParamValue(nParentTable, nParamIndex, sOrigValue) ' trasformo valori Select Case nType Case MachParamType.DOUBLE_ StringToDoubleAdv(value, dNewValue, True) - StringToDoubleAdv(sOrigValue, dOrigValue, True) + m_IsModifiedValue = Math.Abs( dNewValue - m_dValue) > EPS_SMALL Case MachParamType.LENGTH StringToLenAdv(value, dNewValue, True) - StringToLenAdv(sOrigValue, dOrigValue, True) + m_IsModifiedValue = Math.Abs( dNewValue - m_dValue) > EPS_SMALL Case Else - ' per string non faccio nulla + m_IsModifiedValue = String.Compare( value, m_sValue) <> 0 End Select - m_IsModifiedValue = dNewValue <> dOrigValue End If ' se valore immesso è diverso e password non inserita If m_IsModifiedValue AndAlso Not Map.refConfigurationPageVM.bModifyMachParam Then