Changeset 2587 for trunk/src


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/src
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • 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.