Propertify

JamesRamm · JamesRamm · commit bc0059d7a4e5 · 2014-08-15T08:21:26.000+01:00
Made dashes and sketch_params into properties in the style class. Fixes issue #2
diff --git a/lib/matplotlib/style.py b/lib/matplotlib/style.py
@@ -42,4 +42,64 @@ def get_graylevel(self):
     gid = property(GraphicsContextBase.get_gid, GraphicsContextBase.set_gid)
     snap = property(GraphicsContextBase.get_snap, GraphicsContextBase.set_snap)
     hatch = property(GraphicsContextBase.get_hatch, GraphicsContextBase.set_hatch)
- 
+
+
+    # Refactoring of set_dashes into two properties..
+    @property
+    def dash_offset(self):
+        return self._dashes[0]
+    @dash_offset.setter
+    def dash_offset(self, value):
+        self._dashes[0] = value
+
+    @property
+    def dashes(self):
+        return self._dashes[1]
+
+    @dashes.setter
+    def dashes(self, value):
+        if value is not None:
+            dl = np.asarray(value)
+            if np.any(dl <= 0.0):
+                raise ValueError("All values in the dash list must be positive")
+
+        self._dashed[1] = value
+
+    #Color property is an alternative to 'set_foreground'. It does the same thing, but makes no allowances for providing a colour already in RGBA format..
+    @property
+    def color(self):
+        return self._rgb
+    @color.setter
+    def color(self, value):
+        self.set_foreground(value)
+
+    # Defining 3 properties for sketch params
+    @property
+    def sketch_scale(self):
+        return self._sketch[0]
+    @sketch_scale.setter
+    def sketch_scale(self, value):        
+        self.set_sketch_params(scale = value)
+
+    @property
+    def sketch_length(self):
+        return self._sketch[1]
+    @sketch_length.setter
+    def sketch_length(self, value):
+        self.set_sketch_params(length = value)
+
+    @property
+    def sketch_randomness(self):
+        return self._sketch[2]
+    @sketch_randomness.setter
+    def sketch_randomness(self, value):
+        self.set_sketch_params(randomness = value)
+
+    @classmethod
+    def from_dict(cls, styleDict):
+        """ Generate a style class from a dictionary """
+        st = cls()
+        for key, value in styleDict.iteritems():
+            setattr(st, key, value)
+
+        return st
diff --git a/lib/matplotlib/text.py b/lib/matplotlib/text.py
@@ -998,7 +998,7 @@ def set_fontproperties(self, fp):
         """
         if is_string_like(fp):
             fp = FontProperties(fp)
-        self._fontproperties = fp.copy()
+        self._fontproperties = fp
 
     def set_font_properties(self, fp):
         'alias for set_fontproperties'
