Commit 496c467c authored by nobody's avatar nobody
Browse files

This commit was manufactured by cvs2svn to create tag

'KDE_3_3_1_RELEASE'.

svn path=/tags/KDE_3_3_1_RELEASE/kdeedu/kstars/; revision=354021
parents b8bae513 dd1ce806
bin_PROGRAMS = kstars bin_PROGRAMS = kstars
kstars_SOURCES = Options.kcfgc kspluto.cpp addcatdialog.cpp addlinkdialog.cpp colorscheme.cpp detaildialog.cpp dmsbox.cpp dms.cpp filesource.cpp finddialog.cpp focusdialog.cpp geolocation.cpp imageviewer.cpp indidevice.cpp indidriver.cpp indimenu.cpp infobox.cpp infoboxes.cpp jupitermoons.cpp ksasteroid.cpp kscomet.cpp ksfilereader.cpp ksmoon.cpp ksnewstuff.cpp ksnumbers.cpp ksplanetbase.cpp ksplanet.cpp kspopupmenu.cpp kssun.cpp kstarsactions.cpp kstars.cpp kstarsdata.cpp kstarsdatetime.cpp kstarsdcop.cpp kstarsinit.cpp kstarssplash.cpp ksutils.cpp locationdialog.cpp magnitudespinbox.cpp main.cpp mapcanvas.cpp objectnamelist.cpp planetcatalog.cpp simclock.cpp skymap.cpp skymapdraw.cpp skymapevents.cpp skyobject.cpp skyobjectname.cpp skypoint.cpp stardatasink.cpp starobject.cpp starpixmap.cpp telescopewizardprocess.cpp timebox.cpp timedialog.cpp timespinbox.cpp timestepbox.cpp timeunitbox.cpp timezonerule.cpp toggleaction.cpp deepskyobject.cpp fovdialog.cpp fov.cpp indigroup.cpp indiproperty.cpp indielement.cpp devicemanager.cpp indistd.cpp kswizard.cpp csegment.cpp fitsviewer.cpp conbridlg.cpp fitsimage.cpp fitsprocess.cpp imagereductiondlg.cpp opsadvanced.cpp opscatalog.cpp opscolors.cpp fitshistogram.cpp kstarsinterface.skel simclockinterface.skel addcatdialogui.ui devmanager.ui focusdialogdlg.ui indiconf.ui indihostconf.ui opsadvancedui.ui opscatalogui.ui opscolorsui.ui opsguides.ui opssolarsystem.ui telescopewizard.ui fovdialogui.ui newfovui.ui kswizardui.ui contrastbrightnessgui.ui imagereductionui.ui histdialog.ui statform.ui fitsheaderdialog.ui streamformui.ui streamwg.cpp indifitsconf.cpp imgsequencedlgui.ui imagesequence.cpp kstars_SOURCES = Options.kcfgc kspluto.cpp addcatdialog.cpp addlinkdialog.cpp colorscheme.cpp detaildialog.cpp dmsbox.cpp dms.cpp filesource.cpp finddialog.cpp focusdialog.cpp geolocation.cpp imageviewer.cpp indidevice.cpp indidriver.cpp indimenu.cpp infobox.cpp infoboxes.cpp jupitermoons.cpp ksasteroid.cpp kscomet.cpp ksfilereader.cpp ksmoon.cpp ksnewstuff.cpp ksnumbers.cpp ksplanetbase.cpp ksplanet.cpp kspopupmenu.cpp kssun.cpp kstarsactions.cpp kstars.cpp kstarsdata.cpp kstarsdatetime.cpp kstarsdcop.cpp kstarsinit.cpp kstarssplash.cpp ksutils.cpp locationdialog.cpp magnitudespinbox.cpp main.cpp mapcanvas.cpp objectnamelist.cpp planetcatalog.cpp simclock.cpp skymap.cpp skymapdraw.cpp skymapevents.cpp skyobject.cpp skyobjectname.cpp skypoint.cpp stardatasink.cpp starobject.cpp starpixmap.cpp telescopewizardprocess.cpp timebox.cpp timedialog.cpp timespinbox.cpp timestepbox.cpp timeunitbox.cpp timezonerule.cpp toggleaction.cpp deepskyobject.cpp fovdialog.cpp fov.cpp indigroup.cpp indiproperty.cpp indielement.cpp devicemanager.cpp indistd.cpp kswizard.cpp csegment.cpp fitsviewer.cpp conbridlg.cpp fitsimage.cpp fitsprocess.cpp imagereductiondlg.cpp opsadvanced.cpp opscatalog.cpp opscolors.cpp fitshistogram.cpp kstarsinterface.skel simclockinterface.skel addcatdialogui.ui devmanager.ui focusdialogdlg.ui indiconf.ui indihostconf.ui opsadvancedui.ui opscatalogui.ui opscolorsui.ui opsguides.ui opssolarsystem.cpp opssolarsystemui.ui telescopewizard.ui fovdialogui.ui newfovui.ui kswizardui.ui contrastbrightnessgui.ui imagereductionui.ui histdialog.ui statform.ui fitsheaderdialog.ui streamformui.ui streamwg.cpp indifitsconf.cpp imgsequencedlgui.ui imagesequence.cpp
kde_kcfg_DATA = kstars.kcfg kde_kcfg_DATA = kstars.kcfg
kde_conf_DATA = kstarsrc kde_conf_DATA = kstarsrc
......
...@@ -447,7 +447,7 @@ Chitose : : Japan ...@@ -447,7 +447,7 @@ Chitose : : Japan
Chittagong : : Bangladesh : 22 : 15 : 0 : N : 91 : 49 : 59 : E : 6.0 : -- Chittagong : : Bangladesh : 22 : 15 : 0 : N : 91 : 49 : 59 : E : 6.0 : --
Christchurch : : New Zealand : 43 : 28 : 58 : S : 172 : 31 : 58 : E : 12.0 : NZ Christchurch : : New Zealand : 43 : 28 : 58 : S : 172 : 31 : 58 : E : 12.0 : NZ
Christiansoe : Bornholm : Denmark : 55 : 19 : 0 : N : 15 : 11 : 0 : E : 1.0 : EU Christiansoe : Bornholm : Denmark : 55 : 19 : 0 : N : 15 : 11 : 0 : E : 1.0 : EU
Christmas Island : : Australia : 1 : 58 : 59 : N : 157 : 22 : 1 : W : 7.0 : -- Christmas Island : : Australia : 10 : 30 : 00 : S : 105 : 40 : 00 : E : 7.0 : --
Chula Vista : California : USA : 32 : 38 : 35 : N : 117 : 4 : 58 : W : -8.0 : US Chula Vista : California : USA : 32 : 38 : 35 : N : 117 : 4 : 58 : W : -8.0 : US
Chuncheon : Gangwon : Korea : 37 : 54 : 0 : N : 127 : 44 : 0 : E : 9.0 : SK Chuncheon : Gangwon : Korea : 37 : 54 : 0 : N : 127 : 44 : 0 : E : 9.0 : SK
Chungju : Chungbuk : Korea : 36 : 58 : 0 : N : 127 : 53 : 0 : E : 9.0 : SK Chungju : Chungbuk : Korea : 36 : 58 : 0 : N : 127 : 53 : 0 : E : 9.0 : SK
......
...@@ -288,13 +288,18 @@ void DetailDialog::createGeneralTab( const KStarsDateTime &ut, GeoLocation *geo ...@@ -288,13 +288,18 @@ void DetailDialog::createGeneralTab( const KStarsDateTime &ut, GeoLocation *geo
default: //deep-sky objects default: //deep-sky objects
dso = (DeepSkyObject *)selectedObject; dso = (DeepSkyObject *)selectedObject;
if ( ! dso->longname().isEmpty() ) { if ( ! dso->longname().isEmpty() && dso->longname() != dso->name() ) {
pname = dso->translatedLongName(); pname = dso->translatedLongName();
oname = dso->translatedName(); oname = dso->translatedName();
} else { } else {
pname = dso->translatedName(); pname = dso->translatedName();
} }
if ( ! dso->name2().isEmpty() ) oname += ", " + dso->translatedName2();
if ( ! dso->name2().isEmpty() ) {
if ( oname.isEmpty() ) oname = dso->translatedName2();
else oname += ", " + dso->translatedName2();
}
if ( dso->ugc() != 0 ) oname += ", UGC " + QString("%1").arg( dso->ugc() ); if ( dso->ugc() != 0 ) oname += ", UGC " + QString("%1").arg( dso->ugc() );
if ( dso->pgc() != 0 ) oname += ", PGC " + QString("%1").arg( dso->pgc() ); if ( dso->pgc() != 0 ) oname += ", PGC " + QString("%1").arg( dso->pgc() );
......
...@@ -29,6 +29,7 @@ ...@@ -29,6 +29,7 @@
#include <fcntl.h> #include <fcntl.h>
#include <errno.h> #include <errno.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <sys/time.h>
#include <sys/types.h> #include <sys/types.h>
#include <sys/socket.h> #include <sys/socket.h>
#include <netinet/in.h> #include <netinet/in.h>
......
...@@ -281,6 +281,7 @@ LX200Generic::LX200Generic() ...@@ -281,6 +281,7 @@ LX200Generic::LX200Generic()
trackingMode = LX200_TRACK_DEFAULT; trackingMode = LX200_TRACK_DEFAULT;
lastSet = -1; lastSet = -1;
fault = false; fault = false;
simulation = false;
targetRA = 0; targetRA = 0;
targetDEC = 0; targetDEC = 0;
currentRA = 0; currentRA = 0;
...@@ -1188,6 +1189,8 @@ void LX200Generic::handleError(ITextVectorProperty *tvp, int err, const char *ms ...@@ -1188,6 +1189,8 @@ void LX200Generic::handleError(ITextVectorProperty *tvp, int err, const char *ms
bool LX200Generic::isTelescopeOn(void) bool LX200Generic::isTelescopeOn(void)
{ {
if (simulation) return true;
return (PowerSP.sp[0].s == ISS_ON); return (PowerSP.sp[0].s == ISS_ON);
} }
...@@ -1570,6 +1573,8 @@ int LX200Generic::getOnSwitch(ISwitchVectorProperty *sp) ...@@ -1570,6 +1573,8 @@ int LX200Generic::getOnSwitch(ISwitchVectorProperty *sp)
int LX200Generic::checkPower(ISwitchVectorProperty *sp) int LX200Generic::checkPower(ISwitchVectorProperty *sp)
{ {
if (simulation) return 0;
if (PowerSP.s != IPS_OK) if (PowerSP.s != IPS_OK)
{ {
if (!strcmp(sp->label, "")) if (!strcmp(sp->label, ""))
...@@ -1587,7 +1592,8 @@ int LX200Generic::checkPower(ISwitchVectorProperty *sp) ...@@ -1587,7 +1592,8 @@ int LX200Generic::checkPower(ISwitchVectorProperty *sp)
int LX200Generic::checkPower(INumberVectorProperty *np) int LX200Generic::checkPower(INumberVectorProperty *np)
{ {
if (simulation) return 0;
if (PowerSP.s != IPS_OK) if (PowerSP.s != IPS_OK)
{ {
...@@ -1608,6 +1614,8 @@ int LX200Generic::checkPower(INumberVectorProperty *np) ...@@ -1608,6 +1614,8 @@ int LX200Generic::checkPower(INumberVectorProperty *np)
int LX200Generic::checkPower(ITextVectorProperty *tp) int LX200Generic::checkPower(ITextVectorProperty *tp)
{ {
if (simulation) return 0;
if (PowerSP.s != IPS_OK) if (PowerSP.s != IPS_OK)
{ {
if (!strcmp(tp->label, "")) if (!strcmp(tp->label, ""))
...@@ -1712,3 +1720,13 @@ void LX200Generic::getAlignment() ...@@ -1712,3 +1720,13 @@ void LX200Generic::getAlignment()
IDSetSwitch (&AlignmentSw, NULL); IDSetSwitch (&AlignmentSw, NULL);
IDLog("ACK success %c\n", align); IDLog("ACK success %c\n", align);
} }
void LX200Generic::enableSimulation(bool enable)
{
simulation = enable;
if (simulation)
IDLog("Warning: Simulation is activated.\n");
else
IDLog("Simulation is disabled.\n");
}
...@@ -54,6 +54,7 @@ class LX200Generic ...@@ -54,6 +54,7 @@ class LX200Generic
int getOnSwitch(ISwitchVectorProperty *sp); int getOnSwitch(ISwitchVectorProperty *sp);
void setCurrentDeviceName(const char * devName); void setCurrentDeviceName(const char * devName);
void correctFault(); void correctFault();
void enableSimulation(bool enable);
protected: protected:
...@@ -69,6 +70,7 @@ class LX200Generic ...@@ -69,6 +70,7 @@ class LX200Generic
double lastRA; double lastRA;
double lastDEC; double lastDEC;
bool fault; bool fault;
bool simulation;
struct tm *localTM; struct tm *localTM;
......
...@@ -33,7 +33,7 @@ extern ITextVectorProperty Time; ...@@ -33,7 +33,7 @@ extern ITextVectorProperty Time;
extern int MaxReticleFlashRate; extern int MaxReticleFlashRate;
static ISwitch GPSPowerS[] = {{ "On", "", ISS_OFF, 0, 0}, {"Off", "", ISS_ON, 0, 0}}; static ISwitch GPSPowerS[] = {{ "On", "", ISS_OFF, 0, 0}, {"Off", "", ISS_ON, 0, 0}};
static ISwitch GPSStatusS[] = {{ "GPS Sleep", "", ISS_OFF, 0, 0}, {"GPS Wake up", "", ISS_OFF, 0 ,0}, {"GPS Restart", "", ISS_OFF, 0, 0}}; static ISwitch GPSStatusS[] = {{ "Sleep", "", ISS_OFF, 0, 0}, {"Wake up", "", ISS_OFF, 0 ,0}, {"Restart", "", ISS_OFF, 0, 0}};
static ISwitch GPSUpdateS[] = { {"Update", "", ISS_OFF, 0, 0}}; static ISwitch GPSUpdateS[] = { {"Update", "", ISS_OFF, 0, 0}};
static ISwitch AltDecPecS[] = {{ "Enable", "", ISS_OFF, 0 ,0}, {"Disable", "", ISS_OFF, 0 ,0}}; static ISwitch AltDecPecS[] = {{ "Enable", "", ISS_OFF, 0 ,0}, {"Disable", "", ISS_OFF, 0 ,0}};
static ISwitch AzRaPecS[] = {{ "Enable", "", ISS_OFF, 0, 0}, {"Disable", "", ISS_OFF, 0 ,0}}; static ISwitch AzRaPecS[] = {{ "Enable", "", ISS_OFF, 0, 0}, {"Disable", "", ISS_OFF, 0 ,0}};
...@@ -53,6 +53,8 @@ static ISwitchVectorProperty AzRaBackSlashSw = { mydev, "Az/Ra Anti-backslash", ...@@ -53,6 +53,8 @@ static ISwitchVectorProperty AzRaBackSlashSw = { mydev, "Az/Ra Anti-backslash",
static INumber Temp[] = { {"Temp.", "", "%g", -200., 500., 0., 0., 0, 0, 0 } }; static INumber Temp[] = { {"Temp.", "", "%g", -200., 500., 0., 0., 0, 0, 0 } };
static INumberVectorProperty OTATemp = { mydev, "OTA Temperature (C)", "", GPSGroup, IP_RO, 0, IPS_IDLE, Temp, NARRAY(Temp), 0, 0}; static INumberVectorProperty OTATemp = { mydev, "OTA Temperature (C)", "", GPSGroup, IP_RO, 0, IPS_IDLE, Temp, NARRAY(Temp), 0, 0};
void updateTemp(void * /*p*/);
void changeLX200GPSDeviceName(const char *newName) void changeLX200GPSDeviceName(const char *newName)
{ {
strcpy(GPSPowerSw.device, newName); strcpy(GPSPowerSw.device, newName);
...@@ -68,7 +70,8 @@ void changeLX200GPSDeviceName(const char *newName) ...@@ -68,7 +70,8 @@ void changeLX200GPSDeviceName(const char *newName)
LX200GPS::LX200GPS() : LX200_16() LX200GPS::LX200GPS() : LX200_16()
{ {
IEAddTimer(900000, updateTemp, NULL);
} }
void LX200GPS::ISGetProperties (const char *dev) void LX200GPS::ISGetProperties (const char *dev)
...@@ -111,36 +114,18 @@ void LX200GPS::ISNewNumber (const char *dev, const char *name, double values[], ...@@ -111,36 +114,18 @@ void LX200GPS::ISNewNumber (const char *dev, const char *name, double values[],
} }
/*#define turnGPSOn() portWrite("#:g+#")
#define turnGPSOff() portWrite("#:g-#")
#define alignGPSScope() portWrite("#:Aa#")
#define gpsSleep() portWrite("#:hN#")
#define gpsWakeUp() portWrite("#:hW#")
#define gpsRestart() portWrite("#:I#")
#define updateGPS_System() setStandardProcedure("#:gT#")
#define enableDecAltPec() portWrite("#:QA+#")
#define disableDecAltPec() portWrite("#:QA-#")
#define enableRA_AZPec() portWrite("#:QZ+#")
#define disableRA_AZPec() portWrite("#:QZ-#")
#define activateAltDecAntiBackSlash() portWrite("#$BAdd#")
#define activateAzRaAntiBackSlash() portWrite("#$BZdd#")
#define SelenographicSync() portWrite("#:CL#")
double getOTATemp();
*/
void LX200GPS::ISNewSwitch (const char *dev, const char *name, ISState *states, char *names[], int n) void LX200GPS::ISNewSwitch (const char *dev, const char *name, ISState *states, char *names[], int n)
{ {
int index; int index;
char msg[32]; char msg[64];
if (strcmp (dev, thisDevice)) if (strcmp (dev, thisDevice))
return; return;
if (!strcmp(name,GPSPowerSw.name)) if (!strcmp(name,GPSPowerSw.name))
{ {
if (checkPower(&GPSPowerSw)) if (checkPower(&GPSPowerSw))
return; return;
IUResetSwitches(&GPSPowerSw); IUResetSwitches(&GPSPowerSw);
...@@ -155,10 +140,10 @@ double getOTATemp(); ...@@ -155,10 +140,10 @@ double getOTATemp();
if (!strcmp(name,GPSStatusSw.name)) if (!strcmp(name,GPSStatusSw.name))
{ {
if (checkPower(&GPSStatusSw)) if (checkPower(&GPSStatusSw))
return; return;
IUResetSwitches(&GPSPowerSw); IUResetSwitches(&GPSStatusSw);
IUUpdateSwitches(&GPSStatusSw, states, names, n); IUUpdateSwitches(&GPSStatusSw, states, names, n);
index = getOnSwitch(&GPSStatusSw); index = getOnSwitch(&GPSStatusSw);
...@@ -186,7 +171,7 @@ double getOTATemp(); ...@@ -186,7 +171,7 @@ double getOTATemp();
if (!strcmp(name,GPSUpdateSw.name)) if (!strcmp(name,GPSUpdateSw.name))
{ {
if (checkPower(&GPSUpdateSw)) if (checkPower(&GPSUpdateSw))
return; return;
GPSUpdateSw.s = IPS_OK; GPSUpdateSw.s = IPS_OK;
...@@ -203,7 +188,7 @@ double getOTATemp(); ...@@ -203,7 +188,7 @@ double getOTATemp();
if (!strcmp(name, AltDecPecSw.name)) if (!strcmp(name, AltDecPecSw.name))
{ {
if (checkPower(&AltDecPecSw)) if (checkPower(&AltDecPecSw))
return; return;
IUResetSwitches(&AltDecPecSw); IUResetSwitches(&AltDecPecSw);
...@@ -229,8 +214,8 @@ double getOTATemp(); ...@@ -229,8 +214,8 @@ double getOTATemp();
if (!strcmp(name, AzRaPecSw.name)) if (!strcmp(name, AzRaPecSw.name))
{ {
if (checkPower(&AzRaPecSw)) if (checkPower(&AzRaPecSw))
return; return;
IUResetSwitches(&AzRaPecSw); IUResetSwitches(&AzRaPecSw);
IUUpdateSwitches(&AzRaPecSw, states, names, n); IUUpdateSwitches(&AzRaPecSw, states, names, n);
...@@ -255,7 +240,7 @@ double getOTATemp(); ...@@ -255,7 +240,7 @@ double getOTATemp();
if (!strcmp(name, AltDecBackSlashSw.name)) if (!strcmp(name, AltDecBackSlashSw.name))
{ {
if (checkPower(&AltDecBackSlashSw)) if (checkPower(&AltDecBackSlashSw))
return; return;
activateAltDecAntiBackSlash(); activateAltDecAntiBackSlash();
...@@ -284,12 +269,20 @@ double getOTATemp(); ...@@ -284,12 +269,20 @@ double getOTATemp();
LX200_16::ISPoll(); LX200_16::ISPoll();
if (isTelescopeOn())
}
void updateTemp(void * /*p*/)
{
if (telescope->isTelescopeOn())
{ {
getOTATemp(&OTATemp.np[0].value); getOTATemp(&OTATemp.np[0].value);
IDSetNumber(&OTATemp, NULL); IDSetNumber(&OTATemp, NULL);
} }
IEAddTimer(900000, updateTemp, NULL);
} }
void LX200GPS::getBasicData() void LX200GPS::getBasicData()
......
...@@ -30,6 +30,7 @@ ...@@ -30,6 +30,7 @@
#include <signal.h> #include <signal.h>
#include <errno.h> #include <errno.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <sys/time.h>
#include <sys/types.h> #include <sys/types.h>
#include <sys/socket.h> #include <sys/socket.h>
#include <netinet/in.h> #include <netinet/in.h>
......
...@@ -29,6 +29,7 @@ ...@@ -29,6 +29,7 @@
#include <signal.h> #include <signal.h>
#include <errno.h> #include <errno.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <sys/time.h>
#include <sys/types.h> #include <sys/types.h>
#include <sys/socket.h> #include <sys/socket.h>
#include <netinet/in.h> #include <netinet/in.h>
......
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
#endif /* LOCKING */ #endif /* LOCKING */
#ifdef __linux__ #ifdef __linux__
#if defined(arm) || defined(__hppa__) #if defined(arm) || defined(__hppa__) || defined(__sparc__) || defined(__ppc__) || defined(__powerpc__)
#include <fcntl.h> #include <fcntl.h>
#else #else
#include <sys/io.h> #include <sys/io.h>
...@@ -74,7 +74,7 @@ port_t::port_t(int iport) { ...@@ -74,7 +74,7 @@ port_t::port_t(int iport) {
#endif /* LOCKING */ #endif /* LOCKING */
#ifdef LINUX #ifdef LINUX
#if defined(arm) || defined(__hppa__) #if defined(arm) || defined(__hppa__) || defined(__sparc__) || defined(__ppc__) || defined(__powerpc__)
if ((devport = open("/dev/port", O_RDWR)) < 0) { if ((devport = open("/dev/port", O_RDWR)) < 0) {
perror("open /dev/port"); perror("open /dev/port");
return; return;
...@@ -118,7 +118,7 @@ port_t::~port_t(void) { ...@@ -118,7 +118,7 @@ port_t::~port_t(void) {
unlock(port); unlock(port);
#endif /* LOCKING */ #endif /* LOCKING */
#ifdef LINUX #ifdef LINUX
#if defined(arm) || defined(__hppa__) #if defined(arm) || defined(__hppa__) || defined(__sparc__) || defined(__ppc__) || defined(__powerpc__)
if (devport >= 0) if (devport >= 0)
close(devport); close(devport);
#else #else
......
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
#include <unistd.h> #include <unistd.h>
#ifdef __linux__ #ifdef __linux__
#if !defined(arm) && !defined(__hppa__) #if !defined(arm) && !defined(__hppa__) && !defined(__sparc__) && !defined(__ppc__) && !defined(__powerpc__)
#include <sys/io.h> #include <sys/io.h>
#endif /* !arm */ #endif /* !arm */
#elif defined(QNX) #elif defined(QNX)
...@@ -55,7 +55,7 @@ ...@@ -55,7 +55,7 @@
#error Please define a platform in the Makefile #error Please define a platform in the Makefile
#endif #endif
#if defined(arm) || defined(__hppa__) #if defined(arm) || defined(__hppa__) || defined(__sparc__) || defined(__ppc__) || defined(__powerpc__)
static char ports_temp; static char ports_temp;
#ifdef inb #ifdef inb
...@@ -114,7 +114,7 @@ private: ...@@ -114,7 +114,7 @@ private:
#ifdef FREEBSD #ifdef FREEBSD
FILE *devio; FILE *devio;
#endif #endif
#if defined(__linux__) && (defined(arm) || defined(__hppa__)) #if defined(__linux__) && (defined(arm) || defined(__hppa__) || defined(__sparc__) || defined(__ppc__) || defined(__powerpc__))
int devport; int devport;
#endif #endif
}; };
......
...@@ -341,9 +341,9 @@ bool InfoBoxes::timeChanged( const KStarsDateTime &ut, const KStarsDateTime &lt, ...@@ -341,9 +341,9 @@ bool InfoBoxes::timeChanged( const KStarsDateTime &ut, const KStarsDateTime &lt,
QString ot3 = TimeBox->text3(); QString ot3 = TimeBox->text3();
TimeBox->setText1( i18n( "Local Time", "LT: " ) + lt.time().toString() TimeBox->setText1( i18n( "Local Time", "LT: " ) + lt.time().toString()
+ " " + lt.date().toString("dd MMM yyyy") ); + " " + lt.date().toString( "%d %b %Y" ) );
TimeBox->setText2( i18n( "Universal Time", "UT: " ) + ut.time().toString() TimeBox->setText2( i18n( "Universal Time", "UT: " ) + ut.time().toString()
+ " " + ut.date().toString("dd MMM yyyy") ); + " " + ut.date().toString( "%d %b %Y" ) );
QString STString; QString STString;
STString = STString.sprintf( "%02d:%02d:%02d ", lst->hour(), lst->minute(), lst->second() ); STString = STString.sprintf( "%02d:%02d:%02d ", lst->hour(), lst->minute(), lst->second() );
TimeBox->setText3( i18n( "Sidereal Time", "ST: " ) + STString + TimeBox->setText3( i18n( "Sidereal Time", "ST: " ) + STString +
......
...@@ -52,7 +52,6 @@ Comment[tg]=Планетариуми Мизи Корӣ ...@@ -52,7 +52,6 @@ Comment[tg]=Планетариуми Мизи Корӣ
Comment[tr]=Masaüstünde Yıldızlar Comment[tr]=Masaüstünde Yıldızlar
Comment[ven]=Vhusumbedzhwa mupo ya Desikithopo Comment[ven]=Vhusumbedzhwa mupo ya Desikithopo
Comment[xh]=Indlu ye Desktop Comment[xh]=Indlu ye Desktop
Comment[xx]=xxDesktop Planetariumxx
Comment[zh_CN]=桌面天文馆 Comment[zh_CN]=桌面天文馆
Comment[zh_TW]=桌面星象儀 Comment[zh_TW]=桌面星象儀
Comment[zu]=Okwemikhathi kwe-Desktop Comment[zu]=Okwemikhathi kwe-Desktop
...@@ -70,7 +69,6 @@ Name[pt_BR]=Estrelas ...@@ -70,7 +69,6 @@ Name[pt_BR]=Estrelas
Name[sv]=Kstars Name[sv]=Kstars
Name[ta]=கேஸ்டார்ஸ் Name[ta]=கேஸ்டார்ஸ்
Name[ven]=Vhadivhalea vha K Name[ven]=Vhadivhalea vha K
Name[xx]=xxKStarsxx
GenericName=Desktop Planetarium GenericName=Desktop Planetarium
GenericName[bg]=Планетариум за работния плот GenericName[bg]=Планетариум за работния плот
GenericName[bs]=Desktop planetarijum GenericName[bs]=Desktop planetarijum
...@@ -105,7 +103,6 @@ GenericName[sr@Latn]=Planetarijum na radnoj površinidž ...@@ -105,7 +103,6 @@ GenericName[sr@Latn]=Planetarijum na radnoj površinidž
GenericName[sv]=Skrivbordsplanetarium GenericName[sv]=Skrivbordsplanetarium
GenericName[ta]=பணிமேடை கோளரங்கம் GenericName[ta]=பணிமேடை கோளரங்கம்
GenericName[tg]=Планетариуми Мизи Корӣ GenericName[tg]=Планетариуми Мизи Корӣ
GenericName[xx]=xxDesktop Planetariumxx
GenericName[zh_CN]=桌面天文馆 GenericName[zh_CN]=桌面天文馆
X-DCOP-ServiceType=Multi X-DCOP-ServiceType=Multi
Categories=Qt;KDE;Education;Science;Astronomy Categories=Qt;KDE;Education;Science;Astronomy
...@@ -224,6 +224,8 @@ class KStars : public KMainWindow, virtual public KStarsInterface ...@@ -224,6 +224,8 @@ class KStars : public KMainWindow, virtual public KStarsInterface
void resumeDCOP( void ) { kapp->dcopClient()->resume(); } void resumeDCOP( void ) { kapp->dcopClient()->resume(); }
void slotClearAllTrails();
private slots: private slots:
/** /**
*action slot: synch kstars clock to system time *action slot: synch kstars clock to system time
......
...@@ -53,6 +53,9 @@ ...@@ -53,6 +53,9 @@
#include "skyobject.h" #include "skyobject.h"
#include "skyobjectname.h" #include "skyobjectname.h"
#include "ksplanetbase.h" #include "ksplanetbase.h"
#include "ksasteroid.h"
#include "kscomet.h"
#include "ksmoon.h"
#include "simclock.h" #include "simclock.h"
#include "infoboxes.h" #include "infoboxes.h"
#include "toggleaction.h" #include "toggleaction.h"
...@@ -334,6 +337,7 @@ void KStars::slotViewOps() { ...@@ -334,6 +337,7 @@ void KStars::slotViewOps() {
void KStars::slotApplySettings() { void KStars::slotApplySettings() {
Options::writeConfig(); Options::writeConfig();
data()->setFullTimeUpdate();
map()->forceUpdate(); map()->forceUpdate();
} }
...@@ -588,6 +592,9 @@ void KStars::slotTrack() { ...@@ -588,6 +592,9 @@ void KStars::slotTrack() {
map()->setFocusPoint( NULL ); map()->setFocusPoint( NULL );
} else { } else {
map()->setClickedPoint( map()->focus() ); map()->setClickedPoint( map()->focus() );
map()->setClickedObject( NULL );
map()->setFocusObject( NULL );//no longer tracking focusObject
map()->setFocusPoint( map()->clickedPoint() );
Options::setIsTracking( true ); Options::setIsTracking( true );
actionCollection()->action("track_object")->setText( i18n( "Stop &Tracking" ) ); actionCollection()->action("track_object")->setText( i18n( "Stop &Tracking" ) );
actionCollection()->action("track_object")->setIconSet( BarIcon( "encrypted" ) ); actionCollection()->action("track_object")->setIconSet( BarIcon( "encrypted" ) );
...@@ -838,6 +845,36 @@ void KStars::slotFullScreen() ...@@ -838,6 +845,36 @@ void KStars::slotFullScreen()
} }
} }
void KStars::slotClearAllTrails() {
//Exclude object with temporary trail
SkyObject *exOb( NULL );
if ( map()->focusObject() && map()->focusObject()->isSolarSystem() && data()->temporaryTrail ) {
exOb = map()->focusObject();
}