Changeset 2895 for trunk/src

Timestamp:

02/19/14 20:41:19 (11 years ago)

Author:

WataruKawasaki

Message:

New Development: Yes

JIRA Issue: Yes CAS-6168

Ready for Test: Yes

Interface Changes:

What Interface Changed:

Test Programs:

Put in Release Notes: Yes

Module(s): sd.plotter2

Description: added methods to sd.plotter2 to enable changing the size and shape of the entire region to be plotted (which is referred to as 'viewsurface' in PGPLOT).

Location:

trunk/src

Files:

• Plotter2.cpp (modified) (3 diffs)
• Plotter2.h (modified) (2 diffs)
• python_Plotter2.cpp (modified) (1 diff)

trunk/src/Plotter2.cpp

@@ -294 +294 @@
     hasDefaultViewport = true;
     currentViewportId = 0;
+
+    width = 8.82796; // default viewsurface width seems to be this value.
+    aspect = 0.75;   // default viewsurface aspect
 }
 
@@ -320 +323 @@
     cpgopen((filename + "/" + device).c_str());
     hasDevice = true;
+}
+
+float Plotter2::getViewSurfaceWidth() {
+    return width;
+}
+
+float Plotter2::getViewSurfaceAspect() {
+    return aspect;
+}
+
+void Plotter2::setViewSurface(const float inWidth, const float inAspect) {
+    width = inWidth;
+    aspect = inAspect;
 }
 
@@ -1127 +1143 @@
     open();
 
+    if ((width > 0.0) && (aspect > 0.0)) {
+        cpgpap(width, aspect);
+    }
+
     cpgscr(0, 1.0, 1.0, 1.0); // set background color white
     cpgscr(1, 0.0, 0.0, 0.0); // set foreground color black

trunk/src/Plotter2.h

@@ -162 +162 @@
     void setDevice(const std::string& inDevice);
 
+    float getViewSurfaceWidth();
+    float getViewSurfaceAspect();
+    void setViewSurface(const float width, const float aspect);
     int addViewport(const float xmin, const float xmax, const float ymin, const float ymax);
     void setViewport(const float xmin, const float xmax, const float ymin, const float ymax, const int id);
@@ -208 +211 @@
     bool hasDefaultViewport;
     int currentViewportId;
+    float width;
+    float aspect;
     void open();
     void close();

trunk/src/python_Plotter2.cpp

@@ -44 +44 @@
          .def("get_device",&Plotter2::getDevice)
          .def("set_device",&Plotter2::setDevice)
+         .def("get_viewsurface_width",&Plotter2::getViewSurfaceWidth)
+         .def("get_viewsurface_aspect",&Plotter2::getViewSurfaceAspect)
+         .def("set_viewsurface",&Plotter2::setViewSurface)
          .def("add_viewport",&Plotter2::addViewport)
          .def("set_viewport",&Plotter2::setViewport)