q3dviewer 1.1.1__tar.gz → 1.1.2__tar.gz

{q3dviewer-1.1.1/q3dviewer.egg-info → q3dviewer-1.1.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: q3dviewer
-Version: 1.1.1
+Version: 1.1.2
 Summary: A library designed for quickly deploying a 3D viewer.
 Home-page: https://github.com/scomup/q3dviewer
 Author: Liu Yang

{q3dviewer-1.1.1 → q3dviewer-1.1.2}/q3dviewer/tools/film_maker.py

@@ -107,7 +107,7 @@ class CMMViewer(q3d.Viewer):
         label_codec = QLabel("Codec:")
         codec_layout.addWidget(label_codec)
         self.codec_combo = QComboBox()
-        self.codec_combo.addItems(["mjpeg", "mpeg4", "libx264", "libx265"])
+        self.codec_combo.addItems(["libx264", "mjpeg", "mpeg4", "libx265"])
         codec_layout.addWidget(self.codec_combo)
         setting_layout.addLayout(codec_layout)
 
@@ -143,6 +143,8 @@ class CMMViewer(q3d.Viewer):
         dock_widget = QDockWidget("Settings", self)
         dock_widget.setWidget(QWidget())
         dock_widget.widget().setLayout(setting_layout)
+        # Hide close and undock buttons, I don't want the user to close the dock
+        dock_widget.setFeatures(QDockWidget.DockWidgetMovable)
         self.addDockWidget(QtCore.Qt.RightDockWidgetArea, dock_widget)
 
         # Add the dock widget to the main layout
@@ -308,14 +310,16 @@ class CMMViewer(q3d.Viewer):
 
     def start_recording(self):
         self.is_recording = True
-        self.frames_to_record = []
+        self.prv_frame_shape = None
         video_path = self.video_path_edit.text()
         codec = self.codec_combo.currentText()
         self.play_button.setStyleSheet("background-color: red")
         self.play_button.setText("Recording")
         self.writer = imageio.get_writer(video_path, 
                                          fps=self.update_interval,
-                                         codec=codec)  # quality=10
+                                         codec=codec,
+                                         quality=10,
+                                         pixelformat='yuvj420p')
         # disable the all the frame_item while recording
         for frame in self.key_frames:
             frame.item.hide()
@@ -323,6 +327,7 @@ class CMMViewer(q3d.Viewer):
 
     def stop_recording(self, save_movie=True):
         self.is_recording = False
+        self.prv_frame_shape = None
         self.record_checkbox.setChecked(False)
         # enable the all the frame_item after recording
         for frame in self.key_frames:
@@ -342,17 +347,27 @@ class CMMViewer(q3d.Viewer):
 
     def record_frame(self):
         frame = self.glwidget.capture_frame()
-        # make sure the frame size is multiple of 16
+        
+        # restart recording if the window size changes
+        if self.prv_frame_shape is not None and frame.shape != self.prv_frame_shape:
+            self.writer.close()
+            self.start_recording()
+            return
+        self.prv_frame_shape = frame.shape 
+
         height, width, _ = frame.shape
-        if height % 16 != 0 or width % 16 != 0:
-            frame = frame[:-(height % 16), :-(width % 16), :]
-            frame = np.ascontiguousarray(frame)
-        self.frames_to_record.append(frame)
+        # Adjust frame dimensions to be multiples of 16
+        new_height = height - (height % 16)
+        new_width = width - (width % 16)
+        frame = frame[:new_height, :new_width, :]
+        frame = np.ascontiguousarray(frame)
         try:
             self.writer.append_data(frame)
         except Exception as e:
-            print("Don't change the window size during recording.")
-            self.stop_recording(False) # Stop recording without saving
+            # unexpected error, stop recording without saving
+            print("Error while recording:")
+            print(e)
+            self.stop_recording(False)
             self.stop_playback()
 
     def eventFilter(self, obj, event):

{q3dviewer-1.1.1 → q3dviewer-1.1.2/q3dviewer.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: q3dviewer
-Version: 1.1.1
+Version: 1.1.2
 Summary: A library designed for quickly deploying a 3D viewer.
 Home-page: https://github.com/scomup/q3dviewer
 Author: Liu Yang

{q3dviewer-1.1.1 → q3dviewer-1.1.2}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name='q3dviewer',
-    version='1.1.1',
+    version='1.1.2',
     author="Liu Yang",
     description="A library designed for quickly deploying a 3D viewer.",
     long_description=open("README.md").read(),