salabim 24.0.15__tar.gz → 24.0.17__tar.gz

{salabim-24.0.15 → salabim-24.0.17}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: salabim
-Version: 24.0.15
+Version: 24.0.17
 Summary: salabim - discrete event simulation in Python
 Author-email: Ruud van der Ham <rt.van.der.ham@gmail.com>
 Project-URL: Homepage, https://salabim.org

{salabim-24.0.15 → salabim-24.0.17}/pyproject.toml

@@ -8,7 +8,7 @@ authors = [
     {name = "Ruud van der Ham", email = "rt.van.der.ham@gmail.com"}
 ]
 description = "salabim - discrete event simulation in Python"
-version = "24.0.15"
+version = "24.0.17"
 readme = "README.md"
 requires-python = ">=3.7"
 dependencies = [

{salabim-24.0.15 → salabim-24.0.17}/salabim/salabim.py

@@ -1,13 +1,13 @@
-#               _         _      _               ____   _  _        ___      _  ____
-#   ___   __ _ | |  __ _ | |__  (_) _ __ ___    |___ \ | || |      / _ \    / || ___|
-#  / __| / _` || | / _` || '_ \ | || '_ ` _ \     __) || || |_    | | | |   | ||___ \
-#  \__ \| (_| || || (_| || |_) || || | | | | |   / __/ |__   _| _ | |_| | _ | | ___) |
-#  |___/ \__,_||_| \__,_||_.__/ |_||_| |_| |_|  |_____|   |_|  (_) \___/ (_)|_||____/
+#               _         _      _               ____   _  _        ___      _  _____
+#   ___   __ _ | |  __ _ | |__  (_) _ __ ___    |___ \ | || |      / _ \    / ||___  |
+#  / __| / _` || | / _` || '_ \ | || '_ ` _ \     __) || || |_    | | | |   | |   / /
+#  \__ \| (_| || || (_| || |_) || || | | | | |   / __/ |__   _| _ | |_| | _ | |  / /
+#  |___/ \__,_||_| \__,_||_.__/ |_||_| |_| |_|  |_____|   |_|  (_) \___/ (_)|_| /_/
 #                    discrete event simulation
 #
 #  see www.salabim.org for more information, the documentation and license information
 
-__version__ = "24.0.15"
+__version__ = "24.0.17"
 
 import heapq
 import random
@@ -7879,11 +7879,11 @@ by adding:
 
         Note
         ----
-        The component has to be scheduled.
+        The component has to be scheduled or interrupted.
 
         Use resume() to resume
         """
-        if self.status.value != scheduled:
+        if self.status.value not in (scheduled, interrupted):
             raise ValueError(self.name() + " component not scheduled")
         self.set_mode(mode)
         if self.status.value == interrupted:
@@ -7956,7 +7956,6 @@ by adding:
                 lineno = self.lineno_txt(add_at=True)
                 self.env.print_trace("", "", self.name() + " resume (" + self.status() + ")", merge_blanks(lineno, self._modetxt()))
                 if self.status.value == scheduled:
-                    reason = "hold"
                     self._reschedule(self.env._now + self._remaining_duration, priority, urgent, "hold", False)
                 else:
                     raise Exception(self.name() + " unexpected interrupted_status", self.status.value())
@@ -9066,7 +9065,7 @@ by adding:
                         honored = False
                         break
                 elif valuetype == 1:
-                    if eval(value.replace("$", "state._value")):
+                    if not eval(value.replace("$", "state._value")):
                         honored = False
                         break
                 elif valuetype == 2:
@@ -11725,14 +11724,20 @@ class Environment:
                                     format="GIF",
                                 )
                         else:
-                            self._images[0].save(
-                                self._video_name,
-                                disposal=2,
-                                save_all=True,
-                                append_images=self._images[1:],
-                                duration=round(1000 / self._real_fps),
-                                optimize=False,
-                            )
+                            for _ in range(2): # normally runs only once
+                                try:
+                                    self._images[0].save(
+                                        self._video_name,
+                                        disposal=2,
+                                        save_all=True,
+                                        append_images=self._images[1:],
+                                        duration=round(1000 / self._real_fps),
+                                        optimize=False,
+                                    )
+                                    break
+                                except ValueError:  # prevent bug in Python 3.13
+                                    self._images=[image.convert("RGB") for image in self._images]
+
                     else:
                         if PythonInExcel or AnacondaCode:
                             with b64_file_handler(self._video_name, mode="b", result=_pie_result) as f:
@@ -11747,15 +11752,20 @@ class Environment:
                                     format="GIF",
                                 )
                         else:
-                            self._images[0].save(
-                                self._video_name,
-                                disposal=2,
-                                save_all=True,
-                                append_images=self._images[1:],
-                                loop=self._video_repeat,
-                                duration=round(1000 / self._real_fps),
-                                optimize=False,
-                            )
+                            for _ in range(2): # normally runs only once
+                                try:
+
+                                    self._images[0].save(
+                                        self._video_name,
+                                        disposal=2,
+                                        save_all=True,
+                                        append_images=self._images[1:],
+                                        loop=self._video_repeat,
+                                        duration=round(1000 / self._real_fps),
+                                        optimize=False,
+                                    )
+                                except ValueError:  # prevent bug in Python 3.13
+                                    self._images=[image.convert("RGB") for image in self._images]
 
                     del self._images
             elif self._video_out == "png":
@@ -11804,7 +11814,6 @@ class Environment:
                 ao.make_pil_image(self.t())
                 if ao._image_visible and (include_topleft or not ao.getattr("in_topleft", False)):
                     image.paste(ao._image, (int(ao._image_x), int(self._height - ao._image_y - ao._image.size[1])), ao._image.convert("RGBA"))
-
         return image.convert(mode)
 
     def insert_frame(self, image: Any, number_of_frames: int = 1) -> None:
@@ -11819,6 +11828,8 @@ class Environment:
         nuumber_of_frames: int
             Number of 1/30 second long frames to be inserted
         """
+
+
         if self._video_out is None:
             raise ValueError("video not set")
         if isinstance(image, (Path, str)):
@@ -11844,6 +11855,7 @@ class Environment:
                 open_cv_image = cv2.cvtColor(numpy.array(image), cv2.COLOR_RGB2BGR)
                 self._video_out.write(open_cv_image)
 
+
     def _save_frame(self):
         self._exclude_from_animation = "not in video"
         image = self._capture_image("RGBA", self._video_mode)
@@ -25118,7 +25130,7 @@ def resize_with_pad(im, target_width, target_height):
     """
     Resize PIL image keeping ratio and using black background.
     """
-    if im.height == target_width and im.width == target_height:
+    if im.height == target_height and im.width == target_width:
         return im
     target_ratio = target_height / target_width
     im_ratio = im.height / im.width

{salabim-24.0.15 → salabim-24.0.17}/salabim.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: salabim
-Version: 24.0.15
+Version: 24.0.17
 Summary: salabim - discrete event simulation in Python
 Author-email: Ruud van der Ham <rt.van.der.ham@gmail.com>
 Project-URL: Homepage, https://salabim.org