AngleMeasure.cpp   AngleMeasure.cpp 
skipping to change at line 77 skipping to change at line 77
, dragging(false) , dragging(false)
, angle(0.) , angle(0.)
, 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(Q_NULLPTR)
{ {
startPoint.set(0.,0.,0.); startPoint.set(0.,0.,0.);
endPoint.set(0.,0.,0.); endPoint.set(0.,0.,0.);
perp1StartPoint.set(0.,0.,0.); perp1StartPoint.set(0.,0.,0.);
perp1EndPoint.set(0.,0.,0.); perp1EndPoint.set(0.,0.,0.);
perp2StartPoint.set(0.,0.,0.); perp2StartPoint.set(0.,0.,0.);
perp2EndPoint.set(0.,0.,0.); perp2EndPoint.set(0.,0.,0.);
startPointHor.set(0.,0.,0.); startPointHor.set(0.,0.,0.);
endPointHor.set(0.,0.,0.); endPointHor.set(0.,0.,0.);
perp1StartPointHor.set(0.,0.,0.); perp1StartPointHor.set(0.,0.,0.);
skipping to change at line 148 skipping to change at line 148
// 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()));
// Add a toolbar button // Add a toolbar button
try try
{ {
StelGui* gui = dynamic_cast<StelGui*>(app.getGui()); StelGui* gui = dynamic_cast<StelGui*>(app.getGui());
if (gui!=NULL) if (gui!=Q_NULLPTR)
{ {
toolbarButton = new StelButton(NULL, toolbarButton = new StelButton(Q_NULLPTR,
QPixmap(":/angleMeasu re/bt_anglemeasure_on.png"), QPixmap(":/angleMeasu re/bt_anglemeasure_on.png"),
QPixmap(":/angleMeasu re/bt_anglemeasure_off.png"), QPixmap(":/angleMeasu re/bt_anglemeasure_off.png"),
QPixmap(":/graphicGui /glow32x32.png"), QPixmap(":/graphicGui /glow32x32.png"),
"actionShow_Angle_Mea sure"); "actionShow_Angle_Mea sure");
gui->getButtonBar()->addButton(toolbarButton, "065-p luginsGroup"); gui->getButtonBar()->addButton(toolbarButton, "065-p luginsGroup");
} }
} }
catch (std::runtime_error& e) catch (std::runtime_error& e)
{ {
qWarning() << "WARNING: unable create toolbar button for Ang leMeasure plugin: " << e.what(); qWarning() << "WARNING: unable create toolbar button for Ang leMeasure plugin: " << e.what();
skipping to change at line 227 skipping to change at line 227
painter.drawText(xy[0], xy[1], displayedText , 0, 15, -5); painter.drawText(xy[0], xy[1], displayedText , 0, 15, -5);
} }
} }
painter.setLineSmooth(true); painter.setLineSmooth(true);
// main line is a great circle // main line is a great circle
painter.setColor(lineColor[0], lineColor[1], lineColor[2], l ineVisible.getInterstate()); painter.setColor(lineColor[0], lineColor[1], lineColor[2], l ineVisible.getInterstate());
if (frameType==StelCore::FrameEquinoxEqu) if (frameType==StelCore::FrameEquinoxEqu)
{ {
painter.drawGreatCircleArc(startPoint, endPoint, NUL L); painter.drawGreatCircleArc(startPoint, endPoint, Q_N ULLPTR);
// End lines // End lines
painter.drawGreatCircleArc(perp1StartPoint, perp1End painter.drawGreatCircleArc(perp1StartPoint, perp1End
Point, NULL); Point, Q_NULLPTR);
painter.drawGreatCircleArc(perp2StartPoint, perp2End painter.drawGreatCircleArc(perp2StartPoint, perp2End
Point, NULL); Point, Q_NULLPTR);
} }
else else
{ {
painter.drawGreatCircleArc(startPointHor, endPointHo r, NULL); painter.drawGreatCircleArc(startPointHor, endPointHo r, Q_NULLPTR);
// End lines // End lines
painter.drawGreatCircleArc(perp1StartPointHor, perp1 painter.drawGreatCircleArc(perp1StartPointHor, perp1
EndPointHor, NULL); EndPointHor, Q_NULLPTR);
painter.drawGreatCircleArc(perp2StartPointHor, perp2 painter.drawGreatCircleArc(perp2StartPointHor, perp2
EndPointHor, NULL); EndPointHor, Q_NULLPTR);
} }
painter.setLineSmooth(false); painter.setLineSmooth(false);
} }
if (messageFader.getInterstate() > 0.000001f) if (messageFader.getInterstate() > 0.000001f)
{ {
painter.setColor(txtColor[0], txtColor[1], txtColor[2], mess ageFader.getInterstate()); painter.setColor(txtColor[0], txtColor[1], txtColor[2], mess ageFader.getInterstate());
int x = 83; int x = 83;
int y = 120; int y = 120;
int ls = painter.getFontMetrics().lineSpacing(); int ls = painter.getFontMetrics().lineSpacing();
 End of changes. 7 change blocks. 
13 lines changed or deleted 13 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/