Merge branch 'unstable' into 'master'

Unstable

Closes #9 and #8

See merge request !60

Core/Core.cc

@@ -98,6 +98,20 @@
 
 //== IMPLEMENTATION ==========================================================
 
+namespace {
+    void recreateContext()
+    {
+#ifdef WIN32
+        QOpenGLContext* ctx = QOpenGLContext::currentContext();
+        QSurfaceFormat format = QSurfaceFormat::defaultFormat();
+        ctx->setFormat(format);
+        ctx->create();
+        QOffscreenSurface* surface = new QOffscreenSurface();
+        ctx->makeCurrent(surface);
+#endif
+    }
+}
+
 /** \brief Constuctor for the Core Widget ( This is stage 1 , call init for stage 2)
  *
  * Initialization is working the following way:\n
@@ -653,6 +667,7 @@ Core::init() {
       coreWidget_->splitter_->restoreState (windowStates.value("Core/LogSplitter").toByteArray ());
 
       coreWidget_->show();
+      recreateContext();
 
       applyOptions();
 
@@ -671,6 +686,8 @@ Core::init() {
     } else {
 
       coreWidget_->show();
+      recreateContext();
+
       applyOptions();
 
     }

OpenFlipper.cc

@@ -125,6 +125,12 @@ void connect_console()
   if (check) {
     std::cerr << "Error reopening stderr" << std::endl;
   }
+  std::cout.clear();
+  std::cerr.clear();
+  std::cin.clear();
+  std::wcout.clear();
+  std::wcerr.clear();
+  std::wcin.clear();
 }
 
   void attachConsole()
@@ -428,22 +434,43 @@ int main(int argc, char **argv)
   OpenFlipper::Options::argc(&argc);
   OpenFlipper::Options::argv(&argv);
 
-  // Ugly command line parse to check if we run in batch mode or not.
-  // Qt parser needs either QApplication or QCoreApplication to work.
-  // But we need that option to decide which one to choose so ...
-  for (int i = 1; i < argc; i++) {
-     QString option = QString(argv[i]);
-     if (option.contains("batch") || option.contains("-b") ||
-         option.contains("--batch")) {
-       std::cerr << "Batch Mode started" << std::endl;
-       OpenFlipper::Options::nogui(true);
-     }
+  // Set organization and application names
+  QCoreApplication::setOrganizationName("rwth-aachen.de");
+  QCoreApplication::setApplicationName(TOSTRING(PRODUCT_STRING));
+  QCoreApplication::setApplicationVersion(OpenFlipper::Options::coreVersion());
 
-   }
+  // initialize a core application to check for commandline parameters
+  QCoreApplication* coreApp = new QCoreApplication(argc, argv);
+
+  OpenFlipper::Options::initializeSettings();
 
   QCommandLineParser parser;
   QString errorMessage;
 
+  // parse command line options
+  switch (parseCommandLine(parser, &errorMessage)) {
+  case CommandLineOk:
+	  break;
+  case CommandLineError:
+	  fputs(qPrintable(errorMessage), stderr);
+	  fputs("\n\n", stderr);
+	  fputs(qPrintable(parser.helpText()), stderr);
+	  return 1;
+  case CommandLineVersionRequested:
+	  printf("%s %s\n", qPrintable(QCoreApplication::applicationName()),
+		  qPrintable(QCoreApplication::applicationVersion()));
+	  return 0;
+  case CommandLineHelpRequested:
+	  parser.showHelp();
+	  Q_UNREACHABLE();
+  }
+
+  // only one application is allowed so delete the core application
+  // once cmdline parsing is done
+  delete coreApp;
+
+
+
 #ifdef WIN32
   //attach a console if necessary
   attachConsole();
@@ -463,11 +490,10 @@ int main(int argc, char **argv)
     QApplication::setAttribute(Qt::AA_ShareOpenGLContexts);
 #endif
     QApplication::setColorSpec( QApplication::CustomColor );
-    QApplication app(argc,argv);
 
 #if QT_VERSION >= 0x050500
     
-    QSurfaceFormat format = QSurfaceFormat::defaultFormat();
+	QSurfaceFormat format;
     format.setVersion(4, 4);
 
 
@@ -482,6 +508,7 @@ int main(int argc, char **argv)
 
     QSurfaceFormat::setDefaultFormat(format);
 
+	QApplication app(argc, argv);
     QScreen *screen = app.primaryScreen();
 
     QOffscreenSurface *surface = new QOffscreenSurface();
@@ -494,11 +521,6 @@ int main(int argc, char **argv)
 
 #endif
 
-    // Set organization and application names
-    QCoreApplication::setOrganizationName("rwth-aachen.de");
-    QCoreApplication::setApplicationName(TOSTRING(PRODUCT_STRING));
-    QCoreApplication::setApplicationVersion(OpenFlipper::Options::coreVersion());
-
     if ( !QGLFormat::hasOpenGL() ) {
       std::cerr << "This system has no OpenGL support.\n";
       return -1;
@@ -511,25 +533,6 @@ int main(int argc, char **argv)
     // create core ( this also reads the ini files )
     Core * w = new Core( );
 
-
-    switch (parseCommandLine(parser, &errorMessage)) {
-      case CommandLineOk:
-        break;
-      case CommandLineError:
-        fputs(qPrintable(errorMessage), stderr);
-        fputs("\n\n", stderr);
-        fputs(qPrintable(parser.helpText()), stderr);
-        delete w;
-        return 1;
-      case CommandLineVersionRequested:
-        printf("%s %s\n", qPrintable(QCoreApplication::applicationName()),
-            qPrintable(QCoreApplication::applicationVersion()));
-        return 0;
-      case CommandLineHelpRequested:
-        parser.showHelp();
-        Q_UNREACHABLE();
-    }
-
     QString tLang = OpenFlipperSettings().value("Core/Language/Translation","en_US").toString();
 
     if (tLang == "locale")
@@ -537,20 +540,11 @@ int main(int argc, char **argv)
 
     // Install translator for qt internals
     QTranslator qtTranslator;
-//     std::cerr << "Loading qt translations from: " << QLibraryInfo::location(QLibraryInfo::TranslationsPath).toStdString() << std::endl;
-//     if ( qtTranslator.load("qt_" + tLang, QLibraryInfo::location(QLibraryInfo::TranslationsPath)) )
-//       std::cerr << "Loaded" << std::endl;
-//     std::cerr << "Loading qt translations from: " << QLibraryInfo::location(QLibraryInfo::TranslationsPath).toStdString() << std::endl;
     qtTranslator.load("qt_" + tLang, QLibraryInfo::location(QLibraryInfo::TranslationsPath));
-//       std::cerr << "Loaded" << std::endl;
-
     app.installTranslator(&qtTranslator);
     
     // install translator for Core Application
     QString translationDir = OpenFlipper::Options::translationsDirStr() + QDir::separator();
-
-//     std::cerr << "Loading own translations from: " << QString(translationDir + " (" + tLang + ")").toStdString() << std::endl;
-
     QDir dir(translationDir);
     dir.setFilter(QDir::Files);
 
@@ -562,12 +556,12 @@ int main(int argc, char **argv)
       if ( fileInfo.baseName().contains(tLang) ){
         QTranslator* myAppTranslator = new QTranslator();
 
-        if ( myAppTranslator->load( fileInfo.filePath() ) ){
-//           std::cerr << "Loaded " << fileInfo.fileName().toStdString() << std::endl;
-    
+        if ( myAppTranslator->load( fileInfo.filePath() ) )
+        {    
           app.installTranslator(myAppTranslator);
-        } else {
-  	  delete myAppTranslator;
+        } else 
+        {
+  	        delete myAppTranslator;
         }
       }
      }
@@ -591,49 +585,9 @@ int main(int argc, char **argv)
 
     QCoreApplication app(argc,argv);
 
-    // Set organization and application names
-    QCoreApplication::setOrganizationName("rwth-aachen.de");
-    QCoreApplication::setApplicationName(TOSTRING(PRODUCT_STRING));
-    QCoreApplication::setApplicationVersion(OpenFlipper::Options::coreVersion());
-
-    switch (parseCommandLine(parser, &errorMessage)) {
-      case CommandLineOk:
-        break;
-      case CommandLineError:
-        fputs(qPrintable(errorMessage), stderr);
-        fputs("\n\n", stderr);
-        fputs(qPrintable(parser.helpText()), stderr);
-        return 1;
-      case CommandLineVersionRequested:
-        printf("%s %s\n", qPrintable(QCoreApplication::applicationName()),
-            qPrintable(QCoreApplication::applicationVersion()));
-        return 0;
-      case CommandLineHelpRequested:
-        parser.showHelp();
-        Q_UNREACHABLE();
-    }
-
     // create widget ( this also reads the ini files )
     Core * w = new Core( );
 
-    switch (parseCommandLine(parser, &errorMessage)) {
-      case CommandLineOk:
-        break;
-      case CommandLineError:
-        fputs(qPrintable(errorMessage), stderr);
-        fputs("\n\n", stderr);
-        fputs(qPrintable(parser.helpText()), stderr);
-        delete w;
-        return 1;
-      case CommandLineVersionRequested:
-        printf("%s %s\n", qPrintable(QCoreApplication::applicationName()),
-            qPrintable(QCoreApplication::applicationVersion()));
-        return 0;
-      case CommandLineHelpRequested:
-        parser.showHelp();
-        Q_UNREACHABLE();
-    }
-
     // After setting all Options from command line, build the real gui
     w->init();
 

cmake/CMakeLists.txt

@@ -414,6 +414,7 @@ set (PREFOUND_PACKAGES "${LOADED_PACKAGES}" CACHE INTERNAL "List of packages tha
 # ========================================================================
 
 add_subdirectory (OpenFlipper/CoreApp)
+GROUP_PROJECT(${OPENFLIPPER_PRODUCT_STRING} ${OPENFLIPPER_PRODUCT_STRING})
 
 
 # ========================================================================

widgets/coreWidget/CoreWidget.cc

@@ -223,7 +223,6 @@ CoreWidget( QVector<ViewMode*>& _viewModes,
   format.setStencil(true);
   format.setSampleBuffers(true);
 #endif
-  OFGLFormat::setDefaultFormat(format);
 
   // Construct GL context & widget
   baseLayout_ = new QtMultiViewLayout;
@@ -244,7 +243,6 @@ CoreWidget( QVector<ViewMode*>& _viewModes,
   if ( ! test->format().stereo() ) {
     //     std::cerr << "No stereo ... disabling stereo for real context!" << std::endl;
     format.setStereo(false);
-    OFGLFormat::setDefaultFormat(format);
   }/* else {
     std::cerr << "Stereo found ok" << std::endl;
   }*/

widgets/glWidget/QtBaseViewer_qt.cc

@@ -102,7 +102,7 @@ void glViewer::startGLDebugLogger()
     if (glDebugLogger_->initialize())
     {
       connect(glDebugLogger_, SIGNAL(messageLogged(QOpenGLDebugMessage)), this, SLOT(processGLDebugMessage(QOpenGLDebugMessage)));
-      glDebugLogger_->startLogging();
+      glDebugLogger_->startLogging(QOpenGLDebugLogger::SynchronousLogging);
     }
   }
 #endif