Changeset 2830 for trunk/src

Timestamp:

07/31/13 17:37:40 (11 years ago)

Author:

WataruKawasaki

Message:

New Development: Yes

JIRA Issue: Yes (CAS-3620)

Ready for Test: Yes

Interface Changes: No

What Interface Changed:

Test Programs:

Put in Release Notes: Yes

Module(s): sd

Description: a new simple plotter based on PGPLOT. the module name is sd.plotter2. only available on casapy (unavailable in the standalone ASAP)

Location:

trunk/src

Files:

• CMakeLists.txt (modified) (4 diffs)
• Plotter2.cpp (added)
• Plotter2.h (added)
• SConscript (modified) (1 diff)
• python_Plotter2.cpp (added)
• 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 )
@@ -25 +21 @@
 # source files for libpyrap
 set( ASAP_SRCS
-#     ${SRCDIR}/Plotter2.cpp
+     ${SRCDIR}/Plotter2.cpp
      ${SRCDIR}/concurrent.cpp
      ${SRCDIR}/MathUtils.cpp
@@ -85 +81 @@
 
 set( ASAP_PYSRCS
-#     ${SRCDIR}/python_Plotter2.cpp
+     ${SRCDIR}/python_Plotter2.cpp
      ${SRCDIR}/python_Scantable.cpp
      ${SRCDIR}/python_STFiller.cpp
@@ -121 +117 @@
 target_link_libraries( ${ASAPLIB} 
                        #${Boost_LIBRARIES}
-                       ${QT4_LIBRARIES} 
+                       ${X11_LIBRARIES} 
+                       ${PGPLOT_LIBRARIES} 
                        ${PYRAPLIB} 
                        ${ATNFLIB} 

trunk/src/SConscript

@@ -7 +7 @@
 # gather cpp files
 cpps = env.SGlob("*.cpp")
+cpps.remove("Plotter2.cpp")
 pycpps = env.SGlob("python_*.cpp")
 for pf in pycpps:
     cpps.remove(pf)
+pycpps.remove("python_Plotter2.cpp")
 
 # location of libcasav.a

trunk/src/python_asap.cpp

@@ -68 +68 @@
 
 BOOST_PYTHON_MODULE(_asap) {
-  //asap::python::python_Plotter2();
+  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_Plotter2();
     void python_Scantable();
     void python_STFiller();