shinestacker 1.9.1__py3-none-any.whl → 1.9.2__py3-none-any.whl

shinestacker/_version.py

@@ -1 +1 @@
-__version__ = '1.9.1'
+__version__ = '1.9.2'

shinestacker/algorithms/align.py

@@ -65,6 +65,20 @@ _HOMOGRAPHY_THRESHOLDS = {
     'max_aspect_ratio': 2.0,  # max aspect ratio change
 }
 
+_AFFINE_THRESHOLDS_LARGE = {
+    'max_rotation': 20.0,  # degrees
+    'min_scale': 0.5,
+    'max_scale': 1.5,
+    'max_shear': 10.0,  # degrees
+    'max_translation_ratio': 0.2,  # 20% of image dimension
+}
+
+_HOMOGRAPHY_THRESHOLDS_LARGE = {
+    'max_skew': 12.0,  # degrees
+    'max_scale_change': 2.0,  # max area change ratio
+    'max_aspect_ratio': 4.0,  # max aspect ratio change
+}
+
 
 def decompose_affine_matrix(m):
     a, b, tx = m[0, 0], m[0, 1], m[0, 2]
@@ -562,6 +576,9 @@ class AlignFramesBase(SubAction):
     def get_transform_thresholds(self):
         return _AFFINE_THRESHOLDS, _HOMOGRAPHY_THRESHOLDS
 
+    def get_transform_thresholds_large(self):
+        return _AFFINE_THRESHOLDS_LARGE, _HOMOGRAPHY_THRESHOLDS_LARGE
+
     def image_str(self, idx):
         return f"{self.process.frame_str(idx)}, " \
                f"{os.path.basename(self.process.input_filepath(idx))}"
@@ -771,7 +788,7 @@ class AlignFrames(AlignFramesBase):
                 f"{self.process.name}-matches-{idx_str}.pdf")
         else:
             plot_path = None
-        affine_thresholds, homography_thresholds = self.get_transform_thresholds()
+        affine_thresholds, homography_thresholds = self.get_transform_thresholds_large()
         n_good_matches, _m, img = align_images(
             img_ref, img_0,
             feature_config=self.feature_config,

shinestacker/algorithms/align_parallel.py

@@ -104,7 +104,6 @@ class AlignFramesParallel(AlignFramesBase):
                     self._img_locks[i] = 0
                 elif self._img_cache[i] is not None:
                     cached_images += 1
-            # self.print_message(f"cached images: {cached_images}")
         gc.collect()
 
     def begin(self, process):
@@ -176,17 +175,22 @@ class AlignFramesParallel(AlignFramesBase):
             self._transforms[idx] = None
         gc.collect()
         missing_transforms = 0
-        thresholds = self.get_transform_thresholds()
+        thresholds = self.get_transform_thresholds_large()
         for i in range(n_frames):
             if self._cumulative_transforms[i] is not None:
                 self._cumulative_transforms[i] = self._cumulative_transforms[i].astype(np.float32)
-                is_valid, _reason, result = check_transform(
+                is_valid, reason, result = check_transform(
                     self._cumulative_transforms[i], self._img_shapes[i],
                     transform_type, *thresholds)
                 if is_valid:
                     self.save_transform_result(i, result)
                 else:
+                    self.print_message(
+                        f"invalid cumulative transform for {self.image_str(i)}",
+                        color=constants.LOG_COLOR_WARNING, level=logging.WARNING)
+                if self.alignment_config['abort_abnormal']:
                     self._cumulative_transforms[i] = None
+                    raise RuntimeError(f"invalid cumulative transformation: {reason}")
             else:
                 missing_transforms += 1
         msg = "feature extaction completed"
@@ -337,9 +341,9 @@ class AlignFramesParallel(AlignFramesBase):
         m = self._cumulative_transforms[idx]
         if m is None:
             self.print_message(
-                f"no transformation for {self.image_str(idx)}, skipping alignment",
+                f"no transformation for {self.image_str(idx)}, image skipped",
                 color=constants.LOG_COLOR_WARNING, level=logging.WARNING)
-            return img_0
+            return None
         transform_type = self.alignment_config['transform']
         if transform_type == constants.ALIGN_RIGID and m.shape != (2, 3):
             self.print_message(f"invalid matrix shape for rigid transform: {m.shape}")