Icarus :

- corretta gestione decimali in lavorazioni per double/len - cambiato nome CoastingFeed in CoastingFeedPu.
2022-10-27 22:22:14 +02:00
parent c6732698e8
commit c9b9646bbb
3 changed files with 23 additions and 23 deletions
@@ -90,7 +90,7 @@
   Public Const MAC_LEADOUTTANGDIST = "LeadOutTangDist"
   Public Const MAC_LEADOUTORTHODIST = "LeadOutOrthoDist"
   Public Const MAC_COASTINGLEN = "CoastingLen"
-   Public Const MAC_COASTINGFEED = "CoastingFeed"
+   Public Const MAC_COASTINGFEEDPU = "CoastingFeedPu"
   Public Const MAC_WIPELEN = "WipeLen"
   Public Const MAC_WIPEFEEDPU = "WipeFeedPu"
   Public Const MAC_WIPEDIR = "WipeDir"
@@ -209,7 +209,7 @@ Public Class CurrMachiningCathegory
                                                                New CurrNumericMachiningParam(MachiningParam.Params.LEADOUTTANGDIST, nPartId, nIndex, bForceFromDb),
                                                                New CurrNumericMachiningParam(MachiningParam.Params.LEADOUTORTHODIST, nPartId, nIndex, bForceFromDb),
                                                                New CurrNumericMachiningParam(MachiningParam.Params.COASTINGLEN, nPartId, nIndex, bForceFromDb),
-                                                                New CurrNumericMachiningParam(MachiningParam.Params.COASTINGFEED, nPartId, nIndex, bForceFromDb),
+                                                                New CurrNumericMachiningParam(MachiningParam.Params.COASTINGFEEDPU, nPartId, nIndex, bForceFromDb),
                                                                New CurrNumericMachiningParam(MachiningParam.Params.WIPELEN, nPartId, nIndex, bForceFromDb),
                                                                New CurrNumericMachiningParam(MachiningParam.Params.WIPEFEEDPU, nPartId, nIndex, bForceFromDb),
                                                                New CurrNumericMachiningParam(MachiningParam.Params.WIPEDIR, nPartId, nIndex, bForceFromDb)})
@@ -273,13 +273,13 @@ Public Class CurrNumericMachiningParam

   Public Overrides Property sValue As String
      Get
-         Return If(m_bIsLen, LenToString(m_dValue, 1), m_dValue)
+         Return If(m_bIsLen, LenToString(m_dValue, 1), DoubleToString( m_dValue, 2))
      End Get
      Set(value As String)
         If m_bIsLen Then
            StringToLen(value, m_dValue)
         Else
-            m_dValue = value
+            StringToDouble( value, m_dValue)
         End If
         NotifyPropertyChanged(NameOf(sValue))
         NotifyPropertyChanged(NameOf(bIsModifiedFromDb))
@@ -348,15 +348,15 @@ Public Class CurrNumericMachiningParam
         Case Params.COASTINGLEN
            bReadFromPart = EgtGetInfo(nPartId, MAC_COASTINGLEN, m_dValue)
            m_bIsLen = True
-         Case Params.COASTINGFEED
-            bReadFromPart = EgtGetInfo(nPartId, MAC_COASTINGFEED, m_dValue)
-            m_bIsLen = True
+         Case Params.COASTINGFEEDPU
+            bReadFromPart = EgtGetInfo(nPartId, MAC_COASTINGFEEDPU, m_dValue)
+            m_bIsLen = False
         Case Params.WIPELEN
            bReadFromPart = EgtGetInfo(nPartId, MAC_WIPELEN, m_dValue)
            m_bIsLen = True
         Case Params.WIPEFEEDPU
            bReadFromPart = EgtGetInfo(nPartId, MAC_WIPEFEEDPU, m_dValue)
-            m_bIsLen = True
+            m_bIsLen = False
         Case Params.WIPEDIR
            bReadFromPart = EgtGetInfo(nPartId, MAC_WIPEDIR, m_dValue)
            m_bIsLen = True
@@ -431,7 +431,7 @@ Public Class CurrNumericMachiningParam
            Case Params.STRANDH, Params.STRANDW, Params.STRANDCOUNT, Params.OFFSET, Params.STRANDOVERLAP, Params.STARTPOINTOFFSETONSLICE, Params.FLOORCOUNT, Params.G0FEED, Params.TOOLDIAM, Params.CONSTANT
               m_DbParam = DbMachining.CathegoryList.FirstOrDefault(Function(y) y.Type = MachiningCathegory.Cathegories.GENERAL).MachiningParamList.FirstOrDefault(Function(z) z.Type = m_Type)
            Case Params.LINKPARAM, Params.LINKZUP, Params.OFFSETLEADPOINT, Params.LEADINTANGDIST, Params.LEADINORTHODIST,
-                 Params.LEADOUTTANGDIST, Params.LEADOUTORTHODIST, Params.COASTINGLEN, Params.COASTINGFEED, Params.WIPELEN, Params.WIPEFEEDPU, Params.WIPEDIR
+                 Params.LEADOUTTANGDIST, Params.LEADOUTORTHODIST, Params.COASTINGLEN, Params.COASTINGFEEDPU, Params.WIPELEN, Params.WIPEFEEDPU, Params.WIPEDIR
               m_DbParam = DbMachining.CathegoryList.FirstOrDefault(Function(y) y.Type = MachiningCathegory.Cathegories.LINK).MachiningParamList.FirstOrDefault(Function(z) z.Type = m_Type)
            Case Params.RIBSOVERLAP, Params.RIBSSTRANDCOUNT, Params.RIBSLINK, Params.RIBSINVERTORDER, Params.RIBSINVERTDIRECTION, Params.RIBSLEADININVERT,
               Params.RIBSLEADINLEN, Params.RIBSLEADOUTINVERT, Params.RIBSLEADOUTLEN, Params.RIBSLEADOUTCOASTING, Params.RIBSLEADOUTWIPE, Params.RIBSLEADOUTWIPEDIR
@@ -487,8 +487,8 @@ Public Class CurrNumericMachiningParam
            EgtSetInfo(nPartId, MAC_LEADOUTORTHODIST, sWriteValue)
         Case Params.COASTINGLEN
            EgtSetInfo(nPartId, MAC_COASTINGLEN, sWriteValue)
-         Case Params.COASTINGFEED
-            EgtSetInfo(nPartId, MAC_COASTINGFEED, sWriteValue)
+         Case Params.COASTINGFEEDPU
+            EgtSetInfo(nPartId, MAC_COASTINGFEEDPU, sWriteValue)
         Case Params.WIPELEN
            EgtSetInfo(nPartId, MAC_WIPELEN, sWriteValue)
         Case Params.WIPEFEEDPU
@@ -318,7 +318,7 @@ Public Class MachiningCathegory
                                                                New NumericMachiningParam(MachiningParam.Params.LEADOUTTANGDIST, nIndex),
                                                                New NumericMachiningParam(MachiningParam.Params.LEADOUTORTHODIST, nIndex),
                                                                New NumericMachiningParam(MachiningParam.Params.COASTINGLEN, nIndex),
-                                                                New NumericMachiningParam(MachiningParam.Params.COASTINGFEED, nIndex),
+                                                                New NumericMachiningParam(MachiningParam.Params.COASTINGFEEDPU, nIndex),
                                                                New NumericMachiningParam(MachiningParam.Params.WIPELEN, nIndex),
                                                                New NumericMachiningParam(MachiningParam.Params.WIPEFEEDPU, nIndex),
                                                                New NumericMachiningParam(MachiningParam.Params.WIPEDIR, nIndex)})
@@ -413,7 +413,7 @@ Public MustInherit Class MachiningParam
      LEADOUTTANGDIST = 19
      LEADOUTORTHODIST = 20
      COASTINGLEN = 21
-      COASTINGFEED = 22
+      COASTINGFEEDPU = 22
      WIPELEN = 23
      WIPEFEEDPU = 24
      FLOORCOUNT = 25
@@ -509,7 +509,7 @@ Public MustInherit Class MachiningParam
            m_sName = "Lead Out Ortho Dist"
         Case Params.COASTINGLEN
            m_sName = "Coasting Len"
-         Case Params.COASTINGFEED
+         Case Params.COASTINGFEEDPU
            m_sName = "Coasting Feed Pu"
         Case Params.WIPELEN
            m_sName = "Wipe Len"
@@ -610,13 +610,13 @@ Public Class NumericMachiningParam
   End Property
   Public Overridable Property sValue As String
      Get
-         Return If(m_bIsLen, LenToString(m_dValue, 1), m_dValue)
+         Return If(m_bIsLen, LenToString(m_dValue, 1), DoubleToString( m_dValue, 2))
      End Get
      Set(value As String)
         If m_bIsLen Then
            StringToLen(value, m_dValue)
         Else
-            m_dValue = value
+            StringToDouble( value, m_dValue)
         End If
         NotifyPropertyChanged(NameOf(sValue))
      End Set
@@ -688,21 +688,21 @@ Public Class NumericMachiningParam
            Case Params.COASTINGLEN
               m_dValue = ReadMachiningParamDouble(nIndex, MAC_COASTINGLEN, 0)
               m_bIsLen = True
-            Case Params.COASTINGFEED
-               m_dValue = ReadMachiningParamDouble(nIndex, MAC_COASTINGFEED, 0)
-               m_bIsLen = True
+            Case Params.COASTINGFEEDPU
+               m_dValue = ReadMachiningParamDouble(nIndex, MAC_COASTINGFEEDPU, 0)
+               m_bIsLen = False
            Case Params.WIPELEN
               m_dValue = ReadMachiningParamDouble(nIndex, MAC_WIPELEN, 0)
               m_bIsLen = True
            Case Params.WIPEFEEDPU
               m_dValue = ReadMachiningParamDouble(nIndex, MAC_WIPEFEEDPU, 0)
-               m_bIsLen = True
+               m_bIsLen = False
            Case Params.WIPEDIR
               m_dValue = ReadMachiningParamDouble(nIndex, MAC_WIPEDIR, 0)
               m_bIsLen = True
            Case Params.FLOORCOUNT
               m_dValue = ReadMachiningParamDouble(nIndex, MAC_FLOORCOUNT, 0)
-               m_bIsLen = True
+               m_bIsLen = False
            Case Params.G0FEED
               m_dValue = ReadMachiningParamDouble(nIndex, MAC_G0FEED, 0)
               m_bIsLen = True
@@ -804,8 +804,8 @@ Public Class NumericMachiningParam
            WriteMachiningParam(nIndex, MAC_LEADOUTORTHODIST, sWriteValue)
         Case Params.COASTINGLEN
            WriteMachiningParam(nIndex, MAC_COASTINGLEN, sWriteValue)
-         Case Params.COASTINGFEED
-            WriteMachiningParam(nIndex, MAC_COASTINGFEED, sWriteValue)
+         Case Params.COASTINGFEEDPU
+            WriteMachiningParam(nIndex, MAC_COASTINGFEEDPU, sWriteValue)
         Case Params.WIPELEN
            WriteMachiningParam(nIndex, MAC_WIPELEN, sWriteValue)
         Case Params.WIPEFEEDPU