Updates to fix a few bugs in G-Code generation. Fixed graphic bug in execution screen

Author: nkleiner

PrusaMK4S/Handlers/GCodeHandler.cs

@@ -374,8 +374,10 @@ public async Task<byte[]> CreatePrintIteration(int iteration)
     if(AdjustedFileData is null)
       await Init();
 
-    if(iteration == 1)
-      return AdjustedFileData!;
+    if(iteration == 1 && AdjustedFileData is not null)
+    {
+      return AdjustedFileData;
+    }
 
     else
     {
@@ -531,6 +533,7 @@ private async Task<byte[]> GenerateFirstPrintData()
 
     var startup_gcode = stringData.Take(ModificationStartIndex).ToList();
     var shifted_startup = ShiftInitialPurgeLine(startup_gcode);
+    shifted_startup = UpdateBedLeveling(shifted_startup, 0);
 
     var modifiedData = shifted_startup
       .Concat(stringData
@@ -560,7 +563,10 @@ private List<string> ShiftInitialPurgeLine(List<string> gcode)
       }
 
       else if(line.StartsWith("G") && shouldEdit)
-        updatedGcode.Add(ApplyPurgeXOffset(line.Split(), 200));
+      {
+        var updatedLine = ApplyPurgeXOffset(line.Split(), 200);
+        updatedGcode.Add(updatedLine);
+      }
 
       else
         updatedGcode.Add(line);

PrusaMK4S/PrusaMK4s.cs

@@ -172,12 +172,20 @@ public async Task<MK4SRequestResponse> MoveToLastPrint(int z, int dwell, int xOf
       var calculated_y = LatestGCodeHandler.GetPrintBedHeight() - (Math.Abs(LatestGCodeHandler.LatestYShift) + (itemHeight / 2)) + yOffset;
       var calculated_x = LatestGCodeHandler.LatestXShift + (itemWidth / 2) + xOffset;
 
-      var moveResponse = await MovePrinter((int)calculated_x, (int)calculated_y, z, dwell);
-      
-      //This delay allows for the print heads potential travel time
-      await Task.Delay(TimeSpan.FromSeconds(3));
+      try
+      {
+        var moveResponse = await MovePrinter((int)calculated_x, (int)calculated_y, z, dwell);
 
-      return moveResponse;
+        //This delay allows for the print heads potential travel time
+        await Task.Delay(TimeSpan.FromSeconds(3));
+
+        return moveResponse;
+      }
+
+      catch(Exception e)
+      {
+        return new MK4SRequestResponse { Success = false, ErrorString = $"Move Printer Method Failed! {e.Message}" };
+      }
     }
 
     catch(Exception ex)

UI/Pages/Automation/Execution.razor

@@ -199,6 +199,19 @@
         <RadzenSwitch id="smart_calculate_switch" @bind-Value="@ViewModel!.SmartPrintCalculation" Change="@ViewModel!.SetSmartExperimentsToRun"/>
       </div>
 
+      @if (ViewModel!.CurrentStopCondition is not null)
+      {
+        <div class="border border-1 rounded-2 p-2">
+          <div class="d-flex flex-column">
+            <div>
+              Condition: @GenerateStopConditionDisplayName()
+            </div>
+            <div>@ViewModel!.CurrentStopCondition.Description</div>
+            <div>Campaign will re-plan every @ViewModel!.DesiredReplanRate.ToString() experiment(s)</div>
+          </div>
+        </div>
+      }
+
       @if(!ViewModel!.SmartPrintCalculation)
       {
         <div class="d-flex flex-column">
@@ -225,18 +238,6 @@
           <input type="number" class="form-control" @bind="ViewModel!.ExperimentsToRun" disabled/>
         </div>
       }
-      @if (ViewModel!.CurrentStopCondition is not null)
-      {
-        <div class="border border-1 rounded-2 p-2">
-          <div class="d-flex flex-column">
-            <div>
-              Condition: @GenerateStopConditionDisplayName()
-            </div>
-            <div>@ViewModel!.CurrentStopCondition.Description</div>
-            <div>Campaign will re-plan every @ViewModel!.DesiredReplanRate.ToString() experiment(s)</div>
-          </div>
-        </div>
-      }
 
       <div class="d-flex flex-column padded-item">
         <h6>Re-Planning Rate</h6>