Merge #51 Legend background and #2478 Edge axis top into dev

ApplicationCode/UserInterface/RiuMainWindow.cpp

@@ -24,6 +24,7 @@
 #include "RiaBaseDefs.h"
 #include "RiaPreferences.h"
 #include "RiaRegressionTest.h"
+#include "RiaRegressionTestRunner.h"
 
 #include "Rim3dView.h"
 #include "RimCellEdgeColors.h"
@@ -1716,9 +1717,7 @@ void RiuMainWindow::slotCreateCommandObject()
 void RiuMainWindow::slotShowRegressionTestDialog()
 {
     RiaRegressionTest regTestConfig;
-
-    RiaApplication* app = RiaApplication::instance();
-    caf::PdmSettings::readFieldsFromApplicationStore(&regTestConfig);
+    regTestConfig.readSettingsFromApplicationStore();
 
     caf::PdmUiPropertyViewDialog regressionTestDialog(this, &regTestConfig, "Regression Test", "");
     regressionTestDialog.resize(QSize(600, 300));
@@ -1726,17 +1725,9 @@ void RiuMainWindow::slotShowRegressionTestDialog()
     if (regressionTestDialog.exec() == QDialog::Accepted)
     {
         // Write preferences using QSettings and apply them to the application
-        caf::PdmSettings::writeFieldsToApplicationStore(&regTestConfig);
+        regTestConfig.writeSettingsToApplicationStore();
 
-        QString currentApplicationPath = QDir::currentPath();
-
-        QDir::setCurrent(regTestConfig.applicationWorkingFolder);
-
-        QStringList testFilter = regTestConfig.testFilter().split(";", QString::SkipEmptyParts);
-
-        app->executeRegressionTests(regTestConfig.regressionTestFolder, &testFilter);
-
-        QDir::setCurrent(currentApplicationPath);
+		RiaRegressionTestRunner::instance()->executeRegressionTests();
     }
 }
 

ApplicationCode/UserInterface/RiuViewer.cpp

@@ -23,6 +23,7 @@
 #include "RiaApplication.h"
 #include "RiaBaseDefs.h"
 #include "RiaColorTools.h"
+#include "RiaRegressionTestRunner.h"
 
 #include "RimCase.h"
 #include "RimProject.h"
@@ -157,7 +158,7 @@ RiuViewer::RiuViewer(const QGLFormat& format, QWidget* parent)
 
     m_viewerCommands = new RiuViewerCommands(this);
 
-    if (RiaApplication::instance()->isRunningRegressionTests())
+    if (RiaRegressionTestRunner::instance()->isRunningRegressionTests())
     {
         QFont regTestFont = m_infoLabel->font();
         regTestFont.setPixelSize(11);

ApplicationCode/UserInterface/RiuViewerCommands.cpp

@@ -355,6 +355,10 @@ void RiuViewerCommands::displayContextMenu(QMouseEvent* event)
 
                 menuBuilder.addSeparator();
 
+                menuBuilder << "RicAdd3dWellLogCurveFeature";
+
+                menuBuilder.addSeparator();
+
                 menuBuilder.subMenuStart("Completions", QIcon(":/FishBoneGroup16x16.png"));
 
                 menuBuilder << "RicNewWellPathFractureAtPosFeature";