Skip to content

Commit e9fa216

Browse files
pmackenzpmackenz
authored
Merge pull request #144 from NHERI-SimCenter/develop
Adding installers for MacOS and Windows
2 parents b49b320 + f6b1615 commit e9fa216

20 files changed

+1716
-93
lines changed

‎.gitignore

+6
Original file line numberDiff line numberDiff line change
@@ -65,3 +65,9 @@ qwt-6.2/lib/pkgconfig/Qt5Qwt6.pc
6565
qwt-6.2/lib/qwtmathml.pc
6666
qwt-6.2/lib/pkgconfig/Qt5Qwt6.pc
6767
qwt-6.2/lib/qwtmathml.pc
68+
69+
*.swp
70+
71+
*.dmg
72+
73+
PGTinstaller/packages/nheri\.simcenter\.pgt/data/PileGroupTool/

‎InstallScripts/README.txt ‎PGTinstaller/InstallScripts/README.txt

File renamed without changes.

‎InstallScripts/makeInstallPackagePGT.sh ‎PGTinstaller/InstallScripts/makeInstallPackagePGT.sh

File renamed without changes.

‎PGTinstaller/config/NHERI-PGT-Icon.icns

279 KB
Binary file not shown.

‎PGTinstaller/config/NHERI-PGT-Icon.png

3.46 KB
Loading

‎PGTinstaller/config/SimCenterInstallerLogo.png

150 KB
Loading

‎PGTinstaller/config/macconfig.xml

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<Installer>
3+
<Name>Pile Group Tool</Name>
4+
<Version>2.1</Version>
5+
<Title>Pile Group Tool Installer</Title>
6+
<Publisher>NHERI SimCenter</Publisher>
7+
<ProductUrl>https://simcenter.designsafe-ci.org/learning-tools/pile-group-tool</ProductUrl>
8+
<InstallerApplicationIcon>NHERI-PGT-Icon</InstallerApplicationIcon>
9+
<InstallerWindowIcon>NHERI-PGT-Icon</InstallerWindowIcon>
10+
<Logo>NHERI-PGT-Icon.png</Logo>
11+
<Background>SimCenterInstallerLogo.png</Background>
12+
<StartMenuDir>SimCenter Apps</StartMenuDir>
13+
<TargetDir>@HomeDir@/Applications/SimCenterPGT</TargetDir>
14+
</Installer>

‎PGTinstaller/config/watermark.png

3.46 KB
Loading

‎PGTinstaller/config/winconfig.xml

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<Installer>
3+
<Name>Pile Group Tool</Name>
4+
<Version>2.1</Version>
5+
<Title>Pile Group Tool Installer</Title>
6+
<Publisher>NHERI SimCenter</Publisher>
7+
<ProductUrl>https://simcenter.designsafe-ci.org/learning-tools/pile-group-tool</ProductUrl>
8+
<InstallerApplicationIcon>NHERI-PGT-Icon</InstallerApplicationIcon>
9+
<InstallerWindowIcon>NHERI-PGT-Icon</InstallerWindowIcon>
10+
<Logo>NHERI-PGT-Icon.png</Logo>
11+
<WizardStyle>Modern</WizardStyle>
12+
<Background>SimCenterInstallerLogo.png</Background>
13+
<StartMenuDir>SimCenter Apps\Pile Group Tool</StartMenuDir>
14+
<TargetDir>@HomeDir@/Applications/SimCenterTools/PGT</TargetDir>
15+
</Installer>

‎PGTinstaller/packages/nheri.simcenter.pgt/meta/installPGT.qs

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
function Component() {}
2+
3+
Component.prototype.createOperations = function()
4+
{
5+
component.createOperations();
6+
7+
if (systemInfo.productType === "windows")
8+
{
9+
component.addOperation("CreateShortcut", "@TargetDir@/PileGroupTool.exe", "@StartMenuDir@/Pile Group Tool.lnk",
10+
"workingDirectory=@TargetDir@", "description=Start SimCenter Pile Group Tool");
11+
}
12+
}

‎PGTinstaller/packages/nheri.simcenter.pgt/meta/license.txt

+1,575
Large diffs are not rendered by default.

‎PGTinstaller/packages/nheri.simcenter.pgt/meta/package.xml

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<Package>
3+
<DisplayName>Pile Group Tool</DisplayName>
4+
<Description>Educational tool for the study of piles and pile groups interacting with layered soil.</Description>
5+
<Version>2.1</Version>
6+
<ReleaseDate>2018-11-05</ReleaseDate>
7+
<Licenses>
8+
<License name="BSD License Agreement" file="license.txt" />
9+
</Licenses>
10+
<Default>true</Default>
11+
<Script>installPGT.qs</Script>
12+
</Package>

‎PileGroupTool.pro

100755100644
+1
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838

3939
QT += core gui
4040
unix: QT += svg opengl concurrent
41+
win32: QT += opengl printsupport
4142

4243

4344
greaterThan(QT_MAJOR_VERSION, 4): QT += widgets printsupport network

‎help/About/PGTabout.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<h1 id="top">This is the SimCenter Educational Pile Group Tool Version 2.0.4</h1>
1+
<h1 id="top">This is the SimCenter Educational Pile Group Tool Version 2.1</h1>
22

33
<p>
44
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.

‎mainWindow/mainwindow.cpp

+1-3
Original file line numberDiff line numberDiff line change
@@ -201,9 +201,7 @@ MainWindow::MainWindow(bool graphicsModeQCP, QWidget *parent) :
201201
manager->get(QNetworkRequest(QUrl("http://opensees.berkeley.edu/OpenSees/developer/qtPile/use.php")));
202202
//manager->get(QNetworkRequest(QUrl("https://simcenter.designsafe-ci.org/pile-group-analytics/")));
203203

204-
//this->on_forceTypeSelector_activated(0);
205-
//this->on_horizontalForceSlider_valueChanged(10);
206-
//this->on_forceTypeSelector_activated(0);
204+
this->on_forceTypeSelector_activated(0);
207205
}
208206

209207
MainWindow::~MainWindow()

‎mainWindow/mainwindow.h

+5-26
Original file line numberDiff line numberDiff line change
@@ -78,20 +78,6 @@ private slots:
7878
void on_btn_deletePile_clicked();
7979
void on_btn_newPile_clicked();
8080

81-
// material table slots
82-
83-
void on_HForceCtrl_valueChanged(int value);
84-
//void on_horizontalForceSlider_valueChanged(int value); // depricated
85-
//void on_appliedHorizontalForce_valueChanged(double arg1); // depricated
86-
87-
void on_VForceCtrl_valueChanged(int value);
88-
//void on_verticalForceSlider_valueChanged(int value); // depricated
89-
//void on_appliedVerticalForce_editingFinished(); // depricated
90-
91-
void on_MomentCtrl_valueChanged(int value);
92-
//void on_momentSlider_valueChanged(int value); // depricated
93-
//void on_appliedMoment_editingFinished(); // depricated
94-
9581
// layer selection slots
9682
void on_chkBox_layer1_clicked();
9783
void on_chkBox_layer2_clicked();
@@ -110,27 +96,20 @@ private slots:
11096
// Frank's network counter
11197
void replyFinished(QNetworkReply*);
11298

99+
// load control slots
113100
void on_forceTypeSelector_activated(int index);
114101

102+
void on_HForceCtrl_valueChanged(int value);
103+
void on_VForceCtrl_valueChanged(int value);
104+
void on_MomentCtrl_valueChanged(int value);
105+
115106
void on_PushOverCtrl_valueChanged(int value);
116107
void on_PullOutCtrl_valueChanged(int value);
117-
//void on_pushoverDisplacement_editingFinished(); // depricated
118-
//void on_pulloutDisplacement_editingFinished(); // depricated
119-
//void on_pushoverDisplacementSlider_valueChanged(int value); // depricated
120-
//void on_pulloutDisplacementSlider_valueChanged(int value); // depricated
121108

122109
void on_SurfaceDisplacementCtrl_valueChanged(int value);
123110
void on_Interface12Ctrl_valueChanged(int value);
124111
void on_Interface23Ctrl_valueChanged(int value);
125112
void on_BaseDisplacementCtrl_valueChanged(int value);
126-
//void on_surfaceDisplacement_editingFinished(); // depricated
127-
//void on_surfaceDisplacementSlider_valueChanged(int value); // depricated
128-
//void on_Interface12_editingFinished(); // depricated
129-
//void on_Interface12Slider_valueChanged(int value); // depricated
130-
//void on_Interface23_editingFinished(); // depricated
131-
//void on_Interface23Slider_valueChanged(int value); // depricated
132-
//void on_BaseDisplacement_editingFinished(); // depricated
133-
//void on_BaseDisplacementSlider_valueChanged(int value); // depricated
134113

135114
// response to signals from systemPlot
136115
void onSystemPlot_pileSelected(int );

‎mainWindow/mainwindow.ui

+44-41
Original file line numberDiff line numberDiff line change
@@ -37,44 +37,6 @@
3737
</property>
3838
</widget>
3939
</item>
40-
<item row="1" column="1" rowspan="2">
41-
<widget class="QTabWidget" name="tabWidget_system">
42-
<property name="sizePolicy">
43-
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
44-
<horstretch>3</horstretch>
45-
<verstretch>0</verstretch>
46-
</sizepolicy>
47-
</property>
48-
<property name="minimumSize">
49-
<size>
50-
<width>0</width>
51-
<height>0</height>
52-
</size>
53-
</property>
54-
<property name="currentIndex">
55-
<number>0</number>
56-
</property>
57-
<widget class="QWidget" name="systemTab">
58-
<attribute name="title">
59-
<string>System Plot</string>
60-
</attribute>
61-
<layout class="QGridLayout" name="gridLayout_2">
62-
<property name="leftMargin">
63-
<number>0</number>
64-
</property>
65-
<property name="topMargin">
66-
<number>0</number>
67-
</property>
68-
<property name="rightMargin">
69-
<number>0</number>
70-
</property>
71-
<property name="bottomMargin">
72-
<number>0</number>
73-
</property>
74-
</layout>
75-
</widget>
76-
</widget>
77-
</item>
7840
<item row="2" column="0">
7941
<widget class="QTabWidget" name="properties">
8042
<property name="sizePolicy">
@@ -93,7 +55,7 @@
9355
<enum>QTabWidget::West</enum>
9456
</property>
9557
<property name="currentIndex">
96-
<number>2</number>
58+
<number>0</number>
9759
</property>
9860
<property name="usesScrollButtons">
9961
<bool>false</bool>
@@ -1255,7 +1217,7 @@ Layers 2 &amp; 3:</string>
12551217
<enum>Qt::LeftToRight</enum>
12561218
</property>
12571219
<property name="tabPosition">
1258-
<enum>QTabWidget::East</enum>
1220+
<enum>QTabWidget::North</enum>
12591221
</property>
12601222
<property name="currentIndex">
12611223
<number>0</number>
@@ -1465,6 +1427,47 @@ Layers 2 &amp; 3:</string>
14651427
</property>
14661428
</widget>
14671429
</item>
1430+
<item row="2" column="1">
1431+
<widget class="QTabWidget" name="tabWidget_system">
1432+
<property name="sizePolicy">
1433+
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
1434+
<horstretch>3</horstretch>
1435+
<verstretch>0</verstretch>
1436+
</sizepolicy>
1437+
</property>
1438+
<property name="minimumSize">
1439+
<size>
1440+
<width>0</width>
1441+
<height>0</height>
1442+
</size>
1443+
</property>
1444+
<property name="tabPosition">
1445+
<enum>QTabWidget::North</enum>
1446+
</property>
1447+
<property name="currentIndex">
1448+
<number>0</number>
1449+
</property>
1450+
<widget class="QWidget" name="systemTab">
1451+
<attribute name="title">
1452+
<string>System Plot</string>
1453+
</attribute>
1454+
<layout class="QGridLayout" name="gridLayout_2">
1455+
<property name="leftMargin">
1456+
<number>0</number>
1457+
</property>
1458+
<property name="topMargin">
1459+
<number>0</number>
1460+
</property>
1461+
<property name="rightMargin">
1462+
<number>0</number>
1463+
</property>
1464+
<property name="bottomMargin">
1465+
<number>0</number>
1466+
</property>
1467+
</layout>
1468+
</widget>
1469+
</widget>
1470+
</item>
14681471
</layout>
14691472
</widget>
14701473
<widget class="QMenuBar" name="menuBar">
@@ -1473,7 +1476,7 @@ Layers 2 &amp; 3:</string>
14731476
<x>0</x>
14741477
<y>0</y>
14751478
<width>994</width>
1476-
<height>22</height>
1479+
<height>21</height>
14771480
</rect>
14781481
</property>
14791482
<widget class="QMenu" name="menuOpenSeesPile">

‎resources/styleSheets/pgtStyles.qss

+6-1
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,12 @@ QLabel#labelLayerProperties {
163163
}
164164

165165
QLabel#label_about {
166-
font-size: 24pt;
166+
font-size: 20pt;
167+
font-weight: bold;
168+
}
169+
170+
QLabel#label_quickTips {
171+
font-size: 20pt;
167172
font-weight: bold;
168173
}
169174

‎utilWindows/dialogabout.ui

+4-1
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,10 @@
8585
</sizepolicy>
8686
</property>
8787
<property name="text">
88-
<string>About Version 2.1</string>
88+
<string>About Pile Group Tool</string>
89+
</property>
90+
<property name="alignment">
91+
<set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
8992
</property>
9093
</widget>
9194
</item>

‎utilWindows/dialogquicktips.ui

+20-20
Original file line numberDiff line numberDiff line change
@@ -14,24 +14,8 @@
1414
<string>Dialog</string>
1515
</property>
1616
<layout class="QGridLayout" name="gridLayout">
17-
<item row="0" column="0">
18-
<widget class="QLabel" name="logo">
19-
<property name="sizePolicy">
20-
<sizepolicy hsizetype="Minimum" vsizetype="Minimum">
21-
<horstretch>0</horstretch>
22-
<verstretch>0</verstretch>
23-
</sizepolicy>
24-
</property>
25-
<property name="text">
26-
<string/>
27-
</property>
28-
<property name="pixmap">
29-
<pixmap resource="../qtpileresources.qrc">:/resources/NHERI-PGT-Icon.icns</pixmap>
30-
</property>
31-
</widget>
32-
</item>
3317
<item row="0" column="1">
34-
<widget class="QLabel" name="title">
18+
<widget class="QLabel" name="label_quickTips">
3519
<property name="sizePolicy">
3620
<sizepolicy hsizetype="Expanding" vsizetype="Preferred">
3721
<horstretch>0</horstretch>
@@ -49,11 +33,27 @@
4933
<string>Quick Tips</string>
5034
</property>
5135
<property name="alignment">
52-
<set>Qt::AlignBottom|Qt::AlignRight|Qt::AlignTrailing</set>
36+
<set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
37+
</property>
38+
</widget>
39+
</item>
40+
<item row="0" column="2">
41+
<widget class="QLabel" name="logo">
42+
<property name="sizePolicy">
43+
<sizepolicy hsizetype="Minimum" vsizetype="Minimum">
44+
<horstretch>0</horstretch>
45+
<verstretch>0</verstretch>
46+
</sizepolicy>
47+
</property>
48+
<property name="text">
49+
<string/>
50+
</property>
51+
<property name="pixmap">
52+
<pixmap resource="../qtpileresources.qrc">:/resources/NHERI-PGT-Icon.icns</pixmap>
5353
</property>
5454
</widget>
5555
</item>
56-
<item row="1" column="0" colspan="2">
56+
<item row="2" column="0" colspan="3">
5757
<widget class="QTextBrowser" name="textBrowser">
5858
<property name="source">
5959
<url>
@@ -62,7 +62,7 @@
6262
</property>
6363
</widget>
6464
</item>
65-
<item row="2" column="0" colspan="2">
65+
<item row="3" column="0" colspan="3">
6666
<widget class="QDialogButtonBox" name="buttonBox">
6767
<property name="orientation">
6868
<enum>Qt::Horizontal</enum>

0 commit comments

Comments
 (0)