Merge pull request #1666 from SCIInstitute/guiHidpi

Gui hidpi improvements and updated toolkit links

Author: dcwhite

src/Interface/Application/ModuleWidget.cc

@@ -161,10 +161,18 @@ void ModuleWidgetDisplay::setupFrame(QStackedWidget* stacked)
 
 void ModuleWidgetDisplay::setupTitle(const QString& name)
 {
-  QFont titleFont(scirunModuleFontName(), titleFontSize, QFont::Bold);
+  auto hiDpi = ModuleWidget::highResolutionExpandFactor_ > 1;
+  auto fontSize = titleFontSize;
+  if (hiDpi)
+    fontSize--;
+  QFont titleFont(scirunModuleFontName(), fontSize, QFont::Bold);
+  if (hiDpi)
+    titleFont.setBold(false);
   titleLabel_->setFont(titleFont);
   titleLabel_->setText(name);
-  QFont smallerTitleFont(scirunModuleFontName(), titleFontSize - buttonPageFontSizeDiff);
+  if (hiDpi)
+    titleLabel_->setMinimumHeight(1.2 * titleLabel_->minimumHeight());
+  QFont smallerTitleFont(scirunModuleFontName(), fontSize - buttonPageFontSizeDiff);
   buttonGroup_->setFont(smallerTitleFont);
   buttonGroup_->setTitle(name);
   progressGroupBox_->setFont(smallerTitleFont);
@@ -1172,13 +1180,13 @@ void ModuleWidget::makeOptionsDialog()
 
       if (highResolutionExpandFactor_ > 1 && !isViewScene_)
       {
-        //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();
       }
 
+      if (highResolutionExpandFactor_ > 1 && isViewScene_)
+        dialog_->adjustToolbar();
+
       dialog_->pull();
     }
   }

src/Interface/Application/NetworkEditor.cc

@@ -431,10 +431,11 @@ ModuleProxyWidget* NetworkEditor::setupModuleWidget(ModuleWidget* module)
 
   if (highResolutionExpandFactor_ > 1)
   {
-    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));
+    auto multiplier = std::min(highResolutionExpandFactor_, 1.5);
+    module->setFixedHeight(proxy->size().height() * multiplier);
+    proxy->setMaximumHeight(proxy->size().height() * multiplier);
+    module->setFixedWidth(proxy->size().width() * std::max(multiplier*0.9, 1.0));
+    proxy->setMaximumWidth(proxy->size().width() * std::max(multiplier*0.9, 1.0));
   }
 
   scene_->addItem(proxy);

src/Interface/Application/SCIRunMainWindow.cc

@@ -254,24 +254,38 @@ SCIRunMainWindow::SCIRunMainWindow()
   connect(actionKeyboardShortcuts_, SIGNAL(triggered()), this, SLOT(showKeyboardShortcutsDialog()));
 
   //TODO: store in xml file, add to app resources
-  ToolkitInfo fwdInv{ "http://www.sci.utah.edu/images/software/forward-inverse/forward-inverse-mod.png",
-    "http://sci.utah.edu/devbuilds/scirun5/toolkits/FwdInvToolkit_v1.2.zip",
-    "FwdInvToolkit_stable.zip" };
-  fwdInv.setupAction(actionForwardInverseStable_, this);
-  ToolkitInfo fwdInvNightly{ "http://www.sci.utah.edu/images/software/forward-inverse/forward-inverse-mod.png",
-    "https://codeload.github.com/SCIInstitute/FwdInvToolkit/zip/master",
-    "FwdInvToolkit_nightly.zip" };
-  fwdInvNightly.setupAction(actionForwardInverseNightly_, this);
-
-  ToolkitInfo brainStim{ "http://www.sci.utah.edu/images/software/BrainStimulator/brain-stimulator-mod.png",
-    "http://sci.utah.edu/devbuilds/scirun5/toolkits/BrainStimulator_v1.2.zip",
-    "BrainStimulator_stable.zip" };
-  brainStim.setupAction(actionBrainStimulatorStable_, this);
-  ToolkitInfo brainStimNightly{ "http://www.sci.utah.edu/images/software/BrainStimulator/brain-stimulator-mod.png",
-    "https://codeload.github.com/SCIInstitute/BrainStimulator/zip/master",
-    "BrainStimulator_nightly.zip" };
-  brainStimNightly.setupAction(actionBrainStimulatorNightly_, this);
-
+  {
+    ToolkitInfo fwdInv{ "http://www.sci.utah.edu/images/software/forward-inverse/forward-inverse-mod.png",
+    #ifdef __APPLE__
+      "https://codeload.github.com/SCIInstitute/FwdInvToolkit/zip/v1.3",
+    #else
+      "http://sci.utah.edu/devbuilds/scirun5/toolkits/FwdInvToolkit_v1.3.zip",
+    #endif
+      "FwdInvToolkit_stable.zip" };
+    fwdInv.setupAction(actionForwardInverseStable_, this);
+  }
+  {
+    ToolkitInfo fwdInvNightly{ "http://www.sci.utah.edu/images/software/forward-inverse/forward-inverse-mod.png",
+      "https://codeload.github.com/SCIInstitute/FwdInvToolkit/zip/master",
+      "FwdInvToolkit_nightly.zip" };
+    fwdInvNightly.setupAction(actionForwardInverseNightly_, this);
+  }
+  {
+    ToolkitInfo brainStim{ "http://www.sci.utah.edu/images/software/BrainStimulator/brain-stimulator-mod.png",
+    #ifdef __APPLE__
+      "https://codeload.github.com/SCIInstitute/BrainStimulator/zip/BrainStimulator_v1.3",
+    #else
+      "http://sci.utah.edu/devbuilds/scirun5/toolkits/BrainStimulator_v1.3.zip",
+    #endif
+      "BrainStimulator_stable.zip" };
+    brainStim.setupAction(actionBrainStimulatorStable_, this);
+  }
+  {
+    ToolkitInfo brainStimNightly{ "http://www.sci.utah.edu/images/software/BrainStimulator/brain-stimulator-mod.png",
+      "https://codeload.github.com/SCIInstitute/BrainStimulator/zip/master",
+      "BrainStimulator_nightly.zip" };
+    brainStimNightly.setupAction(actionBrainStimulatorNightly_, this);
+  }
   connect(actionLoadToolkit_, SIGNAL(triggered()), this, SLOT(loadToolkit()));
 
   connect(networkEditor_, SIGNAL(networkExecuted()), networkProgressBar_.get(), SLOT(resetModulesDone()));
@@ -537,7 +551,7 @@ void SCIRunMainWindow::setupNetworkEditor()
   {
     auto screen = QApplication::desktop()->screenGeometry();
     if (screen.height() * screen.width() > 5000000)
-      highResolutionExpandFactor *= 1.5;
+      highResolutionExpandFactor = 1.7;
   }
   networkEditor_ = new NetworkEditor({ getter, defaultNotePositionGetter_, dialogErrorControl_, preexecuteFunc,
     tagColorFunc, tagNameFunc, highResolutionExpandFactor, dockManager_ }, scrollAreaWidgetContents_);
@@ -1681,8 +1695,6 @@ void SCIRunMainWindow::resetWindowLayout()
   moduleSelectorDockWidget_->show();
   moduleSelectorDockWidget_->setFloating(false);
   addDockWidget(Qt::LeftDockWidgetArea, moduleSelectorDockWidget_);
-
-  qDebug() << "TODO: toolbars";
 }
 
 void SCIRunMainWindow::hideNonfunctioningWidgets()
@@ -1996,7 +2008,6 @@ void SCIRunMainWindow::showStatusMessage(const QString& str, int timeInMsec)
 
 void SCIRunMainWindow::showExtendedDataInfo()
 {
-  qDebug() << "showExtendedDataInfo";
 }
 
 void SCIRunMainWindow::toggleMetadataLayer(bool toggle)

src/Interface/Modules/Base/ModuleDialogGeneric.h

@@ -80,6 +80,7 @@ namespace Gui {
     void setupButtonBar();
     bool isCollapsed() const { return collapsed_; }
     virtual void createStartupNote() {}
+    virtual void adjustToolbar() {}
     static void setExecutionDisablingServiceFunctionAdd(ExecutionDisablingServiceFunction add) { disablerAdd_ = add; }
     static void setExecutionDisablingServiceFunctionRemove(ExecutionDisablingServiceFunction remove) { disablerRemove_ = remove; }
     static const std::set<ModuleDialogGeneric*>& instances() { return instances_; }

src/Interface/Modules/Render/ViewScene.cc

@@ -160,6 +160,19 @@ void ViewSceneDialog::pullSpecial()
   pulledSavedVisibility_ = true;
 }
 
+void ViewSceneDialog::adjustToolbar()
+{
+  for (auto& child : mToolBar->children())
+  {
+    auto button = qobject_cast<QPushButton*>(child);
+    if (button)
+    {
+      button->setFixedSize(button->size() * 2);
+      button->setIconSize(button->iconSize() * 2);
+    }
+  }
+}
+
 void ViewSceneDialog::setInitialLightValues()
 {
   auto light0str = state_->getValue(Modules::Render::ViewScene::HeadLightColor).toString();

src/Interface/Modules/Render/ViewScene.h

@@ -66,6 +66,7 @@ namespace SCIRun {
         Dataflow::Networks::ModuleStateHandle state,
         QWidget* parent = nullptr);
 
+      void adjustToolbar() override;
     Q_SIGNALS:
       void newGeometryValueForwarder();
       void mousePressSignalForTestingGeometryObjectFeedback(int x, int y, const std::string& selName);