Changeset 2587 for trunk


Ignore:
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:
7 edited

Legend:

Unmodified
Added
Removed
  • trunk/CMakeLists.txt

    r2577 r2587  
    418418message( STATUS "BOOST_INCLUDE_DIR = " ${Boost_INCLUDE_DIR} )
    419419message( STATUS "BOOST_LIBRARIES = " ${Boost_LIBRARIES} )
     420
     421
     422#
     423# Qt4   4.3.4 or later
     424#
     425find_package( Qt4 4.3.4
     426              COMPONENTS QtCore QtGui )
     427if( NOT QT4_FOUND )
     428  message( FATAL_ERROR "Qt4 could not be found. Please check!" )
     429endif()
     430set( QT4_INCLUDE_DIRS ${QT_INCLUDES} CACHE PATH "QT4 include directories" FORCE )
     431set( QT4_DEFINITIONS ${QT_DEFINITIONS} -DQT_NO_DEBUG CACHE STRING "QT4 preprocessor flags" FORCE )
     432set( QT4_LIBRARIES
     433  ${QT_QTCORE_LIBRARY}
     434  ${QT_QTGUI_LIBRARY}
     435  CACHE FILEPATH "QT4 libraries" FORCE )
     436list( REMOVE_ITEM QT4_LIBRARIES "optimized" )
     437list( REMOVE_ITEM QT4_LIBRARIES "debug" )
     438message( STATUS "QT4_INCLUDE_DIRS = " ${QT4_INCLUDE_DIRS} )
     439message( STATUS "QT4_DEFINITIONS = " ${QT4_DEFINITIONS} )
     440message( STATUS "QT4_LIBRARIES = " ${QT4_LIBRARIES} )
    420441
    421442
     
    572593include_directories( ${CASACORE_INCLUDE_DIR}
    573594                     ${Boost_INCLUDE_DIR}
     595                     ${QT4_INCLUDE_DIRS}
    574596                     ${PYTHON_INCLUDE_DIRS}
    575597                     ${WCSLIB_INCLUDE_DIR}
  • trunk/python/CMakeLists.txt

    r2356 r2587  
    99# python modules
    1010set( PYTHON_MODULES
     11     ${PYTHONDIR}/__init__.py
    1112     ${PYTHONDIR}/asapfit.py
    1213     ${PYTHONDIR}/asapfitter.py
     14     ${PYTHONDIR}/asapgrid.py
    1315     ${PYTHONDIR}/asaplinefind.py
     16     ${PYTHONDIR}/asaplot.py
    1417     ${PYTHONDIR}/asaplotbase.py
     18     ${PYTHONDIR}/asaplotgui.py
    1519     ${PYTHONDIR}/asaplotgui_gtk.py
    16      ${PYTHONDIR}/asaplotgui.py
    1720     ${PYTHONDIR}/asaplotgui_qt4.py
    18      ${PYTHONDIR}/asaplot.py
    1921     ${PYTHONDIR}/asapmath.py
    2022     ${PYTHONDIR}/asapplotter.py
     
    2224     ${PYTHONDIR}/coordinate.py
    2325     ${PYTHONDIR}/customgui_base.py
     26     ${PYTHONDIR}/customgui_qt4agg.py
    2427     ${PYTHONDIR}/customgui_tkagg.py
    25      ${PYTHONDIR}/customgui_qt4agg.py
    2628     ${PYTHONDIR}/env.py
    2729     ${PYTHONDIR}/flagplotter.py
    28      ${PYTHONDIR}/__init__.py
    2930     ${PYTHONDIR}/interactivemask.py
    3031     ${PYTHONDIR}/ipysupport.py
     
    3435     ${PYTHONDIR}/opacity.py
    3536     ${PYTHONDIR}/parameters.py
     37#     ${PYTHONDIR}/plotter2.py
    3638     ${PYTHONDIR}/scantable.py
    3739     ${PYTHONDIR}/selector.py
    3840     ${PYTHONDIR}/simplelinefinder.py
    39      ${PYTHONDIR}/utils.py
    40      ${PYTHONDIR}/asapgrid.py
    41      ${PYTHONDIR}/svninfo.txt )
     41     ${PYTHONDIR}/svninfo.txt
     42     ${PYTHONDIR}/utils.py  )
    4243
    4344install( PROGRAMS ${PYTHON_MODULES}
  • trunk/python/__init__.py

    r2356 r2587  
    5353from opacity import model as opacity_model
    5454from asapgrid import asapgrid
     55#from plotter2 import plotter2
    5556from _asap import srctype
    5657
  • trunk/src/CMakeLists.txt

    r2580 r2587  
    77set( SRCDIR ${ASAPROOT}/src )
    88
     9# include QT_USE_FILE
     10include( ${QT_USE_FILE} )
     11
    912# include path
    1013include_directories( ${SRCDIR}
    1114                     ${Boost_INCLUDE_DIR}
     15                     ${QT4_INCLUDE_DIRS}
    1216                     ${ASAPROOT}/external-alma
    1317                     ${ASAPROOT}/external/libpyrap/pyrap-0.3.2 )
     
    2125# source files for libpyrap
    2226set( ASAP_SRCS
     27#     ${SRCDIR}/Plotter2.cpp
    2328     ${SRCDIR}/concurrent.cpp
    2429     ${SRCDIR}/MathUtils.cpp
     
    6469
    6570set( ASAP_PYSRCS
     71#     ${SRCDIR}/python_Plotter2.cpp
    6672     ${SRCDIR}/python_Scantable.cpp
    6773     ${SRCDIR}/python_STFiller.cpp
     
    96102target_link_libraries( ${ASAPLIB}
    97103                       #${Boost_LIBRARIES}
     104                       ${QT4_LIBRARIES}
    98105                       ${PYRAPLIB}
    99106                       ${ATNFLIB}
  • trunk/src/ScantableWrapper.h

    r2435 r2587  
    1313#define ASAPSCANTABLEWRAPPER_H
    1414
     15#include <iostream>
     16#include <string>
    1517#include <vector>
    16 #include <string>
     18
    1719#include <casa/Arrays/Vector.h>
    1820
    1921#include "MathUtils.h"
     22#include "Scantable.h"
     23#include "STCoordinate.h"
    2024#include "STFit.h"
    2125#include "STFitEntry.h"
    22 #include "Scantable.h"
    23 #include "STCoordinate.h"
    2426
    2527namespace asap {
     
    5860    table_(mt.getCP()) {;}
    5961
     62  ~ScantableWrapper()
     63  {
     64  }
     65
    6066  void assign(const ScantableWrapper& mt)
    6167    { table_= mt.getCP(); }
     
    312318} // namespace
    313319#endif
    314 
  • trunk/src/python_asap.cpp

    r2580 r2587  
    6868
    6969BOOST_PYTHON_MODULE(_asap) {
     70  //asap::python::python_Plotter2();
    7071  asap::python::python_Scantable();
    7172  asap::python::python_STFiller();
  • trunk/src/python_asap.h

    r2580 r2587  
    3535  namespace python {
    3636    void translate_ex(const casa::AipsError& e);
     37    //void python_Plotter2();
    3738    void python_Scantable();
    3839    void python_STFiller();
Note: See TracChangeset for help on using the changeset viewer.