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

Merge remote-tracking branch 'gitlab.seriate/master' into feature/NewOpenWindow

Browse Source
This commit is contained in:
Emmanuele Sassi
2023-08-23 10:11:27 +02:00
parent d37014272f 79db35220b
commit 1c81e7fdb4
8 changed files with 14 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
EgtBEAMWALL.Core/BTLModel/BTLFeatureM.vb
+1 -1
View File
@@ -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
EgtBEAMWALL.Core/MachGroupPanel/PartVM.vb
+2 -1
View File
@@ -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
EgtBEAMWALL.Core/My Project/AssemblyInfo.vb
+2 -2
View File
@@ -35,5 +35,5 @@ Imports System.Runtime.InteropServices
' 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")>
EgtBEAMWALL.DataLayer/Properties/AssemblyInfo.cs
+2 -2
View File
@@ -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")]
EgtBEAMWALL.Supervisor/My Project/AssemblyInfo.vb
+2 -2
View File
@@ -70,5 +70,5 @@ Imports System.Windows
' 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")>
EgtBEAMWALL.ViewerOptimizer/ConfigurationPage/ConfigurationPageVM.vb
+3 -7
View File
@@ -1080,21 +1080,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
EgtBEAMWALL.ViewerOptimizer/My Project/AssemblyInfo.vb
+2 -2
View File
@@ -70,5 +70,5 @@ Imports System.Windows
' 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")>
ExtLibs/EgtWPFLib5.dll
BIN
View File
Binary file not shown.