Master

.gitignore

@@ -65,3 +65,15 @@ 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/
+
+PileGroupTool\.pro\.user\.4\.8-pre1
+
+PileGroupTool\.pro\.user\.4\.9-pre1
+
+PileGroupTool.pro.user.4.10-pre1

FEA/pilefeamodeler.cpp

@@ -90,7 +90,7 @@ PileFEAmodeler::PileFEAmodeler()
 PileFEAmodeler::~PileFEAmodeler()
 {
     delete theDomain;
-    theDomain = NULL;
+    theDomain = nullptr;
 }
 
 
@@ -1214,9 +1214,9 @@ void PileFEAmodeler::buildLoad()
         out << endl;
     }
 
-    LinearSeries *theTimeSeries  = NULL;
-    LoadPattern  *theLoadPattern = NULL;
-    NodalLoad    *theLoad        = NULL;
+    LinearSeries *theTimeSeries  = nullptr;
+    LoadPattern  *theLoadPattern = nullptr;
+    NodalLoad    *theLoad        = nullptr;
 
     theTimeSeries  = new LinearSeries(1, 1.0);
     theLoadPattern = new LoadPattern(1);
@@ -1346,7 +1346,7 @@ void PileFEAmodeler::buildAnalysis()
     BandGenLinSolver  *theSolver     = new BandGenLinLapackSolver();
     LinearSOE         *theSOE        = new BandGenLinSOE(*theSolver);
 
-    if (theAnalysis != NULL) delete theAnalysis;
+    if (theAnalysis != nullptr) delete theAnalysis;
 
     theAnalysis = new StaticAnalysis(*theDomain,
                                   *theHandler,
@@ -1389,25 +1389,25 @@ void PileFEAmodeler::buildAnalysis()
 
 void PileFEAmodeler::clearPlotBuffers()
 {
-    foreach (QVector<double> *ptr, locList) { if (ptr != NULL) delete ptr; }
+    foreach (QVector<double> *ptr, locList) { if (ptr != nullptr) delete ptr; }
     locList.clear();
 
-    foreach (QVector<double> *ptr, lateralDispList) { if (ptr != NULL) delete ptr; }
+    foreach (QVector<double> *ptr, lateralDispList) { if (ptr != nullptr) delete ptr; }
     lateralDispList.clear();
 
-    foreach (QVector<double> *ptr, axialDispList) { if (ptr != NULL) delete ptr; }
+    foreach (QVector<double> *ptr, axialDispList) { if (ptr != nullptr) delete ptr; }
     axialDispList.clear();
 
-    foreach (QVector<double> *ptr, MomentList) { if (ptr != NULL) delete ptr; }
+    foreach (QVector<double> *ptr, MomentList) { if (ptr != nullptr) delete ptr; }
     MomentList.clear();
 
-    foreach (QVector<double> *ptr, ShearList) { if (ptr != NULL) delete ptr; }
+    foreach (QVector<double> *ptr, ShearList) { if (ptr != nullptr) delete ptr; }
     ShearList.clear();
 
-    foreach (QVector<double> *ptr, AxialList) { if (ptr != NULL) delete ptr; }
+    foreach (QVector<double> *ptr, AxialList) { if (ptr != nullptr) delete ptr; }
     AxialList.clear();
 
-    foreach (QVector<double> *ptr, StressList) { if (ptr != NULL) delete ptr; }
+    foreach (QVector<double> *ptr, StressList) { if (ptr != nullptr) delete ptr; }
     StressList.clear();
 }
 
@@ -1780,5 +1780,5 @@ void PileFEAmodeler::writeFEMinput(QString filename)
     FEMfile->flush();
     FEMfile->close();
     delete FEMfile;
-    FEMfile = NULL;
+    FEMfile = nullptr;
 }

FEA/pilefeamodeler.h

@@ -172,7 +172,7 @@ class PileFEAmodeler
     QList<CAP_NODE_TYPE>    capNodeList;
 
     Domain *theDomain;
-    StaticAnalysis *theAnalysis = NULL;
+    StaticAnalysis *theAnalysis = nullptr;
 
     int numLoadedNode;
     QVector<double> depthOfLayer = QVector<double>(4, 0.0);
@@ -196,7 +196,7 @@ class PileFEAmodeler
     //
     // state switches
     bool    dumpFEMinput;
-    QFile  *FEMfile = NULL;
+    QFile  *FEMfile = nullptr;
 };
 
 #endif // PILEFEAMODELER_H

InstallScripts/makeInstallPackagePGT.sh → PGTinstaller/InstallScripts/makeInstallPackagePGT.sh

@@ -6,9 +6,9 @@
 
 APP=PileGroupTool
 QWT_FRAMEWORK=qwt.framework
-QWT_FRAMEWORK_PATH=/usr/local/qwt-6.2.0-svn/lib/
+QWT_FRAMEWORK_PATH=/usr/local/qwt-6.1.4-svn/lib/
 
-QT_DEPLOY=/Users/pmackenz/Qt/5.11.1/clang_64/bin/macdeployqt
+QT_DEPLOY=/Users/pmackenz/Qt/5.11.2/clang_64/bin/macdeployqt
 #
 # ---- do not change anything below this line -----------------------------------
 #

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>

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>

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