Maya Tool - Fix Center 2D Offset node update bug

The Center 2D Offset UI was not updating the nodes used under the hood
when the centering was created after the UI was opened - it only found
the nodes when the UI was opened.

Added a "Camera" label, so the user can see which camera is being
controlled.

Renamed "Reset All" button to "Reset Offset" because the later is more
descriptive to what the button actually does - What does "Reset All"
mean? What is "all"?

Author: david-cattermole

docs/source/images/tools_center_2d_ui.png

@@ -43,7 +43,7 @@ Usage to *apply* the centering effect:
 
    - Click 'Remove' button to remove the Center 2D.
 
-   - Click 'Reset All' button to reset all the 2D offsets.
+   - Click 'Reset Offset' button to reset all the 2D offsets.
 
    - Click 'Close' button to close the window.
 

docs/source/tools_displaytools.rst

@@ -35,6 +35,14 @@
 LOG = mmSolver.logger.get_logger()
 
 
+def _update_ui_nodes():
+    import mmSolver.tools.centertwodee.ui.centertwodee_window as window
+
+    window_instance = window.CenterTwoDeeWindow.get_instance()
+    if window_instance is not None:
+        window_instance.update_nodes()
+
+
 def main():
     """
     Center the selected transform onto the camera view.
@@ -54,12 +62,14 @@ def main():
     if model_editor is None:
         msg = 'Please select an active 3D viewport.'
         LOG.warning(msg)
+        _update_ui_nodes()
         return
 
     cam_tfm, cam_shp = viewport_utils.get_viewport_camera(model_editor)
     if cam_shp is None:
         msg = 'Please select an active 3D viewport to get a camera.'
         LOG.warning(msg)
+        _update_ui_nodes()
         return
 
     try:
@@ -140,6 +150,7 @@ def main():
             maya.cmds.select(save_sel, replace=True)
     finally:
         mmapi.set_solver_running(False)
+        _update_ui_nodes()
     return
 
 
@@ -151,12 +162,14 @@ def remove():
     if model_editor is None:
         msg = 'Please select an active 3D viewport.'
         LOG.warning(msg)
+        _update_ui_nodes()
         return
 
     cam_tfm, cam_shp = viewport_utils.get_viewport_camera(model_editor)
     if cam_shp is None:
         msg = 'Please select an active 3D viewport to get a camera.'
         LOG.warning(msg)
+        _update_ui_nodes()
         return
 
     LOG.warning('Removing 2D centering from %r', cam_tfm)
@@ -167,6 +180,7 @@ def remove():
         reproject_utils.reset_pan_zoom(cam_tfm, cam_shp)
     finally:
         mmapi.set_solver_running(False)
+        _update_ui_nodes()
     return
 
 

python/mmSolver/tools/centertwodee/tool.py

@@ -7,13 +7,34 @@
     <x>0</x>
     <y>0</y>
     <width>510</width>
-    <height>146</height>
+    <height>178</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>Form</string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
+   <item>
+    <layout class="QHBoxLayout" name="camera_layout">
+     <item>
+      <widget class="QLabel" name="camera_label">
+       <property name="text">
+        <string>Camera</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QLineEdit" name="camera_lineEdit">
+       <property name="enabled">
+        <bool>false</bool>
+       </property>
+       <property name="readOnly">
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
    <item>
     <widget class="QGroupBox" name="options_groupBox">
      <property name="title">

python/mmSolver/tools/centertwodee/ui/centertwodee_layout.ui

@@ -65,9 +65,12 @@ def __init__(self, parent=None, name=None):
         super(CenterTwoDeeWindow, self).__init__(parent, name=name)
         self.setupUi(self)
         self.addSubForm(centertwodee_layout.CenterTwoDeeLayout)
-        self.offset_node, self.camera_shape = lib.get_offset_nodes()
         self.form = self.getSubForm()
 
+        self.offset_node = None
+        self.camera_shape = None
+        self.update_nodes()
+
         # Set slider defaults in subform
         self.set_initial_values()
 
@@ -81,7 +84,7 @@ def __init__(self, parent=None, name=None):
         self.form.zoom_horizontalSlider.valueChanged.connect(self.form.zoomValueChanged)
         self.form.horizontal_signal.connect(self.horizontal_offset_node_update)
         self.form.vertical_signal.connect(self.vertical_offset_node_update)
-        self.form.zoom_signal.connect(self.camera_shape_update)
+        self.form.zoom_signal.connect(self.zoom_camera_shape_update)
 
         self.setWindowTitle(const.WINDOW_TITLE)
         self.setWindowFlags(QtCore.Qt.Tool)
@@ -94,7 +97,7 @@ def __init__(self, parent=None, name=None):
         self.closeBtn.show()
         self.createBtn.setText('Apply')
         self.applyBtn.setText('Remove')
-        self.resetBtn.setText('Reset All')
+        self.resetBtn.setText('Reset Offset')
 
         self.createBtn.clicked.connect(self.apply_center)
         self.applyBtn.clicked.connect(self.remove_center)
@@ -132,7 +135,7 @@ def vertical_offset_node_update(self, value):
         return
 
     @QtCore.Slot(float)
-    def camera_shape_update(self, value):
+    def zoom_camera_shape_update(self, value):
         output = lib.process_value(input_value=value, source='slider', zoom=True)
         if self.camera_shape:
             lib.set_zoom(self.camera_shape, output)
@@ -148,11 +151,28 @@ def remove_center(self):
 
         tool.remove()
 
+    def update_nodes(self):
+        self.offset_node, self.camera_shape = lib.get_offset_nodes()
+
+        enabled = bool(self.offset_node and self.camera_shape)
+        self.form.horizontal_horizontalSlider.setEnabled(enabled)
+        self.form.vertical_horizontalSlider.setEnabled(enabled)
+        self.form.zoom_horizontalSlider.setEnabled(enabled)
+
+        if enabled is True:
+            self.form.camera_lineEdit.setText(self.camera_shape)
+        else:
+            self.form.camera_lineEdit.setText('')
+
+            # Ensure both are not set.
+            self.offset_node = None
+            self.camera_shape = None
+
     def reset_options(self):
         self.form.reset_options()
 
     def set_initial_values(self):
-        if not self.offset_node:
+        if not self.offset_node or not self.camera_shape:
             horizontal_slider_value = const.DEFAULT_SLIDER_VALUE
             vertical_slider_value = const.DEFAULT_SLIDER_VALUE
             zoom_slider_value = const.DEFAULT_SLIDER_VALUE