Change file structure + Modularize codes + Fix reticle detection qThread bug

.gitignore

@@ -6,7 +6,6 @@ parallax/*.png
 *.npz
 *.pkl
 *.csv
-data
 training
 env
 gitkey
@@ -15,19 +14,16 @@ gitkey.pub
 # Distribution / packaging
 *.egg-info
 build/
-debug/
-debug_images/
 wheels/
 lib/
 dist/
 
 # Sphinx documentation
 docs/_build/
 
-# User-settings
-ui/settings.json
-ui/stage_server_config.json
-ui/reticle_metadata.json
+# User-specific files
+data
+debug
 
 # Unit test / coverage reports
 .coverage

parallax/__init__.py

@@ -4,7 +4,7 @@
 
 import os
 
-__version__ = "1.5.1"
+__version__ = "1.7.0"
 
 # allow multiple OpenMP instances
 os.environ["KMP_DUPLICATE_LIB_OK"] = "True"

parallax/__main__.py

@@ -1,85 +1,35 @@
 """
 Parallax: A GUI application for controlling hardware devices.
 """
-
-import argparse
 import atexit
-import logging
-import os
-
 from PyQt5.QtWidgets import QApplication
-
-from parallax.main_window_wip import MainWindow as MainWindowV2
-from parallax.model import Model
-
-
-def setup_logging():
-    """Set up logging to file."""
-    logger = logging.getLogger()
-    logger.handlers.clear()
-    logger.setLevel(logging.WARNING)
-
-    # Create the directory if it doesn't exist
-    package_dir = os.path.dirname(os.path.abspath(__file__))
-    debug_dir = os.path.join(os.path.dirname(package_dir), "debug")
-    os.makedirs(debug_dir, exist_ok=True)
-    log_file_path = os.path.join(debug_dir, "parallax_debug.log")
-
-    with open(log_file_path, "w"):
-        pass  # Clear the log file
-
-    log_handler = logging.FileHandler(log_file_path)
-    log_handler.setLevel(logging.DEBUG)
-    log_handler.setFormatter(
-        logging.Formatter(
-            fmt="%(asctime)s:%(name)s:%(levelname)s: %(message)s"
-        )
-    )
-    logger.addHandler(log_handler)
+from .main_window import MainWindow
+from .model import Model
+from .config.config_path import setup_logging, PARALLAX_ASCII
+from .config.cli import parse_args, print_arg_info
 
 
 # Main function to run the Parallax application
 if __name__ == "__main__":
-    # Parse command line arguments to configure application behavior
-    parser = argparse.ArgumentParser()
-    parser.add_argument(
-        "-d",
-        "--dummy",
-        action="store_true",
-        help="Dummy mode for testing without hardware",
-    )
+    # Print the ASCII art
+    print(PARALLAX_ASCII)
 
-    parser.add_argument(
-        "-b",
-        "--bundle_adjustment",
-        action="store_true",
-        help="Enable bundle adjustment feature",
-    )
-    args = parser.parse_args()
+    # Parse command line arguments
+    args = parse_args()
+    print_arg_info(args)
 
-    # Print a message if running in dummy mode (no hardware interaction)
-    if args.dummy:
-        print("\nRunning in dummy mode; hardware devices not accessible.")
-    # Print a message if bundle adjustment is enabled
-    if args.bundle_adjustment:
-        print("\nBundle adjustment feature enabled.")
-
-    # Set up logging as configured in the setup_logging function
+    # Set up logging
     setup_logging()
 
     # Initialize the Qt application
     app = QApplication([])
 
-    # Initialize the data model with version "V2"
-    model = Model(version="V2", dummy=args.dummy, bundle_adjustment=args.bundle_adjustment)
-    main_window = MainWindowV2(model, dummy=args.dummy)  # main window
-
-    # Show the main window on screen
+    # Initialize the model and main window
+    model = Model(args)
+    main_window = MainWindow(model)
     main_window.show()
-    # Start the Qt application's main loop
     app.exec()
 
-    # Register cleanup functions to be called on program termination
-    atexit.register(model.clean)  # Clean up resources used by the model
-    # Save user configurations on exit
+    # Clean up on exit
+    atexit.register(model.clean)
     atexit.register(main_window.save_user_configs)

parallax/calibration_camera.py → parallax/cameras/calibration_camera.py

@@ -224,6 +224,16 @@ def get_origin_xyz(self):
             x = tuple(imgpts[0].ravel().astype(int))
             y = tuple(imgpts[1].ravel().astype(int))
             z = tuple(imgpts[2].ravel().astype(int))
+
+            """
+            # Uncomment to print quaternion and translation vector
+            R, _ = cv2.Rodrigues(rvecs)
+            quat = Rscipy.from_matrix(R).as_quat()  # [QX, QY, QZ, QW]
+            QX, QY, QZ, QW = quat
+            TX, TY, TZ = tvecs.flatten()
+            print(f"{self.name}: {QW} {QX} {QY} {QZ} {TX} {TY} {TZ}")
+            """
+
             return origin, x, y, z
         else:
             return None
@@ -378,7 +388,7 @@ def change_coords_system_from_camA_to_global(self, camA, camB, points_3d_AB, pri
         """
         logger.debug(f"=== {camA}, World to Camera transformation ====")
         logger.debug(f"rvecs: {self.rvecA}")
-        logger.debug(f"tvecs: {self.rvecA}")
+        logger.debug(f"tvecs: {self.tvecA}")
 
         if print_results:
             print(f"=== {camA}, World to Camera transformation ====")