diff --git a/Icarus/Constants/Const3dPrint.vb b/Icarus/Constants/Const3dPrint.vb
index 1f3158f..618be44 100644
--- a/Icarus/Constants/Const3dPrint.vb
+++ b/Icarus/Constants/Const3dPrint.vb
@@ -18,6 +18,8 @@
Public Const VIEWPARAMS = "ViewParams"
Public Const IMPORTED_SOLID = "ImportedSolid"
Public Const RESULT_READ_PROG = "ResultReadProg"
+ Public Const KEY_CALC_SOLIDS = "CalcSolids"
+ Public Const KEY_HAS_SOLIDS = "Solids"
' parametri calcolo tempi, F ed S
@@ -60,7 +62,8 @@
Public Const MAT_ORIG = "Orig"
' parametri Lavorazione
- Public Const MAC_TO_RECALC = "ToRecalc"
+ Public Const MAC_TORECALC_SLICE = "ToRecalcSlice"
+ Public Const MAC_TORECALC_GENERATE = "ToRecalcGenerate"
Public Const MAC_GUID = "GUID"
Public Const MAC_NAME = "Name"
Public Const MAC_SLICING45 = "Slicing45"
diff --git a/Icarus/MachiningManager/CurrMachining.vb b/Icarus/CurrMachiningPanel/CurrMachining.vb
similarity index 98%
rename from Icarus/MachiningManager/CurrMachining.vb
rename to Icarus/CurrMachiningPanel/CurrMachining.vb
index 1c7a7d7..e4971a2 100644
--- a/Icarus/MachiningManager/CurrMachining.vb
+++ b/Icarus/CurrMachiningPanel/CurrMachining.vb
@@ -27,7 +27,7 @@ Public Class CurrMachining
End Get
End Property
- Public ReadOnly Property sCurrStrandH As String
+ Public ReadOnly Property dCurrStrandH As Double
Get
Dim StrandH As CurrNumericMachiningParam = m_CathegoryList.FirstOrDefault(Function(x) x.Type = MachiningCathegory.Cathegories.GENERAL).MachiningParamList.FirstOrDefault(Function(y) y.Type = MachiningParam.Params.STRANDH)
If Not IsNothing(StrandH) Then
@@ -37,12 +37,22 @@ Public Class CurrMachining
End If
End Get
End Property
+ Public ReadOnly Property sCurrStrandH As String
+ Get
+ Dim StrandH As CurrNumericMachiningParam = m_CathegoryList.FirstOrDefault(Function(x) x.Type = MachiningCathegory.Cathegories.GENERAL).MachiningParamList.FirstOrDefault(Function(y) y.Type = MachiningParam.Params.STRANDH)
+ If Not IsNothing(StrandH) Then
+ Return StrandH.sValue
+ Else
+ Return False
+ End If
+ End Get
+ End Property
Public ReadOnly Property sCurrStrandW As String
Get
Dim StrandH As CurrNumericMachiningParam = m_CathegoryList.FirstOrDefault(Function(x) x.Type = MachiningCathegory.Cathegories.GENERAL).MachiningParamList.FirstOrDefault(Function(y) y.Type = MachiningParam.Params.STRANDW)
If Not IsNothing(StrandH) Then
- Return StrandH.dValue
+ Return StrandH.sValue
Else
Return False
End If
@@ -53,7 +63,7 @@ Public Class CurrMachining
Get
Dim StrandH As CurrNumericMachiningParam = m_CathegoryList.FirstOrDefault(Function(x) x.Type = MachiningCathegory.Cathegories.GENERAL).MachiningParamList.FirstOrDefault(Function(y) y.Type = MachiningParam.Params.STRANDCOUNT)
If Not IsNothing(StrandH) Then
- Return StrandH.dValue
+ Return StrandH.sValue
Else
Return False
End If
@@ -64,7 +74,7 @@ Public Class CurrMachining
Get
Dim StrandH As CurrNumericMachiningParam = m_CathegoryList.FirstOrDefault(Function(x) x.Type = MachiningCathegory.Cathegories.GENERAL).MachiningParamList.FirstOrDefault(Function(y) y.Type = MachiningParam.Params.OFFSET)
If Not IsNothing(StrandH) Then
- Return StrandH.dValue
+ Return StrandH.sValue
Else
Return False
End If
@@ -157,8 +167,8 @@ Public Class CurrMachining
For Each Cathegory As CurrMachiningCathegory In m_CathegoryList
Cathegory.WriteCurrParamInPart(nPartId)
Next
- ' Imposto flag
- EgtSetInfo(nPartId, MAC_TO_RECALC, True)
+ ' Imposto flag di ricalcolo slice
+ EgtSetInfo(nPartId, MAC_TORECALC_SLICE, True)
End Sub
#End Region ' METHODS
@@ -267,7 +277,7 @@ End Class
Public Class CurrNumericMachiningParam
Inherits NumericMachiningParam
- Public Overrides Property dValue As String
+ Public Overrides Property sValue As String
Get
Return If(m_bIsLen, LenToString(m_dValue, 1), m_dValue)
End Get
@@ -277,7 +287,7 @@ Public Class CurrNumericMachiningParam
Else
m_dValue = value
End If
- NotifyPropertyChanged(NameOf(dValue))
+ NotifyPropertyChanged(NameOf(sValue))
NotifyPropertyChanged(NameOf(bIsModifiedFromDb))
End Set
End Property
@@ -575,7 +585,7 @@ Public Class CurrNumericMachiningParam
Public Sub ResetParamCmd()
m_dValue = DbParam.dOrigValue
- NotifyPropertyChanged(NameOf(dValue))
+ NotifyPropertyChanged(NameOf(sValue))
NotifyPropertyChanged(NameOf(bIsModifiedFromDb))
End Sub
diff --git a/Icarus/MachiningManager/CurrMachiningPanelV.xaml b/Icarus/CurrMachiningPanel/CurrMachiningPanelV.xaml
similarity index 99%
rename from Icarus/MachiningManager/CurrMachiningPanelV.xaml
rename to Icarus/CurrMachiningPanel/CurrMachiningPanelV.xaml
index ac72a16..116945f 100644
--- a/Icarus/MachiningManager/CurrMachiningPanelV.xaml
+++ b/Icarus/CurrMachiningPanel/CurrMachiningPanelV.xaml
@@ -41,7 +41,7 @@
+ Text="{Binding sValue}"/>