From d07db0429a96cc2862300123f55c8d03b9c4bc47 Mon Sep 17 00:00:00 2001
From: Oliver Bock <oliver.bock@aei.mpg.de>
Date: Fri, 20 Feb 2009 14:45:23 +0100
Subject: [PATCH] Various type fixes
---
src/pulsaranimationwidget.cpp | 2 +-
src/pulsaranimationwidget.h | 8 ++++----
src/pulsatingscience.cpp | 2 +-
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/pulsaranimationwidget.cpp b/src/pulsaranimationwidget.cpp
index db81e13..7515553 100644
--- a/src/pulsaranimationwidget.cpp
+++ b/src/pulsaranimationwidget.cpp
@@ -412,7 +412,7 @@ void PulsarAnimationWidget::paintGL()
void PulsarAnimationWidget::runAnimation()
{
- m_frameTimer.start(1000.0 / m_framesPerSecond);
+ m_frameTimer.start(qRound(1000.0 / m_framesPerSecond));
}
void PulsarAnimationWidget::pauseAnimation()
diff --git a/src/pulsaranimationwidget.h b/src/pulsaranimationwidget.h
index 51f7c4b..0199770 100644
--- a/src/pulsaranimationwidget.h
+++ b/src/pulsaranimationwidget.h
@@ -106,8 +106,8 @@ private:
double m_companionMass;
double m_companionSemiMajorAxis;
- int m_pulsarSpinAxisInclination;
- int m_pulsarMagneticAxisInclination;
+ double m_pulsarSpinAxisInclination;
+ double m_pulsarMagneticAxisInclination;
bool m_showOrbits;
bool m_showRotationAxes;
@@ -115,8 +115,8 @@ private:
int m_mouseLastX;
int m_mouseLastY;
- int m_mouseAngleH;
- int m_mouseAngleV;
+ double m_mouseAngleH;
+ double m_mouseAngleV;
double m_cameraZoom;
double m_cameraZoomLBound;
double m_cameraZoomUBound;
diff --git a/src/pulsatingscience.cpp b/src/pulsatingscience.cpp
index caca9d5..e04f6f8 100644
--- a/src/pulsatingscience.cpp
+++ b/src/pulsatingscience.cpp
@@ -422,7 +422,7 @@ void PulsatingScience::on_actionAbout_triggered()
void PulsatingScience::updatePulsarSemiMajorAxisValue(double value)
{
- ui.sliderPulsarSemiMajorAxis->setValue(value * 1000.0);
+ ui.sliderPulsarSemiMajorAxis->setValue(qRound(value * 1000.0));
if((int)value <= 1 || (int)value >= 20) {
if((int)value < 1 || (int)value > 20) {
--
GitLab