chore: refactoring

Author: Herizoran

dwpicker/designer/editor.py

@@ -301,7 +301,7 @@ def create_library_shape(self, path):
 
     def create_shape(
             self, template, before=False, position=None, targets=None,
-            image=False,filepath=None):
+            image=False, filepath=None):
 
         options = deepcopy(template)
         panel = self.shape_canvas.display_options.current_panel

dwpicker/designer/viewportwidget.py

@@ -7,9 +7,8 @@
 from maya import mel
 
 from dwpicker.capture import snap
-from dwpicker.optionvar import (OVERRIDE_PROD_PICKER_DIRECTORY_ENV,
-                                CUSTOM_PROD_PICKER_DIRECTORY,
-                                LAST_IMAGE_DIRECTORY_USED, save_optionvar)
+
+from dwpicker.path import get_filename
 from dwpicker.pyside import QtWidgets, QtCore, QtGui
 from dwpicker.pyside import shiboken2
 from dwpicker.qtutils import icon
@@ -66,10 +65,10 @@ def __init__(self, editor, parent=None):
 
         self.model_panel_name = cmds.modelPanel(picker_model_name, mbv=False)
         cmds.modelEditor(self.model_panel_name,
-                         edit=True,
-                         displayAppearance='smoothShaded',
-                         cam=self.camera_name,
-                         gr=True)
+             edit=True,
+             displayAppearance='smoothShaded',
+             camera=self.camera_name,
+             grid=True)
 
         ptr = omui.MQtUtil.findControl(self.model_panel_name)
         self.model_panel_widget = shiboken2.wrapInstance(long(ptr),
@@ -144,7 +143,7 @@ def __init__(self, editor, parent=None):
         self.snapshot = QtWidgets.QAction(icon('snapshot.png'), '', self)
         self.snapshot.setToolTip("Capture snapshot")
         self.snapshot.triggered.connect(
-            lambda: capture_snapshot(self, camera_combo_box))
+            lambda: self.capture_snapshot(camera_combo_box))
 
         self.toolbar = QtWidgets.QToolBar()
         self.toolbar.setIconSize(QtCore.QSize(14, 14))
@@ -168,12 +167,12 @@ def __init__(self, editor, parent=None):
 
     def showEvent(self, event):
         super(ViewportWidget, self).showEvent(event)
-        self.model_panel_widget.repaint()
+        self.model_panel_widget.update()
 
     def add_snapshot_image(self, file=None):
         if os.path.exists(file):
-            self.editor.create_shape(BACKGROUND, before=True, image=True,
-                                     filepath=file)
+            self.editor.create_shape(
+                BACKGROUND, before=True, image=True, filepath=file)
 
     def update_camera_viewport(self, combo_box, panel):
         """
@@ -183,9 +182,8 @@ def update_camera_viewport(self, combo_box, panel):
         cmds.modelPanel(panel, edit=True, camera=active_camera)
         self.camera_name = active_camera
 
-    def update_resolution_settings(self, combobox, image_size,
-                                   custom_width=None,
-                                   custom_height=None):
+    def update_resolution_settings(
+            self, combobox, image_size, custom_width=None, custom_height=None):
         resolution = combobox.currentText()
 
         if resolution == "Custom":
@@ -220,6 +218,29 @@ def update_resolution_settings(self, combobox, image_size,
                      device_aspect_ratio)
         cmds.setAttr("defaultResolution.pixelAspect", 1)
 
+    def capture_snapshot(self, combo_box):
+        """
+        snapshot args:
+        off_screen: boolean (Process in the background when True)
+        show_ornaments: boolean (Hide Axis and camera names,... when False)
+        """
+        active_camera = combo_box.currentText()
+
+        filename = get_filename()
+
+        snap(active_camera,
+             off_screen=True,
+             filename=filename,
+             frame_padding=0,
+             show_ornaments=False,
+             # clipboard=True,
+             maintain_aspect_ratio=True,
+             camera_options={"displayFieldChart": False})
+
+        # NotificationWidget.show_notification(cls, "Snapshot done!")
+
+        self.add_snapshot_image(filename + ".0.png")
+
 
 class NotificationWidget(QtWidgets.QLabel):
     def __init__(self, parent=None, message="Notification", duration=2000):
@@ -249,7 +270,7 @@ def __init__(self, parent=None, message="Notification", duration=2000):
         self.timer.start(duration)
 
     @staticmethod
-    def show_notification(parent, message="Notification", duration=2000):
+    def show_notification(parent, message="", duration=2000):
         NotificationWidget(parent, message, duration)
 
 
@@ -279,91 +300,48 @@ def toggle_camera_view(camera_name):
                                      orthographic=True)
     up_dir = cmds.camera(camera_name, query=True, worldUp=True)
 
-    camera_view = {"o": True} if is_perspective else {"p": True}
-    cmds.viewPlace(camera_name, up=(up_dir[0], up_dir[1], up_dir[2]),
-                   **camera_view)
+    camera_view = {"ortho": True} if is_perspective else {"perspective": True}
+    cmds.viewPlace(
+        camera_name, up=(up_dir[0], up_dir[1], up_dir[2]), **camera_view)
 
 
 def toggle_camera_settings(panel, camera_name="persp", option="resolution"):
     """
     Toggles the camera settings based on the option specified.
 
-    - 'resolution' toggles the camera resolution (displayResolution and overscan).
-    - 'field_chart' toggles the field chart display.
+    Args:
+        panel (str): The panel's name used on the viewport.
+        camera_name (str): The name of the camera. Defaults to "persp".
+        option (str): The setting to toggle. Options include:
+            - 'lock_camera': Locks or unlocks the camera.
+            - 'resolution': Toggles the camera's resolution settings (displayResolution and overscan).
+            - 'field_chart': Toggles the display of the field chart.
     """
 
     if option == "lock_camera":
         mel.eval("changeCameraLockStatus" + " %s;" % panel)
 
     if option == "resolution":
-        display_resolution = cmds.camera(camera_name, query=True,
-                                         displayResolution=True)
+        display_resolution = cmds.camera(
+            camera_name, query=True, displayResolution=True)
         overscan_value = cmds.camera(camera_name, query=True, overscan=True)
 
         if display_resolution and overscan_value == 1.3:
-            cmds.camera(camera_name, edit=True, displayFilmGate=False,
-                        displayResolution=False, overscan=1.0)
+            cmds.camera(
+                camera_name, edit=True, displayFilmGate=False,
+                displayResolution=False, overscan=1.0)
             return
-        cmds.camera(camera_name, edit=True, displayFilmGate=False,
-                    displayResolution=True, overscan=1.3)
+        cmds.camera(
+            camera_name, edit=True, displayFilmGate=False,
+            displayResolution=True, overscan=1.3)
 
     elif option == "field_chart":
-        field_chart_display = cmds.camera(camera_name, query=True,
-                                          displayFieldChart=True)
+        field_chart_display = cmds.camera(
+            camera_name, query=True, displayFieldChart=True)
         if field_chart_display:
             cmds.camera(camera_name, edit=True, displayFieldChart=False)
             return
         cmds.camera(camera_name, edit=True, displayFieldChart=True)
 
 
-def get_custom_picker_directory():
-    dir_env_overridden = cmds.optionVar(
-        query=OVERRIDE_PROD_PICKER_DIRECTORY_ENV)
-    if not dir_env_overridden:
-        return None
-
-    dir_path = cmds.optionVar(query=CUSTOM_PROD_PICKER_DIRECTORY)
-    if not os.path.isdir(dir_path):
-        return None
-
-    return dir_path
-
-
-def get_filename():
-    folder_path = get_custom_picker_directory()
-    if not folder_path:
-        folder_path = QtWidgets.QFileDialog.getExistingDirectory(None,
-                                                                 "Select Directory",
-                                                                 "")
-        if folder_path:
-            save_optionvar(LAST_IMAGE_DIRECTORY_USED, folder_path)
-        else:
-            folder_path = cmds.optionVar(query=LAST_IMAGE_DIRECTORY_USED)
-
-    filename = os.path.join(folder_path, "dwpicker-" + str(uuid.uuid4()))
-
-    return filename
-
-
-def capture_snapshot(cls, combo_box):
-    """
-    snapshot args:
-    off_screen: boolean (Process in the background when True)
-    show_ornaments: boolean (Hide Axis and camera names,... when False)
-    """
-    active_camera = combo_box.currentText()
-
-    filename = get_filename()
-
-    snap(active_camera,
-         off_screen=True,
-         filename=filename,
-         frame_padding=0,
-         show_ornaments=False,
-         # clipboard=True,
-         maintain_aspect_ratio=True,
-         camera_options={"displayFieldChart": False})
-
-    NotificationWidget.show_notification(cls, "Snapshot done!")
 
-    cls.add_snapshot_image(filename + ".0.png")

dwpicker/path.py

@@ -1,11 +1,15 @@
 
 
 import os
+import uuid
 from maya import cmds
+from dwpicker.pyside import QtWidgets
 from dwpicker.optionvar import (
     AUTO_COLLAPSE_IMG_PATH_FROM_ENV, CUSTOM_PROD_PICKER_DIRECTORY,
     LAST_IMPORT_DIRECTORY, LAST_IMAGE_DIRECTORY_USED, LAST_OPEN_DIRECTORY,
-    OVERRIDE_PROD_PICKER_DIRECTORY_ENV, USE_PROD_PICKER_DIR_AS_DEFAULT)
+    OVERRIDE_PROD_PICKER_DIRECTORY_ENV, USE_PROD_PICKER_DIR_AS_DEFAULT,
+    save_optionvar)
+
 
 
 def unix_path(path, isroot=False):
@@ -78,3 +82,18 @@ def get_image_directory():
         if directory:
             return directory
     return cmds.optionVar(query=LAST_IMAGE_DIRECTORY_USED)
+
+def get_filename():
+    folder_path = get_picker_project_directory()
+    if not folder_path:
+        folder_path = QtWidgets.QFileDialog.getExistingDirectory(None,
+                                                                 "Select Directory",
+                                                                 "")
+        if folder_path:
+            save_optionvar(LAST_IMAGE_DIRECTORY_USED, folder_path)
+        else:
+            folder_path = cmds.optionVar(query=LAST_IMAGE_DIRECTORY_USED)
+
+    filename = os.path.join(folder_path, "dwpicker-" + str(uuid.uuid4()))
+
+    return filename