Changeset 2587 for trunk

Timestamp:

07/05/12 18:47:48 (12 years ago)

Author:

WataruKawasaki

Message:

New Development: No

JIRA Issue: No

Ready for Test: Yes

Interface Changes: No

What Interface Changed:

Test Programs:

Put in Release Notes: No

Module(s): sd

Description: added qt4 settings for cmakefiles, and cleaned up some debug codes.

Location:

trunk

Files:

• CMakeLists.txt (modified) (2 diffs)
• python/CMakeLists.txt (modified) (3 diffs)
• python/__init__.py (modified) (1 diff)
• src/CMakeLists.txt (modified) (4 diffs)
• src/ScantableWrapper.h (modified) (3 diffs)
• src/python_asap.cpp (modified) (1 diff)
• src/python_asap.h (modified) (1 diff)

trunk/CMakeLists.txt

@@ -418 +418 @@
 message( STATUS "BOOST_INCLUDE_DIR = " ${Boost_INCLUDE_DIR} )
 message( STATUS "BOOST_LIBRARIES = " ${Boost_LIBRARIES} )
+
+
+#
+# Qt4   4.3.4 or later
+#
+find_package( Qt4 4.3.4 
+              COMPONENTS QtCore QtGui )
+if( NOT QT4_FOUND )
+  message( FATAL_ERROR "Qt4 could not be found. Please check!" )
+endif()
+set( QT4_INCLUDE_DIRS ${QT_INCLUDES} CACHE PATH "QT4 include directories" FORCE )
+set( QT4_DEFINITIONS ${QT_DEFINITIONS} -DQT_NO_DEBUG CACHE STRING "QT4 preprocessor flags" FORCE )
+set( QT4_LIBRARIES 
+  ${QT_QTCORE_LIBRARY} 
+  ${QT_QTGUI_LIBRARY} 
+  CACHE FILEPATH "QT4 libraries" FORCE )
+list( REMOVE_ITEM QT4_LIBRARIES "optimized" )
+list( REMOVE_ITEM QT4_LIBRARIES "debug" )
+message( STATUS "QT4_INCLUDE_DIRS = " ${QT4_INCLUDE_DIRS} )
+message( STATUS "QT4_DEFINITIONS = " ${QT4_DEFINITIONS} )
+message( STATUS "QT4_LIBRARIES = " ${QT4_LIBRARIES} )
 
 
@@ -572 +593 @@
 include_directories( ${CASACORE_INCLUDE_DIR} 
                      ${Boost_INCLUDE_DIR} 
+                     ${QT4_INCLUDE_DIRS} 
                      ${PYTHON_INCLUDE_DIRS} 
                      ${WCSLIB_INCLUDE_DIR} 

trunk/python/CMakeLists.txt

@@ -9 +9 @@
 # python modules 
 set( PYTHON_MODULES
+     ${PYTHONDIR}/__init__.py
      ${PYTHONDIR}/asapfit.py
      ${PYTHONDIR}/asapfitter.py
+     ${PYTHONDIR}/asapgrid.py
      ${PYTHONDIR}/asaplinefind.py
+     ${PYTHONDIR}/asaplot.py
      ${PYTHONDIR}/asaplotbase.py
+     ${PYTHONDIR}/asaplotgui.py 
      ${PYTHONDIR}/asaplotgui_gtk.py
-     ${PYTHONDIR}/asaplotgui.py 
      ${PYTHONDIR}/asaplotgui_qt4.py
-     ${PYTHONDIR}/asaplot.py
      ${PYTHONDIR}/asapmath.py
      ${PYTHONDIR}/asapplotter.py
@@ -22 +24 @@
      ${PYTHONDIR}/coordinate.py
      ${PYTHONDIR}/customgui_base.py
+     ${PYTHONDIR}/customgui_qt4agg.py
      ${PYTHONDIR}/customgui_tkagg.py
-     ${PYTHONDIR}/customgui_qt4agg.py
      ${PYTHONDIR}/env.py
      ${PYTHONDIR}/flagplotter.py
-     ${PYTHONDIR}/__init__.py
      ${PYTHONDIR}/interactivemask.py
      ${PYTHONDIR}/ipysupport.py
@@ -34 +35 @@
      ${PYTHONDIR}/opacity.py
      ${PYTHONDIR}/parameters.py
+#     ${PYTHONDIR}/plotter2.py
      ${PYTHONDIR}/scantable.py
      ${PYTHONDIR}/selector.py
      ${PYTHONDIR}/simplelinefinder.py
-     ${PYTHONDIR}/utils.py 
-     ${PYTHONDIR}/asapgrid.py
-     ${PYTHONDIR}/svninfo.txt )
+     ${PYTHONDIR}/svninfo.txt
+     ${PYTHONDIR}/utils.py  )
 
 install( PROGRAMS ${PYTHON_MODULES} 

trunk/python/__init__.py

@@ -53 +53 @@
 from opacity import model as opacity_model
 from asapgrid import asapgrid
+#from plotter2 import plotter2
 from _asap import srctype
 

trunk/src/CMakeLists.txt

@@ -7 +7 @@
 set( SRCDIR ${ASAPROOT}/src )
 
+# include QT_USE_FILE
+include( ${QT_USE_FILE} )
+
 # include path
 include_directories( ${SRCDIR} 
                      ${Boost_INCLUDE_DIR}
+                     ${QT4_INCLUDE_DIRS}
                      ${ASAPROOT}/external-alma 
                      ${ASAPROOT}/external/libpyrap/pyrap-0.3.2 )
@@ -21 +25 @@
 # source files for libpyrap
 set( ASAP_SRCS
+#     ${SRCDIR}/Plotter2.cpp
      ${SRCDIR}/concurrent.cpp
      ${SRCDIR}/MathUtils.cpp
@@ -64 +69 @@
 
 set( ASAP_PYSRCS
+#     ${SRCDIR}/python_Plotter2.cpp
      ${SRCDIR}/python_Scantable.cpp
      ${SRCDIR}/python_STFiller.cpp
@@ -96 +102 @@
 target_link_libraries( ${ASAPLIB} 
                        #${Boost_LIBRARIES}
+                       ${QT4_LIBRARIES} 
                        ${PYRAPLIB} 
                        ${ATNFLIB} 

trunk/src/ScantableWrapper.h

@@ -13 +13 @@
 #define ASAPSCANTABLEWRAPPER_H
 
+#include <iostream>
+#include <string>
 #include <vector>
-#include <string>
+
 #include <casa/Arrays/Vector.h>
 
 #include "MathUtils.h"
+#include "Scantable.h"
+#include "STCoordinate.h"
 #include "STFit.h"
 #include "STFitEntry.h"
-#include "Scantable.h"
-#include "STCoordinate.h"
 
 namespace asap {
@@ -58 +60 @@
     table_(mt.getCP()) {;}
 
+  ~ScantableWrapper()
+  {
+  }
+
   void assign(const ScantableWrapper& mt)
     { table_= mt.getCP(); }
@@ -312 +318 @@
 } // namespace
 #endif
-

trunk/src/python_asap.cpp

@@ -68 +68 @@
 
 BOOST_PYTHON_MODULE(_asap) {
+  //asap::python::python_Plotter2();
   asap::python::python_Scantable();
   asap::python::python_STFiller();

trunk/src/python_asap.h

@@ -35 +35 @@
   namespace python {
     void translate_ex(const casa::AipsError& e);
+    //void python_Plotter2();
     void python_Scantable();
     void python_STFiller();