AngleMeasure.cpp   AngleMeasure.cpp 
skipping to change at line 80 skipping to change at line 80
, flagUseDmsFormat(false) , flagUseDmsFormat(false)
, flagShowPA(false) , flagShowPA(false)
, flagShowEquatorial(false) , flagShowEquatorial(false)
, flagShowHorizontal(false) , flagShowHorizontal(false)
, flagShowHorizontalPA(false) , flagShowHorizontalPA(false)
, flagShowHorizontalStartSkylinked(false) , flagShowHorizontalStartSkylinked(false)
, flagShowHorizontalEndSkylinked(false) , flagShowHorizontalEndSkylinked(false)
, angleHor(0.) , angleHor(0.)
, toolbarButton(NULL) , toolbarButton(NULL)
{ {
startPoint.set(0.,0.,0.);
endPoint.set(0.,0.,0.);
perp1StartPoint.set(0.,0.,0.);
perp1EndPoint.set(0.,0.,0.);
perp2StartPoint.set(0.,0.,0.);
perp2EndPoint.set(0.,0.,0.);
startPointHor.set(0.,0.,0.);
endPointHor.set(0.,0.,0.);
perp1StartPointHor.set(0.,0.,0.);
perp1EndPointHor.set(0.,0.,0.);
perp2StartPointHor.set(0.,0.,0.);
perp2EndPointHor.set(0.,0.,0.);
setObjectName("AngleMeasure"); setObjectName("AngleMeasure");
font.setPixelSize(16); font.setPixelSize(16);
configDialog = new AngleMeasureDialog(); configDialog = new AngleMeasureDialog();
conf = StelApp::getInstance().getSettings(); conf = StelApp::getInstance().getSettings();
messageTimer = new QTimer(this); messageTimer = new QTimer(this);
messageTimer->setInterval(7000); messageTimer->setInterval(7000);
messageTimer->setSingleShot(true); messageTimer->setSingleShot(true);
skipping to change at line 122 skipping to change at line 135
return 0; return 0;
} }
void AngleMeasure::init() void AngleMeasure::init()
{ {
if (!conf->childGroups().contains("AngleMeasure")) if (!conf->childGroups().contains("AngleMeasure"))
restoreDefaultSettings(); restoreDefaultSettings();
loadSettings(); loadSettings();
startPoint.set(0.,0.,0.);
endPoint.set(0.,0.,0.);
perp1StartPoint.set(0.,0.,0.);
perp1EndPoint.set(0.,0.,0.);
perp2StartPoint.set(0.,0.,0.);
perp2EndPoint.set(0.,0.,0.);
startPointHor.set(0.,0.,0.);
endPointHor.set(0.,0.,0.);
perp1StartPointHor.set(0.,0.,0.);
perp1EndPointHor.set(0.,0.,0.);
perp2StartPointHor.set(0.,0.,0.);
perp2EndPointHor.set(0.,0.,0.);
StelApp& app = StelApp::getInstance(); StelApp& app = StelApp::getInstance();
// Create action for enable/disable & hook up signals // Create action for enable/disable & hook up signals
addAction("actionShow_Angle_Measure", N_("Angle Measure"), N_("Angle measure"), "enabled", "Ctrl+A"); addAction("actionShow_Angle_Measure", N_("Angle Measure"), N_("Angle measure"), "enabled", "Ctrl+A");
// Initialize the message strings and make sure they are translated when // Initialize the message strings and make sure they are translated when
// the language changes. // the language changes.
updateMessageText(); updateMessageText();
connect(&app, SIGNAL(languageChanged()), this, SLOT(updateMessageTex t())); connect(&app, SIGNAL(languageChanged()), this, SLOT(updateMessageTex t()));
skipping to change at line 271 skipping to change at line 271
painter.drawText(x, y, messageLeftButton); painter.drawText(x, y, messageLeftButton);
y -= ls; y -= ls;
painter.drawText(x, y, messageRightButton); painter.drawText(x, y, messageRightButton);
} }
glDisable(GL_BLEND); glDisable(GL_BLEND);
} }
//! Draw any parts on the screen which are for our module //! Draw any parts on the screen which are for our module
void AngleMeasure::draw(StelCore* core) void AngleMeasure::draw(StelCore* core)
{ {
if (startPoint.lengthSquared()==0.0) // avoid crash on switch-on, lp
:#1455839
return;
if (lineVisible.getInterstate() < 0.000001f && messageFader.getInter state() < 0.000001f) if (lineVisible.getInterstate() < 0.000001f && messageFader.getInter state() < 0.000001f)
return; return;
if (flagShowHorizontal) if (flagShowHorizontal)
{ {
drawOne(core, StelCore::FrameAltAz, StelCore::RefractionOff, horTextColor, horLineColor); drawOne(core, StelCore::FrameAltAz, StelCore::RefractionOff, horTextColor, horLineColor);
} }
if (flagShowEquatorial) if (flagShowEquatorial)
{ {
drawOne(core, StelCore::FrameEquinoxEqu, StelCore::Refractio nAuto, textColor, lineColor); drawOne(core, StelCore::FrameEquinoxEqu, StelCore::Refractio nAuto, textColor, lineColor);
} }
 End of changes. 3 change blocks. 
13 lines changed or deleted 16 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/