Add element emission lines data in JSON format

Author: AstroLensDevelopment

pyCCDGUI.spec

@@ -11,6 +11,7 @@ a = Analysis(
         ('assets/palette.png', 'assets'),
         ('assets/save.png', 'assets'),
         ('assets/lens.png', 'assets'),
+        ('spectrometer/element_emission_lines.json', 'spectrometer'),
     ],
     hiddenimports=[],
     hookspath=[],

spectrometer/CCDpanelsetup.py

@@ -973,6 +973,37 @@ def saveopenfields(self, save_row, CCDplot):
             lambda *args: self.CCDplot.update_marker_colors(bool(self.element_match_var.get())),
         )
 
+        # Tolerance settings for emission line matching
+        tolerance_frame = ttk.Frame(self)
+        tolerance_frame.grid(column=0, row=save_row + 6, padx=(45, 5), pady=(10, 5), columnspan=3, sticky="w")
+        
+        # Green tolerance (exact match)
+        ttk.Label(tolerance_frame, text="Green:").grid(row=0, column=0, padx=(0, 2), sticky="e")
+        self.green_tolerance_var = tk.DoubleVar(value=config.green_tolerance_nm)
+        green_entry = ttk.Entry(tolerance_frame, textvariable=self.green_tolerance_var, width=6)
+        green_entry.grid(row=0, column=1, padx=2)
+        ttk.Label(tolerance_frame, text="nm").grid(row=0, column=2, padx=(0, 8), sticky="w")
+        
+        # Yellow tolerance (close match)
+        ttk.Label(tolerance_frame, text="Yellow:").grid(row=0, column=3, padx=2, sticky="e")
+        self.yellow_tolerance_var = tk.DoubleVar(value=config.yellow_tolerance_nm)
+        yellow_entry = ttk.Entry(tolerance_frame, textvariable=self.yellow_tolerance_var, width=6)
+        yellow_entry.grid(row=0, column=4, padx=2)
+        ttk.Label(tolerance_frame, text="nm").grid(row=0, column=5, padx=(0, 8), sticky="w")
+        
+        # Apply button in same row
+        ttk.Button(
+            tolerance_frame,
+            text="Apply",
+            command=self.apply_tolerance_settings,
+            style="Accent.TButton"
+        ).grid(row=0, column=6, padx=5)
+        
+        # Center the tolerance frame
+        self.grid_columnconfigure(0, weight=1)
+        self.grid_columnconfigure(1, weight=1)
+        self.grid_columnconfigure(2, weight=1)
+
     def open_calibration(self):
         """Open calibration window with proper callback reference"""
         default_calibration.open_calibration_window(
@@ -1099,6 +1130,30 @@ def open_color_picker(self):
             command=lambda: self.close_color_window()
         ).pack(pady=15)
 
+    def apply_tolerance_settings(self):
+        """Apply the tolerance settings and refresh the plot"""
+        try:
+            green_val = self.green_tolerance_var.get()
+            yellow_val = self.yellow_tolerance_var.get()
+            
+            # Validate inputs
+            if green_val <= 0 or yellow_val <= 0:
+                return
+            
+            if green_val >= yellow_val:
+                # Show warning that green should be less than yellow
+                return
+            
+            # Update config values
+            config.green_tolerance_nm = green_val
+            config.yellow_tolerance_nm = yellow_val
+            
+            # Refresh the plot to show updated colors
+            if config.spectroscopy_mode:
+                self.CCDplot.update_marker_colors(True)
+        except ValueError:
+            pass  # Invalid number, ignore
+
     def update_emission_color_controls(self):
         """Enable or disable emission line color controls based on current mode."""
         button = getattr(self, "emission_color_button", None)
@@ -1545,7 +1600,7 @@ def aboutbutton(self, about_row):
 
                 self.logo_label = ttk.Label(self, image=logo_photo)
                 self.logo_label.image = logo_photo  # Keep a reference
-                self.logo_label.grid(row=about_row + 1, columnspan=3, pady=(40, 5), padx=(7,0))
+                self.logo_label.grid(row=about_row + 1, columnspan=3, pady=(15, 5), padx=(7,0))
         except Exception as e:
             print(f"Could not load logo: {e}")
 

spectrometer/CCDplots.py

@@ -443,13 +443,19 @@ def _get_marker_color_and_elements(self, wavelength):
             distance = abs(wavelength - emission_wavelength)
 
             # Calculate match percentage based on distance
-            # 0 nm = 100%, 3 nm = 70%, >3 nm = <70%
-            if distance == 0:
-                match_percentage = 100
-            elif distance <= 3:
-                match_percentage = 100 - (distance / 3.0) * 30
+            # Use configurable thresholds from config
+            green_threshold = config.green_tolerance_nm
+            yellow_threshold = config.yellow_tolerance_nm
+            
+            if distance <= green_threshold:
+                # Within green tolerance: 90-100% match
+                match_percentage = 100 - (distance / green_threshold) * 10
+            elif distance <= yellow_threshold:
+                # Within yellow tolerance: 80-90% match
+                match_percentage = 90 - ((distance - green_threshold) / (yellow_threshold - green_threshold)) * 10
             else:
-                match_percentage = max(0, 70 - (distance - 3) * 10)
+                # Beyond yellow tolerance, skip this element
+                continue
 
             # Only include matches >= 80%
             if match_percentage >= 80:

spectrometer/config.py

@@ -34,5 +34,9 @@
 spectroscopy_mode = False  # False = regular mode, True = spectroscopy mode
 CALIBRATION_COEFF = [0, 1, 0, 0]  # fallback linear
 
+# Emission line matching tolerance (in nm)
+green_tolerance_nm = 0.3  # Lines within this distance show as green (90-100% match)
+yellow_tolerance_nm = 3.0  # Lines within this distance show as yellow (80-89% match)
+
 min_sh = 20
 max_sh = 4294967295