Closes #2418

SCIInstitute · Mar 21, 2023 · b1ee5e7 · b1ee5e7
1 parent 2a48be7
commit b1ee5e7
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 13 deletions.
diff --git a/src/Dataflow/Engine/Controller/PythonImpl.cc b/src/Dataflow/Engine/Controller/PythonImpl.cc
@@ -534,7 +534,7 @@ SharedPointer<PyModule> PythonImpl::addModule(const std::string& name)
     logWarning("Module add failed, no such module type ({})", name);
 
   mostRecentAddModuleId_ = m->id().id_;
-  logCritical("here i have the most recent added id: {}", mostRecentAddModuleId_);
+  //logCritical("here i have the most recent added id: {}", mostRecentAddModuleId_);
 
   return modules_[mostRecentAddModuleId_];
 }

diff --git a/src/Interface/Modules/Render/ViewScene.cc b/src/Interface/Modules/Render/ViewScene.cc
@@ -330,10 +330,7 @@ bool PreviousWidgetSelectionInfo::hasSameWidget(const WidgetHandle widget) const
 
 bool PreviousWidgetSelectionInfo::hasPreviousWidget() const
 {
-  if (previousSelectedWidget_)
-    return true;
-  else
-    return false;
+  return previousSelectedWidget_ != nullptr;
 }
 
 void PreviousWidgetSelectionInfo::deletePreviousWidget()
@@ -441,6 +438,11 @@ ViewSceneDialog::ViewSceneDialog(const std::string& name, ModuleStateHandle stat
   state->connectSpecificStateChanged(Parameters::CameraDistance,[this](){Q_EMIT cameraDistanceChangeForwarder();});
   connect(this, &ViewSceneDialog::cameraDistanceChangeForwarder, this, &ViewSceneDialog::pullCameraDistance);
 
+  state_->connectSpecificStateChanged(Parameters::WindowSizeX, [this]() { adjustSizeFromState(); });
+  state_->connectSpecificStateChanged(Parameters::WindowSizeY, [this]() { adjustSizeFromState(); });
+  state_->connectSpecificStateChanged(Parameters::WindowPositionX, [this]() { adjustPositionFromState(); });
+  state_->connectSpecificStateChanged(Parameters::WindowPositionY, [this]() { adjustPositionFromState(); });
+
   lockMutex();
 
   const std::string filesystemRoot = Application::Instance().executablePath().string();
@@ -1086,11 +1088,7 @@ void ViewSceneDialog::pullSpecial()
       parentWidget()->show();
     }
 
-    if (parentWidget())
-    {
-      const auto qs = QSize(state_->getValue(Parameters::WindowSizeX).toInt(), state_->getValue(Parameters::WindowSizeY).toInt());
-      parentWidget()->resize(qs);
-    }
+    adjustSizeFromState();
 
     if (parentWidget())
     {
@@ -1107,9 +1105,7 @@ void ViewSceneDialog::pullSpecial()
         }
         else
         {
-          const auto x = state_->getValue(Parameters::WindowPositionX).toInt();
-          const auto y = state_->getValue(Parameters::WindowPositionY).toInt();
-          parentWidget()->move(x, y);
+          adjustPositionFromState();
         }
       }
     }
@@ -1122,6 +1118,25 @@ void ViewSceneDialog::pullSpecial()
   }
 }
 
+void ViewSceneDialog::adjustSizeFromState()
+{
+  if (parentWidget())
+  {
+    const auto qs = QSize(state_->getValue(Parameters::WindowSizeX).toInt(), state_->getValue(Parameters::WindowSizeY).toInt());
+    parentWidget()->resize(qs);
+  }
+}
+
+void ViewSceneDialog::adjustPositionFromState()
+{
+  if (parentWidget() && state_->getValue(Parameters::IsFloating).toBool())
+  {
+    const auto x = state_->getValue(Parameters::WindowPositionX).toInt();
+    const auto y = state_->getValue(Parameters::WindowPositionY).toInt();
+    parentWidget()->move(x, y);
+  }
+}
+
 void ViewSceneDialog::adjustToolbar(double factor)
 {
   adjustToolbarForHighResolution(impl_->toolBar1_, factor);

diff --git a/src/Interface/Modules/Render/ViewScene.h b/src/Interface/Modules/Render/ViewScene.h
@@ -290,6 +290,8 @@ namespace SCIRun {
       void takeScreenshot();
       void sendScreenshotDownstreamForTesting();
       void saveScreenshot(QString directory, bool notify);
+      void adjustSizeFromState();
+      void adjustPositionFromState();
 
       std::unique_ptr<ViewSceneDialogImpl> impl_;