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

Merge commit '5f4b50952f33e898e05b29c832858868ff64cd0f'

Browse Source
This commit is contained in:
Nicola Pievani
2025-06-05 09:13:49 +02:00
parent c9e6031763 5f4b50952f
commit ff1616a609
3 changed files with 44 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
My Project/AssemblyInfo.vb
+2 -2
View File
@@ -62,5 +62,5 @@ Imports System.Windows
' by using the '*' as shown below:
' <Assembly: AssemblyVersion("1.0.*")>
<Assembly: AssemblyVersion("2.7.4.1")>
<Assembly: AssemblyFileVersion("2.7.4.1")>
<Assembly: AssemblyVersion("2.7.6.1")>
<Assembly: AssemblyFileVersion("2.7.6.1")>
WaterjetDbWindow/WaterjetDbWindowV.xaml
+8
View File
@@ -48,6 +48,14 @@
</DataTemplate>
</DataGridTextColumn.HeaderTemplate>
</DataGridTextColumn>
<!--Flux-->
<DataGridTextColumn Binding="{Binding Flux}" Width="*">
<DataGridTextColumn.HeaderTemplate>
<DataTemplate>
<TextBlock Text="{Binding DataContext.Flux_Msg,RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"/>
</DataTemplate>
</DataGridTextColumn.HeaderTemplate>
</DataGridTextColumn>
<!--Q1-->
<DataGridTextColumn Binding="{Binding Q1}" Width="*">
<DataGridTextColumn.HeaderTemplate>
WaterjetDbWindow/WaterjetDbWindowVM.vb
+34 -7
View File
@@ -158,6 +158,12 @@ Public Class WaterjetDbWindowVM
End Get
End Property
Public ReadOnly Property Flux_Msg As String
Get
Return "mg/min"
End Get
End Property
Public ReadOnly Property Q1_Msg As String
Get
Return EgtMsg(31753) ' Q1
@@ -394,7 +400,7 @@ Public Class WaterjetDbWindowVM
Else
nId = SelMaterial.SelSubMaterial.ParamList.Count + 1
End If
SelMaterial.SelSubMaterial.ParamList.Add(New WjParam(nId, "0", "0", "0", "0", "0", "0", "0", "0"))
SelMaterial.SelSubMaterial.ParamList.Add(New WjParam(nId, "0", "0", "0", "0", "0", "0", "0", "0", "0"))
SelMaterial.SelSubMaterial.NotifyPropertyChanged(NameOf(ParamList))
bIsModified = True
End If
@@ -596,11 +602,12 @@ Public Class WaterjetDbWindowVM
While EgtUILib.GetPrivateProfileString(sMaterial & "." & sSubMat, QInd.ToString(), "", sParam, sFilePath) > 0
Dim sParams() As String = sParam.Split(","c)
If sParams.Length() = 7 Then
QParamList.Add(New WjParam(QInd, sParams(0), sParams(1), sParams(2), sParams(3), sParams(4), sParams(5), sParams(6), "0"))
ElseIf sParams.Length() > 7 Then
QParamList.Add(New WjParam(QInd, sParams(0), sParams(1), sParams(2), sParams(3), sParams(4), sParams(5), sParams(6), sParams(7)))
QParamList.Add(New WjParam(QInd, sParams(0), sParams(1), sParams(2), sParams(3), sParams(4), sParams(5), sParams(6), "0", "250"))
ElseIf sParams.Length() = 8 Then
QParamList.Add(New WjParam(QInd, sParams(0), sParams(1), sParams(2), sParams(3), sParams(4), sParams(5), sParams(6), sParams(7), "250"))
ElseIf sParams.Length() > 8 Then
QParamList.Add(New WjParam(QInd, sParams(0), sParams(1), sParams(2), sParams(3), sParams(4), sParams(5), sParams(6), sParams(7), sParams(8)))
End If
QInd += 1
End While
SubMatList.Add(New WjSubMaterial(sSubMat, QParamList))
@@ -639,6 +646,7 @@ Public Class WaterjetDbWindowVM
SubMaterial.ParamList = New ObservableCollection(Of WjParam)(SubMaterial.ParamList.OrderBy(Function(x) x.dThickness))
For Each ParamItem In SubMaterial.ParamList
Dim dThickness As Double
Dim dFlux As Double
Dim dQ1 As Double
Dim dQ2 As Double
Dim dQ3 As Double
@@ -649,6 +657,7 @@ Public Class WaterjetDbWindowVM
Dim sValConverted As String = "0"
ParamItem.StringFractionToStringDecimal(ParamItem.Thickness, sValConverted)
StringToLen(sValConverted, dThickness)
StringToDouble(ParamItem.Flux, dFlux)
ParamItem.StringFractionToStringDecimal(ParamItem.Q1, sValConverted)
StringToLen(sValConverted, dQ1)
ParamItem.StringFractionToStringDecimal(ParamItem.Q2, sValConverted)
@@ -670,7 +679,8 @@ Public Class WaterjetDbWindowVM
DoubleToString(dQ4, 3) & "," &
DoubleToString(dQ5, 3) & "," &
DoubleToString(dQExtra, 3) & "," &
DoubleToString(dAngComp, 3) & If(ParamIndex < SubMaterial.ParamList.Count, "", Environment.NewLine), sFilePath)
DoubleToString(dAngComp, 3) & "," &
DoubleToString(dFlux, 3) & If(ParamIndex < SubMaterial.ParamList.Count, "", Environment.NewLine), sFilePath)
ParamItem.IsModifiedReset()
ParamIndex += 1
Next
@@ -828,6 +838,20 @@ Public Class WjParam
End Get
End Property
Private m_IsModifiedFlux As Boolean = False
Private m_Flux As String
Public Property Flux As String
Get
Return m_Flux
End Get
Set(value As String)
ManageFraction(value, m_Flux)
End Set
End Property
Public Sub SetFlux(Flux As String)
m_Flux = Flux
End Sub
Private m_IsModifiedQ1 As Boolean = False
Private m_Q1 As String
Public Property Q1 As String
@@ -942,7 +966,7 @@ Public Class WjParam
m_QExtra = dQExtra
End Sub
Sub New(nId As Integer, dThickness As String, dQ1 As String, dQ2 As String, dQ3 As String, dQ4 As String, dQ5 As String, dQExtra As String, dAngComp As String)
Sub New(nId As Integer, dThickness As String, dQ1 As String, dQ2 As String, dQ3 As String, dQ4 As String, dQ5 As String, dQExtra As String, dAngComp As String, dFlux As String)
m_Id = nId
Dim dVal As Double
StringToDouble(dThickness, dVal)
@@ -960,11 +984,13 @@ Public Class WjParam
StringToDouble(dQExtra, dVal)
m_QExtra = LenToString(dVal, 3)
m_dAngComp = dAngComp
m_Flux = dFlux
End Sub
Public ReadOnly Property IsModified() As Boolean
Get
Return m_IsModifiedThickness OrElse
m_IsModifiedFlux OrElse
m_IsModifiedQ1 OrElse
m_IsModifiedQ2 OrElse
m_IsModifiedQ3 OrElse
@@ -976,6 +1002,7 @@ Public Class WjParam
Public Sub IsModifiedReset()
m_IsModifiedThickness = False
m_IsModifiedFlux = False
m_IsModifiedQ1 = False
m_IsModifiedQ2 = False
m_IsModifiedQ3 = False