[Kstars-devel] KDE/kdeedu/kstars/kstars/widgets

[Akarsh Simha]

SVN commit 909033 by asimha:

Applying Nico Dietrich's patch (modified) to add a Sidereal Day
time-step to the Time Spin Box.

Nico's patch would replace the 12 hour timestep with a sidereal day
timestep. Instead of doing that, I modified the patch to retain the 12
hour timestep and add a sidereal day timestep as well.

Thanks Nico! This closes wishlist bug #170583.
(Thanks Médéric, for pointing this out)

BUG: 170583
CCMAIL: kstars-devel at kde.org



 M  +23 -21    timespinbox.cpp  
 M  +1 -1      timespinbox.h  


--- trunk/KDE/kdeedu/kstars/kstars/widgets/timespinbox.cpp #909032:909033
@@ -95,28 +95,29 @@
         TimeScale[20] = 43200.0;     // 12 hr
         i = 20;
     }
-    TimeScale[i+1] = SECS_PER_DAY;     // 1 day
-    TimeScale[i+2] = 2.*SECS_PER_DAY;  // 2 days
-    TimeScale[i+3] = 3.*SECS_PER_DAY;  // 3 days
-    TimeScale[i+4] = 5.*SECS_PER_DAY;  // 5 days
-    TimeScale[i+5] = 7.*SECS_PER_DAY;  // 1 week
-    TimeScale[i+6] = 14.*SECS_PER_DAY; //2 weeks
-    TimeScale[i+7] = 21.*SECS_PER_DAY; //3 weeks
+    TimeScale[i+1] = 86164.1;     // 23 hr 56 min
+    TimeScale[i+2] = SECS_PER_DAY;     // 1 day
+    TimeScale[i+3] = 2.*SECS_PER_DAY;  // 2 days
+    TimeScale[i+4] = 3.*SECS_PER_DAY;  // 3 days
+    TimeScale[i+5] = 5.*SECS_PER_DAY;  // 5 days
+    TimeScale[i+6] = 7.*SECS_PER_DAY;  // 1 week
+    TimeScale[i+7] = 14.*SECS_PER_DAY; //2 weeks
+    TimeScale[i+8] = 21.*SECS_PER_DAY; //3 weeks
     //Months aren't a simple measurement of time; I'll just use fractions of a year
-    TimeScale[i+8] = SIDEREAL_YEAR/12.0; // 1 month
-    TimeScale[i+9] = SIDEREAL_YEAR/6.0;  // 2 months
-    TimeScale[i+10] = 0.25*SIDEREAL_YEAR; // 3 months
-    TimeScale[i+11] = SIDEREAL_YEAR/3.0;  // 4 months
-    TimeScale[i+12] = 0.5*SIDEREAL_YEAR;  // 6 months
-    TimeScale[i+13] = 0.75*SIDEREAL_YEAR; // 9 months
-    TimeScale[i+14] = SIDEREAL_YEAR;       // 1 year
-    TimeScale[i+15] = 2.0*SIDEREAL_YEAR;   // 2 years
-    TimeScale[i+16] = 3.0*SIDEREAL_YEAR;   // 3 years
-    TimeScale[i+17] = 5.0*SIDEREAL_YEAR;   // 5 years
-    TimeScale[i+18] = 10.0*SIDEREAL_YEAR;  // 10 years
-    TimeScale[i+19] = 25.0*SIDEREAL_YEAR;  // 25 years
-    TimeScale[i+20] = 50.0*SIDEREAL_YEAR;  // 50 years
-    TimeScale[i+21] = 100.0*SIDEREAL_YEAR; // 100 years
+    TimeScale[i+9] = SIDEREAL_YEAR/12.0; // 1 month
+    TimeScale[i+10] = SIDEREAL_YEAR/6.0;  // 2 months
+    TimeScale[i+11] = 0.25*SIDEREAL_YEAR; // 3 months
+    TimeScale[i+12] = SIDEREAL_YEAR/3.0;  // 4 months
+    TimeScale[i+13] = 0.5*SIDEREAL_YEAR;  // 6 months
+    TimeScale[i+14] = 0.75*SIDEREAL_YEAR; // 9 months
+    TimeScale[i+15] = SIDEREAL_YEAR;       // 1 year
+    TimeScale[i+16] = 2.0*SIDEREAL_YEAR;   // 2 years
+    TimeScale[i+17] = 3.0*SIDEREAL_YEAR;   // 3 years
+    TimeScale[i+18] = 5.0*SIDEREAL_YEAR;   // 5 years
+    TimeScale[i+19] = 10.0*SIDEREAL_YEAR;  // 10 years
+    TimeScale[i+20] = 25.0*SIDEREAL_YEAR;  // 25 years
+    TimeScale[i+21] = 50.0*SIDEREAL_YEAR;  // 50 years
+    TimeScale[i+22] = 100.0*SIDEREAL_YEAR; // 100 years
 
     TimeString.clear();
     if ( ! daysOnly() ) {
@@ -144,6 +145,7 @@
     } else {
         TimeString.append( "0 " + i18n( "days" ));
     }
+    TimeString.append( "1 " + i18nc( "sidereal day", "sid day" ));
     TimeString.append( "1 " + i18n( "day" ));
     TimeString.append( "2 " + i18n( "days" ));
     TimeString.append( "3 " + i18n( "days" ));
--- trunk/KDE/kdeedu/kstars/kstars/widgets/timespinbox.h #909032:909033
@@ -68,7 +68,7 @@
 
 private:
     bool DaysOnly;
-    float TimeScale[42];
+    float TimeScale[43];
     QStringList TimeString;
 };