Changeset 2827 for branches/plotter2

Timestamp:

07/27/13 01:23:26 (11 years ago)

Author:

WataruKawasaki

Message:

New Development: No

JIRA Issue: Yes CAS-3620

Ready for Test: Yes

Interface Changes: No

What Interface Changed:

Test Programs:

Put in Release Notes: No

Module(s): sd

Description: modified plotter2.save() so that the previous filename and device are restored finally.

Location:

branches/plotter2

Files:

• python/plotter2.py (modified) (1 diff)
• src/Plotter2.cpp (modified) (1 diff)
• src/Plotter2.h (modified) (1 diff)
• src/python_Plotter2.cpp (modified) (1 diff)

branches/plotter2/python/plotter2.py

@@ -215 +215 @@
 
     def save(self, filename):
+        prev_filename = self._plotter.get_filename()
+        prev_dev      = self._plotter.get_device()
+
         self.set_output(filename)
         self.plot()
+        
+        self.set_output(prev_filename, prev_dev)
     
     def get_vinfo(self):

branches/plotter2/src/Plotter2.cpp

@@ -270 +270 @@
 }
 
+std::string Plotter2::getFileName() {
+    return filename;
+}
+
 void Plotter2::setFileName(const std::string& inFilename) {
     filename = inFilename;
+}
+
+std::string Plotter2::getDevice() {
+    return device;
 }
 

branches/plotter2/src/Plotter2.h

@@ -158 +158 @@
     ~Plotter2();
 
+    std::string getFileName();
     void setFileName(const std::string& inFilename);
+    std::string getDevice();
     void setDevice(const std::string& inDevice);
 

branches/plotter2/src/python_Plotter2.cpp

@@ -40 +40 @@
        class_<Plotter2>("Plotter2")
          .def( init <> () )
+         .def("get_filename",&Plotter2::getFileName)
          .def("set_filename",&Plotter2::setFileName)
+         .def("get_device",&Plotter2::getDevice)
          .def("set_device",&Plotter2::setDevice)
          .def("add_viewport",&Plotter2::addViewport)