Changeset c41ce0

Timestamp:

Aug 11, 2025, 5:43:56 PM (2 months ago)

Author:

Frederik Heber <frederik.heber@…>

Branches:

Candidate_v1.7.0, stable

Children:

641550

Parents:

6294b6

git-author:

Frederik Heber <frederik.heber@…> (05/03/24 15:25:52)

git-committer:

Frederik Heber <frederik.heber@…> (08/11/25 17:43:56)

Message:

Adds qt_size and qt_position arguments to control Qt window size.

• override is only temporary and is not stored in QSettings.
• this allows using these parameters in scripts to take screenshots in a reliable manner but retain the actual window size for other usages.

Location:

src

Files:

• UIElements/Qt4/QtMainWindow.cpp (modified) (2 diffs)
• UIElements/Qt4/QtMainWindow.hpp (modified) (2 diffs)
• UIElements/Qt4/QtUIFactory.cpp (modified) (4 diffs)
• UIElements/Qt4/QtUIFactory.hpp (modified) (1 diff)
• builder_init.cpp (modified) (1 diff)

src/UIElements/Qt4/QtMainWindow.cpp

@@ -158 +158 @@
   QSettings settings;
   settings.beginGroup("MainWindow");
-  resize(settings.value("size", QSize(400, 400)).toSize());
-  move(settings.value("position", QPoint(200, 200)).toPoint());
+  settingsSize = settings.value("size", QSize(400, 400)).toSize();
+  settingsPosition = settings.value("position", QPoint(200, 200)).toPoint();
+
+  const QStringList args = QCoreApplication::arguments();
+  LOG(2, "DEBUG: QApp's seen arguments are " << args.join(",").toStdString());
+
+  const int indexSize = args.indexOf(QString("--qt_size"));
+  const int indexPosition = args.indexOf(QString("--qt_position"));
+
+  if ((indexSize == -1) || (indexPosition == -1)) {
+    resize(settingsSize);
+    move(settingsPosition);
+  } else {
+    // Take size and position from command-line values instead
+    // NOTE: Qt 4.8's toInt() caps the second argument when it's below 1000 (yes, really!). Hence, we're using stoi()
+    const QSize cmdlineSize = QSize(stoi(args[indexSize + 1].split(",")[0].toStdString()), stoi(args[indexSize + 1].split(",")[1].toStdString()));
+    const QPoint cmdlinePosition = QPoint(stoi(args[indexPosition + 1].split(",")[0].toStdString()), stoi(args[indexPosition + 1].split(",")[1].toStdString()));
+    LOG(2, "DEBUG: Using size and position from the command line: (" << cmdlineSize.width() << "," << cmdlineSize.height()
+        << "), (" << cmdlinePosition.x() << "," << cmdlinePosition.y() << ")");
+    resize(cmdlineSize);
+    move(cmdlinePosition);
+  }
   if (settings.value("maximized", false).toBool())
     showMaximized();
   settings.endGroup();
+  LOG(1, "INFO: Size and position is (" << size().width() << "," << size().height() << "), (" << pos().x() << "," << pos().y() << ")");
 
   connect(glWorldView,SIGNAL(hoverChanged(const atomId_t)), infoBox,SLOT(atomHover(const atomId_t)));
@@ -174 +195 @@
 QtMainWindow::~QtMainWindow()
 {
+  const QStringList args = QCoreApplication::arguments();
+  const bool containsSize = args.contains(QString("--qt_size"));
+  const bool containsPosition = args.contains(QString("--qt_position"));
+
   QSettings settings;
   settings.beginGroup("MainWindow");
-  settings.setValue("size", size());
-  settings.setValue("position", pos());
+  if (!containsSize || !containsPosition) {
+    settings.setValue("size", size());
+    settings.setValue("position", pos());
+  } else {
+    settings.setValue("size", settingsSize);
+    settings.setValue("position", settingsPosition);
+  }
   settings.setValue("maximized", isMaximized());
   settings.endGroup();

src/UIElements/Qt4/QtMainWindow.hpp

@@ -39 +39 @@
 class QtToolBar;
 class QCloseEvent;
+class QSize;
+class QPoint;
 
 class QtObservedInstanceBoard;
@@ -73 +75 @@
   QtLogBox *logBox;
   QtLogBox *errorlogBox;
+  //!> Used to store old settings value for window size on exit when overridden from command line
+  QSize settingsSize;
+  //!> Used to store old settings value for window position on exit when overridden from command line
+  QPoint settingsPosition;
 
   QtObservedInstanceBoard *InstanceBoard;

src/UIElements/Qt4/QtUIFactory.cpp

@@ -60 +60 @@
 
 QtUIFactory::QtUIFactory(int _argc, char **_argv) :
-    argc(1),
-    argv(new char*[1]),
+    argc(0),
+    argv(NULL),
     testlauncher_Interrupted(false),
     testlauncher_thread(NULL)
@@ -78 +78 @@
 #ifdef HAVE_BOOST_THREAD_HPP
     std::vector<std::string> scripts;
-    scripts.reserve(_argc-1);
-    for (int i=2;i<_argc;++i)
-      scripts.push_back(std::string(_argv[i]));
+    scripts.reserve(1);
+    scripts.push_back(std::string(_argv[2]));
 
     // check for line-by-line execution
@@ -92 +91 @@
     std::cerr << "Boost::thread support missing! Cannot launch test scripts.\n";
 #endif
-    // use fake commands to not pass test stuff
-    const int length = strlen(_argv[0]);
-    argv[0] = new char[length];
-    strncpy(argv[0],_argv[0], length);
+    // remove test options from command line arguments
+    argc = _argc-2;
+    argv = new char*[argc];
+    int j = 0;
+    for (int i=0;i<_argc;++i) {
+      if ((i >= 1) && (i<3))
+        continue;
+      const int length = strlen(_argv[i]);
+      argv[j] = new char[length];
+      strncpy(argv[j],_argv[i], length);
+      ++j;
+    }
     app = new QApplication(argc,argv);
   } else {
-    const int length = strlen(_argv[0]);
-    argv[0] = new char[length];
-    strncpy(argv[0],_argv[0], length);
+    argc = _argc;
+    argv = new char*[argc];
+    for (int i=0;i<_argc;++i) {
+      const int length = strlen(_argv[i]);
+      argv[i] = new char[length];
+      strncpy(argv[i],_argv[i], length);
+    }
     app = new QApplication(argc,argv);
   }
@@ -146 +157 @@
 {
   return (strncmp(_argument,"--test", 6) == 0);
+}
+
+bool QtUIFactory::isGuiMode(const char *_argument)
+{
+  return (strncmp(_argument,"--qt_size", 9) == 0) || (strncmp(_argument,"--qt_position", 13) == 0);
 }
 

src/UIElements/Qt4/QtUIFactory.hpp

@@ -46 +46 @@
 
   static bool isTestMode(const char *_argument);
+  static bool isGuiMode(const char *_argument);
 
 protected:

src/builder_init.cpp

@@ -140 +140 @@
 #ifdef USE_GUI_QT
       && !QtUIFactory::isTestMode(argv[1])
+      && !QtUIFactory::isGuiMode(argv[1])
 #endif
   ) {