Changeset 2820 for trunk

Timestamp:

07/02/13 13:11:02 (11 years ago)

Author:

Malte Marquarding

Message:

Issue #293: added scantbale.drop_history and added extra parameters to scantable.history to allow selection of rows

Location:

trunk

Files:

• python/scantable.py (modified) (3 diffs)
• src/STHistory.cpp (modified) (2 diffs)
• src/STHistory.h (modified) (1 diff)
• src/Scantable.h (modified) (1 diff)
• src/ScantableWrapper.h (modified) (1 diff)
• src/python_Scantable.cpp (modified) (1 diff)

trunk/python/scantable.py

@@ -2067 +2067 @@
 
     @asaplog_post_dec
-    def history(self, filename=None):
+    def history(self, filename=None, nrows=-1, start=0):
         """\
         Print the history. Optionally to a file.
@@ -2076 +2076 @@
 
         """
-        hist = list(self._gethistory())
+        n = self._historylength()
+        if nrows == -1:
+            nrows = n
+        if start+nrows > n:
+            nrows = nrows-start
+        if n > 1000 and nrows == n:
+            nrows = 1000
+            start = n-1000
+            asaplog.push("Warning: History has {0} entries. Displaying last "
+                         "1000".format(n))
+        hist = list(self._gethistory(nrows, start))
         out = "-"*80
         for h in hist:
-            if h.startswith("---"):
-                out = "\n".join([out, h])
+            if not h.strip():
+                continue
+            if h.find("---") >-1:
+                continue
             else:
                 items = h.split("##")
@@ -2093 +2105 @@
                     s = i.split("=")
                     out += "\n   %s = %s" % (s[0], s[1])
-                out = "\n".join([out, "-"*80])
+                out = "\n".join([out, "*"*80])
         if filename is not None:
             if filename is "":
                 filename = 'scantable_history.txt'
-            import os
             filename = os.path.expandvars(os.path.expanduser(filename))
             if not os.path.isdir(filename):

trunk/src/STHistory.cpp

@@ -20 +20 @@
 #include "STDefs.h"
 #include "STHistory.h"
-
+#include "MathUtils.h"
 
 using namespace casa;
@@ -81 +81 @@
 {
   const Table& t = other.table();
-  addEntry(asap::SEPERATOR);
-  TableCopy::copyRows(table_, t, table_.nrow(), 0, t.nrow());
-  addEntry(asap::SEPERATOR);
+  if (other.nrow() > 0) {
+    addEntry(asap::SEPERATOR);
+    TableCopy::copyRows(table_, t, table_.nrow(), 0, t.nrow());
+    addEntry(asap::SEPERATOR);
+  }
 
 }
 
-std::vector<std::string> asap::STHistory::getHistory( ) const
+std::vector<std::string> asap::STHistory::getHistory( int nrow, 
+                                                      int start) const
 {
-  std::vector<std::string> stlout;
-  for (uInt i=0; i<table_.nrow(); ++i) {
-    stlout.push_back(itemCol_(i));
+  if (nrow < 0) {
+    nrow = this->nrow();
   }
-  return stlout;
+  AlwaysAssert(nrow <= this->nrow(), AipsError);
+  Vector<String> rows;
+  Slicer slice(IPosition(1, start), IPosition(1, nrow));
+  
+  rows = itemCol_.getColumnRange(slice);
+  return mathutil::tovectorstring(rows);
 }
 
+  void asap::STHistory::drop() {
+    table_.removeRow(table_.rowNumbers());
+  }
+
 }

trunk/src/STHistory.h

@@ -62 +62 @@
    * @return a vector of strings
    */
-  std::vector<std::string> getHistory( ) const;
+  std::vector<std::string> getHistory(int nrow=-1, int start=0 ) const;
 
   const casa::String& name() const { return name_; }
+
+  int nrow() const { return table_.nrow(); }
+
+
+  void drop();
 
 private:

trunk/src/Scantable.h

@@ -378 +378 @@
   void makePersistent(const std::string& filename);
 
-  std::vector<std::string> getHistory() const
-    { return historyTable_.getHistory(); };
+  std::vector<std::string> getHistory(int nrow=-1, int start=0) const
+    { return historyTable_.getHistory(nrow, start); }
+
+  uint historyLength()
+  { return historyTable_.nrow(); }
+  
+  void dropHistory() { historyTable_.drop(); }
 
   void addHistory(const std::string& hist) { historyTable_.addEntry(hist); }

trunk/src/ScantableWrapper.h

@@ -242 +242 @@
   }
 
-  std::vector<std::string> getHistory() const
-    { return table_->getHistory(); }
+  std::vector<std::string> getHistory(int nrow=-1, int start=0) const
+    { return table_->getHistory(nrow, start); }
+
+  uint historyLength() {
+    return table_->historyLength();
+  }
+
+  void dropHistory() { table_->dropHistory(); }
 
   void addHistory(const std::string& hist)

trunk/src/python_Scantable.cpp

@@ -131 +131 @@
     .def("_gethistory", &ScantableWrapper::getHistory)
     .def("_addhistory", &ScantableWrapper::addHistory)
+    .def("drop_history", &ScantableWrapper::dropHistory)
+    .def("_historylength", &ScantableWrapper::historyLength)
     .def("_getselection", &ScantableWrapper::getSelection)
     .def("_setselection", &ScantableWrapper::setSelection)