q3dviewer 1.1.1__py3-none-any.whl → 1.1.2__py3-none-any.whl

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.dist-info → q3dviewer-1.1.2.dist-info}/METADATA

@@ -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.dist-info → q3dviewer-1.1.2.dist-info}/RECORD

@@ -28,7 +28,7 @@ q3dviewer/shaders/sort_by_key.glsl,sha256=CA2zOcbyDGYAJSJEUvgjUqNshg9NAehf8ipL3J
 q3dviewer/tools/__init__.py,sha256=01wG7BGM6VX0QyFBKsqPmyf2e-vrmV_N3-mo-VQ1VBg,20
 q3dviewer/tools/cloud_viewer.py,sha256=10f2LSWpmsXzxrGobXw188doVjJbgBfPoqZPUi35EtI,3867
 q3dviewer/tools/example_viewer.py,sha256=yeVXT0k4-h1vTLKnGzWADZD3our6XUaYUTy0p5daTkE,959
-q3dviewer/tools/film_maker.py,sha256=PkkMW6__ml7850U2UV2G1Pn4Ahk4EWa7edcvI_5-Z4Y,16028
+q3dviewer/tools/film_maker.py,sha256=KXl0H03vnS7eAFw7nSRvTG3J0Y7gYt6YFUYaoxJf3xM,16600
 q3dviewer/tools/gaussian_viewer.py,sha256=vIwWmiFhjNmknrEkBLzt2yiegeH7LP3OeNjnGM6GzaI,1633
 q3dviewer/tools/lidar_calib.py,sha256=M01bGg2mT8LwVcYybolr4UW_UUaR-f-BFciEHtjeK-w,10488
 q3dviewer/tools/lidar_cam_calib.py,sha256=SYNLDvi15MX7Q3aGn771fvu1cES9xeXgP0_WmDq33w4,11200
@@ -39,9 +39,9 @@ q3dviewer/utils/convert_ros_msg.py,sha256=sAoQfy3qLQKsIArBAVm8H--wlQXOcmkKK3-Ox9
 q3dviewer/utils/gl_helper.py,sha256=dRY_kUqyPMr7NTcupUr6_VTvgnj53iE2C0Lk0-oFYsI,1435
 q3dviewer/utils/maths.py,sha256=5TmjWUX1K3UjygXxrUsydjbo7tPzu0gD-yy7qtQUGBU,10588
 q3dviewer/utils/range_slider.py,sha256=jZJQL-uQgnpgLvtYSWpKTrJlLkt3aqNpaRQAePEpNd0,3174
-q3dviewer-1.1.1.dist-info/LICENSE,sha256=81cMOyNfw8KLb1JnPYngGHJ5W83gSbZEBU9MEP3tl-E,1124
-q3dviewer-1.1.1.dist-info/METADATA,sha256=wSqlVSSanm719PxnxIE7VOStyogcvsVwK1QobHCOLQI,7032
-q3dviewer-1.1.1.dist-info/WHEEL,sha256=g4nMs7d-Xl9-xC9XovUrsDHGXt-FT0E17Yqo92DEfvY,92
-q3dviewer-1.1.1.dist-info/entry_points.txt,sha256=EOjker7XYaBk70ffvNB_knPcfA33Bnlg21ZjEeM1EyI,362
-q3dviewer-1.1.1.dist-info/top_level.txt,sha256=HFFDCbGu28txcGe2HPc46A7EPaguBa_b5oH7bufmxHM,10
-q3dviewer-1.1.1.dist-info/RECORD,,
+q3dviewer-1.1.2.dist-info/LICENSE,sha256=81cMOyNfw8KLb1JnPYngGHJ5W83gSbZEBU9MEP3tl-E,1124
+q3dviewer-1.1.2.dist-info/METADATA,sha256=c8ONBUQAOF1v0UYF_6_w_vZ25fagwH-bL-k0Mj6x71I,7032
+q3dviewer-1.1.2.dist-info/WHEEL,sha256=g4nMs7d-Xl9-xC9XovUrsDHGXt-FT0E17Yqo92DEfvY,92
+q3dviewer-1.1.2.dist-info/entry_points.txt,sha256=EOjker7XYaBk70ffvNB_knPcfA33Bnlg21ZjEeM1EyI,362
+q3dviewer-1.1.2.dist-info/top_level.txt,sha256=HFFDCbGu28txcGe2HPc46A7EPaguBa_b5oH7bufmxHM,10
+q3dviewer-1.1.2.dist-info/RECORD,,