update checker: add check_required_gcodes_position

gcode_analyzer_ui.py

@@ -1,13 +1,14 @@
 # app.py
 
 import streamlit as st
+import pandas as pd
+from streamlit_ace import st_ace
 from python_gcode_checker import run_checks
 from settings_report_details import generate_detailed_report
 
 def analyze_gcode(gcode, depth_max=0.1):
     errors, warnings = run_checks(gcode, depth_max)
     config_report = generate_detailed_report(gcode)
-    
     return errors, warnings, config_report
 
 def format_issues(issues):
@@ -19,7 +20,16 @@ def format_issues(issues):
             formatted.append(message)  # No "Line 0" for general warnings/errors
     return formatted
 
-# Streamlit UI
+def parse_config_report(config_report):
+    config_lines = config_report.strip().split('\n')
+    config_data = {"Setting": [], "Value": []}
+    for line in config_lines:
+        if ':' in line:
+            key, value = line.split(':', 1)
+            config_data["Setting"].append(key.strip())
+            config_data["Value"].append(value.strip())
+    return pd.DataFrame(config_data)
+
 st.title("G-code Programming Assistant (v0.1)")
 
 st.markdown("""
@@ -30,18 +40,14 @@ Welcome to the G-code Assistant! This tool helps you verify and analyze your G-c
 This is a beta version, and you're free to use it for checking your G-codes. If you encounter any issues or unexpected behavior, please contact the developer at **nico.aspra@bicol-u.edu.ph**.
 """)
 
-# Input for maximum depth of cut
 depth_max = st.number_input("Maximum Depth of Cut", min_value=0.0, value=0.1, step=0.1, format="%.1f")
 
-# Text area for G-code input
-gcode_input = st.text_area("Input G-code", height=300, placeholder="Enter G-code here...")
+# Use Ace editor for G-code input with line numbering
+gcode_input = st_ace(language='text', theme='cobalt', placeholder="Enter G-code here...", font_size=14, height=300)
 
-# Button to analyze G-code
 if st.button("Analyze G-code"):
-    # Run analysis
     errors, warnings, config_report = analyze_gcode(gcode_input, depth_max)
     
-    # Display Errors with count in the subheader
     st.subheader(f"Errors ({len(errors)})")
     if errors:
         for message in format_issues(errors):
@@ -49,7 +55,6 @@ if st.button("Analyze G-code"):
     else:
         st.success("No errors found.")
     
-    # Display Warnings with count in the subheader
     st.subheader(f"Warnings ({len(warnings)})")
     if warnings:
         for message in format_issues(warnings):
@@ -57,10 +62,9 @@ if st.button("Analyze G-code"):
     else:
         st.info("No warnings found.")
     
-    # Display Configuration Settings
     st.subheader("Configuration Settings")
-    st.text(config_report)
-    
-# Footer
+    config_df = parse_config_report(config_report)
+    st.table(config_df)
+
 st.markdown("---")
 st.markdown("Developed by **Aspra, N.**")

python_gcode_checker.py

@@ -54,10 +54,10 @@ def check_required_gcodes(lines_with_numbers):
     Returns a list of errors with individual entries for each missing group.
     """
     required_groups = {
-        "units": {"G20", "G21"},
-        "mode": {"G90", "G91"},
-        "work_coordinates": {"G54", "G55", "G56", "G57", "G58", "G59"},
-        "plane": {"G17", "G18", "G19"},
+        "units": {"G20", "G21"},  # Metric or Imperial Units
+        "mode": {"G90", "G91"},  # Absolute or Incremental Mode
+        "work_coordinates": {"G54", "G55", "G56", "G57", "G58", "G59"},  # Work Offsets
+        "plane": {"G17", "G18", "G19"},  # Selected Plane
     }
 
     # Create a set to track found codes and their line numbers
@@ -72,6 +72,7 @@ def check_required_gcodes(lines_with_numbers):
     
     # Check for presence of required codes
     for category, codes in required_groups.items():
+        # Only flag as missing if both options in a group are absent
         found = any(code in found_codes for code in codes)
         if not found:
             missing_codes = "/".join(sorted(codes))
@@ -86,6 +87,60 @@ def check_required_gcodes(lines_with_numbers):
 
     return missing_group_errors
 
+def check_required_gcodes_position(lines_with_numbers):
+    """
+    Ensures required G-codes appear before movement commands.
+    Flags changes in critical settings (e.g., units) after movement commands.
+    """
+    issues = []
+    movement_seen = False
+    required_groups = {
+        "units": {"G20", "G21"},
+        "mode": {"G90", "G91"},
+        "work_coordinates": {"G54", "G55", "G56", "G57", "G58", "G59"},
+        "plane": {"G17", "G18", "G19"},
+    }
+    critical_gcodes = {
+        "units": {"G20", "G21"},
+        "plane": {"G17", "G18", "G19"},
+    }
+
+    # Track codes found before movement commands
+    codes_before_movement = set()
+
+    for original_line_number, line in lines_with_numbers:
+        tokens = line.split()
+
+        # Check if movement commands are encountered
+        if not movement_seen and any(cmd in tokens for cmd in {"G00", "G01", "G02", "G03"}):
+            movement_seen = True
+
+        if not movement_seen:
+            # Collect required G-codes found before movement
+            codes_before_movement.update(tokens)
+        else:
+            # After movement commands have been seen, check for critical G-codes
+            for token in tokens:
+                for category, codes in critical_gcodes.items():
+                    if token in codes:
+                        issues.append((original_line_number, f"(Warning) {token} appears after movement commands. Ensure this change is intentional -> {line.strip()}"))
+
+    # Check for missing required G-codes before movement commands
+    missing_groups = []
+    for category, codes in required_groups.items():
+        if not any(code in codes_before_movement for code in codes):
+            missing_codes = "/".join(sorted(codes))
+            missing_groups.append(f"({category}) {missing_codes}")
+
+    if missing_groups:
+        first_movement_line = next(
+            (line_num for line_num, line in lines_with_numbers if any(cmd in line for cmd in {"G00", "G01", "G02", "G03"})),
+            1
+        )
+        issues.append((first_movement_line, f"(Error) Missing required G-codes before first movement: {', '.join(missing_groups)}"))
+
+    return issues
+
 def check_end_gcode(lines_with_numbers):
     """
     Checks that M30 is the last G-code command.
@@ -378,8 +433,9 @@ def run_checks(gcode, depth_max=0.1):
     # Preprocess G-code to remove comments and get cleaned lines with original line numbers
     lines_with_numbers = preprocess_gcode(gcode)
 
-    # Run all checks
+    # Collect issues from all checks
     required_gcode_issues = check_required_gcodes(lines_with_numbers)
+    required_gcode_position_issues = check_required_gcodes_position(lines_with_numbers)
     spindle_issues = check_spindle(lines_with_numbers)
     feed_rate_issues = check_feed_rate(lines_with_numbers)
     depth_issues = check_depth_of_cut(lines_with_numbers, depth_max)
@@ -390,6 +446,7 @@ def run_checks(gcode, depth_max=0.1):
     # Combine all issues
     all_issues = (
         required_gcode_issues
+        + required_gcode_position_issues
         + spindle_issues
         + feed_rate_issues
         + depth_issues
@@ -415,10 +472,12 @@ if __name__ == "__main__":
     # Example usage
     gcode_sample = """
     %
-    G21 G90 G54 G17
+    G21 G90 G17 G54
     G00 X0 Y0 Z5.0
     M03 S1000
     G01 Z-0.1 F100  ; Plunge using rapid movement (should be G01)
+    G54
+    G01 Z-0.1
     G01 X10 Y10 
     G01 X20 Y20
     G00 Z5.0   ; Retract using rapid movement (allowed since Z > 0)