diff --git a/README.md b/README.md index a592abdf9fe874f8ffbc7aab3cc411f734f1480a..4dda00c16bf51dc5be4c19e8940a66f4643ce650 100644 --- a/README.md +++ b/README.md @@ -17,6 +17,8 @@ Max Planck Institute for Gravitational Physics 1. Download and install the Qt framework as described above - Note for macOS when using MacPorts: - Run once: `sudo ln -s /opt/local/libexec/qt4/bin/qmake /opt/local/bin/qmake` +1. Run the following command in the project's `lib` directory: + - `make` 1. Run the following commands in the project's root directory: 1. `qmake` 1. `make` diff --git a/lib/antenna_lib.cpp b/lib/antenna_lib.cpp index 536d7bc23544963613a1ab1abb44ff503a8b36fe..20ebdf1940515bca624fd2a6fd84441cf1f3073c 100644 --- a/lib/antenna_lib.cpp +++ b/lib/antenna_lib.cpp @@ -9,7 +9,7 @@ #include <math.h> #include <stdio.h> #include <stdlib.h> -#include <strings.h> +#include <string.h> #include "antenna_lib.h" // Global variables for passing information. Ugly style but doesn't diff --git a/pulsatingscience.pro b/pulsatingscience.pro index 8d7d21da0f9749d9c30a583c54a680d4bf157fb9..fda6f61a8edbead2773bd4ad86dd5385a5ce706b 100644 --- a/pulsatingscience.pro +++ b/pulsatingscience.pro @@ -38,6 +38,9 @@ LIBS += -L$$_PRO_FILE_PWD_/lib -lantenna FORMS += src/pulsatingscience.ui RESOURCES += src/pulsatingscience.qrc +unix:!macx { + LIBS += -lGLU +} win32 { RC_FILE = src/resources/pulsatingscience.rc } diff --git a/src/pulsaranimationwidget.cpp b/src/pulsaranimationwidget.cpp index 81576aa5c5e0a47d5ba0abed7bc31c68c340e233..967cc0d7e7782ba86bae02b0cada41ae055e414f 100644 --- a/src/pulsaranimationwidget.cpp +++ b/src/pulsaranimationwidget.cpp @@ -454,7 +454,8 @@ void PulsarAnimationWidget::paintGL() font.setBold(true); font.setFamily("Arial"); font.setStyleStrategy((QFont::StyleStrategy) (QFont::OpenGLCompatible | QFont::PreferQuality)); - renderText(10, 25, -100, QString("Copyright %1 2017 by O. Bock and B. Allen").arg(QChar(0x00A9)), font); + renderText(10, 40, -100, QString("Copyright %1 2017").arg(QChar(0x00A9)), font); + renderText(10, 25, -100, tr("O. Bock (UI/Graphics) and B. Allen (Physics)"), font); renderText(10, 10, -100, tr("Max Planck Institute for Gravitational Physics"), font); // restore original state diff --git a/src/pulsatingscience.cpp b/src/pulsatingscience.cpp index f4cf689d6884a91e6ef185f536f550db526ced6d..c2bddd26a29717d22abfbefb73756e325044f2eb 100644 --- a/src/pulsatingscience.cpp +++ b/src/pulsatingscience.cpp @@ -276,15 +276,17 @@ void PulsatingScience::on_actionAbout_triggered() { QString content = "<b>%1</b><br>" "<br>" - "%2: Oliver Bock, Bruce Allen<br>" + "%2: Oliver Bock<br>" + "%3: Bruce Allen<br>" "<br>" - "%3: GNU General Public License v3<br>" + "%4: GNU General Public License v3<br>" "<br>" - "Copyright © 2017 %4"; + "Copyright © 2017 %5"; content = content.arg( tr("GW170817"), - tr("Authors"), + tr("UI/Graphics"), + tr("Physics"), tr("License"), tr("Max Planck Institute for Gravitational Physics")); diff --git a/src/pulsatingscience.ui b/src/pulsatingscience.ui index df58eab204c1c72f87f758c9215dda3ee34c912f..80eda80b1d7f7c7dcc834a38cd77687c7e7923b0 100644 --- a/src/pulsatingscience.ui +++ b/src/pulsatingscience.ui @@ -102,7 +102,7 @@ <item row="0" column="0"> <widget class="QLabel" name="label_12"> <property name="text"> - <string>LIGO Hanford</string> + <string><html><head/><body><p><span style=" color:#0000ff;">LIGO Hanford</span></p></body></html></string> </property> </widget> </item> @@ -154,7 +154,7 @@ <item row="1" column="0"> <widget class="QLabel" name="label"> <property name="text"> - <string>LIGO Livingston</string> + <string><html><head/><body><p><span style=" color:#ff0000;">LIGO Livingston</span></p></body></html></string> </property> </widget> </item> @@ -253,7 +253,7 @@ <item row="3" column="0"> <widget class="QLabel" name="label_4"> <property name="text"> - <string>Virgo</string> + <string><html><head/><body><p><span style=" color:#009900;">Virgo</span></p></body></html></string> </property> </widget> </item>