Commit 3bb98d7b authored by Bruce Allen's avatar Bruce Allen
Browse files

Not sure why a merge is needed, could be that OB fixed things twice, once on...

Not sure why a merge is needed, could be that OB fixed things twice, once on my laptop, then once in GIT
Merge branch 'antenna-patterns' of gitlab.aei.uni-hannover.de:einsteinathome/pulsatingscience into antenna-patterns
parents 794ad94d 544999ee
...@@ -17,6 +17,8 @@ Max Planck Institute for Gravitational Physics ...@@ -17,6 +17,8 @@ Max Planck Institute for Gravitational Physics
1. Download and install the Qt framework as described above 1. Download and install the Qt framework as described above
- Note for macOS when using MacPorts: - Note for macOS when using MacPorts:
- Run once: `sudo ln -s /opt/local/libexec/qt4/bin/qmake /opt/local/bin/qmake` - 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. Run the following commands in the project's root directory:
1. `qmake` 1. `qmake`
1. `make` 1. `make`
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
#include <math.h> #include <math.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <strings.h> #include <string.h>
#include "antenna_lib.h" #include "antenna_lib.h"
// Global variables for passing information. Ugly style but doesn't // Global variables for passing information. Ugly style but doesn't
......
...@@ -38,6 +38,9 @@ LIBS += -L$$_PRO_FILE_PWD_/lib -lantenna ...@@ -38,6 +38,9 @@ LIBS += -L$$_PRO_FILE_PWD_/lib -lantenna
FORMS += src/pulsatingscience.ui FORMS += src/pulsatingscience.ui
RESOURCES += src/pulsatingscience.qrc RESOURCES += src/pulsatingscience.qrc
unix:!macx {
LIBS += -lGLU
}
win32 { win32 {
RC_FILE = src/resources/pulsatingscience.rc RC_FILE = src/resources/pulsatingscience.rc
} }
......
...@@ -454,7 +454,8 @@ void PulsarAnimationWidget::paintGL() ...@@ -454,7 +454,8 @@ void PulsarAnimationWidget::paintGL()
font.setBold(true); font.setBold(true);
font.setFamily("Arial"); font.setFamily("Arial");
font.setStyleStrategy((QFont::StyleStrategy) (QFont::OpenGLCompatible | QFont::PreferQuality)); 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); renderText(10, 10, -100, tr("Max Planck Institute for Gravitational Physics"), font);
// restore original state // restore original state
......
...@@ -276,15 +276,17 @@ void PulsatingScience::on_actionAbout_triggered() ...@@ -276,15 +276,17 @@ void PulsatingScience::on_actionAbout_triggered()
{ {
QString content = "<b>%1</b><br>" QString content = "<b>%1</b><br>"
"<br>" "<br>"
"%2: Oliver Bock, Bruce Allen<br>" "%2: Oliver Bock<br>"
"%3: Bruce Allen<br>"
"<br>" "<br>"
"%3: GNU General Public License v3<br>" "%4: GNU General Public License v3<br>"
"<br>" "<br>"
"Copyright &copy; 2017 %4"; "Copyright &copy; 2017 %5";
content = content.arg( content = content.arg(
tr("GW170817"), tr("GW170817"),
tr("Authors"), tr("UI/Graphics"),
tr("Physics"),
tr("License"), tr("License"),
tr("Max Planck Institute for Gravitational Physics")); tr("Max Planck Institute for Gravitational Physics"));
......
...@@ -102,7 +102,7 @@ ...@@ -102,7 +102,7 @@
<item row="0" column="0"> <item row="0" column="0">
<widget class="QLabel" name="label_12"> <widget class="QLabel" name="label_12">
<property name="text"> <property name="text">
<string>LIGO Hanford</string> <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:#0000ff;&quot;&gt;LIGO Hanford&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property> </property>
</widget> </widget>
</item> </item>
...@@ -154,7 +154,7 @@ ...@@ -154,7 +154,7 @@
<item row="1" column="0"> <item row="1" column="0">
<widget class="QLabel" name="label"> <widget class="QLabel" name="label">
<property name="text"> <property name="text">
<string>LIGO Livingston</string> <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:#ff0000;&quot;&gt;LIGO Livingston&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property> </property>
</widget> </widget>
</item> </item>
...@@ -253,7 +253,7 @@ ...@@ -253,7 +253,7 @@
<item row="3" column="0"> <item row="3" column="0">
<widget class="QLabel" name="label_4"> <widget class="QLabel" name="label_4">
<property name="text"> <property name="text">
<string>Virgo</string> <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:#009900;&quot;&gt;Virgo&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property> </property>
</widget> </widget>
</item> </item>
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment