Changeset 2909 for trunk/src

Timestamp:

03/24/14 17:32:50 (11 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:

Module(s): sd

Description: (1) a bug fix in sd.scantable.parse_spw_selection(). modified to get rest frequency value correctly based on molecule ID stored for each spw (the first spectrum having the specified spw in scantable). (2) renamed 'annotation' to 'text' in class or variable names for sd.plotter2.

Location:

trunk/src

Files:

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

trunk/src/Plotter2.cpp

@@ -3 +3 @@
 namespace asap {
 
-Plotter2AnnotationInfo::Plotter2AnnotationInfo() {
+Plotter2TextInfo::Plotter2TextInfo() {
     text = "";
     posx = 0.0;
@@ -14 +14 @@
 }
 
-Plotter2AnnotationInfo::~Plotter2AnnotationInfo() {
+Plotter2TextInfo::~Plotter2TextInfo() {
 }
 
@@ -103 +103 @@
     vRect.clear();
     vArro.clear();
-    vAnno.clear();
+    vText.clear();
 
     labelXString = "";
@@ -139 +139 @@
     vRect.clear();
     vArro.clear();
-    vAnno.clear();
+    vText.clear();
 }
 
@@ -917 +917 @@
     di->lineWidth = width;
     di->lineStyle = style;
-    //vi->vData[dataid].lineStyle = style;
 }
 
@@ -1133 +1132 @@
 }
 
-void Plotter2::setAnnotation(const std::string& label, const float posx, const float posy, const float angle, const float fjust, const float size, const std::string& style, const int color, const int bgcolor, const int inVpid, const int inAnnid) {
-    int vpid = inVpid;
-    if (vpid >= (int)vInfo.size()) {
-        exit(0);
-    }
-    if (vpid < 0) {
-        vpid = vInfo.size() - 1;
-    }
-    if (vpid < 0) {
-        Plotter2ViewportInfo vi;
-        vInfo.push_back(vi);
-        vpid = 0;
-    }
-
-    Plotter2ViewportInfo* vi = &vInfo[vpid];
-
-    int annotationid = inAnnid;
+void Plotter2::setText(const std::string& text, const float inPosx, const float inPosy, const float angle, const float fjust, const float size, const std::string& style, const int color, const int bgcolor, const int inVpid, const int inTextid) {
+    int vpid = inVpid;
+    if (vpid >= (int)vInfo.size()) {
+        exit(0);
+    }
+    if (vpid < 0) {
+        vpid = vInfo.size() - 1;
+    }
+    if (vpid < 0) {
+        Plotter2ViewportInfo vi;
+        vInfo.push_back(vi);
+        vpid = 0;
+    }
+
+    Plotter2ViewportInfo* vi = &vInfo[vpid];
+
+    int annotationid = inTextid;
     if (annotationid < 0) {
-        Plotter2AnnotationInfo ai;
-        vi->vAnno.push_back(ai);
-        annotationid = vi->vAnno.size() - 1;
-    } else if (annotationid >= (int)vi->vAnno.size()) {
-        exit(0);
-    }
-
-    Plotter2AnnotationInfo* ai = &vi->vAnno[annotationid];
+        Plotter2TextInfo ti;
+        vi->vText.push_back(ti);
+        annotationid = vi->vText.size() - 1;
+    } else if (annotationid >= (int)vi->vText.size()) {
+        exit(0);
+    }
+
+    Plotter2TextInfo* ti = &vi->vText[annotationid];
 
     std::string styleString;
@@ -1171 +1170 @@
     }
 
-    ai->text = styleString + label;
-    ai->posx = posx;
-    ai->posy = posy;
-    ai->angle = angle;
-    ai->fjust = fjust;
-    ai->size = size;
-    ai->color = color;
-    ai->bgcolor = bgcolor;
+    ti->text = styleString + text;
+
+    float posx = inPosx;
+    if (posx < 0.0) {
+        posx = 0.5*(vi->vpPosXMin + vi->vpPosXMax);
+    }
+    ti->posx = posx;
+
+    float posy = inPosy;
+    if (posy < 0.0) {
+        posy = 0.5*(vi->vpPosYMin + vi->vpPosYMax);
+    }
+    ti->posy = posy;
+
+    ti->angle = angle;
+    ti->fjust = fjust;
+    ti->size = size;
+    ti->color = color;
+    ti->bgcolor = bgcolor;
 }
 
@@ -1458 +1468 @@
             }
 
-            // annotations
-            for (unsigned int j = 0; j < vi.vAnno.size(); ++j) {
+            // arbitrary texts
+            for (unsigned int j = 0; j < vi.vText.size(); ++j) {
                 resetAttributes(vi);
 
-                Plotter2AnnotationInfo ai = vi.vAnno[j];
-                cpgsch(ai.size);
-                cpgsci(ai.color);
-                cpgstbg(ai.bgcolor);
-                cpgptxt(ai.posx, ai.posy, ai.angle, ai.fjust, ai.text.c_str());
+                Plotter2TextInfo ti = vi.vText[j];
+                cpgsch(ti.size);
+                cpgsci(ti.color);
+                cpgstbg(ti.bgcolor);
+                cpgptxt(ti.posx, ti.posy, ti.angle, ti.fjust, ti.text.c_str());
             }
 

trunk/src/Plotter2.h

@@ -11 +11 @@
 namespace asap {
 
-class Plotter2AnnotationInfo {
-public:
-    Plotter2AnnotationInfo();
-    ~Plotter2AnnotationInfo();
+class Plotter2TextInfo {
+public:
+    Plotter2TextInfo();
+    ~Plotter2TextInfo();
 
     std::string text;
@@ -140 +140 @@
 
     //annotations
-    std::vector<Plotter2AnnotationInfo> vAnno;
+    std::vector<Plotter2TextInfo> vText;
 
     // x-label
@@ -239 +239 @@
     void setMaskX(const float xmin, const float xmax, const int color, const int fill, const int width, const float hsep, const int inVpid);
     void setArrow(const float xtail, const float xhead, const float ytail, const float yhead, const int color, const int width, const int lineStyle, const float headSize, const int headFillStyle, const float headAngle, const float headVent, const int inVpid, const int inArrowid);
-    void setAnnotation(const std::string& label, const float posx, const float posy, const float angle, const float fjust, const float size, const std::string& style, const int color, const int bgcolor, const int inVpid, const int inAnnid);
-    void setLabelX(const std::string& label, const float posx, const float posy, const float size, const std::string& style, const int color, const int bgcolor, const int inVpid);
-    void setLabelY(const std::string& label, const float posx, const float posy, const float size, const std::string& style, const int color, const int bgcolor, const int inVpid);
-    void setTitle(const std::string& label, const float posx, const float posy, const float size, const std::string& style, const int color, const int bgcolor, const int inVpid);
+    void setText(const std::string& text, const float inPosx, const float inPosy, const float angle, const float fjust, const float size, const std::string& style, const int color, const int bgcolor, const int inVpid, const int inTextid);
+    void setLabelX(const std::string& label, const float inPosx, const float inPosy, const float size, const std::string& style, const int color, const int bgcolor, const int inVpid);
+    void setLabelY(const std::string& label, const float inPosx, const float inPosy, const float size, const std::string& style, const int color, const int bgcolor, const int inVpid);
+    void setTitle(const std::string& label, const float inPosx, const float inPosy, const float size, const std::string& style, const int color, const int bgcolor, const int inVpid);
     void setViewportBackgroundColor(const int bgcolor, const int inVpid);
     void plot();

trunk/src/python_Plotter2.cpp

@@ -82 +82 @@
          .def("set_mask_x",&Plotter2::setMaskX)
          .def("set_arrow",&Plotter2::setArrow)
-         .def("set_annotation",&Plotter2::setAnnotation)
+         .def("set_text",&Plotter2::setText)
          .def("set_label_x",&Plotter2::setLabelX)
          .def("set_label_y",&Plotter2::setLabelY)