Changeset 260


Ignore:
Timestamp:
01/22/05 16:42:38 (20 years ago)
Author:
vor010
Message:

SDMemTable & SDMemTableWrapper: formatSec and summary are now const functions.
Makefile has been updated to use the same version for both Narrabri and Epping

Location:
trunk/src
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/Makefile

    r216 r260  
    11TARGET   := ../lib/_asap.so
    22
     3ifdef NARRABRI_ASAP
     4CXX      := /usr/bin/g++
     5else
    36CXX      := g++-3.2.3
     7endif
     8
    49CXXFLAGS := -O -fPIC
    510#CXXFLAGS += -fpermissive # This should be removed.
     
    2833BOOSTLIB  := /nfs/atapplic/boost/linux/lib/libboost_python2.3-gcc-mt.a
    2934BOOSTINC  := -I/usr/local/include/boost
     35
    3036
    3137PYTHONINC := -I/usr/local/include/python2.3
  • trunk/src/SDMemTable.cc

    r251 r260  
    892892}
    893893
    894 String SDMemTable::formatSec(Double x)
     894String SDMemTable::formatSec(Double x) const
    895895{
    896896  Double xcop = x;
     
    928928}
    929929
    930 std::string SDMemTable::summary()   {
     930std::string SDMemTable::summary() const  {
    931931  ROScalarColumn<Int> scans(table_, "SCANID");
    932932  ROScalarColumn<String> srcs(table_, "SRCNAME");
     
    953953  table_.keywordSet().get("FluxUnit", tmp);
    954954  oss << setw(15) << "Flux Unit:" << tmp << endl;
    955   Table t = table_.rwKeywordSet().asTable("FREQUENCIES");
     955  Table t = table_.keywordSet().asTable("FREQUENCIES");
    956956  Vector<Double> vec;
    957957  t.keywordSet().get("RESTFREQS",vec);
  • trunk/src/SDMemTable.h

    r251 r260  
    130130
    131131  // get a summary of the table
    132   virtual std::string summary();
     132  virtual std::string summary() const;
    133133
    134134  std::vector<std::string> history(int whichRow=0) const;
     
    185185private:
    186186  // utility func for nice printout
    187   casa::String formatSec(casa::Double x);
     187  casa::String formatSec(casa::Double x) const;
    188188  void setup();
    189189  // the current cursor into the array
  • trunk/src/SDMemTableWrapper.h

    r251 r260  
    157157  casa::CountedPtr<SDMemTable> getCP() const {return table_;}
    158158  SDMemTable* getPtr() {return &(*table_);}
    159   std::string summary() { return table_->summary(); }
     159  std::string summary() const { return table_->summary(); }
    160160 
    161161  std::vector<std::string> history(int whichRow=0) {
Note: See TracChangeset for help on using the changeset viewer.