AngleMeasure.cpp   AngleMeasure.cpp 
skipping to change at line 162 skipping to change at line 162
//! 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 (lineVisible.getInterstate() < 0.000001f && messageFader.getInter state() < 0.000001f) if (lineVisible.getInterstate() < 0.000001f && messageFader.getInter state() < 0.000001f)
return; return;
const StelProjectorP prj = core->getProjection(StelCore::FrameEquino xEqu); const StelProjectorP prj = core->getProjection(StelCore::FrameEquino xEqu);
StelPainter painter(prj); StelPainter painter(prj);
painter.setFont(font); painter.setFont(font);
Vec3f tColor, lColor;
if (StelApp::getInstance().getVisionModeNight())
{
tColor = StelUtils::getNightColor(textColor);
lColor = StelUtils::getNightColor(lineColor);
}
else
{
tColor = textColor;
lColor = lineColor;
}
if (lineVisible.getInterstate() > 0.000001f) if (lineVisible.getInterstate() > 0.000001f)
{ {
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
glEnable(GL_BLEND); glEnable(GL_BLEND);
glEnable(GL_TEXTURE_2D); glEnable(GL_TEXTURE_2D);
Vec3d xy; Vec3d xy;
if (prj->project(perp1EndPoint,xy)) if (prj->project(perp1EndPoint,xy))
{ {
painter.setColor(textColor[0], textColor[1], textCol or[2], lineVisible.getInterstate()); painter.setColor(tColor[0], tColor[1], tColor[2], li neVisible.getInterstate());
painter.drawText(xy[0], xy[1], angleText, 0, 15, 15) ; painter.drawText(xy[0], xy[1], angleText, 0, 15, 15) ;
} }
glDisable(GL_TEXTURE_2D); glDisable(GL_TEXTURE_2D);
glEnable(GL_LINE_SMOOTH); glEnable(GL_LINE_SMOOTH);
glEnable(GL_BLEND); glEnable(GL_BLEND);
// 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(lColor[0], lColor[1], lColor[2], lineVisibl e.getInterstate());
painter.drawGreatCircleArc(startPoint, endPoint, NULL); painter.drawGreatCircleArc(startPoint, endPoint, NULL);
// End lines // End lines
painter.drawGreatCircleArc(perp1StartPoint, perp1EndPoint, N ULL); painter.drawGreatCircleArc(perp1StartPoint, perp1EndPoint, N ULL);
painter.drawGreatCircleArc(perp2StartPoint, perp2EndPoint, N ULL); painter.drawGreatCircleArc(perp2StartPoint, perp2EndPoint, N ULL);
} }
if (messageFader.getInterstate() > 0.000001f) if (messageFader.getInterstate() > 0.000001f)
{ {
painter.setColor(textColor[0], textColor[1], textColor[2], m essageFader.getInterstate()); painter.setColor(tColor[0], tColor[1], tColor[2], messageFad er.getInterstate());
int x = 83; int x = 83;
int y = 120; int y = 120;
int ls = painter.getFontMetrics().lineSpacing(); int ls = painter.getFontMetrics().lineSpacing();
painter.drawText(x, y, messageEnabled); painter.drawText(x, y, messageEnabled);
y -= ls; y -= ls;
painter.drawText(x, y, messageLeftButton); painter.drawText(x, y, messageLeftButton);
y -= ls; y -= ls;
painter.drawText(x, y, messageRightButton); painter.drawText(x, y, messageRightButton);
} }
} }
 End of changes. 4 change blocks. 
3 lines changed or deleted 14 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/