Changeset c41ce0 for src/UIElements/Qt4/QtUIFactory.cpp

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.

File:

• src/UIElements/Qt4/QtUIFactory.cpp (modified) (4 diffs)

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);
 }