Merge pull request #28 from fmckenna/master

version number to 1.1.0 & remving OpenQuake from Rupture, and merge conflicts
NHERI-SimCenter · Jun 24, 2021 · 45b72ab · 45b72ab
2 parents a603cc7 + 44db8fe
commit 45b72ab
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/EVENTS/UI/RuptureWidget.cpp b/EVENTS/UI/RuptureWidget.cpp
@@ -73,7 +73,8 @@ RuptureWidget::RuptureWidget(QWidget *parent) : SimCenterAppWidget(parent)
 
     ruptureSelectionCombo->addItem("Earthquake Rupture Forecast");
     ruptureSelectionCombo->addItem("Point Source");
-    ruptureSelectionCombo->addItem("OpenQuake Scenario-Based");
+
+    //    ruptureSelectionCombo->addItem("OpenQuake Scenario-Based");
 
     connect(ruptureSelectionCombo,&QComboBox::currentTextChanged,this,&RuptureWidget::handleSelectionChanged);
 

diff --git a/R2D.pro b/R2D.pro
@@ -43,7 +43,7 @@ greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
 # Information about the app
 TARGET = R2D
 TEMPLATE = app
-VERSION=1.0.0
+VERSION=1.1.0
 DEFINES += APP_VERSION=\\\"$$VERSION\\\"
 
 # C++17 support

diff --git a/main.cpp b/main.cpp
@@ -110,7 +110,7 @@ int main(int argc, char *argv[])
     QCoreApplication::setOrganizationName("SimCenter");
     QCoreApplication::setApplicationVersion("1.1.0");
 
-    //GoogleAnalytics::SetTrackingId("UA-186298856-1");
+    //    GoogleAnalytics::SetTrackingId("UA-186298856-1");
     GoogleAnalytics::StartSession();
     GoogleAnalytics::ReportStart();
 
@@ -175,7 +175,7 @@ int main(int argc, char *argv[])
 
     w.setAbout(aboutTitle, aboutSource);
 
-    QString version("Version 1.0.0");
+    QString version("Version 1.1.0");
     w.setVersion(version);
 
     QString citeText("Frank McKenna, Stevan Gavrilovic, Adam Zsarnoczay, Wael Elhaddad, & Kuanshi Zhong. (2021, January 31). NHERI-SimCenter/R2DTool: Version 1.0.0 (Version v1.0.0). Zenodo. http://doi.org/10.5281/zenodo.4483615");