nettracer3d 0.8.2__py3-none-any.whl → 0.8.4__py3-none-any.whl

nettracer3d/community_extractor.py

@@ -462,7 +462,6 @@ def get_color_name_mapping():
         'bright_cyan': (0, 255, 255),
         'dark_teal': (0, 128, 128),
         'turquoise': (64, 224, 208),
-        'aqua': (0, 255, 255),
         'seafoam': (159, 226, 191),
         'teal_blue': (54, 117, 136),
         
@@ -517,21 +516,90 @@ def rgb_to_color_name(rgb: Tuple[int, int, int]) -> str:
         distance = np.sqrt(np.sum((rgb_array - np.array(color_rgb)) ** 2))
         if distance < min_distance:
             min_distance = distance
-            closest_color = color_name + f" {str(rgb_array)}"
-            
+            #closest_color = color_name + f" {str(rgb_array)}" # <- if we want RGB names
+            closest_color = color_name
+
     return closest_color
 
-def convert_node_colors_to_names(node_to_color: Dict[int, Tuple[int, int, int]]) -> Dict[int, str]:
+def convert_node_colors_to_names(node_to_color: Dict[int, Tuple[int, int, int]], 
+                                show_legend: bool = True,
+                                figsize: Tuple[int, int] = (10, 8),
+                                save_path: str = None) -> Dict[int, str]:
     """
     Convert a dictionary of node-to-RGB mappings to node-to-color-name mappings.
+    Optionally displays a matplotlib legend showing the mappings.
     
     Args:
         node_to_color: Dictionary mapping node IDs to RGB tuples
+        show_legend: Whether to display the color legend plot
+        figsize: Figure size as (width, height) for the legend
+        save_path: Optional path to save the legend figure
         
     Returns:
         Dictionary mapping node IDs to color names
     """
-    return {node: rgb_to_color_name(color) for node, color in node_to_color.items()}
+    # Convert colors to names
+    node_to_names = {node: rgb_to_color_name(color) for node, color in node_to_color.items()}
+    
+    # Create legend if requested
+    if show_legend:
+        import matplotlib.pyplot as plt
+        from matplotlib.patches import Rectangle
+        
+        num_entries = len(node_to_color)
+        
+        # Calculate dynamic spacing based on number of entries
+        entry_height = 0.8
+        total_height = num_entries * entry_height + 1.5  # Extra space for title and margins
+        
+        # Create figure and axis with proper scaling
+        fig, ax = plt.subplots(figsize=figsize)
+        ax.set_xlim(0, 10)
+        ax.set_ylim(0, total_height)
+        ax.axis('off')
+        
+        # Title
+        ax.text(5, total_height - 0.5, 'Color Legend', 
+                fontsize=16, fontweight='bold', ha='center')
+        
+        # Sort nodes for consistent display
+        sorted_nodes = sorted(node_to_color.keys())
+        
+        # Create legend entries
+        for i, node in enumerate(sorted_nodes):
+            y_pos = total_height - (i + 1) * entry_height - 0.8
+            rgb = node_to_color[node]
+            color_name = node_to_names[node]
+            
+            # Normalize RGB values for matplotlib (0-1 range)
+            norm_rgb = tuple(c/255.0 for c in rgb)
+            
+            # Draw color swatch (using actual RGB values)
+            swatch = Rectangle((1.0, y_pos - 0.15), 0.8, 0.3, 
+                              facecolor=norm_rgb, edgecolor='black', linewidth=1)
+            ax.add_patch(swatch)
+            
+            # Node ID (exactly as it appears in dict keys)
+            ax.text(0.2, y_pos, str(node), fontsize=12, fontweight='bold', 
+                    va='center', ha='left')
+            
+            # Color name (mapped name, nicely formatted)
+            ax.text(2.2, y_pos, color_name.replace('_', ' ').title(), 
+                    fontsize=11, va='center', ha='left')
+        
+        # Add border around the legend
+        border = Rectangle((0.1, 0.1), 9.8, total_height - 0.2, 
+                          fill=False, edgecolor='gray', linewidth=2)
+        ax.add_patch(border)
+        
+        plt.tight_layout()
+        
+        if save_path:
+            plt.savefig(save_path, dpi=300, bbox_inches='tight')
+            
+        plt.show()
+    
+    return node_to_names
 
 def generate_distinct_colors(n_colors: int) -> List[Tuple[int, int, int]]:
     """
@@ -596,7 +664,7 @@ def assign_node_colors(node_list: List[int], labeled_array: np.ndarray) -> Tuple
     
     # Convert colors for naming
     node_to_color_rgb = {k: tuple(v[:3]) for k, v in node_to_color.items()}
-    node_to_color_names = convert_node_colors_to_names(node_to_color_rgb)
+    node_to_color_names = convert_node_colors_to_names(node_to_color_rgb, show_legend = False)
     
     return rgba_array, node_to_color_names
 

nettracer3d/excelotron.py

@@ -1238,7 +1238,7 @@ class TabbedIdentityWidget(QFrame):
 
 class ExcelToDictGUI(QMainWindow):
     # Add this signal
-    data_exported = pyqtSignal(dict, str)  # dictionary, property_name
+    data_exported = pyqtSignal(dict, str, bool)  # dictionary, property_name, add_status
     
     def __init__(self):
         super().__init__()
@@ -1255,6 +1255,7 @@ class ExcelToDictGUI(QMainWindow):
         
         self.setWindowTitle("Excel to Python Dictionary Converter")
         self.setGeometry(100, 100, 1200, 800)
+        self.add = False
         
         self.setup_ui()
 
@@ -1414,6 +1415,14 @@ class ExcelToDictGUI(QMainWindow):
         self.export_btn.clicked.connect(self.export_dictionary)
         export_layout.addWidget(self.export_btn)
 
+        self.add_button = QPushButton("+")
+        self.add_button.setFixedSize(20, 20)
+        self.add_button.setCheckable(True)
+        self.add_button.setChecked(False)
+        self.add_button.clicked.connect(self.toggle_add)
+        export_layout.addWidget(self.add_button)
+
+
         right_layout.addLayout(export_layout)
 
         right_widget.setLayout(right_layout)
@@ -1431,6 +1440,15 @@ class ExcelToDictGUI(QMainWindow):
         # Add splitter to main layout
         main_layout.addWidget(splitter)
 
+    def toggle_add(self):
+
+        if self.add_button.isChecked():
+            print("Exported Properties will be added onto existing ones")
+            self.add = True
+        else:
+            print("Exported Properties will be override existing ones")
+            self.add = False
+
     def load_template(self, template_name):
         if template_name in self.templates:
             # Clear existing columns
@@ -1681,12 +1699,13 @@ class ExcelToDictGUI(QMainWindow):
                 return
                 
             # Emit signal to parent application
-            self.data_exported.emit(result_dict, property_name)
+            self.data_exported.emit(result_dict, property_name, self.add)
             
             # Still store in global variables for backward compatibility
             import builtins
             builtins.excel_dict = result_dict
             builtins.target_property = property_name
+            builtins.add = self.add
             
             # Show success message with preview
             preview = str(result_dict)