GridLinesMgr.cpp   GridLinesMgr.cpp 
skipping to change at line 17 skipping to change at line 17
* as published by the Free Software Foundation; either version 2 * as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version. * of the License, or (at your option) any later version.
* *
* This program is distributed in the hope that it will be useful, * This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, U SA. * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA.
*/ */
#include <set> #include <set>
#include <QSettings> #include <QSettings>
#include <QDebug> #include <QDebug>
#include <QFontMetrics> #include <QFontMetrics>
#include <QtOpenGL> #include <QtOpenGL>
#include "GridLinesMgr.hpp" #include "GridLinesMgr.hpp"
#include "StelApp.hpp" #include "StelApp.hpp"
skipping to change at line 54 skipping to change at line 54
public: public:
// Create and precompute positions of a SkyGrid // Create and precompute positions of a SkyGrid
SkyGrid(StelCore::FrameType frame); SkyGrid(StelCore::FrameType frame);
virtual ~SkyGrid(); virtual ~SkyGrid();
void draw(const StelCore* prj) const; void draw(const StelCore* prj) const;
void setFontSize(double newFontSize); void setFontSize(double newFontSize);
void setColor(const Vec3f& c) {color = c;} void setColor(const Vec3f& c) {color = c;}
const Vec3f& getColor() {return color;} const Vec3f& getColor() {return color;}
void update(double deltaTime) {fader.update((int)(deltaTime*1000));} void update(double deltaTime) {fader.update((int)(deltaTime*1000));}
void setFadeDuration(float duration) {fader.setDuration((int)(durati on*1000.f));} void setFadeDuration(float duration) {fader.setDuration((int)(durati on*1000.f));}
void setFlagshow(bool b){fader = b;} void setDisplayed(const bool displayed){fader = displayed;}
bool getFlagshow(void) const {return fader;} bool isDisplayed(void) const {return fader;}
private: private:
Vec3f color; Vec3f color;
StelCore::FrameType frameType; StelCore::FrameType frameType;
QFont font; QFont font;
LinearFader fader; LinearFader fader;
}; };
//! @class SkyLine //! @class SkyLine
//! Class which manages a line to display around the sky like the ecliptic line. //! Class which manages a line to display around the sky like the ecliptic line.
class SkyLine class SkyLine
{ {
public: public:
enum SKY_LINE_TYPE enum SKY_LINE_TYPE
{ {
EQUATOR, EQUATOR,
ECLIPTIC, ECLIPTIC,
MERIDIAN, MERIDIAN,
HORIZON HORIZON,
GALACTICPLANE
}; };
// Create and precompute positions of a SkyGrid // Create and precompute positions of a SkyGrid
SkyLine(SKY_LINE_TYPE _line_type = EQUATOR); SkyLine(SKY_LINE_TYPE _line_type = EQUATOR);
virtual ~SkyLine(); virtual ~SkyLine();
void draw(StelCore* core) const; void draw(StelCore* core) const;
void setColor(const Vec3f& c) {color = c;} void setColor(const Vec3f& c) {color = c;}
const Vec3f& getColor() {return color;} const Vec3f& getColor() {return color;}
void update(double deltaTime) {fader.update((int)(deltaTime*1000));} void update(double deltaTime) {fader.update((int)(deltaTime*1000));}
void setFadeDuration(float duration) {fader.setDuration((int)(durati on*1000.f));} void setFadeDuration(float duration) {fader.setDuration((int)(durati on*1000.f));}
void setFlagshow(bool b){fader = b;} void setDisplayed(const bool displayed){fader = displayed;}
bool getFlagshow(void) const {return fader;} bool isDisplayed(void) const {return fader;}
void setFontSize(double newSize); void setFontSize(double newSize);
//! Re-translates the label.
void updateLabel();
private: private:
SKY_LINE_TYPE line_type; SKY_LINE_TYPE line_type;
Vec3f color; Vec3f color;
StelCore::FrameType frameType; StelCore::FrameType frameType;
LinearFader fader; LinearFader fader;
QFont font; QFont font;
QString label; QString label;
}; };
// rms added color as parameter // rms added color as parameter
skipping to change at line 519 skipping to change at line 522
fpt.transfo4d(rotLon); fpt.transfo4d(rotLon);
} }
} }
} }
SkyLine::SkyLine(SKY_LINE_TYPE _line_type) : color(0.f, 0.f, 1.f) SkyLine::SkyLine(SKY_LINE_TYPE _line_type) : color(0.f, 0.f, 1.f)
{ {
font.setPixelSize(14); font.setPixelSize(14);
line_type = _line_type; line_type = _line_type;
updateLabel();
}
SkyLine::~SkyLine()
{
}
void SkyLine::setFontSize(double newFontSize)
{
font.setPixelSize(newFontSize);
}
void SkyLine::updateLabel()
{
switch (line_type) switch (line_type)
{ {
case MERIDIAN: case MERIDIAN:
frameType = StelCore::FrameAltAz; frameType = StelCore::FrameAltAz;
label = q_("Meridian"); label = q_("Meridian");
break; break;
case ECLIPTIC: case ECLIPTIC:
frameType = StelCore::FrameObservercentricEcliptic; frameType = StelCore::FrameObservercentricEcliptic;
label = q_("Ecliptic"); label = q_("Ecliptic");
break; break;
case EQUATOR: case EQUATOR:
frameType = StelCore::FrameEquinoxEqu; frameType = StelCore::FrameEquinoxEqu;
label = q_("Equator"); label = q_("Equator");
break; break;
case HORIZON: case HORIZON:
frameType = StelCore::FrameAltAz; frameType = StelCore::FrameAltAz;
label = q_("Horizon"); label = q_("Horizon");
break; break;
case GALACTICPLANE:
frameType = StelCore::FrameGalactic;
label = q_("Galactic Plane");
break;
} }
} }
SkyLine::~SkyLine()
{
}
void SkyLine::setFontSize(double newFontSize)
{
font.setPixelSize(newFontSize);
}
void SkyLine::draw(StelCore *core) const void SkyLine::draw(StelCore *core) const
{ {
if (!fader.getInterstate()) if (!fader.getInterstate())
return; return;
StelProjectorP prj = core->getProjection(frameType, frameType!=StelC ore::FrameAltAz ? StelCore::RefractionAuto : StelCore::RefractionOff); StelProjectorP prj = core->getProjection(frameType, frameType!=StelC ore::FrameAltAz ? StelCore::RefractionAuto : StelCore::RefractionOff);
// Get the bounding halfspace // Get the bounding halfspace
const SphericalCap& viewPortSphericalCap = prj->getBoundingCap(); const SphericalCap& viewPortSphericalCap = prj->getBoundingCap();
skipping to change at line 629 skipping to change at line 641
{ {
setObjectName("GridLinesMgr"); setObjectName("GridLinesMgr");
equGrid = new SkyGrid(StelCore::FrameEquinoxEqu); equGrid = new SkyGrid(StelCore::FrameEquinoxEqu);
equJ2000Grid = new SkyGrid(StelCore::FrameJ2000); equJ2000Grid = new SkyGrid(StelCore::FrameJ2000);
galacticGrid = new SkyGrid(StelCore::FrameGalactic); galacticGrid = new SkyGrid(StelCore::FrameGalactic);
aziGrid = new SkyGrid(StelCore::FrameAltAz); aziGrid = new SkyGrid(StelCore::FrameAltAz);
equatorLine = new SkyLine(SkyLine::EQUATOR); equatorLine = new SkyLine(SkyLine::EQUATOR);
eclipticLine = new SkyLine(SkyLine::ECLIPTIC); eclipticLine = new SkyLine(SkyLine::ECLIPTIC);
meridianLine = new SkyLine(SkyLine::MERIDIAN); meridianLine = new SkyLine(SkyLine::MERIDIAN);
horizonLine = new SkyLine(SkyLine::HORIZON); horizonLine = new SkyLine(SkyLine::HORIZON);
galacticPlaneLine = new SkyLine(SkyLine::GALACTICPLANE);
} }
GridLinesMgr::~GridLinesMgr() GridLinesMgr::~GridLinesMgr()
{ {
delete equGrid; delete equGrid;
delete equJ2000Grid; delete equJ2000Grid;
delete galacticGrid; delete galacticGrid;
delete aziGrid; delete aziGrid;
delete equatorLine; delete equatorLine;
delete eclipticLine; delete eclipticLine;
delete meridianLine; delete meridianLine;
delete horizonLine; delete horizonLine;
delete galacticPlaneLine;
} }
/************************************************************************* /*************************************************************************
Reimplementation of the getCallOrder method Reimplementation of the getCallOrder method
*************************************************************************/ *************************************************************************/
double GridLinesMgr::getCallOrder(StelModuleActionName actionName) const double GridLinesMgr::getCallOrder(StelModuleActionName actionName) const
{ {
if (actionName==StelModule::ActionDraw) if (actionName==StelModule::ActionDraw)
return StelApp::getInstance().getModuleMgr().getModule("Nebu laMgr")->getCallOrder(actionName)+10; return StelApp::getInstance().getModuleMgr().getModule("Nebu laMgr")->getCallOrder(actionName)+10;
return 0; return 0;
skipping to change at line 666 skipping to change at line 680
Q_ASSERT(conf); Q_ASSERT(conf);
setFlagAzimuthalGrid(conf->value("viewing/flag_azimuthal_grid").toBo ol()); setFlagAzimuthalGrid(conf->value("viewing/flag_azimuthal_grid").toBo ol());
setFlagEquatorGrid(conf->value("viewing/flag_equatorial_grid").toBoo l()); setFlagEquatorGrid(conf->value("viewing/flag_equatorial_grid").toBoo l());
setFlagEquatorJ2000Grid(conf->value("viewing/flag_equatorial_J2000_g rid").toBool()); setFlagEquatorJ2000Grid(conf->value("viewing/flag_equatorial_J2000_g rid").toBool());
setFlagGalacticGrid(conf->value("viewing/flag_galactic_grid").toBool ()); setFlagGalacticGrid(conf->value("viewing/flag_galactic_grid").toBool ());
setFlagEquatorLine(conf->value("viewing/flag_equator_line").toBool() ); setFlagEquatorLine(conf->value("viewing/flag_equator_line").toBool() );
setFlagEclipticLine(conf->value("viewing/flag_ecliptic_line").toBool ()); setFlagEclipticLine(conf->value("viewing/flag_ecliptic_line").toBool ());
setFlagMeridianLine(conf->value("viewing/flag_meridian_line").toBool ()); setFlagMeridianLine(conf->value("viewing/flag_meridian_line").toBool ());
setFlagHorizonLine(conf->value("viewing/flag_horizon_line").toBool() ); setFlagHorizonLine(conf->value("viewing/flag_horizon_line").toBool() );
connect(&StelApp::getInstance(), SIGNAL(colorSchemeChanged(const QSt setFlagGalacticPlaneLine(conf->value("viewing/flag_galactic_plane_li
ring&)), this, SLOT(setStelStyle(const QString&))); ne").toBool());
StelApp& app = StelApp::getInstance();
connect(&app, SIGNAL(colorSchemeChanged(const QString&)), this, SLOT
(setStelStyle(const QString&)));
connect(&app, SIGNAL(languageChanged()), this, SLOT(updateLineLabels
()));
} }
void GridLinesMgr::update(double deltaTime) void GridLinesMgr::update(double deltaTime)
{ {
// Update faders // Update faders
equGrid->update(deltaTime); equGrid->update(deltaTime);
equJ2000Grid->update(deltaTime); equJ2000Grid->update(deltaTime);
galacticGrid->update(deltaTime); galacticGrid->update(deltaTime);
aziGrid->update(deltaTime); aziGrid->update(deltaTime);
equatorLine->update(deltaTime); equatorLine->update(deltaTime);
eclipticLine->update(deltaTime); eclipticLine->update(deltaTime);
meridianLine->update(deltaTime); meridianLine->update(deltaTime);
horizonLine->update(deltaTime); horizonLine->update(deltaTime);
galacticPlaneLine->update(deltaTime);
} }
void GridLinesMgr::draw(StelCore* core) void GridLinesMgr::draw(StelCore* core)
{ {
equGrid->draw(core); equGrid->draw(core);
galacticGrid->draw(core); galacticGrid->draw(core);
equJ2000Grid->draw(core); equJ2000Grid->draw(core);
aziGrid->draw(core); aziGrid->draw(core);
equatorLine->draw(core); equatorLine->draw(core);
eclipticLine->draw(core); eclipticLine->draw(core);
meridianLine->draw(core); meridianLine->draw(core);
horizonLine->draw(core); horizonLine->draw(core);
galacticPlaneLine->draw(core);
} }
void GridLinesMgr::setStelStyle(const QString& section) void GridLinesMgr::setStelStyle(const QString& section)
{ {
QSettings* conf = StelApp::getInstance().getSettings(); QSettings* conf = StelApp::getInstance().getSettings();
// Load colors from config file // Load colors from config file
QString defaultColor = conf->value(section+"/default_color").toStrin g(); QString defaultColor = conf->value(section+"/default_color").toStrin g();
setColorEquatorGrid(StelUtils::strToVec3f(conf->value(section+"/equa torial_color", defaultColor).toString())); setColorEquatorGrid(StelUtils::strToVec3f(conf->value(section+"/equa torial_color", defaultColor).toString()));
setColorEquatorJ2000Grid(StelUtils::strToVec3f(conf->value(section+" /equatorial_J2000_color", defaultColor).toString())); setColorEquatorJ2000Grid(StelUtils::strToVec3f(conf->value(section+" /equatorial_J2000_color", defaultColor).toString()));
setColorGalacticGrid(StelUtils::strToVec3f(conf->value(section+"/gal actic_color", defaultColor).toString())); setColorGalacticGrid(StelUtils::strToVec3f(conf->value(section+"/gal actic_color", defaultColor).toString()));
setColorAzimuthalGrid(StelUtils::strToVec3f(conf->value(section+"/az imuthal_color", defaultColor).toString())); setColorAzimuthalGrid(StelUtils::strToVec3f(conf->value(section+"/az imuthal_color", defaultColor).toString()));
setColorEquatorLine(StelUtils::strToVec3f(conf->value(section+"/equa tor_color", defaultColor).toString())); setColorEquatorLine(StelUtils::strToVec3f(conf->value(section+"/equa tor_color", defaultColor).toString()));
setColorEclipticLine(StelUtils::strToVec3f(conf->value(section+"/ecl iptic_color", defaultColor).toString())); setColorEclipticLine(StelUtils::strToVec3f(conf->value(section+"/ecl iptic_color", defaultColor).toString()));
setColorMeridianLine(StelUtils::strToVec3f(conf->value(section+"/mer idian_color", defaultColor).toString())); setColorMeridianLine(StelUtils::strToVec3f(conf->value(section+"/mer idian_color", defaultColor).toString()));
setColorHorizonLine(StelUtils::strToVec3f(conf->value(section+"/hori zon_color", defaultColor).toString())); setColorHorizonLine(StelUtils::strToVec3f(conf->value(section+"/hori zon_color", defaultColor).toString()));
setColorGalacticPlaneLine(StelUtils::strToVec3f(conf->value(section+
"/galactic_plane_color", defaultColor).toString()));
}
void GridLinesMgr::updateLineLabels()
{
equatorLine->updateLabel();
eclipticLine->updateLabel();
meridianLine->updateLabel();
horizonLine->updateLabel();
} }
//! Set flag for displaying Azimuthal Grid //! Set flag for displaying Azimuthal Grid
void GridLinesMgr::setFlagAzimuthalGrid(bool b) {aziGrid->setFlagshow(b);} void GridLinesMgr::setFlagAzimuthalGrid(const bool displayed)
{
if(displayed != aziGrid->isDisplayed()) {
aziGrid->setDisplayed(displayed);
emit azimuthalGridDisplayedChanged(displayed);
}
}
//! Get flag for displaying Azimuthal Grid //! Get flag for displaying Azimuthal Grid
bool GridLinesMgr::getFlagAzimuthalGrid(void) const {return aziGrid->getFla bool GridLinesMgr::getFlagAzimuthalGrid(void) const
gshow();} {
Vec3f GridLinesMgr::getColorAzimuthalGrid(void) const {return aziGrid->getC return aziGrid->isDisplayed();
olor();} }
Vec3f GridLinesMgr::getColorAzimuthalGrid(void) const
{
return aziGrid->getColor();
}
void GridLinesMgr::setColorAzimuthalGrid(const Vec3f& newColor)
{
if(newColor != aziGrid->getColor()) {
aziGrid->setColor(newColor);
emit azimuthalGridColorChanged(newColor);
}
}
//! Set flag for displaying Equatorial Grid //! Set flag for displaying Equatorial Grid
void GridLinesMgr::setFlagEquatorGrid(bool b) {equGrid->setFlagshow(b);} void GridLinesMgr::setFlagEquatorGrid(const bool displayed)
{
if(displayed != equGrid->isDisplayed()) {
equGrid->setDisplayed(displayed);
emit equatorGridDisplayedChanged(displayed);
}
}
//! Get flag for displaying Equatorial Grid //! Get flag for displaying Equatorial Grid
bool GridLinesMgr::getFlagEquatorGrid(void) const {return equGrid->getFlags bool GridLinesMgr::getFlagEquatorGrid(void) const
how();} {
Vec3f GridLinesMgr::getColorEquatorGrid(void) const {return equGrid->getCol return equGrid->isDisplayed();
or();} }
Vec3f GridLinesMgr::getColorEquatorGrid(void) const
{
return equGrid->getColor();
}
void GridLinesMgr::setColorEquatorGrid(const Vec3f& newColor)
{
if(newColor != equGrid->getColor()) {
equGrid->setColor(newColor);
emit equatorGridColorChanged(newColor);
}
}
//! Set flag for displaying Equatorial J2000 Grid //! Set flag for displaying Equatorial J2000 Grid
void GridLinesMgr::setFlagEquatorJ2000Grid(bool b) {equJ2000Grid->setFlagsh void GridLinesMgr::setFlagEquatorJ2000Grid(const bool displayed)
ow(b);} {
if(displayed != equJ2000Grid->isDisplayed()) {
equJ2000Grid->setDisplayed(displayed);
emit equatorJ2000GridDisplayedChanged(displayed);
}
}
//! Get flag for displaying Equatorial J2000 Grid //! Get flag for displaying Equatorial J2000 Grid
bool GridLinesMgr::getFlagEquatorJ2000Grid(void) const {return equJ2000Grid bool GridLinesMgr::getFlagEquatorJ2000Grid(void) const
->getFlagshow();} {
Vec3f GridLinesMgr::getColorEquatorJ2000Grid(void) const {return equJ2000Gr return equJ2000Grid->isDisplayed();
id->getColor();} }
Vec3f GridLinesMgr::getColorEquatorJ2000Grid(void) const
{
return equJ2000Grid->getColor();
}
void GridLinesMgr::setColorEquatorJ2000Grid(const Vec3f& newColor)
{
if(newColor != equJ2000Grid->getColor()) {
equJ2000Grid->setColor(newColor);
emit equatorJ2000GridColorChanged(newColor);
}
}
//! Set flag for displaying Equatorial J2000 Grid //! Set flag for displaying Equatorial J2000 Grid
void GridLinesMgr::setFlagGalacticGrid(bool b) {galacticGrid->setFlagshow(b void GridLinesMgr::setFlagGalacticGrid(const bool displayed)
);} {
if(displayed != galacticGrid->isDisplayed()) {
galacticGrid->setDisplayed(displayed);
emit galacticGridDisplayedChanged(displayed);
}
}
//! Get flag for displaying Equatorial J2000 Grid //! Get flag for displaying Equatorial J2000 Grid
bool GridLinesMgr::getFlagGalacticGrid(void) const {return galacticGrid->ge bool GridLinesMgr::getFlagGalacticGrid(void) const
tFlagshow();} {
Vec3f GridLinesMgr::getColorGalacticGrid(void) const {return galacticGrid-> return galacticGrid->isDisplayed();
getColor();} }
Vec3f GridLinesMgr::getColorGalacticGrid(void) const
{
return galacticGrid->getColor();
}
void GridLinesMgr::setColorGalacticGrid(const Vec3f& newColor)
{
if(newColor != galacticGrid->getColor()) {
galacticGrid->setColor(newColor);
emit galacticGridColorChanged(newColor);
}
}
//! Set flag for displaying Equatorial Line //! Set flag for displaying Equatorial Line
void GridLinesMgr::setFlagEquatorLine(bool b) {equatorLine->setFlagshow(b); void GridLinesMgr::setFlagEquatorLine(const bool displayed)
} {
if(displayed != equatorLine->isDisplayed()) {
equatorLine->setDisplayed(displayed);
emit equatorLineDisplayedChanged(displayed);
}
}
//! Get flag for displaying Equatorial Line //! Get flag for displaying Equatorial Line
bool GridLinesMgr::getFlagEquatorLine(void) const {return equatorLine->getF bool GridLinesMgr::getFlagEquatorLine(void) const
lagshow();} {
Vec3f GridLinesMgr::getColorEquatorLine(void) const {return equatorLine->ge return equatorLine->isDisplayed();
tColor();} }
Vec3f GridLinesMgr::getColorEquatorLine(void) const
{
return equatorLine->getColor();
}
void GridLinesMgr::setColorEquatorLine(const Vec3f& newColor)
{
if(newColor != equatorLine->getColor()) {
equatorLine->setColor(newColor);
emit equatorLineColorChanged(newColor);
}
}
//! Set flag for displaying Ecliptic Line //! Set flag for displaying Ecliptic Line
void GridLinesMgr::setFlagEclipticLine(bool b) {eclipticLine->setFlagshow(b void GridLinesMgr::setFlagEclipticLine(const bool displayed)
);} {
if(displayed != eclipticLine->isDisplayed()) {
eclipticLine->setDisplayed(displayed);
emit eclipticLineDisplayedChanged(displayed);
}
}
//! Get flag for displaying Ecliptic Line //! Get flag for displaying Ecliptic Line
bool GridLinesMgr::getFlagEclipticLine(void) const {return eclipticLine->ge bool GridLinesMgr::getFlagEclipticLine(void) const
tFlagshow();} {
Vec3f GridLinesMgr::getColorEclipticLine(void) const {return eclipticLine-> return eclipticLine->isDisplayed();
getColor();} }
Vec3f GridLinesMgr::getColorEclipticLine(void) const
{
return eclipticLine->getColor();
}
void GridLinesMgr::setColorEclipticLine(const Vec3f& newColor)
{
if(newColor != eclipticLine->getColor()) {
eclipticLine->setColor(newColor);
emit eclipticLineColorChanged(newColor);
}
}
//! Set flag for displaying Meridian Line //! Set flag for displaying Meridian Line
void GridLinesMgr::setFlagMeridianLine(bool b) {meridianLine->setFlagshow(b void GridLinesMgr::setFlagMeridianLine(const bool displayed)
);} {
if(displayed != meridianLine->isDisplayed()) {
meridianLine->setDisplayed(displayed);
emit meridianLineDisplayedChanged(displayed);
}
}
//! Get flag for displaying Meridian Line //! Get flag for displaying Meridian Line
bool GridLinesMgr::getFlagMeridianLine(void) const {return meridianLine->ge bool GridLinesMgr::getFlagMeridianLine(void) const
tFlagshow();} {
Vec3f GridLinesMgr::getColorMeridianLine(void) const {return meridianLine-> return meridianLine->isDisplayed();
getColor();} }
Vec3f GridLinesMgr::getColorMeridianLine(void) const
{
return meridianLine->getColor();
}
void GridLinesMgr::setColorMeridianLine(const Vec3f& newColor)
{
if(newColor != meridianLine->getColor()) {
meridianLine->setColor(newColor);
emit meridianLineColorChanged(newColor);
}
}
//! Set flag for displaying Horizon Line //! Set flag for displaying Horizon Line
void GridLinesMgr::setFlagHorizonLine(bool b) {horizonLine->setFlagshow(b); void GridLinesMgr::setFlagHorizonLine(const bool displayed)
} {
if(displayed != horizonLine->isDisplayed()) {
horizonLine->setDisplayed(displayed);
emit horizonLineDisplayedChanged(displayed);
}
}
//! Get flag for displaying Horizon Line //! Get flag for displaying Horizon Line
bool GridLinesMgr::getFlagHorizonLine(void) const {return horizonLine->getF bool GridLinesMgr::getFlagHorizonLine(void) const
lagshow();} {
Vec3f GridLinesMgr::getColorHorizonLine(void) const {return horizonLine->ge return horizonLine->isDisplayed();
tColor();} }
Vec3f GridLinesMgr::getColorHorizonLine(void) const
{
return horizonLine->getColor();
}
void GridLinesMgr::setColorHorizonLine(const Vec3f& newColor)
{
if(newColor != horizonLine->getColor()) {
horizonLine->setColor(newColor);
emit horizonLineColorChanged(newColor);
}
}
void GridLinesMgr::setColorAzimuthalGrid(const Vec3f& v) { aziGrid->setColo //! Set flag for displaying GalacticPlane Line
r(v);} void GridLinesMgr::setFlagGalacticPlaneLine(const bool displayed)
void GridLinesMgr::setColorEquatorGrid(const Vec3f& v) { equGrid->setColor( {
v);} if(displayed != galacticPlaneLine->isDisplayed()) {
void GridLinesMgr::setColorEquatorJ2000Grid(const Vec3f& v) { equJ2000Grid- galacticPlaneLine->setDisplayed(displayed);
>setColor(v);} emit galacticPlaneLineDisplayedChanged(displayed);
void GridLinesMgr::setColorGalacticGrid(const Vec3f& v) { galacticGrid->set }
Color(v);} }
void GridLinesMgr::setColorEquatorLine(const Vec3f& v) { equatorLine->setCo //! Get flag for displaying GalacticPlane Line
lor(v);} bool GridLinesMgr::getFlagGalacticPlaneLine(void) const
void GridLinesMgr::setColorEclipticLine(const Vec3f& v) { eclipticLine->set {
Color(v);} return galacticPlaneLine->isDisplayed();
void GridLinesMgr::setColorMeridianLine(const Vec3f& v) { meridianLine->set }
Color(v);} Vec3f GridLinesMgr::getColorGalacticPlaneLine(void) const
void GridLinesMgr::setColorHorizonLine(const Vec3f& v) { horizonLine->setCo {
lor(v);} return galacticPlaneLine->getColor();
}
void GridLinesMgr::setColorGalacticPlaneLine(const Vec3f& newColor)
{
if(newColor != galacticPlaneLine->getColor()) {
galacticPlaneLine->setColor(newColor);
emit galacticPlaneLineColorChanged(newColor);
}
}
 End of changes. 31 change blocks. 
63 lines changed or deleted 225 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/