Merge pull request #144 from NHERI-SimCenter/develop

Adding installers for MacOS and Windows
NHERI-SimCenter · Nov 3, 2018 · e9fa216 · e9fa216
2 parents b49b320 + f6b1615
commit e9fa216
Showing 20 changed files with 1,716 additions and 93 deletions.
diff --git a/.gitignore b/.gitignore
@@ -65,3 +65,9 @@ qwt-6.2/lib/pkgconfig/Qt5Qwt6.pc
 qwt-6.2/lib/qwtmathml.pc
 qwt-6.2/lib/pkgconfig/Qt5Qwt6.pc
 qwt-6.2/lib/qwtmathml.pc
+
+*.swp
+
+*.dmg
+
+PGTinstaller/packages/nheri\.simcenter\.pgt/data/PileGroupTool/
diff --git a/InstallScripts/README.txt → PGTinstaller/InstallScripts/README.txt b/InstallScripts/README.txt → PGTinstaller/InstallScripts/README.txt
diff --git a/InstallScripts/makeInstallPackagePGT.sh → ...r/InstallScripts/makeInstallPackagePGT.sh b/InstallScripts/makeInstallPackagePGT.sh → ...r/InstallScripts/makeInstallPackagePGT.sh
diff --git a/PGTinstaller/config/NHERI-PGT-Icon.icns b/PGTinstaller/config/NHERI-PGT-Icon.icns
diff --git a/PGTinstaller/config/NHERI-PGT-Icon.png b/PGTinstaller/config/NHERI-PGT-Icon.png
diff --git a/PGTinstaller/config/SimCenterInstallerLogo.png b/PGTinstaller/config/SimCenterInstallerLogo.png
diff --git a/PGTinstaller/config/macconfig.xml b/PGTinstaller/config/macconfig.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Installer>
+    <Name>Pile Group Tool</Name>
+    <Version>2.1</Version>
+    <Title>Pile Group Tool Installer</Title>
+    <Publisher>NHERI SimCenter</Publisher>
+    <ProductUrl>https://simcenter.designsafe-ci.org/learning-tools/pile-group-tool</ProductUrl>
+    <InstallerApplicationIcon>NHERI-PGT-Icon</InstallerApplicationIcon>
+    <InstallerWindowIcon>NHERI-PGT-Icon</InstallerWindowIcon>
+    <Logo>NHERI-PGT-Icon.png</Logo>
+    <Background>SimCenterInstallerLogo.png</Background>
+    <StartMenuDir>SimCenter Apps</StartMenuDir>
+    <TargetDir>@HomeDir@/Applications/SimCenterPGT</TargetDir>
+</Installer>
diff --git a/PGTinstaller/config/watermark.png b/PGTinstaller/config/watermark.png
diff --git a/PGTinstaller/config/winconfig.xml b/PGTinstaller/config/winconfig.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Installer>
+    <Name>Pile Group Tool</Name>
+    <Version>2.1</Version>
+    <Title>Pile Group Tool Installer</Title>
+    <Publisher>NHERI SimCenter</Publisher>
+    <ProductUrl>https://simcenter.designsafe-ci.org/learning-tools/pile-group-tool</ProductUrl>
+    <InstallerApplicationIcon>NHERI-PGT-Icon</InstallerApplicationIcon>
+    <InstallerWindowIcon>NHERI-PGT-Icon</InstallerWindowIcon>
+    <Logo>NHERI-PGT-Icon.png</Logo>
+    <WizardStyle>Modern</WizardStyle>
+    <Background>SimCenterInstallerLogo.png</Background>
+    <StartMenuDir>SimCenter Apps\Pile Group Tool</StartMenuDir>
+    <TargetDir>@HomeDir@/Applications/SimCenterTools/PGT</TargetDir>
+</Installer>
diff --git a/PGTinstaller/packages/nheri.simcenter.pgt/meta/installPGT.qs b/PGTinstaller/packages/nheri.simcenter.pgt/meta/installPGT.qs
@@ -0,0 +1,12 @@
+function Component() {}
+
+Component.prototype.createOperations = function()
+{
+    component.createOperations();
+
+    if (systemInfo.productType === "windows")
+    {
+        component.addOperation("CreateShortcut", "@TargetDir@/PileGroupTool.exe", "@StartMenuDir@/Pile Group Tool.lnk",
+            "workingDirectory=@TargetDir@", "description=Start SimCenter Pile Group Tool");
+    }
+}
diff --git a/PGTinstaller/packages/nheri.simcenter.pgt/meta/license.txt b/PGTinstaller/packages/nheri.simcenter.pgt/meta/license.txt
diff --git a/PGTinstaller/packages/nheri.simcenter.pgt/meta/package.xml b/PGTinstaller/packages/nheri.simcenter.pgt/meta/package.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Package>
+    <DisplayName>Pile Group Tool</DisplayName>
+    <Description>Educational tool for the study of piles and pile groups interacting with layered soil.</Description>
+    <Version>2.1</Version>
+    <ReleaseDate>2018-11-05</ReleaseDate>
+    <Licenses>
+        <License name="BSD License Agreement" file="license.txt" />
+    </Licenses>
+    <Default>true</Default>
+    <Script>installPGT.qs</Script>
+</Package>
diff --git a/PileGroupTool.pro b/PileGroupTool.pro
@@ -38,6 +38,7 @@
 
 QT       += core gui
 unix: QT += svg opengl concurrent
+win32: QT += opengl printsupport
 
 
 greaterThan(QT_MAJOR_VERSION, 4): QT += widgets printsupport network

diff --git a/help/About/PGTabout.html b/help/About/PGTabout.html
@@ -1,4 +1,4 @@
-<h1 id="top">This is the SimCenter Educational Pile Group Tool Version 2.0.4</h1>
+<h1 id="top">This is the SimCenter Educational Pile Group Tool Version 2.1</h1>
 
 <p>
 Please be aware that this software is not intended to be used in any commercial analysis and/or design. All contributors of NHERI SimCenter are free of responsibility and liability resulting from the use of this software. Use of this software is at your own risk.

diff --git a/mainWindow/mainwindow.cpp b/mainWindow/mainwindow.cpp
@@ -201,9 +201,7 @@ MainWindow::MainWindow(bool graphicsModeQCP, QWidget *parent) :
     manager->get(QNetworkRequest(QUrl("http://opensees.berkeley.edu/OpenSees/developer/qtPile/use.php")));
     //manager->get(QNetworkRequest(QUrl("https://simcenter.designsafe-ci.org/pile-group-analytics/")));
 
-    //this->on_forceTypeSelector_activated(0);
-    //this->on_horizontalForceSlider_valueChanged(10);
-    //this->on_forceTypeSelector_activated(0);
+    this->on_forceTypeSelector_activated(0);
 }
 
 MainWindow::~MainWindow()

diff --git a/mainWindow/mainwindow.h b/mainWindow/mainwindow.h
@@ -78,20 +78,6 @@ private slots:
     void on_btn_deletePile_clicked();
     void on_btn_newPile_clicked();
 
-    // material table slots
-
-    void on_HForceCtrl_valueChanged(int value);
-    //void on_horizontalForceSlider_valueChanged(int value);      // depricated
-    //void on_appliedHorizontalForce_valueChanged(double arg1);   // depricated
-
-    void on_VForceCtrl_valueChanged(int value);
-    //void on_verticalForceSlider_valueChanged(int value);        // depricated
-    //void on_appliedVerticalForce_editingFinished();             // depricated
-
-    void on_MomentCtrl_valueChanged(int value);
-    //void on_momentSlider_valueChanged(int value);               // depricated
-    //void on_appliedMoment_editingFinished();                    // depricated
-
     // layer selection slots
     void on_chkBox_layer1_clicked();
     void on_chkBox_layer2_clicked();
@@ -110,27 +96,20 @@ private slots:
     // Frank's network counter
     void replyFinished(QNetworkReply*);
 
+    // load control slots
     void on_forceTypeSelector_activated(int index);
 
+    void on_HForceCtrl_valueChanged(int value);
+    void on_VForceCtrl_valueChanged(int value);
+    void on_MomentCtrl_valueChanged(int value);
+
     void on_PushOverCtrl_valueChanged(int value);
     void on_PullOutCtrl_valueChanged(int value);
-    //void on_pushoverDisplacement_editingFinished();             // depricated
-    //void on_pulloutDisplacement_editingFinished();              // depricated
-    //void on_pushoverDisplacementSlider_valueChanged(int value); // depricated
-    //void on_pulloutDisplacementSlider_valueChanged(int value);  // depricated
 
     void on_SurfaceDisplacementCtrl_valueChanged(int value);
     void on_Interface12Ctrl_valueChanged(int value);
     void on_Interface23Ctrl_valueChanged(int value);
     void on_BaseDisplacementCtrl_valueChanged(int value);
-    //void on_surfaceDisplacement_editingFinished();              // depricated
-    //void on_surfaceDisplacementSlider_valueChanged(int value);  // depricated
-    //void on_Interface12_editingFinished();                      // depricated
-    //void on_Interface12Slider_valueChanged(int value);          // depricated
-    //void on_Interface23_editingFinished();                      // depricated
-    //void on_Interface23Slider_valueChanged(int value);          // depricated
-    //void on_BaseDisplacement_editingFinished();                 // depricated
-    //void on_BaseDisplacementSlider_valueChanged(int value);     // depricated
 
     // response to signals from systemPlot
     void onSystemPlot_pileSelected(int );

diff --git a/mainWindow/mainwindow.ui b/mainWindow/mainwindow.ui
@@ -37,44 +37,6 @@
       </property>
      </widget>
     </item>
-    <item row="1" column="1" rowspan="2">
-     <widget class="QTabWidget" name="tabWidget_system">
-      <property name="sizePolicy">
-       <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
-        <horstretch>3</horstretch>
-        <verstretch>0</verstretch>
-       </sizepolicy>
-      </property>
-      <property name="minimumSize">
-       <size>
-        <width>0</width>
-        <height>0</height>
-       </size>
-      </property>
-      <property name="currentIndex">
-       <number>0</number>
-      </property>
-      <widget class="QWidget" name="systemTab">
-       <attribute name="title">
-        <string>System Plot</string>
-       </attribute>
-       <layout class="QGridLayout" name="gridLayout_2">
-        <property name="leftMargin">
-         <number>0</number>
-        </property>
-        <property name="topMargin">
-         <number>0</number>
-        </property>
-        <property name="rightMargin">
-         <number>0</number>
-        </property>
-        <property name="bottomMargin">
-         <number>0</number>
-        </property>
-       </layout>
-      </widget>
-     </widget>
-    </item>
     <item row="2" column="0">
      <widget class="QTabWidget" name="properties">
       <property name="sizePolicy">
@@ -93,7 +55,7 @@
        <enum>QTabWidget::West</enum>
       </property>
       <property name="currentIndex">
-       <number>2</number>
+       <number>0</number>
       </property>
       <property name="usesScrollButtons">
        <bool>false</bool>
@@ -1255,7 +1217,7 @@ Layers 2 &amp; 3:</string>
        <enum>Qt::LeftToRight</enum>
       </property>
       <property name="tabPosition">
-       <enum>QTabWidget::East</enum>
+       <enum>QTabWidget::North</enum>
       </property>
       <property name="currentIndex">
        <number>0</number>
@@ -1465,6 +1427,47 @@ Layers 2 &amp; 3:</string>
       </property>
      </widget>
     </item>
+    <item row="2" column="1">
+     <widget class="QTabWidget" name="tabWidget_system">
+      <property name="sizePolicy">
+       <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+        <horstretch>3</horstretch>
+        <verstretch>0</verstretch>
+       </sizepolicy>
+      </property>
+      <property name="minimumSize">
+       <size>
+        <width>0</width>
+        <height>0</height>
+       </size>
+      </property>
+      <property name="tabPosition">
+       <enum>QTabWidget::North</enum>
+      </property>
+      <property name="currentIndex">
+       <number>0</number>
+      </property>
+      <widget class="QWidget" name="systemTab">
+       <attribute name="title">
+        <string>System Plot</string>
+       </attribute>
+       <layout class="QGridLayout" name="gridLayout_2">
+        <property name="leftMargin">
+         <number>0</number>
+        </property>
+        <property name="topMargin">
+         <number>0</number>
+        </property>
+        <property name="rightMargin">
+         <number>0</number>
+        </property>
+        <property name="bottomMargin">
+         <number>0</number>
+        </property>
+       </layout>
+      </widget>
+     </widget>
+    </item>
    </layout>
   </widget>
   <widget class="QMenuBar" name="menuBar">
@@ -1473,7 +1476,7 @@ Layers 2 &amp; 3:</string>
      <x>0</x>
      <y>0</y>
      <width>994</width>
-     <height>22</height>
+     <height>21</height>
     </rect>
    </property>
    <widget class="QMenu" name="menuOpenSeesPile">

diff --git a/resources/styleSheets/pgtStyles.qss b/resources/styleSheets/pgtStyles.qss
@@ -163,7 +163,12 @@ QLabel#labelLayerProperties {
 }
 
 QLabel#label_about {
-    font-size: 24pt;
+    font-size: 20pt;
+    font-weight: bold;
+}
+
+QLabel#label_quickTips {
+    font-size: 20pt;
     font-weight: bold;
 }
 

diff --git a/utilWindows/dialogabout.ui b/utilWindows/dialogabout.ui
@@ -85,7 +85,10 @@
       </sizepolicy>
      </property>
      <property name="text">
-      <string>About Version 2.1</string>
+      <string>About Pile Group Tool</string>
+     </property>
+     <property name="alignment">
+      <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
      </property>
     </widget>
    </item>

diff --git a/utilWindows/dialogquicktips.ui b/utilWindows/dialogquicktips.ui
@@ -14,24 +14,8 @@
    <string>Dialog</string>
   </property>
   <layout class="QGridLayout" name="gridLayout">
-   <item row="0" column="0">
-    <widget class="QLabel" name="logo">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="text">
-      <string/>
-     </property>
-     <property name="pixmap">
-      <pixmap resource="../qtpileresources.qrc">:/resources/NHERI-PGT-Icon.icns</pixmap>
-     </property>
-    </widget>
-   </item>
    <item row="0" column="1">
-    <widget class="QLabel" name="title">
+    <widget class="QLabel" name="label_quickTips">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
        <horstretch>0</horstretch>
@@ -49,11 +33,27 @@
       <string>Quick Tips</string>
      </property>
      <property name="alignment">
-      <set>Qt::AlignBottom|Qt::AlignRight|Qt::AlignTrailing</set>
+      <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="2">
+    <widget class="QLabel" name="logo">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="text">
+      <string/>
+     </property>
+     <property name="pixmap">
+      <pixmap resource="../qtpileresources.qrc">:/resources/NHERI-PGT-Icon.icns</pixmap>
      </property>
     </widget>
    </item>
-   <item row="1" column="0" colspan="2">
+   <item row="2" column="0" colspan="3">
     <widget class="QTextBrowser" name="textBrowser">
      <property name="source">
       <url>
@@ -62,7 +62,7 @@
      </property>
     </widget>
    </item>
-   <item row="2" column="0" colspan="2">
+   <item row="3" column="0" colspan="3">
     <widget class="QDialogButtonBox" name="buttonBox">
      <property name="orientation">
       <enum>Qt::Horizontal</enum>