Changeset 2830

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

Files:

• CMakeLists.txt (modified) (3 diffs)
• python/CMakeLists.txt (modified) (1 diff)
• python/__init__.py (modified) (1 diff)
• python/plotter2.py (added)
• src/CMakeLists.txt (modified) (4 diffs)
• src/Plotter2.cpp (added)
• src/Plotter2.h (added)
• src/SConscript (modified) (1 diff)
• src/python_Plotter2.cpp (added)
• 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} )
 
 
@@ -527 +506 @@
 endif()
 
+# X11.
+if( NOT APPLE )
+  find_package( X11 REQUIRED )
+  # Rename
+  set( X11_INCLUDE_DIRS ${X11_INCLUDE_DIR} )
+endif()
+
+# PGPLOT (FORTRAN plotting package).
+# depends on X11
+if( STANDALONE )
+  ############
+  find_path( PGPLOT_INCLUDE_DIRS cpgplot.h
+             PATHS /usr
+             PATH_SUFFIXES include )
+  if( PGPLOT_INCLUDE_DIRS MATCHES "NOTFOUND$" )
+    message( FATAL ERROR "cpgplot.h could not be found. Please check!" )
+  endif()
+  find_library( CPGPLOT_LIB libcpgplot.${SO}
+                PATHS /usr
+                PATH_SUFFIXES lib64 lib )
+  if( CPGPLOT_LIB MATCHES "NOTFOUND$" )
+    message( FATAL ERROR "libcpgplot could not be found. Please check!" )
+  endif()
+  find_library( PGPLOT_LIB libpgplot.${SO}
+                PATHS /usr
+                PATH_SUFFIXES lib64 lib )
+  if( PGPLOT_LIB MATCHES "NOTFOUND$" )
+    message( FATAL ERROR "libpgplot could not be found. Please check!" )
+  endif()
+  set( PGPLOT_LIBRARIES "${CPGPLOT_LIB} ${PGPLOT_LIB} ${X11_LIBRARIES} ${FORTRAN_LIBRARIES} " )
+  ############
+else()
+  if( APPLE )
+    set( _deps FORTRAN )
+  else()
+    set( _deps X11 FORTRAN )
+  endif()
+  if (CMAKE_SYSTEM MATCHES ^Darwin-11 AND NOT LLVMCOMPILER )
+     set( CMAKE_SHARED_LINKER_FLAGS "-Wl,-undefined -Wl,error -framework AppKit -lgfortran" )
+  else()
+     if (APPLE) 
+        set( CMAKE_SHARED_LINKER_FLAGS "-Wl,-undefined -Wl,error -framework AppKit" )
+     else()
+        set( CMAKE_SHARED_LINKER_FLAGS "-Wl,-undefined -Wl,error" )
+     endif()
+  endif()
+  casa_find( PGPLOT
+    VERSION 5.3.1
+    PREFIX_HINTS ${PGPLOT_ROOT_DIR}
+    INCLUDES cpgplot.h
+    LIBS pgplot${pgplot_ext} cpgplot${pgplot_ext}
+    DEPENDS ${_deps} )
+endif()
 
 #
@@ -593 +625 @@
 include_directories( ${CASACORE_INCLUDE_DIR} 
                      ${Boost_INCLUDE_DIR} 
-                     ${QT4_INCLUDE_DIRS} 
+                     ${X11_INCLUDE_DIRS} 
+                     ${PGPLOT_INCLUDE_DIRS} 
                      ${PYTHON_INCLUDE_DIRS} 
                      ${WCSLIB_INCLUDE_DIR} 

trunk/python/CMakeLists.txt

@@ -35 +35 @@
      ${PYTHONDIR}/opacity.py
      ${PYTHONDIR}/parameters.py
-#     ${PYTHONDIR}/plotter2.py
+     ${PYTHONDIR}/plotter2.py
      ${PYTHONDIR}/sbseparator.py
      ${PYTHONDIR}/scantable.py

trunk/python/__init__.py

@@ -54 +54 @@
 from asapgrid import asapgrid, asapgrid2
 from edgemarker import edgemarker
-#from plotter2 import plotter2
+if is_casapy():
+    from plotter2 import plotter2
 from sbseparator import sbseparator
 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 )
@@ -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();