Fixes for color palette matching (#1)

Author: dudewheresmycode

README.md

@@ -77,16 +77,28 @@ git clone https://github.com/OpenGolfSim/meshery-tool.git
 cd meshery-tool
 ```
 
-Setup a python virtual environment:
+We use pyenv to manage local builds.
 
 ```bash
-python3 -m venv venv
+pyenv virtualenv 3.13.9 mesh_venv
+```
+
+Set the virtual env (do this each time you open a new shell window)
+
+```bash
+pyenv shell mesh_venv
 ```
 
 Then install the required dependencies:
 
 ```bash
-./venv/bin/pip install -r requirements.txt
+pip install -r requirements.txt
+```
+
+Then you can run with:
+
+```bash
+python src/meshery.py
 ```
 
 #### Building Distributable Apps
@@ -99,6 +111,7 @@ To build:
 pyinstaller meshery.spec
 ```
 
+
 #### App Icons
 
 Here's how I created the app icons. First add all the files you need to the iconset folder:

src/lib/process.py

@@ -49,6 +49,8 @@ def run(self):
 
       layer_index = 0
       for layer in self.svg_info['layers']:
+        if self._running == False:
+          raise Exception("Canceled")
         num_points = max(int(layer['path'].length()) * 20, 100)
         num_points = min(num_points, 10000)
         poly = path_to_polygon(layer['path'], num_points)
@@ -59,7 +61,7 @@ def run(self):
           self.debug_log.emit(f"Unable to determine surface type based on assigned fill color! ({layer["attr"]})")
           return None
 
-        self.debug_log.emit(f"Processing surface: {surface}, {num_points} points")
+        self.debug_log.emit(f"Processing surface: {surface}, {num_points} points")          
 
         layers.append({
           "index": layer_index,
@@ -69,8 +71,8 @@ def run(self):
           "surface": surface,
           "color": color
         })
-
         layer_index += 1
+
         # self.progress.emit(layer_index)
         # time.sleep(1)   # blocking work simulated
 
@@ -92,6 +94,8 @@ def run(self):
       layers_completed = 0
 
       for layer in layers:
+        if self._running == False:
+          raise Exception("Canceled")
         if layer['polygon'].is_empty:
           self.debug_log.emit(f"  Skipping empty polygon for {layer['surface']}")
           continue
@@ -107,18 +111,26 @@ def run(self):
           interior_spacing = 0.5
         if layer['surface'] == "river":
           interior_spacing = 0.2
+        # if layer['surface'] == "rough":
+        #   interior_spacing = 1.0
+        #   boundary_spacing = 0.75
 
         self.debug_log.emit(f"Generating {layer['label']} polygons with spacing {interior_spacing}")
         vertices, faces = triangulate_polygon(layer['polygon'], boundary_spacing, interior_spacing)
-
+        if self._running == False:
+          raise Exception("Canceled")
         if vertices.shape[0] == 0 or faces.shape[0] == 0:
           self.debug_log.emit(f"  Skipping empty shape for {layer['surface']}")
           continue
 
         # conform meshes to heightmap
         self.debug_log.emit(f"Conforming {layer['label']} polygon to heightmap")
+        
+        # keep lake surfaces flat
+        # if layer['surface'] != "water":
         vertices = map_mesh_to_heightmap(vertices, terrain_data["data"], self.svg_info["width"], self.svg_info["height"], max_world_height)
-
+        if self._running == False:
+          raise Exception("Canceled")
         face_colors = np.tile(hex_to_rgba(layer["color"]), (faces.shape[0], 1))
         mesh = trimesh.Trimesh(vertices=vertices, faces=faces, face_colors=face_colors)
 
@@ -138,9 +150,9 @@ def run(self):
       # # self.debug_log.emit(f"Exporting OBJ files to output folder: {self.output_path}")      
       # # lib.export.export_individual_obj_files(allMeshes, layers, self.output_path)
 
-      self.finished.emit(result)
+      self.finished.emit(0)
     except Exception as e:
-      self.finished.emit(None)
+      self.finished.emit(1)
       self.error.emit(str(e))
 
   def stop(self):
@@ -151,6 +163,7 @@ def stop(self):
 
 
 
+
 def generate_meshes(args, layers, terrain_data, width, height, debug_log):
   allMeshes = []
 
@@ -223,6 +236,7 @@ def parse_layers(svg_file):
       if (surface == None or color == None):
         debug_log(f"Unable to determine surface type based on assigned fill color! ({attr})", True)
         return None
+
       print(f"Processing surface: {surface}, {num_points} points")
 
       layers.append({

src/lib/surfaces.py

@@ -2,7 +2,7 @@
 
 def match_surface(attr, surfaceColorMap):
     styleAttr = attr.get('style', None)
-    colorPattern = r"fill:#([0-9a-f]+);"
+    colorPattern = r"fill:#([0-9a-f]+)"
     match_obj = re.search(colorPattern, styleAttr, re.IGNORECASE)
     surface = None
     matchedColor = None

src/lib/svg.py

@@ -12,6 +12,8 @@ def subtract_higher_layers(layers):
   union_above = None
   for layer in sorted_layers:
     poly = layer['polygon']
+    # if layer['surface'] == 'lake_surface':
+    #   continue
     if union_above:
       poly = poly.difference(union_above)
     if poly.is_empty:

src/ui/progress.py

@@ -20,6 +20,8 @@
 from PySide6.QtGui import QPixmap
 
 class UIProgress(QVBoxLayout):
+  canceled = Signal()
+
   def __init__(self, parent=None):
     super(UIProgress, self).__init__(parent)
 
@@ -61,9 +63,7 @@ def __init__(self, parent=None):
     self.addWidget(self.cancel_button)    
 
   def cancel_work(self):
-    if self.worker:
-      self.worker.stop()
-    self.switch_layout(0)
+    self.canceled.emit()
 
   def setup_progress(self, steps = 0):
     self.progress_bar.setMaximum(steps)
@@ -75,9 +75,12 @@ def update_progress(self, step = 0):
 
   def on_finished(self, result):
     # handle result (None if cancelled)
-    self.debug_log("Export completed successfully!")
-    self.progress_bar.setValue(0)
-    print("Finished!, result:", result)
+    if result == 0:
+      self.debug_log("Export completed successfully!")
+      self.progress_bar.setValue(0)
+      print("Finished!, result:", result)
+    else:
+      self.debug_log("Export failed")
 
   def debug_log(self, message):
     print(message)

src/ui/window.py

@@ -43,6 +43,8 @@ def __init__(self, parent=None):
 
     self.progress_screen = UIProgress()
 
+    self.progress_screen.canceled.connect(self.on_canceled)
+
     job_widget = QWidget()
     job_widget.setLayout(self.progress_screen)
     self.stacked_layout.addWidget(job_widget)
@@ -56,6 +58,17 @@ def __init__(self, parent=None):
     self.stacked_layout.setCurrentIndex(0)
     self.setLayout(main_layout)
 
+  def on_canceled(self):
+    if self.worker:
+      print("stop worker")
+      self.worker.stop()
+
+    # if self.thread:
+    # #   print("stop thread")
+    #   self.thread.terminate()
+    #   self.thread.wait()
+
+    # self.stacked_layout.setCurrentIndex(0)
 
   def on_restart_form(self):
     print("on_restart_form")