Changeset 2587 for trunk/src

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/src

Files:

• CMakeLists.txt (modified) (4 diffs)
• ScantableWrapper.h (modified) (3 diffs)
• python_asap.cpp (modified) (1 diff)
• python_asap.h (modified) (1 diff)

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();