From 9e7d215a4a9a8f5568d8994efc0b78e7adeb0ec0 Mon Sep 17 00:00:00 2001
From: Oliver Bock <oliver.bock@aei.mpg.de>
Date: Fri, 13 Feb 2009 14:40:19 +0100
Subject: [PATCH] Improved initial settings
* Using show event to update pulse profile
* Using 60 deg inclination of magentic axis
---
src/pulsaranimationwidget.cpp | 13 +++++++++----
src/pulsaranimationwidget.h | 1 +
src/pulsatingscience.ui | 7 +++++--
3 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/src/pulsaranimationwidget.cpp b/src/pulsaranimationwidget.cpp
index 6817fac..3000cc9 100644
--- a/src/pulsaranimationwidget.cpp
+++ b/src/pulsaranimationwidget.cpp
@@ -78,7 +78,7 @@ PulsarAnimationWidget::PulsarAnimationWidget(QWidget *parent) :
// initial companion is "Neutron Star"
m_companionMass = 1.4;
m_pulsarSpinAxisInclination = 0.0;
- m_pulsarMagneticAxisInclination = 45.0;
+ m_pulsarMagneticAxisInclination = 60.0;
m_pulsarSemiMajorAxis = 5.0;
m_companionSemiMajorAxis = (m_pulsarMass/m_companionMass) * m_pulsarSemiMajorAxis;
// initial spin frequency of 0.5 Hz
@@ -102,9 +102,6 @@ PulsarAnimationWidget::PulsarAnimationWidget(QWidget *parent) :
// update camera based on settings above
updateCameraPosition(m_mouseAngleH, m_mouseAngleV, m_cameraZoom);
-
- // finally, create initial pulse profile based on settings above
- updatePulseProfile();
}
PulsarAnimationWidget::~PulsarAnimationWidget()
@@ -512,6 +509,14 @@ void PulsarAnimationWidget::mouseReleaseEvent(QMouseEvent *event)
updateGL();
}
+void PulsarAnimationWidget::showEvent(QShowEvent *event)
+{
+ Q_UNUSED(event);
+
+ // update and propagate pulse profile
+ updatePulseProfile();
+}
+
void PulsarAnimationWidget::updateCameraPosition(const int angleH, const int angleV, const double zoom)
{
m_cameraPosX = sin(angleH * deg2rad) * cos(angleV * deg2rad) * zoom;
diff --git a/src/pulsaranimationwidget.h b/src/pulsaranimationwidget.h
index 65093fa..51f7c4b 100644
--- a/src/pulsaranimationwidget.h
+++ b/src/pulsaranimationwidget.h
@@ -70,6 +70,7 @@ private:
void mousePressEvent(QMouseEvent *event);
void mouseMoveEvent(QMouseEvent *event);
void mouseReleaseEvent(QMouseEvent *event);
+ void showEvent(QShowEvent *event);
void updateOrbitPeriod();
void updateOrbitRadii();
diff --git a/src/pulsatingscience.ui b/src/pulsatingscience.ui
index e60e54c..7854369 100644
--- a/src/pulsatingscience.ui
+++ b/src/pulsatingscience.ui
@@ -226,7 +226,7 @@
<number>180</number>
</property>
<property name="value" >
- <number>45</number>
+ <number>60</number>
</property>
<property name="orientation" >
<enum>Qt::Horizontal</enum>
@@ -244,8 +244,11 @@
<property name="segmentStyle" >
<enum>QLCDNumber::Flat</enum>
</property>
+ <property name="value" stdset="0" >
+ <double>60.000000000000000</double>
+ </property>
<property name="intValue" stdset="0" >
- <number>45</number>
+ <number>60</number>
</property>
</widget>
</item>
--
GitLab