From f48a09ac2ff23f6f333b63c5116018e8d5549bd4 Mon Sep 17 00:00:00 2001 From: Bruce Allen <ballen4705@googlemail.com> Date: Fri, 15 Sep 2017 07:18:13 +0200 Subject: [PATCH] Modified the attribution statements and improved the labeling of sliders --- src/pulsaranimationwidget.cpp | 8 ++++---- src/pulsatingscience.cpp | 4 ++-- src/pulsatingscience.ui | 16 ++++++++-------- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/pulsaranimationwidget.cpp b/src/pulsaranimationwidget.cpp index 134fdf3..053d3c2 100644 --- a/src/pulsaranimationwidget.cpp +++ b/src/pulsaranimationwidget.cpp @@ -454,10 +454,10 @@ void PulsarAnimationWidget::paintGL() font.setBold(true); font.setFamily("Arial"); font.setStyleStrategy((QFont::StyleStrategy) (QFont::OpenGLCompatible | QFont::PreferQuality)); - 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, 40, -100, tr("B. Allen and O. Bock"), font); + renderText(10, 25, -100, tr("MPI for Gravitational Physics"), font); + renderText(10, 10, -100, QString("Copyright %1 2017").arg(QChar(0x00A9)), font); + // restore original state glMatrixMode(GL_PROJECTION); } diff --git a/src/pulsatingscience.cpp b/src/pulsatingscience.cpp index 1e19ea5..7466884 100644 --- a/src/pulsatingscience.cpp +++ b/src/pulsatingscience.cpp @@ -287,8 +287,8 @@ void PulsatingScience::on_actionAbout_triggered() content = content.arg( tr("GW170817"), - tr("UI/Graphics"), - tr("Physics"), + tr("UI/Graphics Code"), + tr("Physics Code"), tr("License"), tr("Max Planck Institute for Gravitational Physics")); diff --git a/src/pulsatingscience.ui b/src/pulsatingscience.ui index dae7760..042047f 100644 --- a/src/pulsatingscience.ui +++ b/src/pulsatingscience.ui @@ -182,7 +182,7 @@ <item row="5" column="1"> <widget class="QSlider" name="sliderSourceInclination"> <property name="statusTip"> - <string>Use this slider to adjust the inclination/polarization of the source plane (psi)</string> + <string>Use this slider to adjust the longitude (psi) of the binary system's orbital ascending node</string> </property> <property name="minimum"> <number>0</number> @@ -207,7 +207,7 @@ <item row="3" column="1"> <widget class="QSlider" name="sliderVirgoAngle"> <property name="statusTip"> - <string>Use this slider to adjust the orientation of Virgo</string> + <string>Use this slider to rotate Virgo away from its actual orientation. The meter on the far right shows the relative Virgo strain amplitude.</string> </property> <property name="maximum"> <number>360</number> @@ -239,7 +239,7 @@ <item row="1" column="0"> <widget class="QLabel" name="label"> <property name="text"> - <string><html><head/><body><p><span style=" color:#ff0000;">LIGO Livingston</span></p></body></html></string> + <string><html><head/><body><p><span style=" color:#ff0000;">LIGO Livingston Oreientation</span></p></body></html></string> </property> </widget> </item> @@ -269,7 +269,7 @@ <item row="0" column="1"> <widget class="QSlider" name="sliderLHOAngle"> <property name="statusTip"> - <string>Use this slider to adjust the orientation of LHO</string> + <string>Use this slider to rotate LIGO Hanford (LHO) away from its actual orientation. The meter on the far right shows the relative LHO strain amplitude.</string> </property> <property name="minimum"> <number>0</number> @@ -317,7 +317,7 @@ <item row="3" column="0"> <widget class="QLabel" name="label_4"> <property name="text"> - <string><html><head/><body><p><span style=" color:#009900;">Virgo</span></p></body></html></string> + <string><html><head/><body><p><span style=" color:#009900;">Virgo Orientation</span></p></body></html></string> </property> </widget> </item> @@ -331,14 +331,14 @@ <item row="0" column="0"> <widget class="QLabel" name="label_12"> <property name="text"> - <string><html><head/><body><p><span style=" color:#0000ff;">LIGO Hanford</span></p></body></html></string> + <string><html><head/><body><p><span style=" color:#0000ff;">LIGO Hanford Orientation</span></p></body></html></string> </property> </widget> </item> <item row="4" column="1"> <widget class="QSlider" name="sliderSourceIota"> <property name="statusTip"> - <string>Use this slider to adjust the source plane normal (iota)</string> + <string>Use this slider to adjust the orbital plane inclination angle (iota) of the binary system</string> </property> <property name="minimum"> <number>0</number> @@ -360,7 +360,7 @@ <item row="1" column="1"> <widget class="QSlider" name="sliderLLOAngle"> <property name="statusTip"> - <string>Use this slider to adjust the orientation of LLO</string> + <string>Use this slider to rotate LIGO Livingston (LLO) away from its actual orientation. The meter on the far right shows the relative LLO strain amplitude.</string> </property> <property name="minimum"> <number>0</number> -- GitLab