- spostati lavorazioni e materiali sotto la macchina

- criptati Db lavorazioni e materiali
This commit is contained in:
Emmanuele Sassi
2022-10-10 11:47:23 +02:00
parent 4c3cc235cb
commit 17a87ed067
8 changed files with 222 additions and 156 deletions
+1
View File
@@ -106,6 +106,7 @@ Public Class MachiningDbVM
Dim sCurrMachining As String = ""
GetMainPrivateProfileString(S_PRINTING3D, K_CURRMACHINING, "", sCurrMachining)
m_SelMachining = MachiningList.FirstOrDefault(Function(x) x.sGUID = sCurrMachining)
NotifyPropertyChanged(NameOf(SelMachining))
End Sub
#End Region ' METHODS
+1 -7
View File
@@ -97,12 +97,7 @@ Public Class MainWindowM
Return m_s3dPrintingDir
End Get
End Property
Private m_sMachiningsDir As String
Friend ReadOnly Property sMachiningsDir As String
Get
Return m_sMachiningsDir
End Get
End Property
Private m_sMaterialsDir As String
Friend ReadOnly Property sMaterialsDir As String
Get
@@ -170,7 +165,6 @@ Public Class MainWindowM
' Impostazione path resources dir
m_sResourcesRoot = m_sDataRoot & "\" & RES_DIR
' Impostazione path machinings e materials dir
m_sMachiningsDir = m_sDataRoot & "\" & MACHININGS_DIR
m_sMaterialsDir = m_sDataRoot & "\" & MATERIALS_DIR
' Impostazione direttorio per le macchine
If GetMainPrivateProfileString(S_MACH, K_MACHINESDIR, "", m_sMachinesRoot) = 0 Then
+98 -107
View File
@@ -150,9 +150,9 @@ Public Class Material
' per lettura da file
Sub New(nIndex As Integer)
m_nIndex = nIndex
Dim sMatIniFilePath As String = Map.refMainWindowVM.MainWindowM.sMaterialsDir & "/Materials.ini"
GetPrivateProfileString(nIndex, MAT_GUID, "", m_sGUID, sMatIniFilePath)
EgtGetStringUtf8FromIni(nIndex, MAT_NAME, "", m_sName, sMatIniFilePath)
ReadMaterialParamString(nIndex, MAT_GUID, "", m_sGUID)
ReadMaterialParamString(nIndex, MAT_NAME, "", m_sName)
'EgtGetStringUtf8FromIni(nIndex, MAT_NAME, "", m_sName, sMatIniFilePath)
m_CathegoryList.Add(New MaterialCathegory(MaterialCathegory.Cathegories.GENERAL, nIndex))
m_CathegoryList.Add(New MaterialCathegory(MaterialCathegory.Cathegories.TEMPERATURES, nIndex))
m_CathegoryList.Add(New MaterialCathegory(MaterialCathegory.Cathegories.CONSTANT, nIndex))
@@ -188,60 +188,59 @@ Public Class Material
m_nIndex = nIndex
m_sName = sName
m_sGUID = sGUID
Dim sMatIniFilePath As String = Map.refMainWindowVM.MainWindowM.sMaterialsDir & "/Materials.ini"
m_dK = GetPrivateProfileDouble(m_nIndex, MAT_K, 0, sMatIniFilePath)
m_dC1 = GetPrivateProfileDouble(m_nIndex, MAT_C1, 0, sMatIniFilePath)
m_dC2 = GetPrivateProfileDouble(m_nIndex, MAT_C2, 0, sMatIniFilePath)
m_dDensity = GetPrivateProfileDouble(m_nIndex, MAT_DENSITY, 0, sMatIniFilePath)
m_dAMax = GetPrivateProfileDouble(m_nIndex, MAT_AMAX, 0, sMatIniFilePath)
m_dATrg = GetPrivateProfileDouble(m_nIndex, MAT_ATRG, 0, sMatIniFilePath)
m_dAMin = GetPrivateProfileDouble(m_nIndex, MAT_AMIN, 0, sMatIniFilePath)
m_dBMax = GetPrivateProfileDouble(m_nIndex, MAT_BMAX, 0, sMatIniFilePath)
m_dBTrg = GetPrivateProfileDouble(m_nIndex, MAT_BTRG, 0, sMatIniFilePath)
m_dBMin = GetPrivateProfileDouble(m_nIndex, MAT_BMIN, 0, sMatIniFilePath)
m_dKW = GetPrivateProfileDouble(m_nIndex, MAT_KW, 0, sMatIniFilePath)
m_dKZ = GetPrivateProfileDouble(m_nIndex, MAT_KZ, 0, sMatIniFilePath)
m_dKN = GetPrivateProfileDouble(m_nIndex, MAT_KN, 0, sMatIniFilePath)
m_dK = ReadMaterialParamDouble(m_nIndex, MAT_K, 0)
m_dC1 = ReadMaterialParamDouble(m_nIndex, MAT_C1, 0)
m_dC2 = ReadMaterialParamDouble(m_nIndex, MAT_C2, 0)
m_dDensity = ReadMaterialParamDouble(m_nIndex, MAT_DENSITY, 0)
m_dAMax = ReadMaterialParamDouble(m_nIndex, MAT_AMAX, 0)
m_dATrg = ReadMaterialParamDouble(m_nIndex, MAT_ATRG, 0)
m_dAMin = ReadMaterialParamDouble(m_nIndex, MAT_AMIN, 0)
m_dBMax = ReadMaterialParamDouble(m_nIndex, MAT_BMAX, 0)
m_dBTrg = ReadMaterialParamDouble(m_nIndex, MAT_BTRG, 0)
m_dBMin = ReadMaterialParamDouble(m_nIndex, MAT_BMIN, 0)
m_dKW = ReadMaterialParamDouble(m_nIndex, MAT_KW, 0)
m_dKZ = ReadMaterialParamDouble(m_nIndex, MAT_KZ, 0)
m_dKN = ReadMaterialParamDouble(m_nIndex, MAT_KN, 0)
End Sub
Private Sub ReadAllParams()
'm_bSlicing45 = GetPrivateProfileDouble(m_nIndex, MAC_SLICING45, 0, CurrentMachine.sMachiningFilePath)
'm_dStrandH = GetPrivateProfileDouble(m_nIndex, MAC_STRANDH, 0, CurrentMachine.sMachiningFilePath)
'm_dStrandW = GetPrivateProfileDouble(m_nIndex, MAC_STRANDW, 0, CurrentMachine.sMachiningFilePath)
'm_nStrandCount = GetPrivateProfileDouble(m_nIndex, MAC_STRANDCOUNT, 0, CurrentMachine.sMachiningFilePath)
'm_dOffset = GetPrivateProfileDouble(m_nIndex, MAC_OFFSET, 0, CurrentMachine.sMachiningFilePath)
'm_dStartPointOffsetOnSlice = GetPrivateProfileDouble(m_nIndex, MAC_STARTPOINTOFFSETONSLICE, 0, CurrentMachine.sMachiningFilePath)
'm_dStrandOrder = GetPrivateProfileDouble(m_nIndex, MAC_STRANDORDER, 0, CurrentMachine.sMachiningFilePath)
'm_dDirection = GetPrivateProfileDouble(m_nIndex, MAC_DIRECTION, 0, CurrentMachine.sMachiningFilePath)
'm_dLinkType = GetPrivateProfileDouble(m_nIndex, MAC_LINKTYPE, 0, CurrentMachine.sMachiningFilePath)
'm_dLinkParam = GetPrivateProfileDouble(m_nIndex, MAC_LINKPARAM, 0, CurrentMachine.sMachiningFilePath)
'm_dLinkZup = GetPrivateProfileDouble(m_nIndex, MAC_LINKZUP, 0, CurrentMachine.sMachiningFilePath)
'm_dOffsetLeadPoint = GetPrivateProfileDouble(m_nIndex, MAC_OFFSETLEADPOINT, 0, CurrentMachine.sMachiningFilePath)
'm_dLeadIn = GetPrivateProfileDouble(m_nIndex, MAC_LEADIN, 0, CurrentMachine.sMachiningFilePath)
'm_dLeadInTangDist = GetPrivateProfileDouble(m_nIndex, MAC_LEADINTANGDIST, 0, CurrentMachine.sMachiningFilePath)
'm_dLeadInOrthoDist = GetPrivateProfileDouble(m_nIndex, MAC_LEADINORTHODIST, 0, CurrentMachine.sMachiningFilePath)
'm_dLeadOut = GetPrivateProfileDouble(m_nIndex, MAC_LEADOUT, 0, CurrentMachine.sMachiningFilePath)
'm_dLeadOutTangDist = GetPrivateProfileDouble(m_nIndex, MAC_LEADOUTTANGDIST, 0, CurrentMachine.sMachiningFilePath)
'm_dLeadOutOrthoDist = GetPrivateProfileDouble(m_nIndex, MAC_LEADOUTORTHODIST, 0, CurrentMachine.sMachiningFilePath)
'm_dCoastingLen = GetPrivateProfileDouble(m_nIndex, MAC_COASTINGLEN, 0, CurrentMachine.sMachiningFilePath)
'm_dCoastingFeed = GetPrivateProfileDouble(m_nIndex, MAC_COASTINGFEED, 0, CurrentMachine.sMachiningFilePath)
'm_dWipeLen = GetPrivateProfileDouble(m_nIndex, MAC_WIPELEN, 0, CurrentMachine.sMachiningFilePath)
'm_dWipeFeedPu = GetPrivateProfileDouble(m_nIndex, MAC_WIPEFEEDPU, 0, CurrentMachine.sMachiningFilePath)
'm_dFloorCount = GetPrivateProfileDouble(m_nIndex, MAC_FLOORCOUNT, 0, CurrentMachine.sMachiningFilePath)
'm_dG0Feed = GetPrivateProfileDouble(m_nIndex, MAC_G0FEED, 0, CurrentMachine.sMachiningFilePath)
'm_dToolDiam = GetPrivateProfileDouble(m_nIndex, MAC_TOOLDIAM, 0, CurrentMachine.sMachiningFilePath)
'm_dRibsOverlap = GetPrivateProfileDouble(m_nIndex, MAC_RIBSOVERLAP, 0, CurrentMachine.sMachiningFilePath)
'm_dRibsStrandCount = GetPrivateProfileDouble(m_nIndex, MAC_RIBSSTRANDCOUNT, 0, CurrentMachine.sMachiningFilePath)
'm_dRibsLink = GetPrivateProfileDouble(m_nIndex, MAC_RIBSLINK, 0, CurrentMachine.sMachiningFilePath)
'm_dRibsInvertOrder = GetPrivateProfileDouble(m_nIndex, MAC_RIBSINVERTORDER, 0, CurrentMachine.sMachiningFilePath)
'm_dRibsInvertDirection = GetPrivateProfileDouble(m_nIndex, MAC_RIBSINVERTDIRECTION, 0, CurrentMachine.sMachiningFilePath)
'm_dRibsLeadInInvert = GetPrivateProfileDouble(m_nIndex, MAC_RIBSLEADININVERT, 0, CurrentMachine.sMachiningFilePath)
'm_dRibsLeadInLen = GetPrivateProfileDouble(m_nIndex, MAC_RIBSLEADINLEN, 0, CurrentMachine.sMachiningFilePath)
'm_dRibsLeadOutInvert = GetPrivateProfileDouble(m_nIndex, MAC_RIBSLEADOUTINVERT, 0, CurrentMachine.sMachiningFilePath)
'm_dRibsLeadOutLen = GetPrivateProfileDouble(m_nIndex, MAC_RIBSLEADOUTLEN, 0, CurrentMachine.sMachiningFilePath)
'm_dRibsLeadOutCoasting = GetPrivateProfileDouble(m_nIndex, MAC_RIBSLEADOUTCOASTING, 0, CurrentMachine.sMachiningFilePath)
'm_dRibsLeadOutWipe = GetPrivateProfileDouble(m_nIndex, MAC_RIBSLEADOUTWIPE, 0, CurrentMachine.sMachiningFilePath)
'm_dRibsLeadOutWipeDir = GetPrivateProfileDouble(m_nIndex, MAC_RIBSLEADOUTWIPEDIR, 0, CurrentMachine.sMachiningFilePath)
'm_bSlicing45 = ReadMaterialParamDouble(m_nIndex, MAC_SLICING45, 0, CurrentMachine.sMachiningFilePath)
'm_dStrandH = ReadMaterialParamDouble(m_nIndex, MAC_STRANDH, 0, CurrentMachine.sMachiningFilePath)
'm_dStrandW = ReadMaterialParamDouble(m_nIndex, MAC_STRANDW, 0, CurrentMachine.sMachiningFilePath)
'm_nStrandCount = ReadMaterialParamDouble(m_nIndex, MAC_STRANDCOUNT, 0, CurrentMachine.sMachiningFilePath)
'm_dOffset = ReadMaterialParamDouble(m_nIndex, MAC_OFFSET, 0, CurrentMachine.sMachiningFilePath)
'm_dStartPointOffsetOnSlice = ReadMaterialParamDouble(m_nIndex, MAC_STARTPOINTOFFSETONSLICE, 0, CurrentMachine.sMachiningFilePath)
'm_dStrandOrder = ReadMaterialParamDouble(m_nIndex, MAC_STRANDORDER, 0, CurrentMachine.sMachiningFilePath)
'm_dDirection = ReadMaterialParamDouble(m_nIndex, MAC_DIRECTION, 0, CurrentMachine.sMachiningFilePath)
'm_dLinkType = ReadMaterialParamDouble(m_nIndex, MAC_LINKTYPE, 0, CurrentMachine.sMachiningFilePath)
'm_dLinkParam = ReadMaterialParamDouble(m_nIndex, MAC_LINKPARAM, 0, CurrentMachine.sMachiningFilePath)
'm_dLinkZup = ReadMaterialParamDouble(m_nIndex, MAC_LINKZUP, 0, CurrentMachine.sMachiningFilePath)
'm_dOffsetLeadPoint = ReadMaterialParamDouble(m_nIndex, MAC_OFFSETLEADPOINT, 0, CurrentMachine.sMachiningFilePath)
'm_dLeadIn = ReadMaterialParamDouble(m_nIndex, MAC_LEADIN, 0, CurrentMachine.sMachiningFilePath)
'm_dLeadInTangDist = ReadMaterialParamDouble(m_nIndex, MAC_LEADINTANGDIST, 0, CurrentMachine.sMachiningFilePath)
'm_dLeadInOrthoDist = ReadMaterialParamDouble(m_nIndex, MAC_LEADINORTHODIST, 0, CurrentMachine.sMachiningFilePath)
'm_dLeadOut = ReadMaterialParamDouble(m_nIndex, MAC_LEADOUT, 0, CurrentMachine.sMachiningFilePath)
'm_dLeadOutTangDist = ReadMaterialParamDouble(m_nIndex, MAC_LEADOUTTANGDIST, 0, CurrentMachine.sMachiningFilePath)
'm_dLeadOutOrthoDist = ReadMaterialParamDouble(m_nIndex, MAC_LEADOUTORTHODIST, 0, CurrentMachine.sMachiningFilePath)
'm_dCoastingLen = ReadMaterialParamDouble(m_nIndex, MAC_COASTINGLEN, 0, CurrentMachine.sMachiningFilePath)
'm_dCoastingFeed = ReadMaterialParamDouble(m_nIndex, MAC_COASTINGFEED, 0, CurrentMachine.sMachiningFilePath)
'm_dWipeLen = ReadMaterialParamDouble(m_nIndex, MAC_WIPELEN, 0, CurrentMachine.sMachiningFilePath)
'm_dWipeFeedPu = ReadMaterialParamDouble(m_nIndex, MAC_WIPEFEEDPU, 0, CurrentMachine.sMachiningFilePath)
'm_dFloorCount = ReadMaterialParamDouble(m_nIndex, MAC_FLOORCOUNT, 0, CurrentMachine.sMachiningFilePath)
'm_dG0Feed = ReadMaterialParamDouble(m_nIndex, MAC_G0FEED, 0, CurrentMachine.sMachiningFilePath)
'm_dToolDiam = ReadMaterialParamDouble(m_nIndex, MAC_TOOLDIAM, 0, CurrentMachine.sMachiningFilePath)
'm_dRibsOverlap = ReadMaterialParamDouble(m_nIndex, MAC_RIBSOVERLAP, 0, CurrentMachine.sMachiningFilePath)
'm_dRibsStrandCount = ReadMaterialParamDouble(m_nIndex, MAC_RIBSSTRANDCOUNT, 0, CurrentMachine.sMachiningFilePath)
'm_dRibsLink = ReadMaterialParamDouble(m_nIndex, MAC_RIBSLINK, 0, CurrentMachine.sMachiningFilePath)
'm_dRibsInvertOrder = ReadMaterialParamDouble(m_nIndex, MAC_RIBSINVERTORDER, 0, CurrentMachine.sMachiningFilePath)
'm_dRibsInvertDirection = ReadMaterialParamDouble(m_nIndex, MAC_RIBSINVERTDIRECTION, 0, CurrentMachine.sMachiningFilePath)
'm_dRibsLeadInInvert = ReadMaterialParamDouble(m_nIndex, MAC_RIBSLEADININVERT, 0, CurrentMachine.sMachiningFilePath)
'm_dRibsLeadInLen = ReadMaterialParamDouble(m_nIndex, MAC_RIBSLEADINLEN, 0, CurrentMachine.sMachiningFilePath)
'm_dRibsLeadOutInvert = ReadMaterialParamDouble(m_nIndex, MAC_RIBSLEADOUTINVERT, 0, CurrentMachine.sMachiningFilePath)
'm_dRibsLeadOutLen = ReadMaterialParamDouble(m_nIndex, MAC_RIBSLEADOUTLEN, 0, CurrentMachine.sMachiningFilePath)
'm_dRibsLeadOutCoasting = ReadMaterialParamDouble(m_nIndex, MAC_RIBSLEADOUTCOASTING, 0, CurrentMachine.sMachiningFilePath)
'm_dRibsLeadOutWipe = ReadMaterialParamDouble(m_nIndex, MAC_RIBSLEADOUTWIPE, 0, CurrentMachine.sMachiningFilePath)
'm_dRibsLeadOutWipeDir = ReadMaterialParamDouble(m_nIndex, MAC_RIBSLEADOUTWIPEDIR, 0, CurrentMachine.sMachiningFilePath)
End Sub
Friend Sub Save()
@@ -277,9 +276,9 @@ Public Class Material
End Sub
Friend Sub WriteParamsOnDb(nIndex As Integer)
Dim sMacIniFilePath As String = Map.refMainWindowVM.MainWindowM.sMaterialsDir & "/Materials.ini"
WritePrivateProfileString(nIndex, MAT_GUID, m_sGUID, sMacIniFilePath)
EgtWriteStringUtf8toIni(nIndex, MAT_NAME, m_sName, sMacIniFilePath)
WriteMaterialParam(nIndex, MAT_GUID, m_sGUID)
WriteMaterialParam(nIndex, MAT_NAME, m_sName)
' EgtWriteStringUtf8toIni(nIndex, MAT_NAME, m_sName)
For Each Cathegory In m_CathegoryList
Cathegory.WriteParamOnDb(nIndex)
Next
@@ -556,68 +555,66 @@ Public Class NumericMaterialParam
Sub New(Type As Params, nIndex As Integer)
MyBase.New(Type)
Dim sMacIniFilePath As String = Map.refMainWindowVM.MainWindowM.sMaterialsDir & "/Materials.ini"
Select Case Type
Case Params.T1
m_dValue = GetPrivateProfileDouble(nIndex, MAT_T1, 0, sMacIniFilePath)
m_dValue = ReadMaterialParamDouble(nIndex, MAT_T1, 0)
m_bIsLen = False
Case Params.T2
m_dValue = GetPrivateProfileDouble(nIndex, MAT_T2, 0, sMacIniFilePath)
m_dValue = ReadMaterialParamDouble(nIndex, MAT_T2, 0)
m_bIsLen = False
Case Params.T3
m_dValue = GetPrivateProfileDouble(nIndex, MAT_T3, 0, sMacIniFilePath)
m_dValue = ReadMaterialParamDouble(nIndex, MAT_T3, 0)
m_bIsLen = False
Case Params.T4
m_dValue = GetPrivateProfileDouble(nIndex, MAT_T4, 0, sMacIniFilePath)
m_dValue = ReadMaterialParamDouble(nIndex, MAT_T4, 0)
m_bIsLen = False
Case Params.T5
m_dValue = GetPrivateProfileDouble(nIndex, MAT_T5, 0, sMacIniFilePath)
m_dValue = ReadMaterialParamDouble(nIndex, MAT_T5, 0)
m_bIsLen = False
Case Params.K
m_dValue = GetPrivateProfileDouble(nIndex, MAT_K, 0, sMacIniFilePath)
m_dValue = ReadMaterialParamDouble(nIndex, MAT_K, 0)
m_bIsLen = False
Case Params.C1
m_dValue = GetPrivateProfileDouble(nIndex, MAT_C1, 0, sMacIniFilePath)
m_dValue = ReadMaterialParamDouble(nIndex, MAT_C1, 0)
m_bIsLen = False
Case Params.C2
m_dValue = GetPrivateProfileDouble(nIndex, MAT_C2, 0, sMacIniFilePath)
m_dValue = ReadMaterialParamDouble(nIndex, MAT_C2, 0)
m_bIsLen = False
Case Params.DENSITY
m_dValue = GetPrivateProfileDouble(nIndex, MAT_DENSITY, 0, sMacIniFilePath)
m_dValue = ReadMaterialParamDouble(nIndex, MAT_DENSITY, 0)
m_bIsLen = False
Case Params.AMAX
m_dValue = GetPrivateProfileDouble(nIndex, MAT_AMAX, 0, sMacIniFilePath)
m_dValue = ReadMaterialParamDouble(nIndex, MAT_AMAX, 0)
m_bIsLen = False
Case Params.ATRG
m_dValue = GetPrivateProfileDouble(nIndex, MAT_ATRG, 0, sMacIniFilePath)
m_dValue = ReadMaterialParamDouble(nIndex, MAT_ATRG, 0)
m_bIsLen = False
Case Params.AMIN
m_dValue = GetPrivateProfileDouble(nIndex, MAT_AMIN, 0, sMacIniFilePath)
m_dValue = ReadMaterialParamDouble(nIndex, MAT_AMIN, 0)
m_bIsLen = False
Case Params.BMAX
m_dValue = GetPrivateProfileDouble(nIndex, MAT_BMAX, 0, sMacIniFilePath)
m_dValue = ReadMaterialParamDouble(nIndex, MAT_BMAX, 0)
m_bIsLen = False
Case Params.BTRG
m_dValue = GetPrivateProfileDouble(nIndex, MAT_BTRG, 0, sMacIniFilePath)
m_dValue = ReadMaterialParamDouble(nIndex, MAT_BTRG, 0)
m_bIsLen = False
Case Params.BMIN
m_dValue = GetPrivateProfileDouble(nIndex, MAT_BMIN, 0, sMacIniFilePath)
m_dValue = ReadMaterialParamDouble(nIndex, MAT_BMIN, 0)
m_bIsLen = False
Case Params.KW
m_dValue = GetPrivateProfileDouble(nIndex, MAT_KW, 0, sMacIniFilePath)
m_dValue = ReadMaterialParamDouble(nIndex, MAT_KW, 0)
m_bIsLen = False
Case Params.KZ
m_dValue = GetPrivateProfileDouble(nIndex, MAT_KZ, 0, sMacIniFilePath)
m_dValue = ReadMaterialParamDouble(nIndex, MAT_KZ, 0)
m_bIsLen = False
Case Params.KN
m_dValue = GetPrivateProfileDouble(nIndex, MAT_KN, 0, sMacIniFilePath)
m_dValue = ReadMaterialParamDouble(nIndex, MAT_KN, 0)
m_bIsLen = False
End Select
m_dOrigValue = m_dValue
End Sub
Friend Overrides Sub WriteParamOnDb(nIndex As Integer)
Dim sMacIniFilePath As String = Map.refMainWindowVM.MainWindowM.sMaterialsDir & "/Materials.ini"
Dim sWriteValue As String = ""
If m_bIsLen Then
sWriteValue = LenToString(m_dValue, 5)
@@ -626,41 +623,41 @@ Public Class NumericMaterialParam
End If
Select Case Type
Case Params.T1
WritePrivateProfileString(nIndex, MAT_T1, sWriteValue, sMacIniFilePath)
WriteMaterialParam(nIndex, MAT_T1, sWriteValue)
Case Params.T2
WritePrivateProfileString(nIndex, MAT_T2, sWriteValue, sMacIniFilePath)
WriteMaterialParam(nIndex, MAT_T2, sWriteValue)
Case Params.T3
WritePrivateProfileString(nIndex, MAT_T3, sWriteValue, sMacIniFilePath)
WriteMaterialParam(nIndex, MAT_T3, sWriteValue)
Case Params.T4
WritePrivateProfileString(nIndex, MAT_T4, sWriteValue, sMacIniFilePath)
WriteMaterialParam(nIndex, MAT_T4, sWriteValue)
Case Params.T5
WritePrivateProfileString(nIndex, MAT_T5, sWriteValue, sMacIniFilePath)
WriteMaterialParam(nIndex, MAT_T5, sWriteValue)
Case Params.K
WritePrivateProfileString(nIndex, MAT_K, sWriteValue, sMacIniFilePath)
WriteMaterialParam(nIndex, MAT_K, sWriteValue)
Case Params.C1
WritePrivateProfileString(nIndex, MAT_C1, sWriteValue, sMacIniFilePath)
WriteMaterialParam(nIndex, MAT_C1, sWriteValue)
Case Params.C2
WritePrivateProfileString(nIndex, MAT_C2, sWriteValue, sMacIniFilePath)
WriteMaterialParam(nIndex, MAT_C2, sWriteValue)
Case Params.DENSITY
WritePrivateProfileString(nIndex, MAT_DENSITY, sWriteValue, sMacIniFilePath)
WriteMaterialParam(nIndex, MAT_DENSITY, sWriteValue)
Case Params.AMAX
WritePrivateProfileString(nIndex, MAT_AMAX, sWriteValue, sMacIniFilePath)
WriteMaterialParam(nIndex, MAT_AMAX, sWriteValue)
Case Params.ATRG
WritePrivateProfileString(nIndex, MAT_ATRG, sWriteValue, sMacIniFilePath)
WriteMaterialParam(nIndex, MAT_ATRG, sWriteValue)
Case Params.AMIN
WritePrivateProfileString(nIndex, MAT_AMIN, sWriteValue, sMacIniFilePath)
WriteMaterialParam(nIndex, MAT_AMIN, sWriteValue)
Case Params.BMAX
WritePrivateProfileString(nIndex, MAT_BMAX, sWriteValue, sMacIniFilePath)
WriteMaterialParam(nIndex, MAT_BMAX, sWriteValue)
Case Params.BTRG
WritePrivateProfileString(nIndex, MAT_BTRG, sWriteValue, sMacIniFilePath)
WriteMaterialParam(nIndex, MAT_BTRG, sWriteValue)
Case Params.BMIN
WritePrivateProfileString(nIndex, MAT_BMIN, sWriteValue, sMacIniFilePath)
WriteMaterialParam(nIndex, MAT_BMIN, sWriteValue)
Case Params.KW
WritePrivateProfileString(nIndex, MAT_KW, sWriteValue, sMacIniFilePath)
WriteMaterialParam(nIndex, MAT_KW, sWriteValue)
Case Params.KZ
WritePrivateProfileString(nIndex, MAT_KZ, sWriteValue, sMacIniFilePath)
WriteMaterialParam(nIndex, MAT_KZ, sWriteValue)
Case Params.KN
WritePrivateProfileString(nIndex, MAT_KN, sWriteValue, sMacIniFilePath)
WriteMaterialParam(nIndex, MAT_KN, sWriteValue)
End Select
End Sub
@@ -734,11 +731,10 @@ Public Class StringMaterialParam
Sub New(Type As Params, nIndex As Integer)
MyBase.New(Type)
Dim sMacIniFilePath As String = Map.refMainWindowVM.MainWindowM.sMaterialsDir & "\Materials.ini"
Select Case Type
Case Params.ORIG
Dim sOrigGUID As String = ""
GetPrivateProfileString(nIndex, MAT_ORIG, "", sOrigGUID, sMacIniFilePath)
ReadMaterialParamString(nIndex, MAT_ORIG, "", sOrigGUID)
If sOrigGUID = "***" Then
m_sGUID = sOrigGUID
m_sValue = sOrigGUID
@@ -767,10 +763,9 @@ Public Class StringMaterialParam
End Sub
Friend Overrides Sub WriteParamOnDb(nIndex As Integer)
Dim sMacIniFilePath As String = Map.refMainWindowVM.MainWindowM.sMaterialsDir & "/Materials.ini"
Select Case Type
Case Params.ORIG
WritePrivateProfileString(nIndex, MAT_ORIG, m_sGUID, sMacIniFilePath)
WriteMaterialParam(nIndex, MAT_ORIG, m_sGUID)
End Select
End Sub
@@ -820,21 +815,19 @@ Public Class ComboMaterialParam
Sub New(Type As Params, nIndex As Integer)
MyBase.New(Type)
Dim sMacIniFilePath As String = Map.refMainWindowVM.MainWindowM.sMaterialsDir & "/Materials.ini"
Select Case Type
'Case Params.STRANDORDER
' m_ValueList = New List(Of IdNameStruct)({New IdNameStruct(Material.MPAR_STRANDORDERS.INTOOUT, "From Inside To Outside"),
' New IdNameStruct(Material.MPAR_STRANDORDERS.OUTTOIN, "From Outside To Inside")})
' m_SelValue = m_ValueList.FirstOrDefault(Function(x) x.Id = GetPrivateProfileDouble(nIndex, MAC_STRANDORDER, 0, sMacIniFilePath))
' m_SelValue = m_ValueList.FirstOrDefault(Function(x) x.Id = ReadMaterialParamDouble(nIndex, MAC_STRANDORDER, 0))
End Select
m_OrigSelValue = m_SelValue
End Sub
Friend Overrides Sub WriteParamOnDb(nIndex As Integer)
Dim sMacIniFilePath As String = Map.refMainWindowVM.MainWindowM.sMaterialsDir & "/Materials.ini"
Select Case Type
'Case Params.STRANDORDER
' WritePrivateProfileString(nIndex, MAC_STRANDORDER, m_SelValue.Id, sMacIniFilePath)
' WriteMaterialParam(nIndex, MAC_STRANDORDER, m_SelValue.Id)
End Select
End Sub
@@ -877,19 +870,17 @@ Public Class CheckMaterialParam
Sub New(Type As Params, nIndex As Integer)
MyBase.New(Type)
Dim sMacIniFilePath As String = Map.refMainWindowVM.MainWindowM.sMaterialsDir & "/Materials.ini"
Select Case Type
'Case Params.SLICING45
' m_bValue = GetPrivateProfileDouble(nIndex, MAC_SLICING45, 0, sMacIniFilePath)
' m_bValue = ReadMaterialParamDouble(nIndex, MAC_SLICING45, 0)
End Select
m_bOrigValue = m_bValue
End Sub
Friend Overrides Sub WriteParamOnDb(nIndex As Integer)
Dim sMacIniFilePath As String = Map.refMainWindowVM.MainWindowM.sMaterialsDir & "/Materials.ini"
Select Case Type
'Case Params.SLICING45
' WritePrivateProfileString(nIndex, MAC_SLICING45, If(m_bValue, 1, 0), sMacIniFilePath)
' WriteMaterialParam(nIndex, MAC_SLICING45, If(m_bValue, 1, 0))
End Select
End Sub
+37 -22
View File
@@ -24,7 +24,7 @@ Public Class MaterialDbVM
' verifico se modificato
If Not IsNothing(m_SelMaterial) AndAlso m_SelMaterial.bIsModified Then
' chiedo se salvare
Select Case MessageBox.Show("Salvare le modifiche apportate alla lavorazione selezionata?", "Info", MessageBoxButton.YesNoCancel, MessageBoxImage.Question)
Select Case MessageBox.Show("Do you want to save material modification?", "Info", MessageBoxButton.YesNoCancel, MessageBoxImage.Question)
Case MessageBoxResult.Yes
m_SelMaterial.Save()
Case MessageBoxResult.No
@@ -36,14 +36,18 @@ Public Class MaterialDbVM
End If
' recupero stato IsExpanded di tutte le categorie
Dim IsExpandedList As New List(Of Boolean)
For Each Cathegory In m_SelMaterial.CathegoryList
IsExpandedList.Add(Cathegory.Cathegory_IsExpanded)
Next
If Not IsNothing(m_SelMaterial) Then
For Each Cathegory In m_SelMaterial.CathegoryList
IsExpandedList.Add(Cathegory.Cathegory_IsExpanded)
Next
End If
m_SelMaterial = value
' ripristino stato IsExpanded di tutte le categorie
For Index = 0 To m_SelMaterial.CathegoryList.Count - 1
m_SelMaterial.CathegoryList(Index).Cathegory_IsExpanded = IsExpandedList(Index)
Next
If IsExpandedList.Count > 0 AndAlso Not IsNothing(value) Then
For Index = 0 To m_SelMaterial.CathegoryList.Count - 1
m_SelMaterial.CathegoryList(Index).Cathegory_IsExpanded = IsExpandedList(Index)
Next
End If
End Set
End Property
@@ -82,27 +86,25 @@ Public Class MaterialDbVM
Sub New()
' Creo riferimento a questa classe in EgtCAM5Map
Map.SetRefMaterialDbVM(Me)
' inizializzo lista lavorazioni
Init()
End Sub
#End Region ' CONSTRUCTORS
#Region "METHODS"
Private Sub Init()
Dim sMachiningIniFilePath As String = Map.refMainWindowVM.MainWindowM.sMaterialsDir & "\Materials.ini"
Friend Sub Init()
MaterialList.Clear()
Dim nIndex As Integer = 1
Dim sGUID As String = ""
Dim sName As String = ""
While GetPrivateProfileString(nIndex, MAT_GUID, "", sGUID, sMachiningIniFilePath) > 0
While ReadMaterialParamString(nIndex, MAT_GUID, "", sGUID) > 0
MaterialList.Add(New Material(nIndex))
nIndex += 1
End While
Dim sCurrMaterial As String = ""
GetMainPrivateProfileString(S_PRINTING3D, K_CURRMATERIAL, "", sCurrMaterial)
m_SelMaterial = MaterialList.FirstOrDefault(Function(x) x.sGUID = sCurrMaterial)
NotifyPropertyChanged(NameOf(SelMaterial))
End Sub
#End Region ' METHODS
@@ -121,9 +123,9 @@ Public Class MaterialDbVM
End Property
Public Sub Ok()
If m_SelMaterial.bIsModified Then
If Not IsNothing(m_SelMaterial) AndAlso m_SelMaterial.bIsModified Then
' chiedo se salvare
Select Case MessageBox.Show("Salvare le modifiche apportate al materiale selezionato?", "Warning", MessageBoxButton.YesNoCancel, MessageBoxImage.Warning)
Select Case MessageBox.Show("Do you want to save material modification?", "Warning", MessageBoxButton.YesNoCancel, MessageBoxImage.Warning)
Case MessageBoxResult.Yes
m_SelMaterial.Save()
Case MessageBoxResult.No
@@ -133,8 +135,7 @@ Public Class MaterialDbVM
End Select
End If
If m_bIsModified Then
Dim sMatIniFilePath As String = Map.refMainWindowVM.MainWindowM.sMaterialsDir & "/Materials.ini"
Dim sBakMatIniFilePath As String = Path.ChangeExtension(sMatIniFilePath, ".bak")
Dim sBakMatIniFilePath As String = Path.ChangeExtension(CurrentMachine.sMaterialsFilePath, ".bak")
If File.Exists(sBakMatIniFilePath) Then
Try
' cambio estensione in bak a file Db vecchio
@@ -142,24 +143,24 @@ Public Class MaterialDbVM
Catch ex As Exception
End Try
End If
If File.Exists(sMatIniFilePath) Then
If File.Exists(CurrentMachine.sMaterialsFilePath) Then
Try
' cambio estensione in bak a file Db vecchio
File.Move(sMatIniFilePath, sBakMatIniFilePath)
File.Move(CurrentMachine.sMaterialsFilePath, sBakMatIniFilePath)
Catch ex As Exception
End Try
End If
' se ancora esiste lo elimino
If File.Exists(sMatIniFilePath) Then
If File.Exists(CurrentMachine.sMaterialsFilePath) Then
Try
File.Delete(sMatIniFilePath)
File.Delete(CurrentMachine.sMaterialsFilePath)
Catch ex As Exception
End Try
End If
' creo nuovo file
If Not File.Exists(sMatIniFilePath) Then
If Not File.Exists(CurrentMachine.sMaterialsFilePath) Then
Try
File.WriteAllLines(sMatIniFilePath, {"; Commento per evitare BOM con UTF-8"})
File.WriteAllLines(CurrentMachine.sMaterialsFilePath, {"; Commento per evitare BOM con UTF-8"})
Catch ex As Exception
End Try
End If
@@ -168,6 +169,18 @@ Public Class MaterialDbVM
m_MaterialList(Index).WriteParamsOnDb(Index + 1)
Next
m_bIsModified = False
' aggiorno lista materiali Db
Init()
' aggiorno lista materiali TopBar
Dim PrevMaterialGuid As String = Map.refTopPanelVM.SelMaterial.sGUID
Map.refTopPanelVM.InitMaterialList()
Dim PrevMaterial As MaterialIndex = Map.refTopPanelVM.MaterialList.FirstOrDefault(Function(x) x.sGUID = PrevMaterialGuid)
If Not IsNothing(PrevMaterial) Then
Map.refTopPanelVM.SetSelMaterial(PrevMaterial)
Else
Map.refTopPanelVM.SelMaterial = Nothing
Map.refTopPanelVM.NotifyPropertyChanged(NameOf(Map.refTopPanelVM.SelMaterial))
End If
End If
' ripristino modalita' standard
Map.refTopPanelVM.SelPage = Pages.MODIFY
@@ -239,6 +252,8 @@ Public Class MaterialDbVM
Select Case MessageBox.Show("Sei sicuro di voler cancellare la lavorazione selezionata?", "Warning", MessageBoxButton.YesNo, MessageBoxImage.Warning)
Case MessageBoxResult.Yes
m_MaterialList.Remove(m_SelMaterial)
' segno Db come modificato
Map.refMaterialDbVM.SetIsModified(True)
Case MessageBoxResult.No
Return
End Select
+3
View File
@@ -124,6 +124,9 @@
Binding="{Binding sTCurr}"
IsReadOnly="True"
Width="1*"/>
<DataGridTextColumn Header="TWait"
Binding="{Binding sTWait}"
Width="1*"/>
<DataGridTextColumn Header="FMin"
Binding="{Binding sFMin}"
IsReadOnly="True"
+34 -13
View File
@@ -42,11 +42,11 @@
FontWeight="Light"
VerticalContentAlignment="Center">
</ComboBox>
<Button Grid.Column="1"
<!--<Button Grid.Column="1"
Command="{Binding PartModify_Command}"
Style="{StaticResource PrintParamDb_Button}">
<Image Source="/Resources/TopPanel/Edit.png"/>
</Button>
</Button>-->
</Grid>
<ToggleButton x:Name="ModifyBtn"
Content="{Binding SelectedItem.sName, ElementName=ModifyModeListBox}"
@@ -146,28 +146,49 @@
VerticalContentAlignment="Center"
HorizontalContentAlignment="Stretch"
Style="{StaticResource PrintParam_ToggleButton}">
<UniformGrid Rows="1" HorizontalAlignment="Stretch">
<Grid HorizontalAlignment="Stretch">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="2*"/>
<ColumnDefinition Width="1*"/>
<ColumnDefinition Width="2*"/>
<ColumnDefinition Width="1*"/>
<ColumnDefinition Width="2*"/>
<ColumnDefinition Width="1*"/>
<ColumnDefinition Width="2*"/>
<ColumnDefinition Width="1*"/>
<ColumnDefinition Width="2*"/>
<ColumnDefinition Width="1*"/>
</Grid.ColumnDefinitions>
<TextBlock Text="45°:"
HorizontalAlignment="Right"/>
<TextBlock Text="{Binding CurrMachining.bCurrSlicing45}"
<TextBlock Grid.Column="1"
Text="{Binding CurrMachining.bCurrSlicing45}"
HorizontalAlignment="Left"/>
<TextBlock Text="StrandH:"
<TextBlock Grid.Column="2"
Text="StrandH:"
HorizontalAlignment="Right"/>
<TextBlock Text="{Binding CurrMachining.sCurrStrandH}"
<TextBlock Grid.Column="3"
Text="{Binding CurrMachining.sCurrStrandH}"
HorizontalAlignment="Left"/>
<TextBlock Text="StrandW:"
<TextBlock Grid.Column="4"
Text="StrandW:"
HorizontalAlignment="Right"/>
<TextBlock Text="{Binding CurrMachining.sCurrStrandW}"
<TextBlock Grid.Column="5"
Text="{Binding CurrMachining.sCurrStrandW}"
HorizontalAlignment="Left"/>
<TextBlock Text="StrandCount:"
<TextBlock Grid.Column="6"
Text="StrandCount:"
HorizontalAlignment="Right"/>
<TextBlock Text="{Binding CurrMachining.sCurrStrandCount}"
<TextBlock Grid.Column="7"
Text="{Binding CurrMachining.sCurrStrandCount}"
HorizontalAlignment="Left"/>
<TextBlock Text="Offset:"
<TextBlock Grid.Column="8"
Text="Offset:"
HorizontalAlignment="Right"/>
<TextBlock Text="{Binding CurrMachining.sCurrOffset}"
<TextBlock Grid.Column="9"
Text="{Binding CurrMachining.sCurrOffset}"
HorizontalAlignment="Left"/>
</UniformGrid>
</Grid>
</ToggleButton>
</Grid>
</Border>
+24 -7
View File
@@ -92,10 +92,15 @@ Public Class TopPanelVM
' imposto pagina di modifica
SetSelPage(Pages.MODIFY)
End If
m_SelModifyMode = value
If Not IsNothing(value) AndAlso Map.refTopPanelVM.m_PartList.Count > 0 AndAlso Not IsNothing(Map.refTopPanelVM.SelPart) Then
' se non c'e' pezzo selezionato , modalita' nulla
If IsNothing(m_SelPart) Then
m_SelModifyMode = Nothing
Else
m_SelModifyMode = value
End If
If Not IsNothing(m_SelModifyMode) AndAlso Map.refTopPanelVM.m_PartList.Count > 0 AndAlso Not IsNothing(Map.refTopPanelVM.SelPart) Then
Dim SelLeftPanel As LeftPanelVM.Panels = LeftPanelVM.Panels.NULL
Select Case value.ModifyMode
Select Case m_SelModifyMode.ModifyMode
Case ModifyModes.DISPOSITION
SelLeftPanel = LeftPanelVM.Panels.DISPOSITION
Case ModifyModes.REFERENCE
@@ -198,12 +203,22 @@ Public Class TopPanelVM
Return m_SelMaterial
End Get
Set(value As MaterialIndex)
' salvo materiale selezionato come ultimo utilizzato
If Not IsNothing(value) Then WriteMainPrivateProfileString(S_PRINTING3D, K_CURRMATERIAL, value.sGUID)
' salvo selezionato per riselezionarlo
Dim PrevMachiningGuid As Guid = m_SelMachining.sGUID
' seleziono materiale
m_SelMaterial = value
WriteMainPrivateProfileString(S_PRINTING3D, K_CURRMATERIAL, value.sGUID)
' ricarico lista lavorazioni valide per il materiale selezionato
InitMachiningsList()
Dim PrevMachining As MachiningIndex = m_MachiningList.FirstOrDefault(Function(x) x.sGUID = PrevMachiningGuid)
SetSelMachining(If(Not IsNothing(PrevMachining), PrevMachining, Nothing))
End Set
End Property
Friend Sub SetSelMaterial(value As MaterialIndex)
m_SelMaterial = value
NotifyPropertyChanged(NameOf(SelMaterial))
End Sub
#End Region ' Material
@@ -305,9 +320,10 @@ Public Class TopPanelVM
Dim nIndex As Integer = 1
Dim sGUID As String = ""
Dim sName As String = ""
While GetPrivateProfileString(nIndex, MAT_GUID, "", sGUID, Map.refMainWindowVM.MainWindowM.sMaterialsDir & "/Materials.ini") > 0
While ReadMaterialParamString(nIndex, MAT_GUID, "", sGUID) > 0
' leggo nome
EgtGetStringUtf8FromIni(nIndex, MAT_NAME, "", sName, Map.refMainWindowVM.MainWindowM.sMaterialsDir & "/Materials.ini")
ReadMaterialParamString(nIndex, MAT_NAME, "", sName)
' EgtGetStringUtf8FromIni(nIndex, MAT_NAME, "", sName)
MaterialList.Add(New MaterialIndex(nIndex, sGUID, sName))
nIndex += 1
End While
@@ -349,7 +365,8 @@ Public Class TopPanelVM
GetMainPrivateProfileString(S_PRINTING3D, K_CURRMACHINING, "", sCurrMachining)
Dim CurrMachining As Guid
Guid.TryParse(sCurrMachining, CurrMachining)
SelMachining = MachiningList.FirstOrDefault(Function(x) x.sGUID = CurrMachining)
m_SelMachining = MachiningList.FirstOrDefault(Function(x) x.sGUID = CurrMachining)
NotifyPropertyChanged(NameOf(SelMachining))
End Sub
Friend Function GetSelMachining() As Machining
+24
View File
@@ -82,6 +82,7 @@ Public Module CurrentMachine
EgtRemoveMachGroup(nQqqId Or GDB_ID.NULL)
' carico materiali e lavorazioni
Map.refTopPanelVM.InitMaterialList()
Map.refMaterialDbVM.Init()
Map.refTopPanelVM.InitMachiningsList()
Map.refMachiningDbVM.Init()
' Ripristino stato segnalazione modifica
@@ -171,6 +172,29 @@ Public Module CurrentMachine
End If
End Function
Friend Function ReadMaterialParamString(lpAppName As String, lpKeyName As String, lpDefault As String, ByRef lpString As String) As Integer
Dim nResult As Integer = GetPrivateProfileString(lpAppName, lpKeyName, lpDefault, lpString, m_sMaterialsFilePath)
If Not String.IsNullOrWhiteSpace(lpString) Then
'lpString = EgwCrypto.DecryptString(lpString, m_Salt)
lpString = EgwCrypto.PowerDecryptString(lpString, m_Salt)
Else
lpString = ""
End If
Return nResult
End Function
Friend Function ReadMaterialParamDouble(lpAppName As String, lpKeyName As String, dDefault As Double) As Double
Dim sParam As String = ""
Dim dParam As Double = dDefault
ReadMaterialParamString(lpAppName, lpKeyName, dDefault, sParam)
StringToDouble(sParam, dParam)
Return dParam
End Function
Friend Function WriteMaterialParam(lpAppName As String, lpKeyName As String, lpString As String) As Boolean
Return WritePrivateProfileString(lpAppName, lpKeyName, EgwCrypto.PowerEncryptString(lpString, m_Salt), m_sMaterialsFilePath)
End Function
#End Region 'Methods
End Module