Skip to content
GitLab
Commit c36b689b authored by Bruce Allen's avatar Bruce Allen
Browse files

Incorporating Oliver's changes 

Merge branch 'antenna-patterns' of gitlab.aei.uni-hannover.de:einsteinathome/pulsatingscience into antenna-patterns
parents a81f67f8 ac4f2914
Hide whitespace changes
Inline Side-by-side
src/pulsatingscience.cpp
View file @ c36b689b
......@@ -62,6 +62,8 @@ PulsatingScience::PulsatingScience(QWidget *parent) : QMainWindow(parent)
// establish object communications
connect(ui.pulsarGlWidget, SIGNAL(pulseProfileUpdated(const PlotData&)),
ui.pulseScopeWidget, SLOT(plot(const PlotData&)));
connect(ui.pulsarGlWidget, SIGNAL(pulseProfileUpdated(const PlotData&)),
this, SLOT(updateAmplitudes(const PlotData&)));
connect(m_hiddenShortcut, SIGNAL(activated()),
this, SLOT(toggleHiddenDemoMode()));
......@@ -352,6 +354,13 @@ void PulsatingScience::userInactivityCallback()
saveOrRestoreInitialAnimationSettings();
}
void PulsatingScience::updateAmplitudes(const PlotData& data) {
QString s;
ui.lcdAmpLHO->display(s.sprintf("%.2f", data.m_ampLHO));
ui.lcdAmpLLO->display(s.sprintf("%.2f", data.m_ampLLO));
ui.lcdAmpVirgo->display(s.sprintf("%.2f", data.m_ampVirgo));
}
void PulsatingScience::saveOrRestoreInitialAnimationSettings()
{
static bool initialized = false;
......
src/pulsatingscience.h
View file @ c36b689b
......@@ -62,6 +62,8 @@ public slots:
void userInactivityCallback();
void updateAmplitudes(const PlotData& data);
protected:
bool eventFilter(QObject *obj, QEvent *event);
......
src/pulsatingscience.ui
View file @ c36b689b
......@@ -73,66 +73,65 @@
<layout class="QGridLayout" name="gridLayout_3">
<item row="1" column="0">
<layout class="QGridLayout" name="gridLayout_2">
<item row="3" column="1">
<widget class="QSlider" name="sliderVirgoAngle">
<property name="statusTip">
<string>Use this slider to adjust the orientation of Virgo</string>
</property>
<property name="maximum">
<number>360</number>
</property>
<property name="value">
<number>0</number>
</property>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="tickPosition">
<enum>QSlider::TicksBelow</enum>
<item row="1" column="5">
<widget class="QLabel" name="label_10">
<property name="text">
<string>A:</string>
</property>
</widget>
</item>
<item row="0" column="3">
<widget class="QLabel" name="label_13">
<item row="3" column="5">
<widget class="QLabel" name="label_11">
<property name="text">
<string>deg</string>
<string>A:</string>
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QLabel" name="label_12">
<item row="0" column="5">
<widget class="QLabel" name="label_2">
<property name="text">
<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>
<string>A:</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QSlider" name="sliderLHOAngle">
<property name="statusTip">
<string>Use this slider to adjust the orientation of LHO</string>
</property>
<property name="minimum">
<number>0</number>
<item row="3" column="3">
<widget class="QLabel" name="label_7">
<property name="text">
<string>deg</string>
</property>
<property name="maximum">
<number>360</number>
</widget>
</item>
<item row="1" column="2">
<widget class="QLCDNumber" name="lcdLLOAngle">
<property name="numDigits">
<number>6</number>
</property>
<property name="pageStep">
<number>10</number>
<property name="segmentStyle">
<enum>QLCDNumber::Flat</enum>
</property>
<property name="value">
<number>0</number>
<property name="value" stdset="0">
<double>0.000000000000000</double>
</property>
</widget>
</item>
<item row="0" column="4">
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="tickPosition">
<enum>QSlider::TicksBelow</enum>
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</property>
</widget>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item row="0" column="2">
<widget class="QLCDNumber" name="lcdLHOAngle">
<item row="5" column="2">
<widget class="QLCDNumber" name="lcdSourceInclination">
<property name="numDigits">
<number>6</number>
</property>
......@@ -144,24 +143,46 @@
</property>
</widget>
</item>
<item row="5" column="3">
<widget class="QLabel" name="label_9">
<item row="1" column="4">
<spacer name="horizontalSpacer_2">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item row="4" column="3">
<widget class="QLabel" name="label_6">
<property name="text">
<string>deg</string>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label">
<property name="text">
<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>
<item row="4" column="2">
<widget class="QLCDNumber" name="lcdSourceIota">
<property name="numDigits">
<number>6</number>
</property>
<property name="segmentStyle">
<enum>QLCDNumber::Flat</enum>
</property>
<property name="intValue" stdset="0">
<number>0</number>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QSlider" name="sliderLLOAngle">
<item row="5" column="1">
<widget class="QSlider" name="sliderSourceInclination">
<property name="statusTip">
<string>Use this slider to adjust the orientation of LLO</string>
<string>Use this slider to adjust the inclination/polarization of the source plane (psi)</string>
</property>
<property name="minimum">
<number>0</number>
......@@ -169,21 +190,12 @@
<property name="maximum">
<number>360</number>
</property>
<property name="pageStep">
<number>10</number>
</property>
<property name="value">
<number>0</number>
</property>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="invertedAppearance">
<bool>false</bool>
</property>
<property name="invertedControls">
<bool>false</bool>
</property>
<property name="tickPosition">
<enum>QSlider::TicksBelow</enum>
</property>
......@@ -192,8 +204,27 @@
</property>
</widget>
</item>
<item row="1" column="2">
<widget class="QLCDNumber" name="lcdLLOAngle">
<item row="3" column="1">
<widget class="QSlider" name="sliderVirgoAngle">
<property name="statusTip">
<string>Use this slider to adjust the orientation of Virgo</string>
</property>
<property name="maximum">
<number>360</number>
</property>
<property name="value">
<number>0</number>
</property>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="tickPosition">
<enum>QSlider::TicksBelow</enum>
</property>
</widget>
</item>
<item row="0" column="2">
<widget class="QLCDNumber" name="lcdLHOAngle">
<property name="numDigits">
<number>6</number>
</property>
......@@ -205,15 +236,22 @@
</property>
</widget>
</item>
<item row="5" column="0">
<widget class="QLabel" name="label_3">
<item row="1" column="0">
<widget class="QLabel" name="label">
<property name="text">
<string>Source: psi</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>
</widget>
</item>
<item row="5" column="2">
<widget class="QLCDNumber" name="lcdSourceInclination">
<item row="4" column="0">
<widget class="QLabel" name="label_5">
<property name="text">
<string>Source: iota</string>
</property>
</widget>
</item>
<item row="3" column="2">
<widget class="QLCDNumber" name="lcdVirgoAngle">
<property name="numDigits">
<number>6</number>
</property>
......@@ -223,12 +261,15 @@
<property name="value" stdset="0">
<double>0.000000000000000</double>
</property>
<property name="intValue" stdset="0">
<number>0</number>
</property>
</widget>
</item>
<item row="5" column="1">
<widget class="QSlider" name="sliderSourceInclination">
<item row="0" column="1">
<widget class="QSlider" name="sliderLHOAngle">
<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 orientation of LHO</string>
</property>
<property name="minimum">
<number>0</number>
......@@ -236,6 +277,9 @@
<property name="maximum">
<number>360</number>
</property>
<property name="pageStep">
<number>10</number>
</property>
<property name="value">
<number>0</number>
</property>
......@@ -245,22 +289,35 @@
<property name="tickPosition">
<enum>QSlider::TicksBelow</enum>
</property>
<property name="tickInterval">
<number>0</number>
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QLabel" name="label_4">
<item row="3" column="4">
<spacer name="horizontalSpacer_3">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item row="0" column="3">
<widget class="QLabel" name="label_13">
<property name="text">
<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>
<string>deg</string>
</property>
</widget>
</item>
<item row="3" column="3">
<widget class="QLabel" name="label_7">
<item row="3" column="0">
<widget class="QLabel" name="label_4">
<property name="text">
<string>deg</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>
</widget>
</item>
......@@ -271,26 +328,10 @@
</property>
</widget>
</item>
<item row="3" column="2">
<widget class="QLCDNumber" name="lcdVirgoAngle">
<property name="numDigits">
<number>6</number>
</property>
<property name="segmentStyle">
<enum>QLCDNumber::Flat</enum>
</property>
<property name="value" stdset="0">
<double>0.000000000000000</double>
</property>
<property name="intValue" stdset="0">
<number>0</number>
</property>
</widget>
</item>
<item row="4" column="0">
<widget class="QLabel" name="label_5">
<item row="0" column="0">
<widget class="QLabel" name="label_12">
<property name="text">
<string>Source: iota</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>
</widget>
</item>
......@@ -316,26 +357,75 @@
</property>
</widget>
</item>
<item row="4" column="2">
<widget class="QLCDNumber" name="lcdSourceIota">
<property name="numDigits">
<number>6</number>
<item row="1" column="1">
<widget class="QSlider" name="sliderLLOAngle">
<property name="statusTip">
<string>Use this slider to adjust the orientation of LLO</string>
</property>
<property name="segmentStyle">
<enum>QLCDNumber::Flat</enum>
<property name="minimum">
<number>0</number>
</property>
<property name="intValue" stdset="0">
<property name="maximum">
<number>360</number>
</property>
<property name="pageStep">
<number>10</number>
</property>
<property name="value">
<number>0</number>
</property>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="invertedAppearance">
<bool>false</bool>
</property>
<property name="invertedControls">
<bool>false</bool>
</property>
<property name="tickPosition">
<enum>QSlider::TicksBelow</enum>
</property>
<property name="tickInterval">
<number>0</number>
</property>
</widget>
</item>
<item row="4" column="3">
<widget class="QLabel" name="label_6">
<item row="5" column="3">
<widget class="QLabel" name="label_9">
<property name="text">
<string>deg</string>
</property>
</widget>
</item>
<item row="5" column="0">
<widget class="QLabel" name="label_3">
<property name="text">
<string>Source: psi</string>
</property>
</widget>
</item>
<item row="0" column="6">
<widget class="QLCDNumber" name="lcdAmpLHO">
<property name="numDigits">
<number>4</number>
</property>
</widget>
</item>
<item row="1" column="6">
<widget class="QLCDNumber" name="lcdAmpLLO">
<property name="numDigits">
<number>4</number>
</property>
</widget>
</item>
<item row="3" column="6">
<widget class="QLCDNumber" name="lcdAmpVirgo">
<property name="numDigits">
<number>4</number>
</property>
</widget>
</item>
</layout>
</item>
</layout>
......
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