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

[Médéric Boquien]

SVN commit 931954 by mboquien:

Reorganisation part 6: move the fitsio dependent part into the fitsviwer dir. I have also moved there the related files from the widgets/ dir as i think it is better to have all fits related files 
into a single dir. I have also named the dir fitsviewer so we can distinguish with other unrelated future cfitsio dependent features, such as fits-on-the-sky-map.

CCMAIL: kstars-devel at kde.org


 M  +12 -8     CMakeLists.txt  
 D             fitsheaderdialog.ui  
 D             fitshistogram.cpp  
 D             fitshistogram.h  
 D             fitshistogramui.ui  
 D             fitsimage.cpp  
 D             fitsimage.h  
 A             fitsviewer (directory)  
 D             fitsviewer.cpp  
 D             fitsviewer.h  
 AM            fitsviewer/fitsheaderdialog.ui   fitsheaderdialog.ui#931943
 AM            fitsviewer/fitshistogram.cpp   fitshistogram.cpp#931943 [License: GPL (v2+)]
 AM            fitsviewer/fitshistogram.h   fitshistogram.h#931943 [License: GPL (v2+)]
 AM            fitsviewer/fitshistogramdraw.cpp   widgets/fitshistogramdraw.cpp#931949 [License: GPL (v2+)]
 AM            fitsviewer/fitshistogramdraw.h   widgets/fitshistogramdraw.h#931943 [License: GPL (v2+)]
 AM            fitsviewer/fitshistogramui.ui   fitshistogramui.ui#931943
 AM            fitsviewer/fitsimage.cpp   fitsimage.cpp#931943 [License: GPL (v2+)]
 AM            fitsviewer/fitsimage.h   fitsimage.h#931943 [License: GPL (v2+)]
 AM            fitsviewer/fitsviewer.cpp   fitsviewer.cpp#931943 [License: GPL (v2+)]
 AM            fitsviewer/fitsviewer.h   fitsviewer.h#931943 [License: GPL (v2+)]
 AM            fitsviewer/statform.ui   statform.ui#931943
 M  +1 -1      indi/indistd.cpp  
 M  +1 -1      kstarsactions.cpp  
 D             statform.ui  
 D             widgets/fitshistogramdraw.cpp  
 D             widgets/fitshistogramdraw.h  


--- trunk/KDE/kdeedu/kstars/kstars/CMakeLists.txt #931953:931954
@@ -9,14 +9,18 @@
 Find_package(ZLIB REQUIRED)
 
 if (CFITSIO_FOUND)
-  set (fits_SRCS fitshistogram.cpp fitsimage.cpp fitsviewer.cpp)
-  set (fitswidgets_SRCS widgets/fitshistogramdraw.cpp)
-set(fitsui_SRCS
-	fitsheaderdialog.ui
-	statform.ui
-	indi/streamform.ui
-	fitshistogramui.ui 
+  set (fits_SRCS
+    fitsviewer/fitshistogram.cpp
+    fitsviewer/fitsimage.cpp
+    fitsviewer/fitsviewer.cpp
+    fitsviewer/fitshistogramdraw.cpp
 )
+  set (fitsui_SRCS
+    fitsviewer/fitsheaderdialog.ui
+    fitsviewer/statform.ui
+    indi/streamform.ui
+    fitsviewer/fitshistogramui.ui 
+)
   include_directories(${CFITSIO_INCLUDE_DIR})
 endif(CFITSIO_FOUND)
 
@@ -210,7 +214,7 @@
    skycomponents/flagcomponent.cpp
 )
 
-set(libkstarswidgets_SRCS ${fitswidgets_SRCS}
+set(libkstarswidgets_SRCS
 	widgets/calcframe.cpp 
 	widgets/clicklabel.cpp 
 	widgets/dmsbox.cpp 
** trunk/KDE/kdeedu/kstars/kstars/fitsviewer/fitsheaderdialog.ui #property svn:eol-style
   + native
** trunk/KDE/kdeedu/kstars/kstars/fitsviewer/fitsheaderdialog.ui #property svn:keywords
   + Author Date Id Revision
** trunk/KDE/kdeedu/kstars/kstars/fitsviewer/fitsheaderdialog.ui #property svn:mergeinfo
   + 
** trunk/KDE/kdeedu/kstars/kstars/fitsviewer/fitsheaderdialog.ui #property svn:mime-type
   + text/x-designer
** trunk/KDE/kdeedu/kstars/kstars/fitsviewer/fitshistogram.cpp #property svn:eol-style
   + native
** trunk/KDE/kdeedu/kstars/kstars/fitsviewer/fitshistogram.cpp #property svn:keywords
   + Author Date Id Revision
** trunk/KDE/kdeedu/kstars/kstars/fitsviewer/fitshistogram.cpp #property svn:mergeinfo
   + 
** trunk/KDE/kdeedu/kstars/kstars/fitsviewer/fitshistogram.cpp #property svn:mime-type
   + text/x-c++src
** trunk/KDE/kdeedu/kstars/kstars/fitsviewer/fitshistogram.h #property svn:eol-style
   + native
** trunk/KDE/kdeedu/kstars/kstars/fitsviewer/fitshistogram.h #property svn:keywords
   + Author Date Id Revision
** trunk/KDE/kdeedu/kstars/kstars/fitsviewer/fitshistogram.h #property svn:mergeinfo
   + 
** trunk/KDE/kdeedu/kstars/kstars/fitsviewer/fitshistogram.h #property svn:mime-type
   + text/x-chdr
** trunk/KDE/kdeedu/kstars/kstars/fitsviewer/fitshistogramdraw.cpp #property svn:mergeinfo
   + 
** trunk/KDE/kdeedu/kstars/kstars/fitsviewer/fitshistogramdraw.h #property svn:mergeinfo
   + 
** trunk/KDE/kdeedu/kstars/kstars/fitsviewer/fitshistogramui.ui #property svn:mergeinfo
   + 
** trunk/KDE/kdeedu/kstars/kstars/fitsviewer/fitsimage.cpp #property svn:eol-style
   + native
** trunk/KDE/kdeedu/kstars/kstars/fitsviewer/fitsimage.cpp #property svn:keywords
   + Author Date Id Revision
** trunk/KDE/kdeedu/kstars/kstars/fitsviewer/fitsimage.cpp #property svn:mergeinfo
   + 
** trunk/KDE/kdeedu/kstars/kstars/fitsviewer/fitsimage.cpp #property svn:mime-type
   + text/x-c++src
** trunk/KDE/kdeedu/kstars/kstars/fitsviewer/fitsimage.h #property svn:eol-style
   + native
** trunk/KDE/kdeedu/kstars/kstars/fitsviewer/fitsimage.h #property svn:keywords
   + Author Date Id Revision
** trunk/KDE/kdeedu/kstars/kstars/fitsviewer/fitsimage.h #property svn:mergeinfo
   + 
** trunk/KDE/kdeedu/kstars/kstars/fitsviewer/fitsimage.h #property svn:mime-type
   + text/x-chdr
** trunk/KDE/kdeedu/kstars/kstars/fitsviewer/fitsviewer.cpp #property svn:eol-style
   + native
** trunk/KDE/kdeedu/kstars/kstars/fitsviewer/fitsviewer.cpp #property svn:keywords
   + Author Date Id Revision
** trunk/KDE/kdeedu/kstars/kstars/fitsviewer/fitsviewer.cpp #property svn:mergeinfo
   + 
** trunk/KDE/kdeedu/kstars/kstars/fitsviewer/fitsviewer.cpp #property svn:mime-type
   + text/x-c++src
** trunk/KDE/kdeedu/kstars/kstars/fitsviewer/fitsviewer.h #property svn:eol-style
   + native
** trunk/KDE/kdeedu/kstars/kstars/fitsviewer/fitsviewer.h #property svn:keywords
   + Author Date Id Revision
** trunk/KDE/kdeedu/kstars/kstars/fitsviewer/fitsviewer.h #property svn:mergeinfo
   + 
** trunk/KDE/kdeedu/kstars/kstars/fitsviewer/fitsviewer.h #property svn:mime-type
   + text/x-chdr
** trunk/KDE/kdeedu/kstars/kstars/fitsviewer/statform.ui #property svn:eol-style
   + native
** trunk/KDE/kdeedu/kstars/kstars/fitsviewer/statform.ui #property svn:keywords
   + Author Date Id Revision
** trunk/KDE/kdeedu/kstars/kstars/fitsviewer/statform.ui #property svn:mergeinfo
   + 
** trunk/KDE/kdeedu/kstars/kstars/fitsviewer/statform.ui #property svn:mime-type
   + text/x-designer
--- trunk/KDE/kdeedu/kstars/kstars/indi/indistd.cpp #931953:931954
@@ -28,7 +28,7 @@
 #include <config-kstars.h>
 
 #ifdef HAVE_CFITSIO_H
-#include "fitsviewer.h"
+#include "fitsviewer/fitsviewer.h"
 #endif
 
 #include <sys/socket.h>
--- trunk/KDE/kdeedu/kstars/kstars/kstarsactions.cpp #931953:931954
@@ -97,7 +97,7 @@
 #include "skycomponents/customcatalogcomponent.h"
 
 #ifdef HAVE_CFITSIO_H
-#include "fitsviewer.h"
+#include "fitsviewer/fitsviewer.h"
 #endif
 
 #ifdef HAVE_XPLANET