Fix bug where blank lines led to incomplete toolchanges

ansonl · ansonl · commit 002ebbf6253d · 2024-11-13T15:25:59.000-08:00
diff --git a/src/gui.py b/src/gui.py
@@ -21,7 +21,7 @@
 # UI Constants
 APP_NAME_ABBREVIATION = 'MFM'
 APP_NAME = f'3D G-code Map Feature Modifier ({APP_NAME_ABBREVIATION})'
-APP_VERSION = '1.6.0'
+APP_VERSION = '1.6.1'
 POST_PROCESS_BUTTON = 'Post Process'
 POST_PROCESS_BUTTON_PROCESSING = 'Processing'
 
@@ -168,7 +168,7 @@ def create_widgets(self):
     gcodeFlavorLabel.grid(row=0, column=0, sticky=tk.W, padx=10)
     gcodeFlavorComboBox = ttk.Combobox(
       state="readonly",
-      values=['Marlin 2 (PrusaSlicer/Bambu Studio)']
+      values=['Marlin 2 (PrusaSlicer/Bambu Studio/Orca Slicer)']
     )
     gcodeFlavorComboBox.current(0)
     gcodeFlavorComboBox.grid(row=0, column=1, sticky=tk.EW, padx=10, pady=10)
@@ -326,11 +326,13 @@ def postProcessTask():
         if TEST_MODE:
           #userOptions[CONFIG_INPUT_FILE] = 'sample_models/dual_color_dice/tests/dice_multiple_bambu_prime.gcode'
           #userOptions[CONFIG_INPUT_FILE] = 'sample_models/dual_color_dice/tests/dice_multiple_bambu_no_prime.gcode'
-          userOptions[CONFIG_INPUT_FILE] = 'sample_models/dual_color_dice/tests/dice_multiple_prusa_prime.gcode'
+          userOptions[CONFIG_INPUT_FILE] = 'sample_models/dual_color_dice/tests/dice_multiple_orca_prime.gcode'
+          #userOptions[CONFIG_INPUT_FILE] = 'sample_models/dual_color_dice/tests/dice_multiple_orca_no_prime.gcode'
+          #userOptions[CONFIG_INPUT_FILE] = 'sample_models/dual_color_dice/tests/dice_multiple_prusa_prime.gcode'
           #userOptions[CONFIG_INPUT_FILE] = 'sample_models/dual_color_dice/tests/dice_multiple_prusa_no_prime.gcode'
           userOptions[IMPORT_OPTIONS_FILENAME] = 'sample_models/dual_color_dice/config-dice-test.json'
-          #userOptions[CONFIG_TOOLCHANGE_MINIMAL_FILE] = 'minimal_toolchanges/bambu-x1-series.gcode'
-          userOptions[CONFIG_TOOLCHANGE_MINIMAL_FILE] = 'minimal_toolchanges/prusa-xl-series.gcode'
+          userOptions[CONFIG_TOOLCHANGE_MINIMAL_FILE] = 'minimal_toolchanges/bambu-x1-series.gcode'
+          #userOptions[CONFIG_TOOLCHANGE_MINIMAL_FILE] = 'minimal_toolchanges/prusa-xl-series.gcode'
           userOptions[CONFIG_OUTPUT_FILE] = 'dice-export.gcode'
 
           #userOptions[CONFIG_INPUT_FILE] = 'sample_models/CA/ca_p3.gcode'
diff --git a/src/mfm/map_post_process.py b/src/mfm/map_post_process.py
@@ -128,6 +128,10 @@ def addFeatureToList(ps: PrintState, cf: Feature):
       # wipe_end marker for normal printing features to skip
       wipeEndMatch = re.match(WIPE_END, cl)
 
+      #Debug
+      if f.tell() == 155194:
+        0==0
+
       # end if we find next layer marker
       if changeLayerMatch:
         printState.layerEnd = f.tell() - len(cl) - (len(le)-1)
@@ -138,10 +142,6 @@ def addFeatureToList(ps: PrintState, cf: Feature):
         printState.layerEndOriginalColor = curOriginalColor
         break
       
-      #Debug
-      if f.tell() == 125095:
-        0==0
-
       checkAndUpdatePosition(cl=cl, pp=curStartPosition)
 
       # If UNIVERSAL LAYER CHANGE END found first, look ahead to see if a new feature is the first thing on this layer or previous feature is continued.
@@ -191,7 +191,7 @@ def addFeatureToList(ps: PrintState, cf: Feature):
 
       # Look for FEATURE to find feature type
       if featureTypeMatch or (len(printState.features) == 0 and useFirstSpecialGcodeAsFeature and specialGcodeMatch):
-        #print(f"found FEATURE match at {f.tell() - len(cl) - (len(le)-1)}")
+        print(f"found FEATURE match {featureTypeMatch.groups()[0] if featureTypeMatch else 'None'} at {f.tell() - len(cl) - (len(le)-1)}")
 
         # Don't end prime tower if we found prime tower feature for Bambu
         if curFeature and curFeature.featureType == PRIME_TOWER and featureTypeMatch and (featureTypeMatch.groups()[0] == PRIME_TOWER or featureTypeMatch.groups()[0] == WIPE_TOWER):
@@ -236,7 +236,7 @@ def addFeatureToList(ps: PrintState, cf: Feature):
       # A toolchange is found UNIVERSAL_TOOLCHANGE_START
       elif univeralToolchangeStartMatch: 
         curFeature.toolchange = Feature()
-        curFeature.toolchange.featureType = TOOLCHANGE
+        curFeature.toolchange.featureType = TOOLCHANGE                                                 
         curFeature.toolchange.start = f.tell() - len(cl) - (len(le)-1)
         #print(f"found toolchange start at {curFeature.toolchange.start}")
         continue
@@ -253,6 +253,7 @@ def addFeatureToList(ps: PrintState, cf: Feature):
       elif univeralToolchangeEndMatch:
         if curFeature.toolchange == None:
           print(f"toolchange end found before toolchange start at {f.tell()} set .end to {f.tell() - len(cl) - (len(le)-1)}")
+          1==0 # assert crash
           break
         curFeature.toolchange.end = f.tell() - len(cl) - (len(le)-1)
         #print(f"found toolchange end at {curFeature.toolchange.end}")
@@ -346,10 +347,14 @@ def checkAndInsertToolchange(ps: PrintState, f: typing.TextIO, out: typing.TextI
       nextAvailablePrimeTowerFeature = ps.primeTowerFeatures.pop(0)
       cp = f.tell()
       f.seek(nextAvailablePrimeTowerFeature.start, os.SEEK_SET)
-      while f.tell() <= nextAvailablePrimeTowerFeature.end:
+      # We check if the position is != instead of <= because readline() with the next line being empty meaning it looks like double line endings leads to high tell() values that do not make sense but still seek to the correct position anyways.
+      while f.tell() != nextAvailablePrimeTowerFeature.end:
         cl = f.readline()
 
-        # Skip WIPE_END of the inserted prime tower
+        if f.tell() == 155194:
+          0==0
+
+        # Skip WIPE_END of the nserted prime tower
         if nextAvailablePrimeTowerFeature.wipeEnd and f.tell() == nextAvailablePrimeTowerFeature.wipeEnd.start:
           writeWithFilters(out, cl, loadedColors)
           out.write(";WIPE_END placeholder for PrusaSlicer Gcode Viewer\n")
diff --git a/src/mfm/printing_classes.py b/src/mfm/printing_classes.py
@@ -34,14 +34,29 @@ class SkipType(enum.Enum):
 
 # State of current Print FILE
 class PrintState:
+  """The current state of the processed G-code file."""
+
   def __init__(self):
     self.height: float = -1 
+    """The current printing height relative to the buildplate."""
+
     self.layerHeight: float = 0
+    """The layer height of an individual layer relative to the top of the last layer. E.g. 0.12, 0.2"""
+
     self.previousLayerHeight: float = 0
+    """The previous layer's layer height."""
+
     self.layerStart: int = 0
+    """The character position of the layer start."""
+
     self.layerEnd: int = 0
+    """The character position of the layer end."""
+
     self.lastFeature: Feature = None
+    """Reference to last original feature of the previous layer. Used in case it originally continues to next layer."""
+
     self.prevLayerLastFeature: Feature = None
+    """Reference to last original feature of the layer before the previous layer."""
 
     # Color info
     self.originalColor: int = -1 # last color changed to in original print at the start of the layer
