pyvale 2025.7.1__cp311-cp311-win32.whl → 2025.7.2__cp311-cp311-win32.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.1.dist-info → pyvale-2025.7.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyvale
-Version: 2025.7.1
+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.1.dist-info → pyvale-2025.7.2.dist-info}/RECORD

@@ -14,13 +14,13 @@ pyvale/cameradata2d.py,sha256=SZW4EwP2maaJDoVywPvJ5CIzxE9M0T00v6YFMMXbXIY,2819
 pyvale/camerasensor.py,sha256=3j44NG5Odk4AzspXqHfJx5vWzAHDPg3dg4xoHWIpdiI,5479
 pyvale/camerastereo.py,sha256=L_HBN3JIGLkAMk1ZIvDye3xqwyVaudsM9NgyybD5rJM,10142
 pyvale/cameratools.py,sha256=_DTrvLMop2QoEdkUkr4dkiwZmNhxgnHv2Te7EKg0knM,19723
-pyvale/dataset.py,sha256=OzjDrqSee5jSV8y4AhQ_aSedqDftSBlCKH92Lk304NM,15354
-pyvale/dic2d.py,sha256=oisTCqSxRULme-5r2YfvNJe9mS1vw0yqvpRc9bNYe-U,7731
-pyvale/dic2dcpp.cp311-win32.pyd,sha256=3rkJFDNyIHHbuZxMv-6HjE2HzihBgnTtxnh6BobrS1Y,505344
-pyvale/dicchecks.py,sha256=cmJbgCLjaEblBnP45R_bnrwAXTUqO91b8Diz0wimKdg,16488
-pyvale/dicdataimport.py,sha256=2Qht6OoLXO9nK7_jt1POR3qbn0thWYedBFJ-w9YwGkU,7438
-pyvale/dicregionofinterest.py,sha256=1d3tqnvQTQU88Qz7ISpOsUPMrdm8Ty9RJXzC0J-_kqs,33768
-pyvale/dicresults.py,sha256=bZnA9Yu348DYVE80DkcNeSu-Ddh7GQNnENz5_e1bPZU,1938
+pyvale/dataset.py,sha256=d9W8RhHoUJDVk4bxU1GkkmQARuiyfxGnzjb-q3tJWOw,15356
+pyvale/dic2d.py,sha256=oKnoSARBO5f23NTenBlEkguWs7mQCTP-57v_hTZPU2M,8798
+pyvale/dic2dcpp.cp311-win32.pyd,sha256=JwvPOvCdeOltLGqCc1k-wUeJnROqiioOktIRUtQwLdI,519168
+pyvale/dicchecks.py,sha256=h1Aja0F8aBHMTsNRif8imlJDUsZ8aWUK4PjWa8KwOLo,17241
+pyvale/dicdataimport.py,sha256=498Z1URii8kHYqoj4GqCshms-JApwhyBsVJXp6FFk3c,12233
+pyvale/dicregionofinterest.py,sha256=cEIMFBMqAyMQmaAGtTO7oZEY2t5Ddi5gb7D8kabwEiQ,39428
+pyvale/dicresults.py,sha256=68AaSnWooFzJpBTmB0aAbWQiUIF6cVldCZn8BIP9b0k,2097
 pyvale/dicspecklegenerator.py,sha256=IvAuEXXn_B8aKlDORFylXMcvVoMYnsqeqDFcyFg9Ktw,8057
 pyvale/dicspecklequality.py,sha256=_-Ym4eloquvqWYBWwXtp-u6bbUYkIAgAKwb6lj2LItM,10273
 pyvale/dicstrain.py,sha256=IV2F7eEkRRkmmEIhtmCWar_k7mMq-VFUYldTC4FYd_I,13174
@@ -74,8 +74,8 @@ pyvale/visualsimplotter.py,sha256=yF11R-m9NSz4WPMjpN5qJqZm1fzhn5l6SnXIeJQ9Pmg,69
 pyvale/visualsimsensors.py,sha256=t-2tJJoown9xGezrub-EWJSRgoOH7On1FI3gIPvPPu0,12723
 pyvale/visualtools.py,sha256=CfrRYFIKEBl66kZuhLchG-tgDQiUp-nC2sTCylQqejs,4952
 pyvale/visualtraceplotter.py,sha256=1u9x3AfnzXS0fF8EAUm-v_E-xYXor7STlsoWob_-iCc,5629
-pyvale/cython/rastercyth.c,sha256=xch6omzS1fIbZ8oAbMTY3BCRoWkvatIeqrAIHJR2PN8,1282853
-pyvale/cython/rastercyth.cp311-win32.pyd,sha256=j81BAta7lc2w9HaRiShkKcgKPcjtIPGJEJ82mjv34XU,143360
+pyvale/cython/rastercyth.c,sha256=d-JXXcD03qJvkJ5tZha_IeVGuM_-9wyHxVXep48Bb8c,1282853
+pyvale/cython/rastercyth.cp311-win32.pyd,sha256=tCtwAycoNCeDgeHN-P066R7O-qQPf_ono6yumkGrHfs,143360
 pyvale/cython/rastercyth.py,sha256=sifuWGmgB0Z8MhQTigNt9lMEMwY3oI9G0Q9a1vQQEYw,27096
 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
@@ -103,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=_LbVdgrRrErF-h3AxwUYAz5bpw2KduA035BCOEWyXdo,12285
-pyvale/dic/cpp/dicfourier.cpp,sha256=bs-t4koUz5Pd-UTnEC4wzhboHLJcD7GbPYjwQ9Ps78M,24196
-pyvale/dic/cpp/dicinterpolator.cpp,sha256=BzO3atEcu-ouGjBjhKeEttKgTlG5GcesJ5KYvvRF8MA,20884
-pyvale/dic/cpp/dicmain.cpp,sha256=BL7-02_ZByZLC_c5rjecVAM1N6DgJQAi6eGT2LJS8vk,9075
-pyvale/dic/cpp/dicoptimizer.cpp,sha256=6Q4hcqqolO1MGhvXGTGDrdpAfNJeghVrpsu3z151FRw,26604
+pyvale/dic/cpp/dicfourier.cpp,sha256=jmbuLZI-ETpmEMqxeY83MfX8X-ZEJ-zjRfmVQzUBKGU,25382
+pyvale/dic/cpp/dicinterpolator.cpp,sha256=8lwj8sBHx3nnpUq9dqUOVif9KwIAEhG-w28CVq2AjTE,22451
+pyvale/dic/cpp/dicmain.cpp,sha256=MsTgGsL7gFokDF-34iAzI_v0B_XQkEirUsjC65U56IQ,9269
+pyvale/dic/cpp/dicoptimizer.cpp,sha256=Vqahn6nMbUDGVJTsQ_Q2HQDg1xJ2ddvUJYAlp6FvtWE,26858
 pyvale/dic/cpp/dicrg.cpp,sha256=ZAgXQnPP55HAU7VhPVcchtvIgQVy3ele7-zZKPAc04k,4488
-pyvale/dic/cpp/dicscanmethod.cpp,sha256=-hXZ3YMc03HlMvCMIFD2A203Bjy8_FhDTv0_Tqb_WzI,27443
+pyvale/dic/cpp/dicscanmethod.cpp,sha256=Md17AdPfV7T4cmQQTWV1fBb2KxkL19nqYmvgQl745ZM,27754
+pyvale/dic/cpp/dicsignalhandler.cpp,sha256=XL5e67jlrqyT7wY9nL8n0aYKU7ASzqlC9-YhJ0Aj9TU,491
 pyvale/dic/cpp/dicsmooth.cpp,sha256=voV7Ge1jqaW3A-87ORxVMv_JFfBlW9_pFoi6NZfoUAs,4583
-pyvale/dic/cpp/dicstrain.cpp,sha256=Sr8sHi3T6Sly0P6h6eTH-K9u5CiQU1ZWjaj6XKtEYhQ,14400
-pyvale/dic/cpp/dicutil.cpp,sha256=TxBwxa89xEaduDxxq8JPeRpj-dSi8Pb-xlI7dY_-J7I,20392
+pyvale/dic/cpp/dicstrain.cpp,sha256=s3J4MTEuIbHHUbrPuWDqwL78DI0FgcdUyHIE5YbLr7M,14631
+pyvale/dic/cpp/dicutil.cpp,sha256=ci2zKFbI9YmY9bJLhNhp76hnb4Yd7JH3RtArRUDbW2E,22314
 pyvale/examples/__init__.py,sha256=qCiIGOM2Oxw7TsjsIvYR054rhhoHzLKX2mCJve9NaJk,275
 pyvale/examples/basics/ex1_1_basicscalars_therm2d.py,sha256=IlGUDXAXqWycEV7TUiUoy_TmYv6-1YbuLas1n7xpDcc,6035
 pyvale/examples/basics/ex1_2_sensormodel_therm2d.py,sha256=zDrcPY_z8yeXHtlBzFV-l5CIVn-CBc_IDhJtBU0Sz8M,6048
@@ -204,8 +205,8 @@ pyvale/simcases/run_1case.py,sha256=srR8bs3pKhPaF_E4nqLsMXO1ivtK5WKRWIZ0O6pXGRs,
 pyvale/simcases/run_all_cases.py,sha256=x6IhG7jalAPuZRFdNTH9oof9L_Nol5vWjjU_lPi5i0Q,1972
 pyvale/simcases/run_build_case.py,sha256=3FaSjQrYxVmmKAC_CvORAvFr6Xwo0pEOjiWTzG7fMbU,2002
 pyvale/simcases/run_example_cases.py,sha256=6-gUDPqPmBj01q4CcsG5MiVWqt71BP4J85fWGOuS3Eg,1979
-pyvale-2025.7.1.dist-info/licenses/LICENSE,sha256=PLyswAYGHdw3qwnrd4I8glj6pc89FgAgY6W1VtK0NT0,1119
-pyvale-2025.7.1.dist-info/METADATA,sha256=i6Quq3QBuJ3oPcGjTuZzDeIM1uxeQBHNfQNz4zG5mnE,6485
-pyvale-2025.7.1.dist-info/WHEEL,sha256=Ri8zddKrjGdgjlj1OpSsvpDnvHfnQhMQWi3E_v2pqng,97
-pyvale-2025.7.1.dist-info/top_level.txt,sha256=u1d_f4iZ3b3_96Rb_zrs9hyrpC4yE5e1Lg6Ey_Wgr0c,7
-pyvale-2025.7.1.dist-info/RECORD,,
+pyvale-2025.7.2.dist-info/licenses/LICENSE,sha256=PLyswAYGHdw3qwnrd4I8glj6pc89FgAgY6W1VtK0NT0,1119
+pyvale-2025.7.2.dist-info/METADATA,sha256=Azlf3gsqC9ejnFAdvz3DR6NMNHiYs7fj_3mWs5dHyJk,6485
+pyvale-2025.7.2.dist-info/WHEEL,sha256=Ri8zddKrjGdgjlj1OpSsvpDnvHfnQhMQWi3E_v2pqng,97
+pyvale-2025.7.2.dist-info/top_level.txt,sha256=u1d_f4iZ3b3_96Rb_zrs9hyrpC4yE5e1Lg6Ey_Wgr0c,7
+pyvale-2025.7.2.dist-info/RECORD,,