Changeset 2861 for trunk/python

Timestamp:

10/11/13 21:43:16 (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: Yes

Module(s): sd

Description: (1) bugfix in setting masks

(2) finished implementation of get_vinfo()
(3) change get_*index() to class methods
(4) modify get_*index() to raise exception when invalid value given

File:

• trunk/python/plotter2.py (modified) (3 diffs)

trunk/python/plotter2.py

@@ -588 +588 @@
         self._plotter.get_vinfo()
 
-    def get_colorindex(self, colorname):
-        """\
-        (for internal use)
+    @classmethod
+    def get_colorindex(cls, colorname):
+        """\
         convert the given color name into color index used in PGPLOT.
         """
         name = colorname.strip().lower()
-
-        if name == "white":       idx = 0  # our definition of bgcolor
-        if name == "black":       idx = 1  # our definition of fgcolor
-        if name == "red":         idx = 2
-        if name == "green":       idx = 3
-        if name == "blue":        idx = 4
-        if name == "cyan":        idx = 5
-        if name == "magenta":     idx = 6
-        if name == "yellow":      idx = 7
-        if name == "orange":      idx = 8
-        if name == "yellowgreen": idx = 9
-        if name == "emerald":     idx = 10
-        if name == "skyblue":     idx = 11
-        if name == "purple":      idx = 12
-        if name == "pink":        idx = 13
-        if name == "gray":        idx = 14
-        if name == "lightgray":   idx = 15
-
-        return idx
-
-    def list_colornames(self):
+        available_color = True
+
+        if   name == "white":       idx =  0  # our definition of bgcolor
+        elif name == "black":       idx =  1  # our definition of fgcolor
+        elif name == "red":         idx =  2
+        elif name == "green":       idx =  3
+        elif name == "blue":        idx =  4
+        elif name == "cyan":        idx =  5
+        elif name == "magenta":     idx =  6
+        elif name == "yellow":      idx =  7
+        elif name == "orange":      idx =  8
+        elif name == "yellowgreen": idx =  9
+        elif name == "emerald":     idx = 10
+        elif name == "skyblue":     idx = 11
+        elif name == "purple":      idx = 12
+        elif name == "pink":        idx = 13
+        elif name == "gray":        idx = 14
+        elif name == "lightgray":   idx = 15
+        else: available_color = False
+
+        if (available_color):
+            return idx
+        else:
+            raise ValueError("Unavailable colour name.")
+
+    @classmethod
+    def list_colornames(cls):
         """\
         list the available color names.
@@ -637 +643 @@
         print "---------------------------------"
 
-    def get_linestyleindex(self, fstyle):
-        """\
-        (for internal use)
+    @classmethod
+    def get_linestyleindex(cls, fstyle):
+        """\
         convert the given line style into style index used in PGPLOT.
         """
         style = fstyle.strip().lower()
-        if style == "solid":               idx = 1
-        if style == "dashed":              idx = 2
-        if style == "dash-dotted":         idx = 3
-        if style == "dotted":              idx = 4
-        if style == "dash-dot-dot-dotted": idx = 5
-        
-        return idx
-    
-    def list_linestyles(self):
+        available_style = True
+        
+        if   style == "solid":               idx = 1
+        elif style == "dashed":              idx = 2
+        elif style == "dash-dotted":         idx = 3
+        elif style == "dotted":              idx = 4
+        elif style == "dash-dot-dot-dotted": idx = 5
+        else: available_style = False
+
+        if (available_style):
+            return idx
+        else:
+            raise ValueError("Unavailable line style.")
+    
+    @classmethod
+    def list_linestyles(cls):
         """\
         list the available line styles.
@@ -663 +676 @@
         print "------------------------------"
 
-    def get_fillstyleindex(self, fstyle):
-        """\
-        (for internal use)
+    @classmethod
+    def get_fillstyleindex(cls, fstyle):
+        """\
         convert the given fill style into style index used in PGPLOT.
         """
         style = fstyle.strip().lower()
-        if style == "solid":        idx = 1
-        if style == "outline":      idx = 2
-        if style == "hatched":      idx = 3
-        if style == "crosshatched": idx = 4
-        
-        return idx
-    
-    def list_fillstyles(self):
+        available_style = True
+        
+        if   style == "solid":        idx = 1
+        elif style == "outline":      idx = 2
+        elif style == "hatched":      idx = 3
+        elif style == "crosshatched": idx = 4
+        else: available_style = False
+
+        if (available_style):
+            return idx
+        else:
+            raise ValueError("Unavailable fill style.")
+    
+    @classmethod
+    def list_fillstyles(cls):
         """\
         list the available fill styles.