[Kstars-devel] kdeedu/kstars/kstars

[Jason Harris]

CVS commit by harris: 

Fixing faint limits of deep-sky objects.  The spinboxes in the options 
window were limited to 10.0 mag, but many DSOs are fainter than this.  
The spinboxes now go up to 16.0.  

However, because the magnitudes of the NGC/IC catalog are so incomplete 
(and the ones that are there I have found to be unreliable), I am 
disabling an adjustable faint limit for DSOs.  I will re-enable it once 
the magnitudes of the ngc/ic objects can be completed and corrected.  
Any volunteers?  ;)

CCMAIL: kstars-devel at kde.org
  


  M +2 -0      deepskyobject.cpp   1.5
  M +1 -1      deepskyobject.h   1.5
  M +2 -2      kstars.kcfg   1.11
  M +4 -0      opscatalog.cpp   1.4
  M +6 -0      opscatalogui.ui   1.3
  M +6 -2      skymapdraw.cpp   1.62


--- kdeedu/kstars/kstars/deepskyobject.cpp  #1.4:1.5
@@ -100,4 +100,6 @@ QImage* DeepSkyObject::readImage( void )
 }
 
+void DeepSkyObject::deleteImage() { delete Image; Image = 0; }
+
 void DeepSkyObject::drawSymbol( QPainter &psky, int x, int y, int PositionAngle, double zoom, double scale ) {
         // if size is 0.0 set it to 1.0, this are normally stars (type 0 and 1)

--- kdeedu/kstars/kstars/deepskyobject.h  #1.4:1.5
@@ -153,5 +153,5 @@ public:
 /**delete the Image pointer, and set it to 0.
         */
-        void deleteImage() { delete Image; Image = 0; }
+        void deleteImage();
 
 /**@return true if the object is in the Messier catalog

--- kdeedu/kstars/kstars/kstars.kcfg  #1.10:1.11
@@ -576,10 +576,10 @@
                 <entry name="MagLimitDrawDeepSky" type="Double">
                         <label>Faint limit for deep-sky objects</label>
-                        <default>14.0</default>
+                        <default>16.0</default>
                         <whatsthis>The faint magnitude limit for drawing deep-sky objects, when fully zoomed in.</whatsthis>
                 </entry>
                 <entry name="MagLimitDrawDeepSkyZoomOut" type="Double">
                         <label>Faint limit for deep-sky objects when zoomed out</label>
-                        <default>10.0</default>
+                        <default>16.0</default>
                         <whatsthis>The faint magnitude limit for drawing deep-sky objects, when fully zoomed out.</whatsthis>
                 </entry>

--- kdeedu/kstars/kstars/opscatalog.cpp  #1.3:1.4
@@ -24,4 +24,5 @@
 #include "skymap.h"
 #include "addcatdialog.h"
+#include "magnitudespinbox.h"
 
 OpsCatalog::OpsCatalog( QWidget *p, const char *name, WFlags fl ) 
@@ -43,4 +44,7 @@ OpsCatalog::OpsCatalog( QWidget *p, cons
         showMessier->setOn( Options::showMessier() );
 
+        kcfg_MagLimitDrawDeepSky->setMaxValue( 16.0 );
+        kcfg_MagLimitDrawDeepSkyZoomOut->setMaxValue( 16.0 );
+        
         //Add custom catalogs, if necessary
         for ( unsigned int i=0; i<Options::catalogCount(); ++i ) { //loop over custom catalogs

--- kdeedu/kstars/kstars/opscatalogui.ui  #1.2:1.3
@@ -433,4 +433,7 @@
                                 <cstring>kcfg_MagLimitDrawDeepSky</cstring>
                             </property>
+                            <property name="enabled">
+                                <bool>false</bool>
+                            </property>
                             <property name="focusPolicy">
                                 <enum>StrongFocus</enum>
@@ -473,4 +476,7 @@
                                 <cstring>kcfg_MagLimitDrawDeepSkyZoomOut</cstring>
                             </property>
+                            <property name="enabled">
+                                <bool>false</bool>
+                            </property>
                             <property name="focusPolicy">
                                 <enum>StrongFocus</enum>

--- kdeedu/kstars/kstars/skymapdraw.cpp  #1.61:1.62
@@ -1150,6 +1150,10 @@ void SkyMap::drawDeepSkyCatalog( QPainte
                 double lgz = log10(Options::zoomFactor());
                 double maglim = Options::magLimitDrawDeepSky();
-                if ( lgz <= 0.75*lgmax ) maglim -= (Options::magLimitDrawDeepSky() - Options::magLimitDrawDeepSkyZoomOut() )*(0.75*lgmax - lgz)/(0.75*lgmax - lgmin);
-                else maglim = 40.0; //show all deep-sky objects above 0.75*lgmax
+                
+                //FIXME
+                //disabling faint limits until the NGC/IC catalog has reasonable mags
+                //if ( lgz <= 0.75*lgmax ) maglim -= (Options::magLimitDrawDeepSky() - Options::magLimitDrawDeepSkyZoomOut() )*(0.75*lgmax - lgz)/(0.75*lgmax - lgmin);
+                //else 
+                        maglim = 40.0; //show all deep-sky objects above 0.75*lgmax
 
                 for ( DeepSkyObject *obj = catalog.first(); obj; obj = catalog.next() ) {