Closes #1124

Good enough to make module UIs usable

Author: dcwhite

src/Dataflow/Engine/Controller/NetworkEditorController.cc

@@ -120,7 +120,7 @@ namespace
 
       ModulePositions positions;
       int i = 0;
-      const double moduleVerticalSpacing = 80;
+      const double moduleVerticalSpacing = 110;
       const double moduleHorizontalSpacing = 264;
       const double moduleSpacingOffset = 10;
       static int numSnips = 0;

src/Interface/Application/ModuleWidget.cc

@@ -1035,6 +1035,8 @@ void ModuleWidget::setColorUnselected()
 
 boost::shared_ptr<ModuleDialogFactory> ModuleWidget::dialogFactory_;
 
+double ModuleWidget::highResolutionExpandFactor_ = 1;
+
 void ModuleWidget::makeOptionsDialog()
 {
   if (theModule_->has_ui())
@@ -1074,14 +1076,13 @@ void ModuleWidget::makeOptionsDialog()
         dockable_->setFloating(true);
       }
 
-      auto expand = Core::Application::Instance().parameters()->developerParameters()->guiExpandFactor().get_value_or(-1);
-      if (expand > 1)
+      if (highResolutionExpandFactor_ > 1)
       {
-        qDebug() << "expand factor for dialogs:" << expand;
-        qDebug() << dialog_->size();
-        dialog_->setFixedHeight(dialog_->size().height() * expand);
-        dialog_->setFixedWidth(dialog_->size().width() * (((expand - 1) * 0.5) + 1));
-        qDebug() << dialog_->size();
+        //qDebug() << "expand factor for dialogs:" << highResolutionExpandFactor_;
+        //qDebug() << dialog_->size();
+        dialog_->setFixedHeight(dialog_->size().height() * highResolutionExpandFactor_);
+        dialog_->setFixedWidth(dialog_->size().width() * (((highResolutionExpandFactor_ - 1) * 0.5) + 1));
+        //qDebug() << dialog_->size();
       }
 
       dialog_->pull();

src/Interface/Application/ModuleWidget.h

@@ -104,7 +104,8 @@ class ModuleWidget : public QStackedWidget,
 	Q_OBJECT
 
 public:
-  ModuleWidget(NetworkEditor* ed, const QString& name, SCIRun::Dataflow::Networks::ModuleHandle theModule, boost::shared_ptr<DialogErrorControl> dialogErrorControl,
+  ModuleWidget(NetworkEditor* ed, const QString& name, SCIRun::Dataflow::Networks::ModuleHandle theModule, 
+    boost::shared_ptr<DialogErrorControl> dialogErrorControl,
     QWidget* parent = nullptr);
   ~ModuleWidget();
 
@@ -162,6 +163,8 @@ class ModuleWidget : public QStackedWidget,
   QString metadataToString() const;
   QDialog* dialog();
 
+  static double highResolutionExpandFactor_;
+
 public Q_SLOTS:
   virtual bool executeWithSignals() override;
   void toggleOptionsDialog();

src/Interface/Application/NetworkEditor.cc

@@ -64,6 +64,7 @@ NetworkEditor::NetworkEditor(boost::shared_ptr<CurrentModuleSelection> moduleSel
   PreexecuteFunc preexecuteFunc,
   TagColorFunc tagColor,
   TagNameFunc tagName,
+  double highResolutionExpandFactor,
   QWidget* parent)
   : QGraphicsView(parent),
   modulesSelectedByCL_(false),
@@ -80,11 +81,13 @@ NetworkEditor::NetworkEditor(boost::shared_ptr<CurrentModuleSelection> moduleSel
   moduleEventProxy_(new ModuleEventProxy),
   zLevelManager_(new ZLevelManager(scene_)),
   fileLoading_(false),
-  preexecute_(preexecuteFunc)
+  preexecute_(preexecuteFunc),
+  highResolutionExpandFactor_(highResolutionExpandFactor)
 {
   scene_->setBackgroundBrush(Qt::darkGray);
   ModuleWidget::connectionFactory_.reset(new ConnectionFactory(scene_));
   ModuleWidget::closestPortFinder_.reset(new ClosestPortFinder(scene_));
+  ModuleWidget::highResolutionExpandFactor_ = highResolutionExpandFactor_; 
 
   setScene(scene_);
   setDragMode(RubberBandDrag);
@@ -378,15 +381,15 @@ void NetworkEditor::setupModuleWidget(ModuleWidget* module)
   proxy->createPortPositionProviders();
   proxy->highlightPorts(Preferences::Instance().highlightPorts ? 1 : 0);
 
-  auto expand = Core::Application::Instance().parameters()->developerParameters()->guiExpandFactor().get_value_or(-1);
-
-  if (expand > 0)
+  if (highResolutionExpandFactor_ > 1)
   {
-    qDebug() << "expand factor:" << expand;
-    qDebug() << proxy->size();
-    module->setFixedHeight(proxy->size().height() * expand);
-    proxy->setMaximumHeight(proxy->size().height() * expand);
-    qDebug() << proxy->size();
+    //qDebug() << "module widget expand factor:" << highResolutionExpandFactor_;
+    //qDebug() << proxy->size();
+    module->setFixedHeight(proxy->size().height() * highResolutionExpandFactor_);
+    proxy->setMaximumHeight(proxy->size().height() * highResolutionExpandFactor_);
+    module->setFixedWidth(proxy->size().width() * std::max(highResolutionExpandFactor_*0.9, 1.0));
+    proxy->setMaximumWidth(proxy->size().width() * std::max(highResolutionExpandFactor_*0.9, 1.0));
+    //qDebug() << proxy->size();
   }
 
   scene_->addItem(proxy);

src/Interface/Application/NetworkEditor.h

@@ -174,11 +174,13 @@ namespace Gui {
 	  Q_OBJECT
 
   public:
-    explicit NetworkEditor(boost::shared_ptr<CurrentModuleSelection> moduleSelectionGetter, boost::shared_ptr<DefaultNotePositionGetter> dnpg,
+    explicit NetworkEditor(boost::shared_ptr<CurrentModuleSelection> moduleSelectionGetter, 
+        boost::shared_ptr<DefaultNotePositionGetter> dnpg,
 				boost::shared_ptr<DialogErrorControl> dialogErrorControl,
         PreexecuteFunc preexecuteFunc,
         TagColorFunc tagColor,
         TagNameFunc tagName,
+        double highResolutionExpandFactor,
         QWidget* parent = nullptr);
     ~NetworkEditor();
     void setNetworkEditorController(boost::shared_ptr<NetworkEditorControllerGuiProxy> controller);
@@ -353,6 +355,7 @@ namespace Gui {
     bool insertingNewModuleAlongConnection_ { false };
     PreexecuteFunc preexecute_;
     bool showTagGroupsOnFileLoad_ { false };
+    double highResolutionExpandFactor_{ 1 };
   };
 }
 }

src/Interface/Application/SCIRunMainWindow.cc

@@ -375,7 +375,7 @@ SCIRunMainWindow::SCIRunMainWindow() : shortcuts_(nullptr), returnCode_(0), quit
 
   setupVersionButton();
 
-	WidgetStyleMixin::tabStyle(optionsTabWidget_);
+  WidgetStyleMixin::tabStyle(optionsTabWidget_);
 }
 
 void SCIRunMainWindow::initialize()
@@ -505,10 +505,15 @@ void SCIRunMainWindow::setupNetworkEditor()
   auto tagColorFunc = [this](int tag) { return tagManagerWindow_->tagColor(tag); };
   auto tagNameFunc = [this](int tag) { return tagManagerWindow_->tagName(tag); };
 	auto preexecuteFunc = [this]() { preexecute(); };
+  auto highResolutionExpandFactor = Core::Application::Instance().parameters()->developerParameters()->guiExpandFactor().get_value_or(1.0);
+  {
+    auto screen = QApplication::desktop()->screenGeometry();
+    if (screen.height() * screen.width() > 5000000)
+      highResolutionExpandFactor *= 1.5;
+  }
   networkEditor_ = new NetworkEditor(getter, defaultNotePositionGetter_, dialogErrorControl_, preexecuteFunc,
-    tagColorFunc, tagNameFunc, scrollAreaWidgetContents_);
+    tagColorFunc, tagNameFunc, highResolutionExpandFactor, scrollAreaWidgetContents_);
   networkEditor_->setObjectName(QString::fromUtf8("networkEditor_"));
-  //networkEditor_->setContextMenuPolicy(Qt::ActionsContextMenu);
   networkEditor_->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOn);
   networkEditor_->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOn);
   networkEditor_->verticalScrollBar()->setValue(0);