[Kstars-devel] [kstars] /: Restructuring KStars layout a bit. Added auxiliary and time directories, moved a few files to their logical destinations, and removed duplicated files.
Jasem Mutlaq
mutlaqja at ikarustech.com
Wed Feb 11 08:19:02 UTC 2015
Git commit 06805105dcb4db386919c9da3790fd3a7dd91cb8 by Jasem Mutlaq.
Committed on 11/02/2015 at 08:17.
Pushed by mutlaqja into branch 'master'.
Restructuring KStars layout a bit. Added auxiliary and time directories, moved a few files to their logical destinations, and removed duplicated files.
CCMAIL:kstars-devel at kde.org
M +8 -0 datahandlers/CMakeLists.txt
M +1 -1 datahandlers/ksparser.h
M +48 -21 kstars/CMakeLists.txt
R +0 -0 kstars/auxiliary/binfilehelper.cpp [from: kstars/binfilehelper.cpp - 100% similarity]
R +0 -0 kstars/auxiliary/binfilehelper.h [from: kstars/binfilehelper.h - 100% similarity]
R +0 -0 kstars/auxiliary/colorscheme.cpp [from: kstars/colorscheme.cpp - 100% similarity]
R +0 -0 kstars/auxiliary/colorscheme.h [from: kstars/colorscheme.h - 100% similarity]
R +0 -0 kstars/auxiliary/dms.cpp [from: kstars/dms.cpp - 100% similarity]
R +1 -1 kstars/auxiliary/dms.h [from: kstars/dms.h - 099% similarity]
R +0 -0 kstars/auxiliary/fov.cpp [from: kstars/fov.cpp - 100% similarity]
R +0 -0 kstars/auxiliary/fov.h [from: kstars/fov.h - 100% similarity]
R +0 -0 kstars/auxiliary/geolocation.cpp [from: kstars/geolocation.cpp - 100% similarity]
R +0 -0 kstars/auxiliary/geolocation.h [from: kstars/geolocation.h - 100% similarity]
R +0 -0 kstars/auxiliary/imageexporter.cpp [from: kstars/imageexporter.cpp - 100% similarity]
R +0 -0 kstars/auxiliary/imageexporter.h [from: kstars/imageexporter.h - 100% similarity]
R +0 -0 kstars/auxiliary/imageviewer.cpp [from: kstars/imageviewer.cpp - 100% similarity]
R +0 -0 kstars/auxiliary/imageviewer.h [from: kstars/imageviewer.h - 100% similarity]
R +0 -0 kstars/auxiliary/ksfilereader.cpp [from: kstars/ksfilereader.cpp - 100% similarity]
R +0 -0 kstars/auxiliary/ksfilereader.h [from: kstars/ksfilereader.h - 100% similarity]
R +0 -0 kstars/auxiliary/ksuserdb.cpp [from: kstars/ksuserdb.cpp - 100% similarity]
R +0 -0 kstars/auxiliary/ksuserdb.h [from: kstars/ksuserdb.h - 100% similarity]
R +0 -0 kstars/auxiliary/ksutils.cpp [from: kstars/ksutils.cpp - 100% similarity]
R +0 -0 kstars/auxiliary/ksutils.h [from: kstars/ksutils.h - 100% similarity]
R +0 -0 kstars/auxiliary/kswizard.cpp [from: kstars/kswizard.cpp - 100% similarity]
R +0 -0 kstars/auxiliary/kswizard.h [from: kstars/kswizard.h - 100% similarity]
R +0 -0 kstars/auxiliary/thumbnaileditor.cpp [from: kstars/thumbnaileditor.cpp - 100% similarity]
R +0 -0 kstars/auxiliary/thumbnaileditor.h [from: kstars/thumbnaileditor.h - 100% similarity]
R +0 -0 kstars/auxiliary/thumbnaileditor.ui [from: kstars/thumbnaileditor.ui - 100% similarity]
R +0 -0 kstars/auxiliary/thumbnailpicker.cpp [from: kstars/thumbnailpicker.cpp - 100% similarity]
R +0 -0 kstars/auxiliary/thumbnailpicker.h [from: kstars/thumbnailpicker.h - 100% similarity]
R +0 -0 kstars/auxiliary/thumbnailpicker.ui [from: kstars/thumbnailpicker.ui - 100% similarity]
M +1 -1 kstars/dialogs/exportimagedialog.cpp
M +1 -1 kstars/skyobjects/deepskyobject.h
R +0 -0 kstars/skyobjects/satellitegroup.cpp [from: kstars/satellitegroup.cpp - 100% similarity]
R +0 -0 kstars/skyobjects/satellitegroup.h [from: kstars/satellitegroup.h - 100% similarity]
M +1 -1 kstars/skyobjects/skyobject.h
M +2 -2 kstars/skyobjects/skypoint.h
D +0 -83 kstars/targetlistcomponent.cpp
D +0 -105 kstars/targetlistcomponent.h
R +0 -0 kstars/time/kstarsdatetime.cpp [from: kstars/kstarsdatetime.cpp - 100% similarity]
R +0 -0 kstars/time/kstarsdatetime.h [from: kstars/kstarsdatetime.h - 100% similarity]
R +0 -0 kstars/time/simclock.cpp [from: kstars/simclock.cpp - 100% similarity]
R +0 -0 kstars/time/simclock.h [from: kstars/simclock.h - 100% similarity]
R +0 -0 kstars/time/timezonerule.cpp [from: kstars/timezonerule.cpp - 100% similarity]
R +0 -0 kstars/time/timezonerule.h [from: kstars/timezonerule.h - 100% similarity]
R +0 -0 kstars/tools/obslistpopupmenu.cpp [from: kstars/obslistpopupmenu.cpp - 100% similarity]
R +0 -0 kstars/tools/obslistpopupmenu.h [from: kstars/obslistpopupmenu.h - 100% similarity]
http://commits.kde.org/kstars/06805105dcb4db386919c9da3790fd3a7dd91cb8
diff --git a/datahandlers/CMakeLists.txt b/datahandlers/CMakeLists.txt
index acd1cd9..c799072 100644
--- a/datahandlers/CMakeLists.txt
+++ b/datahandlers/CMakeLists.txt
@@ -1,3 +1,11 @@
+include_directories(
+ ${kstars_SOURCE_DIR}/kstars/tools
+ ${kstars_SOURCE_DIR}/kstars/skyobjects
+ ${kstars_SOURCE_DIR}/kstars/skycomponents
+ ${kstars_SOURCE_DIR}/kstars/auxiliary
+ ${kstars_SOURCE_DIR}/kstars/time
+)
+
set(LibKSDataHandlers_SRCS
${kstars_SOURCE_DIR}/datahandlers/catalogentrydata.cpp
${kstars_SOURCE_DIR}/datahandlers/catalogdata.cpp
diff --git a/datahandlers/ksparser.h b/datahandlers/ksparser.h
index 353893e..2f91602 100644
--- a/datahandlers/ksparser.h
+++ b/datahandlers/ksparser.h
@@ -17,7 +17,7 @@
#ifndef KSTARS_KSPARSER_H
#define KSTARS_KSPARSER_H
-#include "kstars/ksfilereader.h"
+#include "kstars/auxiliary/ksfilereader.h"
#include <QStandardPaths>
#include <QList>
#include <QFile>
diff --git a/kstars/CMakeLists.txt b/kstars/CMakeLists.txt
index e014a76..fce3228 100644
--- a/kstars/CMakeLists.txt
+++ b/kstars/CMakeLists.txt
@@ -11,6 +11,14 @@ if(MSVC)
add_definitions(-DNOMINMAX)
endif()
+include_directories(
+ ${kstars_SOURCE_DIR}/kstars/tools
+ ${kstars_SOURCE_DIR}/kstars/skyobjects
+ ${kstars_SOURCE_DIR}/kstars/skycomponents
+ ${kstars_SOURCE_DIR}/kstars/auxiliary
+ ${kstars_SOURCE_DIR}/kstars/time
+)
+
if (CFITSIO_FOUND)
set (fits_SRCS
fitsviewer/fitshistogram.cpp
@@ -125,12 +133,6 @@ endif ( XPLANET_FOUND )
# add_definitions(-DHAVE_OPENGL)
#endif( OPENGL_FOUND )
-include_directories(
- ${kstars_SOURCE_DIR}/kstars/tools
- ${kstars_SOURCE_DIR}/kstars/skyobjects
- ${kstars_SOURCE_DIR}/kstars/skycomponents
-)
-
########### next target ###############
set(libkstarstools_SRCS
tools/altvstime.cpp
@@ -154,6 +156,7 @@ set(libkstarstools_SRCS
tools/modcalcsidtime.cpp
tools/modcalcvlsr.cpp
tools/observinglist.cpp
+ tools/obslistpopupmenu.cpp
tools/sessionsortfilterproxymodel.cpp
tools/obslistwizard.cpp
tools/planetviewer.cpp
@@ -331,6 +334,7 @@ set(kstars_skyobjects_SRCS
skyobjects/starobject.cpp
skyobjects/trailobject.cpp
skyobjects/satellite.cpp
+ skyobjects/satellitegroup.cpp
skyobjects/supernova.cpp
)
@@ -377,20 +381,38 @@ set(kstars_projection_SRCS
)
set(kstars_extra_SRCS
- colorscheme.cpp dms.cpp fov.cpp geolocation.cpp
- imageviewer.cpp kstarsdbus.cpp
- ksfilereader.cpp ksnumbers.cpp
- kspopupmenu.cpp obslistpopupmenu.cpp ksalmanac.cpp
- kstarsactions.cpp kstarsdata.cpp ksuserdb.cpp kstarsdatetime.cpp
- kstarsinit.cpp kstars.cpp
- kstarssplash.cpp ksutils.cpp kswizard.cpp
- simclock.cpp skymap.cpp skymapdrawabstract.cpp skymapqdraw.cpp skymapevents.cpp
- skypainter.cpp skyqpainter.cpp
- texturemanager.cpp
- timezonerule.cpp
- thumbnailpicker.cpp thumbnaileditor.cpp binfilehelper.cpp
- satellitegroup.cpp
- imageexporter.cpp
+ auxiliary/colorscheme.cpp
+ auxiliary/dms.cpp
+ auxiliary/fov.cpp
+ auxiliary/geolocation.cpp
+ auxiliary/imageviewer.cpp
+ auxiliary/ksfilereader.cpp
+ auxiliary/ksuserdb.cpp
+ auxiliary/thumbnailpicker.cpp
+ auxiliary/thumbnaileditor.cpp
+ auxiliary/binfilehelper.cpp
+ auxiliary/imageexporter.cpp
+ auxiliary/ksutils.cpp
+ auxiliary/kswizard.cpp
+ time/simclock.cpp
+ time/kstarsdatetime.cpp
+ time/timezonerule.cpp
+ kstarsdbus.cpp
+ ksnumbers.cpp
+ kspopupmenu.cpp
+ ksalmanac.cpp
+ kstarsactions.cpp
+ kstarsdata.cpp
+ kstarsinit.cpp
+ kstars.cpp
+ kstarssplash.cpp
+ skymap.cpp
+ skymapdrawabstract.cpp
+ skymapqdraw.cpp
+ skymapevents.cpp
+ skypainter.cpp
+ skyqpainter.cpp
+ texturemanager.cpp
)
set(oal_SRCS
@@ -468,7 +490,12 @@ kconfig_add_kcfg_files(kstars_SRCS ${kstars_KCFG_SRCS})
ki18n_wrap_ui(kstars_SRCS
${indiui_SRCS} ${ui_SRCS} ${fitsui_SRCS} ${ekosui_SRCS} ${xplanetui_SRCS} ${kstars_optionsui_SRCS} ${kstars_dialogsui_SRCS}
${printingui_SRCS}
- thumbnailpicker.ui thumbnaileditor.ui oal/observeradd.ui oal/equipmentwriter.ui oal/execute.ui skycomponents/notifyupdatesui.ui
+ auxiliary/thumbnailpicker.ui
+ auxiliary/thumbnaileditor.ui
+ oal/observeradd.ui
+ oal/equipmentwriter.ui
+ oal/execute.ui
+ skycomponents/notifyupdatesui.ui
)
#FIXME We need to port this
diff --git a/kstars/binfilehelper.cpp b/kstars/auxiliary/binfilehelper.cpp
similarity index 100%
rename from kstars/binfilehelper.cpp
rename to kstars/auxiliary/binfilehelper.cpp
diff --git a/kstars/binfilehelper.h b/kstars/auxiliary/binfilehelper.h
similarity index 100%
rename from kstars/binfilehelper.h
rename to kstars/auxiliary/binfilehelper.h
diff --git a/kstars/colorscheme.cpp b/kstars/auxiliary/colorscheme.cpp
similarity index 100%
rename from kstars/colorscheme.cpp
rename to kstars/auxiliary/colorscheme.cpp
diff --git a/kstars/colorscheme.h b/kstars/auxiliary/colorscheme.h
similarity index 100%
rename from kstars/colorscheme.h
rename to kstars/auxiliary/colorscheme.h
diff --git a/kstars/dms.cpp b/kstars/auxiliary/dms.cpp
similarity index 100%
rename from kstars/dms.cpp
rename to kstars/auxiliary/dms.cpp
diff --git a/kstars/dms.h b/kstars/auxiliary/dms.h
similarity index 99%
rename from kstars/dms.h
rename to kstars/auxiliary/dms.h
index e47b931..1af5b76 100644
--- a/kstars/dms.h
+++ b/kstars/auxiliary/dms.h
@@ -23,7 +23,7 @@
#include <QString>
#include <cmath>
-#include "nan.h"
+#include "../nan.h"
/** @class dms
* @short An angle, stored as degrees, but expressible in many ways.
diff --git a/kstars/fov.cpp b/kstars/auxiliary/fov.cpp
similarity index 100%
rename from kstars/fov.cpp
rename to kstars/auxiliary/fov.cpp
diff --git a/kstars/fov.h b/kstars/auxiliary/fov.h
similarity index 100%
rename from kstars/fov.h
rename to kstars/auxiliary/fov.h
diff --git a/kstars/geolocation.cpp b/kstars/auxiliary/geolocation.cpp
similarity index 100%
rename from kstars/geolocation.cpp
rename to kstars/auxiliary/geolocation.cpp
diff --git a/kstars/geolocation.h b/kstars/auxiliary/geolocation.h
similarity index 100%
rename from kstars/geolocation.h
rename to kstars/auxiliary/geolocation.h
diff --git a/kstars/imageexporter.cpp b/kstars/auxiliary/imageexporter.cpp
similarity index 100%
rename from kstars/imageexporter.cpp
rename to kstars/auxiliary/imageexporter.cpp
diff --git a/kstars/imageexporter.h b/kstars/auxiliary/imageexporter.h
similarity index 100%
rename from kstars/imageexporter.h
rename to kstars/auxiliary/imageexporter.h
diff --git a/kstars/imageviewer.cpp b/kstars/auxiliary/imageviewer.cpp
similarity index 100%
rename from kstars/imageviewer.cpp
rename to kstars/auxiliary/imageviewer.cpp
diff --git a/kstars/imageviewer.h b/kstars/auxiliary/imageviewer.h
similarity index 100%
rename from kstars/imageviewer.h
rename to kstars/auxiliary/imageviewer.h
diff --git a/kstars/ksfilereader.cpp b/kstars/auxiliary/ksfilereader.cpp
similarity index 100%
rename from kstars/ksfilereader.cpp
rename to kstars/auxiliary/ksfilereader.cpp
diff --git a/kstars/ksfilereader.h b/kstars/auxiliary/ksfilereader.h
similarity index 100%
rename from kstars/ksfilereader.h
rename to kstars/auxiliary/ksfilereader.h
diff --git a/kstars/ksuserdb.cpp b/kstars/auxiliary/ksuserdb.cpp
similarity index 100%
rename from kstars/ksuserdb.cpp
rename to kstars/auxiliary/ksuserdb.cpp
diff --git a/kstars/ksuserdb.h b/kstars/auxiliary/ksuserdb.h
similarity index 100%
rename from kstars/ksuserdb.h
rename to kstars/auxiliary/ksuserdb.h
diff --git a/kstars/ksutils.cpp b/kstars/auxiliary/ksutils.cpp
similarity index 100%
rename from kstars/ksutils.cpp
rename to kstars/auxiliary/ksutils.cpp
diff --git a/kstars/ksutils.h b/kstars/auxiliary/ksutils.h
similarity index 100%
rename from kstars/ksutils.h
rename to kstars/auxiliary/ksutils.h
diff --git a/kstars/kswizard.cpp b/kstars/auxiliary/kswizard.cpp
similarity index 100%
rename from kstars/kswizard.cpp
rename to kstars/auxiliary/kswizard.cpp
diff --git a/kstars/kswizard.h b/kstars/auxiliary/kswizard.h
similarity index 100%
rename from kstars/kswizard.h
rename to kstars/auxiliary/kswizard.h
diff --git a/kstars/thumbnaileditor.cpp b/kstars/auxiliary/thumbnaileditor.cpp
similarity index 100%
rename from kstars/thumbnaileditor.cpp
rename to kstars/auxiliary/thumbnaileditor.cpp
diff --git a/kstars/thumbnaileditor.h b/kstars/auxiliary/thumbnaileditor.h
similarity index 100%
rename from kstars/thumbnaileditor.h
rename to kstars/auxiliary/thumbnaileditor.h
diff --git a/kstars/thumbnaileditor.ui b/kstars/auxiliary/thumbnaileditor.ui
similarity index 100%
rename from kstars/thumbnaileditor.ui
rename to kstars/auxiliary/thumbnaileditor.ui
diff --git a/kstars/thumbnailpicker.cpp b/kstars/auxiliary/thumbnailpicker.cpp
similarity index 100%
rename from kstars/thumbnailpicker.cpp
rename to kstars/auxiliary/thumbnailpicker.cpp
diff --git a/kstars/thumbnailpicker.h b/kstars/auxiliary/thumbnailpicker.h
similarity index 100%
rename from kstars/thumbnailpicker.h
rename to kstars/auxiliary/thumbnailpicker.h
diff --git a/kstars/thumbnailpicker.ui b/kstars/auxiliary/thumbnailpicker.ui
similarity index 100%
rename from kstars/thumbnailpicker.ui
rename to kstars/auxiliary/thumbnailpicker.ui
diff --git a/kstars/dialogs/exportimagedialog.cpp b/kstars/dialogs/exportimagedialog.cpp
index 0de497c..c65ee40 100644
--- a/kstars/dialogs/exportimagedialog.cpp
+++ b/kstars/dialogs/exportimagedialog.cpp
@@ -20,7 +20,7 @@
#include "kstars/skymap.h"
#include "../printing/legend.h"
#include "kstars/skyqpainter.h"
-#include "../imageexporter.h"
+#include "imageexporter.h"
#include <KMessageBox>
diff --git a/kstars/skyobjects/deepskyobject.h b/kstars/skyobjects/deepskyobject.h
index 21a5381..adce4da 100644
--- a/kstars/skyobjects/deepskyobject.h
+++ b/kstars/skyobjects/deepskyobject.h
@@ -22,7 +22,7 @@
#include <qpoint.h>
#include "kstars/skyobjects/skyobject.h"
-#include "kstars/dms.h"
+#include "dms.h"
class QImage;
class QString;
diff --git a/kstars/satellitegroup.cpp b/kstars/skyobjects/satellitegroup.cpp
similarity index 100%
rename from kstars/satellitegroup.cpp
rename to kstars/skyobjects/satellitegroup.cpp
diff --git a/kstars/satellitegroup.h b/kstars/skyobjects/satellitegroup.h
similarity index 100%
rename from kstars/satellitegroup.h
rename to kstars/skyobjects/satellitegroup.h
diff --git a/kstars/skyobjects/skyobject.h b/kstars/skyobjects/skyobject.h
index 915dd8c..d340ddb 100644
--- a/kstars/skyobjects/skyobject.h
+++ b/kstars/skyobjects/skyobject.h
@@ -25,7 +25,7 @@
#include <KLocalizedString>
#include "skypoint.h"
-#include "kstars/dms.h"
+#include "dms.h"
#include "auxinfo.h"
class QPoint;
diff --git a/kstars/skyobjects/skypoint.h b/kstars/skyobjects/skypoint.h
index fd2e881..05d89b8 100644
--- a/kstars/skyobjects/skypoint.h
+++ b/kstars/skyobjects/skypoint.h
@@ -23,8 +23,8 @@
#include <QList>
-#include "kstars/dms.h"
-#include "kstars/kstarsdatetime.h"
+#include "dms.h"
+#include "kstarsdatetime.h"
class KSNumbers;
class KSSun;
diff --git a/kstars/targetlistcomponent.cpp b/kstars/targetlistcomponent.cpp
deleted file mode 100644
index 3ef1bd3..0000000
--- a/kstars/targetlistcomponent.cpp
+++ /dev/null
@@ -1,83 +0,0 @@
-/***************************************************************************
- targetlistcomponent.cpp - K Desktop Planetarium
- -------------------
- begin : Oct 14 2010 9:59 PM CDT
- copyright : (C) 2010 Akarsh Simha
- email : akarsh.simha at kdemail.net
- ***************************************************************************/
-
-/***************************************************************************
- * *
- * This program is free software; you can redistribute it and/or modify *
- * it under the terms of the GNU General Public License as published by *
- * the Free Software Foundation; either version 2 of the License, or *
- * (at your option) any later version. *
- * *
- ***************************************************************************/
-
-#include "targetlistcomponent.h"
-#include "skymap.h"
-#include "Options.h"
-
-TargetListComponent::TargetListComponent( SkyComposite *parent ) : SkyComponent( parent ) {
- list = 0;
- drawSymbols = 0;
- drawLabels = 0;
-}
-
-TargetListComponent::TargetListComponent( SkyComposite *parent, SkyObjectList *objectList, QPen _pen,
- bool (*optionDrawSymbols)(void), bool (*optionDrawLabels)(void) )
- : SkyComponent( parent ), pen( _pen ) {
-
- list = objectList;
- drawSymbols = optionDrawSymbols;
- drawLabels = optionDrawLabels;
-}
-
-/**
-
-// This method is now implemented in SkyPainter subclasses, and hence is redundant.
-// But I'd let this method stick around for a while, before I get rid of it altogether
-// - Akarsh
-
-void TargetListComponent::drawTargetSymbol( SkyPainter *skyp, SkyObject *obj ) {
- SkyMap *map = SkyMap::Instance(); // FIXME: Replace with projector upon merger of Harry's code
- if ( ! map->checkVisibility( obj ) )
- return;
- QPointF o = map->toScreen( obj ); // FIXME: Replace with appropriate call on the projector upon merger of Harry's code
- if( !drawSymbols || (*drawSymbols)() ) {
- if (o.x() >= 0. && o.x() <= map->width()*map->scale() && o.y() >=0. && o.y() <= map->height()*map->scale() ) {
- if ( Options::useAntialias() ) {
- float size = 20.*map->scale();
- float x1 = o.x() - 0.5*size;
- float y1 = o.y() - 0.5*size;
- psky.drawArc( QRectF(x1, y1, size, size), -60*16, 120*16 );
- psky.drawArc( QRectF(x1, y1, size, size), 120*16, 120*16 );
- } else {
- int size = 20*int(map->scale());
- int x1 = int(o.x()) - size/2;
- int y1 = int(o.y()) - size/2;
- psky.drawArc( QRect(x1, y1, size, size), -60*16, 120*16 );
- psky.drawArc( QRect(x1, y1, size, size), 120*16, 120*16 );
- }
- if ( drawLabels && (*drawLabels)() )
- obj->drawRudeNameLabel( psky, o );
- }
- }
-}
-*/
-
-void TargetListComponent::draw( SkyPainter *skyp ) {
- if( drawSymbols && !(*drawSymbols)() )
- return;
- if( !list || list->count() <= 0 )
- return;
- /*
- // Superceded by SkyPainter::drawObservingList()
- foreach( SkyObject *obj, *list ) {
- drawTargetSymbol( psky, obj );
- }
- */
- skyp->setPen( pen );
- skyp->drawObservingList( *list );
-}
diff --git a/kstars/targetlistcomponent.h b/kstars/targetlistcomponent.h
deleted file mode 100644
index 7ad3ee0..0000000
--- a/kstars/targetlistcomponent.h
+++ /dev/null
@@ -1,105 +0,0 @@
-/***************************************************************************
- targetlistcomponent.h - K Desktop Planetarium
- -------------------
- begin : Oct 14 2010 9:59 PM CDT
- copyright : (C) 2010 Akarsh Simha
- email : akarsh.simha at kdemail.net
- ***************************************************************************/
-
-/***************************************************************************
- * *
- * This program is free software; you can redistribute it and/or modify *
- * it under the terms of the GNU General Public License as published by *
- * the Free Software Foundation; either version 2 of the License, or *
- * (at your option) any later version. *
- * *
- ***************************************************************************/
-
-#ifndef TARGETLISTCOMPONENT_H
-#define TARGETLISTCOMPONENT_H
-
-#include "skypainter.h"
-#include "skycomponent.h"
-#include "typedef.h"
-#include "skyobject.h"
-
-/**
- *@class TargetListComponent
- *@short Highlights objects present in certain lists by drawing "target" symbols around them.
- *
- * To represent lists of specific objects on the skymap (eg: A star
- * hopping route, or a list of planned observation targets), one would
- * typically like to draw over the skymap, a bunch of symbols
- * highlighting the locations of these objects. This class manages
- * drawing of such lists. Along with the list, we also associate a pen
- * to use to represent objects from that list. Once this class is made
- * aware of a list to plot (which is stored somewhere else), it does
- * so when called from the SkyMapComposite. The class may be supplied
- * with pointers to two methods that tell it whether to draw symbols /
- * labels or not. Disabling symbol drawing is equivalent to disabling
- * the list. If the pointers are NULL, the symbols are always drawn,
- * but the labels are not drawn.
- *
- *@note This does not inherit from ListComponent because it is not
- * necessary. ListComponent has extra methods like objectNearest(),
- * which we don't want. Also, ListComponent maintains its own list,
- * whereas this class merely holds a pointer to a list that's
- * manipulated from elsewhere.
- */
-
-class TargetListComponent : public SkyComponent {
-
- public:
-
- /**
- *@short Default constructor.
- */
- explicit TargetListComponent( SkyComposite *parent );
-
- /**
- *@short Constructor that sets up this target list
- */
- TargetListComponent( SkyComposite *parent, QList<SkyObject*> *objectList, QPen _pen,
- bool (*optionDrawSymbols)(void) = 0, bool (*optionDrawLabels)(void) = 0 );
-
- /**
- *@short Draw this component by iterating over the list.
- *
- *@note This method does not bother refreshing the coordinates of
- * the objects on the list. So this must be called only after the
- * objects are drawn in a given draw cycle.
- */
- virtual void draw( SkyPainter *skyp );
-
- // FIXME: Maybe we should make these member objects private / protected?
- SkyObjectList *list; // Pointer to list of objects to draw
- QPen pen; // Pen to use to draw
-
- /**
- *@short Pointer to static method that tells us whether to draw this list or not
- *@note If the pointer is NULL, the list is drawn nevertheless
- */
- bool (*drawSymbols)( void );
-
- /**
- *@short Pointer to static method that tells us whether to draw labels for this list or not
- *@note If the pointer is NULL, labels are not drawn
- */
- bool (*drawLabels)( void );
-
- protected:
- /**
- *@short Draws a target symbol around the object, and also draws labels if requested
- *@note Does not update the positions of the objects. See the note on draw() for details.
- */
- /*
-
- // This method is superseded by the definitions in SkyPainter
- // and might need to be reinstated only while generalizing the
- // class to draw other textures.
-
- virtual void drawTargetSymbol( SkyPainter *skyp, SkyObject *obj );
- */
-};
-
-#endif
diff --git a/kstars/kstarsdatetime.cpp b/kstars/time/kstarsdatetime.cpp
similarity index 100%
rename from kstars/kstarsdatetime.cpp
rename to kstars/time/kstarsdatetime.cpp
diff --git a/kstars/kstarsdatetime.h b/kstars/time/kstarsdatetime.h
similarity index 100%
rename from kstars/kstarsdatetime.h
rename to kstars/time/kstarsdatetime.h
diff --git a/kstars/simclock.cpp b/kstars/time/simclock.cpp
similarity index 100%
rename from kstars/simclock.cpp
rename to kstars/time/simclock.cpp
diff --git a/kstars/simclock.h b/kstars/time/simclock.h
similarity index 100%
rename from kstars/simclock.h
rename to kstars/time/simclock.h
diff --git a/kstars/timezonerule.cpp b/kstars/time/timezonerule.cpp
similarity index 100%
rename from kstars/timezonerule.cpp
rename to kstars/time/timezonerule.cpp
diff --git a/kstars/timezonerule.h b/kstars/time/timezonerule.h
similarity index 100%
rename from kstars/timezonerule.h
rename to kstars/time/timezonerule.h
diff --git a/kstars/obslistpopupmenu.cpp b/kstars/tools/obslistpopupmenu.cpp
similarity index 100%
rename from kstars/obslistpopupmenu.cpp
rename to kstars/tools/obslistpopupmenu.cpp
diff --git a/kstars/obslistpopupmenu.h b/kstars/tools/obslistpopupmenu.h
similarity index 100%
rename from kstars/obslistpopupmenu.h
rename to kstars/tools/obslistpopupmenu.h
More information about the Kstars-devel
mailing list