pyvale 2025.7.0__cp311-cp311-musllinux_1_2_aarch64.whl → 2025.7.2__cp311-cp311-musllinux_1_2_aarch64.whl

pyvale/dicregionofinterest.py

@@ -84,6 +84,7 @@ class DICRegionOfInterest:
         self.height = None
         self.width = None
         self.subset_size = None
+        self.coord_label = None
 
     def interactive_selection(self, subset_size):
         """
@@ -117,6 +118,8 @@ class DICRegionOfInterest:
         
         # Create graphics widget
         self.graphics_widget = pg.GraphicsLayoutWidget()
+
+
         
         main_layout.addLayout(sidebar)
         main_layout.addWidget(self.graphics_widget)
@@ -165,7 +168,27 @@ class DICRegionOfInterest:
         self.buttons['undo_prev'].setEnabled(False)
         self.buttons['redo_prev'].setEnabled(False)
         
+        self.coord_label = QtWidgets.QLabel("(-, -)")
+        self.coord_label.setAlignment(QtCore.Qt.AlignmentFlag.AlignRight)
+
+        # Set fixed width to handle largest expected value comfortably
+        self.coord_label.setMinimumWidth(350)
+        self.coord_label.setMaximumWidth(350)
+
+        self.coord_label.setStyleSheet("""
+            QLabel {
+                background-color: rgba(0, 0, 0, 150);
+                color: white;
+                padding: 5px;
+                border-radius: 3px;
+                font-family: monospace;
+                font-size: 12px;
+            }
+        """)
+        
         sidebar.addStretch()
+        sidebar.addWidget(self.coord_label)
+        
         return sidebar
 
     def _setup_graphics(self):
@@ -222,6 +245,24 @@ class DICRegionOfInterest:
             self.buttons[btn_id].clicked.connect(handler)
 
         self.main_view.scene().sigMouseClicked.connect(self._mouse_clicked)
+        self.main_view.scene().sigMouseMoved.connect(self._mouse_moved)
+
+
+    def _mouse_moved(self, pos):
+        """Handle mouse movement to update coordinate display."""
+        if self.main_view.sceneBoundingRect().contains(pos):
+            mouse_point = self.main_view.mapSceneToView(pos)
+            # Convert from graphics coordinates to image coordinates
+            img_x = int(round(mouse_point.x()))
+            img_y = int(round(self.width - mouse_point.y()))
+            
+            # Clamp coordinates to image bounds
+            img_x = max(0, min(img_x, self.height - 1))
+            img_y = max(0, min(img_y, self.width - 1))
+            
+            self.coord_label.setText(f"({img_x}, {img_y})")
+        else:
+            self.coord_label.setText("(-, -)")
 
     def _start_drawing_mode(self, mode):
         """Start drawing mode for specified shape type."""
@@ -536,7 +577,7 @@ class DICRegionOfInterest:
             self._update_button_states()
 
     def _save_interactive_roi(self):
-        """Save the current ROI to a YAML file."""
+        """Save the current ROI to a YAML file. This only works with the interactive GUI."""
         filename, _ = QtWidgets.QFileDialog.getSaveFileName(self.main_window, 'Save ROI', 'roi_interactive.yaml', filter='YAML Files (*.yaml)')
 
         if filename:
@@ -566,7 +607,7 @@ class DICRegionOfInterest:
                 yaml.dump(serialized, f, sort_keys=False)
 
     def _open_interactive_roi(self):
-        """Open ROI from a YAML file."""
+        """Open ROI from a YAML file. This only works with the interactive GUI."""
         filename, _ = QtWidgets.QFileDialog.getOpenFileName(
             self.main_window, 'Open ROI', filter='YAML Files (*.yaml)'
         )
@@ -586,6 +627,7 @@ class DICRegionOfInterest:
                 if entry.get('type') == 'SeedROI':
                     # Restore the seed ROI
                     x, y = entry['pos']
+                    y = self.width-y
                     size = entry.get('size', [10, 10])  # fallback default
                     self.seed_roi = pg.RectROI(
                         [x, y], size,
@@ -671,13 +713,13 @@ class DICRegionOfInterest:
     def _finalize_selection(self):
         """Process the final mask and seed location."""
         self.mask = np.flipud(self.temp_mask.T)
-        
+
         if hasattr(self, 'seed_roi'):
             pos = self.seed_roi.pos()
             x = int(np.floor(pos.x()))
             y = int(np.floor(self.width - pos.y()))
             self.seed = [x, y]
-            
+
             if not self.mask[y, x]:
                 raise ValueError(f"Seed location [{x}, {y}] is not within the mask")
             print(f"Final seed location: [{x}, {y}]")
@@ -833,6 +875,111 @@ class DICRegionOfInterest:
         self.__roi_selected = True
 
 
+    def save_yaml(self,  filename: str | Path) -> None:
+        """
+        Save the current ROI to a YAML file. This only works with the after having run the interactive GUI.
+
+        Parameters
+        ----------
+        filename : str or pathlib.Path
+            Filename of the YAML file to save the ROI data.
+
+        Raises
+        ------
+        ValueError
+            If no ROI has been selected.
+        """
+
+        if filename:
+
+            # Ensure extension is added if user doesn't include it
+            if filename and not filename.endswith('.yaml'):
+                filename += '.yaml'
+
+            print("Saving to file:", filename)
+            serialized = [
+                self._get_roi_data(roi, add) 
+                for roi, add in zip(self.roi_list, self.add_list)
+            ]
+
+            # add ROI to serialized data
+            if hasattr(self, 'seed_roi'):
+                self._finalize_selection()
+                seed_data = {
+                    'type': 'SeedROI',
+                    'pos': [self.seed[0], self.seed[1]],
+                    'size': [self.subset_size, self.subset_size],
+                    'add': True
+                }
+                serialized.append(seed_data)
+
+            with open(filename, 'w') as f:
+                yaml.dump(serialized, f, sort_keys=False)
+
+    def read_yaml(self, filename: str | Path) -> None:
+        """
+        Load the ROI from a YAML file and restore the state of the GUI.
+        This method will clear existing ROIs and restore the state from the YAML file.
+
+        Parameters
+        ----------
+        filename : str or pathlib.Path
+            Path to the YAML file containing the ROI data.
+
+        Raises
+        ------
+        FileNotFoundError
+            If the specified file does not exist.
+        ValueError
+            If the loaded data is not a valid ROI format.
+        """
+
+        # need to create a temp qapplication so I can import the ROI.
+        self.__roi_selected = True
+        
+        # Initialize GUI
+        self._setup_gui()
+        self._setup_graphics()
+        self._connect_signals()
+
+        if filename:
+            with open(filename, 'r') as f:
+                data = yaml.safe_load(f)
+
+            self.roi_list = []
+            self.add_list = []
+
+            self.seed_roi = None  # Clear existing seed
+
+            for entry in data:
+                if entry.get('type') == 'SeedROI':
+                    # Restore the seed ROI
+                    x, y = entry['pos']
+                    y = self.width-y
+                    size = entry.get('size', [10, 10])  # fallback default
+                    self.seed_roi = pg.RectROI(
+                        [x, y], size,
+                        pen=pg.mkPen('b', width=3),
+                        hoverPen=pg.mkPen('y', width=3),
+                        handlePen='#0000',
+                        handleHoverPen='#0000'
+                    )
+                    self.main_view.addItem(self.seed_roi)
+
+                else:
+                    # Restore standard ROI
+                    roi = self._create_roi_from_data(entry)
+                    self.roi_list.append(roi)
+                    self.add_list.append(entry['add'])
+                    self.main_view.addItem(roi)
+                    roi.sigRegionChanged.connect(self._redraw_fill_layer)
+
+            self._redraw_fill_layer()
+            self._update_button_states()
+            self._finalize_selection()
+
+
+
     def show_image(self) -> None:
         """
         Displays the current mask in grayscale.
@@ -842,20 +989,30 @@ class DICRegionOfInterest:
             ValueError: If no ROI is selected.
         """
 
-        
-        if not self.__roi_selected:
-                raise ValueError("No ROI selected with 'interactive_selection' or 'rect_boundary'")
+        # Convert grayscale image to 3-channel if needed
+        if self.ref_image.ndim == 2:
+            ref_image_color = cv2.cvtColor(self.ref_image.astype(np.uint8), cv2.COLOR_GRAY2BGR)
+        else:
+            ref_image_color = self.ref_image
 
         # Create a green mask image
-        green_mask = np.zeros_like(self.ref_image)
+        if self.ref_image.ndim == 3:
+            green_mask = np.zeros_like(self.ref_image)
+        elif self.ref_image.ndim == 2:
+            h, w = self.ref_image.shape
+            green_mask = np.zeros((h, w, 3), dtype=self.ref_image.dtype)
+        else:
+            raise ValueError(f"Unsupported image shape: {self.ref_image.shape}")
 
-        green_mask[self.mask,:] = [0, 255, 0]
+        # Apply the green mask
+        green_mask[self.mask, :] = [0, 255, 0]
 
-        # Blend the original image and the mask
-        blended = self.ref_image.astype(float) * 0.7 + green_mask.astype(float) * 0.3
+        # Blend the original image and the green mask
+        blended = ref_image_color.astype(float) * 0.7 + green_mask.astype(float) * 0.3
         blended = blended.astype(np.uint8)
 
         # Display using Matplotlib
+        import matplotlib.pyplot as plt
         plt.figure()
         plt.imshow(blended)
         plt.axis('off')

pyvale/dicresults.py

@@ -38,6 +38,8 @@ class DICResults:
         Final `xtol` value from the optimization routine, indicating solution tolerance.
     niter : np.ndarray
         Number of iterations taken to converge for each subset point.
+    shape_params : np.ndarray | None
+        Optional shape parameters if output during DIC calculation (e.g., affine, rigid).
     filenames : list[str]
         name of DIC result files that have been found
     """
@@ -52,4 +54,5 @@ class DICResults:
     ftol: np.ndarray
     xtol: np.ndarray
     niter: np.ndarray
+    shape_params: np.ndarray
     filenames: list[str]

{pyvale-2025.7.0.dist-info → pyvale-2025.7.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyvale
-Version: 2025.7.0
+Version: 2025.7.2
 Summary: An all-in-one package for sensor simulation, sensor uncertainty quantification, sensor placement optimisation and simulation calibration or validation.
 Author-email: "scepticalrabbit et al." <thescepticalrabbit@gmail.com>
 License: MIT License

{pyvale-2025.7.0.dist-info → pyvale-2025.7.2.dist-info}/RECORD

@@ -14,13 +14,13 @@ pyvale/cameradata2d.py,sha256=O3imDz8BUer6Wxo82KzCQrVLIBDL5RLy8aNoQoKG4b0,2736
 pyvale/camerasensor.py,sha256=6T-9-bUK5_rLr_qg6VMi-u5gjifHWOMfIHqyqZxL9OQ,5332
 pyvale/camerastereo.py,sha256=a9rfswcwdiKRuj9Hs4GvIY3_LBuUjYn514wc_XmbCxk,9925
 pyvale/cameratools.py,sha256=fNulJWAcRpvPQN-TzoNLqCYxrdJFOs37ER4n3OANnJQ,19240
-pyvale/dataset.py,sha256=HOAQJ-UEN7yGyJ0Y-OdymneqEkIHBrgzPwGe0lEJrSs,14939
-pyvale/dic2d.py,sha256=DWFMOIf2n354iLlCxf-ruO9-_YeOAp1RFgQel4hhnmE,7567
-pyvale/dic2dcpp.cpython-311-aarch64-linux-musl.so,sha256=pcgazFcsjnYeTwuXzPSO3LR_pXgUlLOmTggWaarSDzs,55019857
-pyvale/dicchecks.py,sha256=HCgSUiOvGCKjdkASMSWL6DOhYuIN2-X7YLNxJs9fees,16012
-pyvale/dicdataimport.py,sha256=2hEGEeVTLQwpuQUxV-CVN_PsDgtDRK1v-xf5YuarOJk,7191
-pyvale/dicregionofinterest.py,sha256=RsSjd6ZjcghqpFxDkwmNbJmJ5s96Q7dL1SLNKUDWRbk,32881
-pyvale/dicresults.py,sha256=HGZTWNqCsdraUAJSNGYeAcm9ZJT38EeCeAjTYpcTksk,1883
+pyvale/dataset.py,sha256=UfPlHXbFenMZuwUuv40Wr46b9GXHp9Gq8QUbJK2rkYg,14941
+pyvale/dic2d.py,sha256=104AKgmectRIYcezbtFi0HMGS_DAG9JfKXAPAm6UCFQ,8607
+pyvale/dic2dcpp.cpython-311-aarch64-linux-musl.so,sha256=NvxQfjw9IqGs-xZisQbaDnqelyqWDd5xYHKYrpyVYso,55872737
+pyvale/dicchecks.py,sha256=IbmYlMjSbwL09DfaDE6-LuCRSkJ6DBL3OAA9HSApZQk,16753
+pyvale/dicdataimport.py,sha256=YGUcs3LKTaIVCroIraT_D8mMA4mQF5M2yLrk93acHyI,11863
+pyvale/dicregionofinterest.py,sha256=n92jEvOczoE4CPqzQA7lG7I-dsxlxLKa6qzILnDLlDg,38384
+pyvale/dicresults.py,sha256=EIC4y0knc053AOepEEXeA_Z93HLbXW6OpX6XtwrsLYQ,2039
 pyvale/dicspecklegenerator.py,sha256=PohlSC13wZJZ4hOA5Z-GWML-MsN1pBTSA-pqtiLer8s,7819
 pyvale/dicspecklequality.py,sha256=soZKclWHSuwCsp_P4_EqDRbzTNw21n8rC8kv14i-NCU,9968
 pyvale/dicstrain.py,sha256=M4bjJaxb3orG3Ftv7P0BVCGnI8eThptns1FiNj8xVx4,12787
@@ -74,9 +74,11 @@ pyvale/visualsimplotter.py,sha256=m5mPIMGvSF4hhefTilkhBhii9t6rcoRKkqSdx5MugSs,68
 pyvale/visualsimsensors.py,sha256=hINsI73NQvHunJ3lUZX-F0RrN_u6gzF0tMHZwsxHr34,12405
 pyvale/visualtools.py,sha256=9nDMZHXv0N7HBl0vOL9QLeHlayYl6ng4dx2-5i2TJjw,4816
 pyvale/visualtraceplotter.py,sha256=y-GjToF5U2VIGO-YwR_tKi_vMUO3ayhaohaWrWNUFgQ,5487
-pyvale/cython/rastercyth.c,sha256=e_TrMLVWqlszlTagd9lh1LCZjMTdGzXTV0KAEc-ATR0,1250303
+pyvale/cython/rastercyth.c,sha256=aWgzRZR_iBDpR0THvJzIhpXEdMWRXQeTZhkYLLYDXuo,1250303
 pyvale/cython/rastercyth.cpython-311-aarch64-linux-musl.so,sha256=H2tRXWYwlkJI6TSeBVlcwOtRkRceCv7mHWmjcvw1ZvM,1489472
 pyvale/cython/rastercyth.py,sha256=b-KJDysrc_LxBnWirXkNhKNy6jZ-d4xTFrXGSgDCp34,26411
+pyvale/data/DIC_Challenge_Star_Noise_Def.tiff,sha256=no_q1L4_0plbVmg3TPEpgoRp3iLMrx2vH_X1fBwnLSw,2020090
+pyvale/data/DIC_Challenge_Star_Noise_Ref.tiff,sha256=y0JSFyHvmO_cgabG8hOej5HioQ_9Bh7O8VYVTfVr_S8,2020102
 pyvale/data/__init__.py,sha256=h1zJBQZxFSPPUksp_ErTC1uTQLdSmoc-ry3D_naPKYE,271
 pyvale/data/cal_target.tiff,sha256=4dbDIm7h7gYDJOhWOZXO-rs162ZLqxb1bdrbTykMEMk,4718962
 pyvale/data/case00_HEX20_out.e,sha256=wTdEWvGyQBhP1D1bIy5YZKu7I_QISWLEjl9K9VOOnbI,241172
@@ -101,15 +103,16 @@ pyvale/data/plate_rigid_def0000.tiff,sha256=YlGU0lIlkh61StQku7lK7P6oDZDa-g5R98fU
 pyvale/data/plate_rigid_def0001.tiff,sha256=CFIveUYubbbUDpQfnsO0iPaBTzwbjQbcAOCG1mm2040,1601722
 pyvale/data/plate_rigid_ref0000.tiff,sha256=EolObMm5QzGeewgq3bLhlkHor_6ASuNoYrV2AbYrFro,1601722
 pyvale/dic/cpp/dicbruteforce.cpp,sha256=9Z9jx-K6_wgGX_Ezp1lf1ulqkLQ6X6EaOLwXAxw_Aeg,11915
-pyvale/dic/cpp/dicfourier.cpp,sha256=W3RjzqsbUpNSxfozObFJQnpcAGeqWcJpiSXKoaJr-cs,23548
-pyvale/dic/cpp/dicinterpolator.cpp,sha256=HkA_qKp70IePO6w50om13L5yqQqYDiYQD2V9i6klhhM,20325
-pyvale/dic/cpp/dicmain.cpp,sha256=qZvuC3m42Dg-_cjTVoh8dThtw6enqqTCvhIHSEKwvxA,8860
-pyvale/dic/cpp/dicoptimizer.cpp,sha256=krR7jLdLQEvX8iwNWjMKDseXu5Ka5szJTYrbcjOThak,25929
+pyvale/dic/cpp/dicfourier.cpp,sha256=PSaUiDtu3pGOl_MVT5dL5cch-0pKUs2UwyqFiEn6wzE,24702
+pyvale/dic/cpp/dicinterpolator.cpp,sha256=jAByBWInJuufTla4J5tDJledqr2fdmPj8lSZYPzraC0,21837
+pyvale/dic/cpp/dicmain.cpp,sha256=_SaL_joDNs9hpybiirlG11KSsKaR_UqKuwzQOi__mcA,9049
+pyvale/dic/cpp/dicoptimizer.cpp,sha256=k5oCFMvhC7sFu6qdmqbADQtPIsLIZhcDDnHW1OH80YU,26178
 pyvale/dic/cpp/dicrg.cpp,sha256=uicGKxOAgsTZgOpG18NDN-SoD0pJFu2wYGhP1Xg3S9U,4351
-pyvale/dic/cpp/dicscanmethod.cpp,sha256=MjzxECbRkn-fR211xJRDB4lsn-lf6dqHYXTOrLr2D-A,26766
+pyvale/dic/cpp/dicscanmethod.cpp,sha256=tnMLTuO4pKKf_IDlWFWy2iwJ4Zndpv1pIvX_eu9_c50,27077
+pyvale/dic/cpp/dicsignalhandler.cpp,sha256=MMcKGV7tsO6T6VS5vw0KJKhpfzPgaGAiwum6RPHPt2U,475
 pyvale/dic/cpp/dicsmooth.cpp,sha256=sKOyPTEBAcPzJjSc4jAl_JCLFBz5eJ8EXYh0iT7i0L4,4445
-pyvale/dic/cpp/dicstrain.cpp,sha256=wrcRcx_Jn5EvRLlXc_zVJ15VJVpRBHLLpMbcot8UOCM,14017
-pyvale/dic/cpp/dicutil.cpp,sha256=UEN3_Fm4gB_CRJY1wPvEUGGjjoBNwpPridPz32yPWPA,19829
+pyvale/dic/cpp/dicstrain.cpp,sha256=-ObnJ3J1SCl8UAmzskQx_wNPOU5zMB5aNrJtNWnpVpg,14244
+pyvale/dic/cpp/dicutil.cpp,sha256=Y4OAdLViEPlOSDSWoashXmqOmaPkD6TSyTiRDeWSw9Q,21695
 pyvale/examples/__init__.py,sha256=h1zJBQZxFSPPUksp_ErTC1uTQLdSmoc-ry3D_naPKYE,271
 pyvale/examples/basics/ex1_1_basicscalars_therm2d.py,sha256=tR8wGXoHUXaOCsJzSTFzgiTJpmoyVg6FCKoLnCmbq-4,5893
 pyvale/examples/basics/ex1_2_sensormodel_therm2d.py,sha256=ar7w73Nt1rjZiw8ma3nIf7rTbVHhmCRgAdcNLb7tlUg,5898
@@ -205,8 +208,8 @@ pyvale/simcases/run_example_cases.py,sha256=l5KOQvPMNRUkJMotaReG2nmrFtVBNWCwKVez
 pyvale.libs/libgcc_s-69c45f16.so.1,sha256=BOFjRP57t9LgRNNAnFVK5VHmrp5UU-p5NcfcZ10dnd4,201673
 pyvale.libs/libgomp-b626072d.so.1.0.0,sha256=0dyDmNGBMMrQqww_YKstjI7dawNUVm3HSzLzLfpYNh4,410617
 pyvale.libs/libstdc++-1f1a71be.so.6.0.33,sha256=sURAhanafc8tH6FGDqPKz7dsPGNb0Aym8vBo6UbJ3Ok,3650097
-pyvale-2025.7.0.dist-info/METADATA,sha256=2EMm9ruK8W9KOWxDCfRibI8tu5dGoemtS5voLp90V8U,6387
-pyvale-2025.7.0.dist-info/WHEEL,sha256=LNZuceeFd58B9QVekwESAWqB09LEv_tgGDcYQrpkG9U,113
-pyvale-2025.7.0.dist-info/top_level.txt,sha256=u1d_f4iZ3b3_96Rb_zrs9hyrpC4yE5e1Lg6Ey_Wgr0c,7
-pyvale-2025.7.0.dist-info/RECORD,,
-pyvale-2025.7.0.dist-info/licenses/LICENSE,sha256=h2qWsRIazuLLhALyUsCP6aE0DFcswL9SSSt9sgMzZi4,1099
+pyvale-2025.7.2.dist-info/METADATA,sha256=oemYkdNkKrT7uGin03lIwtFXU-Ob_ayvIngcVz5RkxE,6387
+pyvale-2025.7.2.dist-info/WHEEL,sha256=LNZuceeFd58B9QVekwESAWqB09LEv_tgGDcYQrpkG9U,113
+pyvale-2025.7.2.dist-info/top_level.txt,sha256=u1d_f4iZ3b3_96Rb_zrs9hyrpC4yE5e1Lg6Ey_Wgr0c,7
+pyvale-2025.7.2.dist-info/RECORD,,
+pyvale-2025.7.2.dist-info/licenses/LICENSE,sha256=h2qWsRIazuLLhALyUsCP6aE0DFcswL9SSSt9sgMzZi4,1099