Merge pull request #300 from UV-CDAT/issue_298_markers_default_size

Issue 298 markers default size

Author: danlipsa

docs/Jupyter/1D_Multi_line_Plots.ipynb

@@ -13,7 +13,7 @@ def setUp(self):
         self.data.id = "My Taylor Diagram Data"
         # Markers attributes for later
         self.ids = ["A1", "A2", "A3", "B", "C1", "C2", "C3"]
-        self.sizes = [25., 5., 20., 20., 20., 20., 20., ]
+        self.sizes = [2.5, 5, 2., 2., 2., 2., 2., ]
         self.symbols = [
             "square",
             "dot",

docs/Jupyter/test_vcs_markers_uniform.png

@@ -11,7 +11,7 @@ def testMintics(self):
         line.linecolor = "red"  # Red color obviously
         line.linewidth = 2.  # A bit thicker
         line.marker = "circle"  #
-        line.markersize = 10  # A bit bigger
+        line.markersize = 1
         s = MV2.array(s)
         s.id = "sine"
         xaxis = s.getAxis(0)

tests/basetaylortest.py

@@ -8,7 +8,7 @@ def testDrawMarkerLegend(self):
                                     ["red", "blue", "green"], [
                                         "solid", "dash", "dot"], [1, 4, 8],
                                     ["blue", "green", "red"], [
-                                        "cross", "square", "dot"], [3, 4, 5],
+                                        "cross", "square", "dot"], [.2, .6, 5],
                                     ["sample A", "type B", "thing C"], render=True, bg=self.bg)
 
         fnm = "test_drawLinesAndMarkersLegend.png"
@@ -21,7 +21,7 @@ def testDrawMarkerLegend(self):
         t.legend.y2 = .65
         ids = ["Sea Level Pressure (ERA-Interim)","SW Cloud Forcing (CERES-EBAF 4.0)","LW Cloud Forcing (CERES-EBAF 4.0)","Land Precipitation (GPCP 2.2)","Ocean Precipitation (GPCP 2.2)","2-m temperature","More"]
         #ids = ["SLP(ERA-Interim)","A2","A3","B1","C1","C2","C3"]
-        id_sizes = [15., 15., 15., 15., 15., 15., 15.,]
+        id_sizes = [1.5, 1.5, 1.5, 1.5, 1.5, 1.5, 1.5,]
         id_colors = ["red","orange","green","cyan","blue","purple","black"]
         symbols = ["diamond","square_fill","circle","triangle_right_fill","triangle_left_fill","triangle_up_fill","triangle_down_fill"]
         colors = ["red","orange","green","cyan","blue","purple","black"]

tests/test_vcs_1D_mintics.py

@@ -10,7 +10,7 @@ def testDrawMarkerLegend(self):
         t.legend.y2 = .65
         ids = ["Sea Level Pressure (ERA-Interim)","SW Cloud Forcing (CERES-EBAF 4.0)","LW Cloud Forcing (CERES-EBAF 4.0)","Land Precipitation (GPCP 2.2)","Ocean Precipitation (GPCP 2.2)","2-m temperature","More"]
         #ids = ["SLP(ERA-Interim)","A2","A3","B1","C1","C2","C3"]
-        id_sizes = [15., 15., 15., 15., 15., 15., 15.,]
+        id_sizes = [1.5, 1.5, 1.5, 1.5, 1.5, 1.5, 1.5,]
         id_colors = ["red","orange","green","cyan","blue","purple","black"]
         symbols = ["diamond","square_fill","circle","triangle_right_fill","triangle_left_fill","triangle_up_fill","triangle_down_fill"]
         colors = ["red","orange","green","cyan","blue","purple","black"]

tests/test_vcs_drawLinesAndMarkersLegend.py

@@ -12,6 +12,6 @@ def testVCSMarkers(self):
         # m.worldcoordinate=[-10,10,0,10]
         m.type = ['plus', 'diamond', 'square_fill', "hurricane"]
         m.color = [242, 243, 244, 242]
-        m.size = [20, 20, 20, 5]
+        m.size = [2, 2, 2, 150]
         self.x.plot(m, bg=self.bg)
         self.checkImage("test_vcs_markers.png")

tests/test_vcs_drawLinesAndMarkersLegend_2.py

@@ -0,0 +1,29 @@
+import basevcstest
+
+
+class TestVCSMarkers(basevcstest.VCSBaseTest):
+    def testVCSMarkersUniform(self):
+        names = ['dot', 'plus', 'star', 'circle', 'cross', 'diamond', 'triangle_up', 'triangle_down', 'triangle_down', 'triangle_left', 'triangle_right', 'square', 'diamond_fill', 'triangle_up_fill', 'triangle_down_fill', 'triangle_left_fill', 'triangle_right_fill', 'square_fill', 'hurricane', 'w00', 'w01', 'w02', 'w03', 'w04', 'w05', 'w06', 'w07', 'w08', 'w09', 'w10', 'w11', 'w12', 'w13', 'w14', 'w15', 'w16', 'w17', 'w18', 'w19', 'w20', 'w21', 'w22', 'w23', 'w24', 'w25', 'w26', 'w27', 'w28', 'w29', 'w30', 'w31', 'w32', 'w33', 'w34', 'w35', 'w36', 'w37', 'w38', 'w39', 'w40', 'w41', 'w42', 'w43', 'w44', 'w45', 'w46', 'w47', 'w48', 'w49', 'w50', 'w51', 'w52', 'w53', 'w54', 'w55', 'w56', 'w57', 'w58', 'w59', 'w60', 'w61', 'w62', 'w63', 'w64', 'w65', 'w66', 'w67', 'w68', 'w69', 'w70', 'w71', 'w72', 'w73', 'w74', 'w75', 'w76', 'w77', 'w78', 'w79', 'w80', 'w81', 'w82', 'w83', 'w84', 'w85', 'w86', 'w87', 'w88', 'w89', 'w90', 'w91', 'w92', 'w93', 'w94', 'w95', 'w96', 'w97', 'w98', 'w99', 'w100', 'w101', 'w102']
+
+        tmpl = self.x.createtemplate()
+
+
+        tmpl.legend.x1 = .05
+        tmpl.legend.x2 = .95
+
+        tmpl.legend.y1 = .05
+        tmpl.legend.y2 = .95
+        n = len(names)
+        sizes = [1,]*18
+        for i in range(len(names)-len(sizes)):
+            sizes.append(1.)
+        tmpl.drawLinesAndMarkersLegend(self.x, [[0,0,0,0]]*n, 
+                ["solid",]*n,
+                [1,]*n,
+                ["black",]*n,
+                names,
+                sizes,
+                names
+                )
+
+        self.checkImage("test_vcs_markers_uniform.png")

tests/test_vcs_markers.py

@@ -0,0 +1,28 @@
+import basevcstest
+
+
+class TestVCSMarkers(basevcstest.VCSBaseTest):
+    def testVCSMarkersUniform(self):
+        names = ['dot', 'plus', 'star', 'circle', 'cross', 'diamond', 'triangle_up', 'square', 'square_fill', 'hurricane', 'w00', 'w01']
+
+        tmpl = self.x.createtemplate()
+
+
+        tmpl.legend.x1 = .05
+        tmpl.legend.x2 = .95
+
+        tmpl.legend.y1 = .05
+        tmpl.legend.y2 = .95
+        n = len(names)
+        size = 10.
+        sizes = [size,]*n
+        tmpl.drawLinesAndMarkersLegend(self.x, [[0,0,0,0]]*n, 
+                ["solid",]*n,
+                [size,]*n,
+                ["black",]*n,
+                names,
+                sizes,
+                names
+                )
+
+        self.checkImage("test_vcs_markers_uniform_2.png")

tests/test_vcs_markers_uniform_size.py

@@ -14,6 +14,6 @@ def testStarTriangleMarker(self):
         m.x = [[.1], [.3], [.5], [.7], [.9]]
         m.y = [[.1], [.3], [.5], [.7], [.9]]
         m.color = [200, 150, 160, 175, 125]
-        m.size = [50, 50, 50, 50, 50]
+        m.size = [5, 5, 5, 5, 5]
         self.x.plot(m, bg=self.bg)
         self.checkImage("test_vcs_star_triangle_markers.png")