diff --git a/vcs/boxfill.py b/vcs/boxfill.py index fc83feb36..8b48f86fb 100755 --- a/vcs/boxfill.py +++ b/vcs/boxfill.py @@ -12,14 +12,8 @@ # Description: Python command wrapper for VCS's boxfill graphics method. # # Version: 5.0 # ############################################################################### -# -# -# -############################################################################### -# # -# Import: VCS C extension module. # -# # -############################################################################### + + import vcs import cdtime import VCS_validation_functions @@ -1066,104 +1060,51 @@ def script(self, script_filename, mode='a'): fp.write("v=vcs.init()\n\n") unique_name = '__Gfb__' + self.name - fp.write( - "#----------Boxfill (Gfb) member (attribute) listings ----------\n") + fp.write("#----------Boxfill (Gfb) member (attribute) listings ----------\n") fp.write("gfb_list=v.listelements('boxfill')\n") fp.write("if ('%s' in gfb_list):\n" % self.name) fp.write(" %s = v.getboxfill('%s')\n" % (unique_name, self.name)) fp.write("else:\n") - fp.write( - " %s = v.createboxfill('%s')\n" % - (unique_name, self.name)) + fp.write(" %s = v.createboxfill('%s')\n" % (unique_name, self.name)) # Common core graphics method attributes fp.write("%s.projection = '%s'\n" % (unique_name, self.projection)) - fp.write( - "%s.xticlabels1 = '%s'\n" % - (unique_name, self.xticlabels1)) - fp.write( - "%s.xticlabels2 = '%s'\n" % - (unique_name, self.xticlabels2)) + fp.write("%s.xticlabels1 = '%s'\n" % (unique_name, self.xticlabels1)) + fp.write("%s.xticlabels2 = '%s'\n" % (unique_name, self.xticlabels2)) fp.write("%s.xmtics1 = '%s'\n" % (unique_name, self.xmtics1)) fp.write("%s.xmtics2 = '%s'\n" % (unique_name, self.xmtics2)) - fp.write( - "%s.yticlabels1 = '%s'\n" % - (unique_name, self.yticlabels1)) - fp.write( - "%s.yticlabels2 = '%s'\n" % - (unique_name, self.yticlabels2)) + fp.write("%s.yticlabels1 = '%s'\n" % (unique_name, self.yticlabels1)) + fp.write("%s.yticlabels2 = '%s'\n" % (unique_name, self.yticlabels2)) fp.write("%s.ymtics1 = '%s'\n" % (unique_name, self.ymtics1)) fp.write("%s.ymtics2 = '%s'\n" % (unique_name, self.ymtics2)) if isinstance(self.datawc_x1, (int, long, float)): fp.write("%s.datawc_x1 = %g\n" % (unique_name, self.datawc_x1)) else: - fp.write( - "%s.datawc_x1 = '%s'\n" % - (unique_name, self.datawc_x1)) + fp.write("%s.datawc_x1 = '%s'\n" % (unique_name, self.datawc_x1)) if isinstance(self.datawc_y1, (int, long, float)): fp.write("%s.datawc_y1 = %g\n" % (unique_name, self.datawc_y1)) else: - fp.write( - "%s.datawc_y1 = '%s'\n" % - (unique_name, self.datawc_y1)) + fp.write("%s.datawc_y1 = '%s'\n" % (unique_name, self.datawc_y1)) if isinstance(self.datawc_x2, (int, long, float)): fp.write("%s.datawc_x2 = %g\n" % (unique_name, self.datawc_x2)) else: - fp.write( - "%s.datawc_x2 = '%s'\n" % - (unique_name, self.datawc_x2)) + fp.write("%s.datawc_x2 = '%s'\n" % (unique_name, self.datawc_x2)) if isinstance(self.datawc_y2, (int, long, float)): fp.write("%s.datawc_y2 = %g\n" % (unique_name, self.datawc_y2)) else: - fp.write( - "%s.datawc_y2 = '%s'\n" % - (unique_name, self.datawc_y2)) - fp.write( - "%s.xaxisconvert = '%s'\n" % - (unique_name, self.xaxisconvert)) - fp.write( - "%s.yaxisconvert = '%s'\n" % - (unique_name, self.yaxisconvert)) + fp.write("%s.datawc_y2 = '%s'\n" % (unique_name, self.datawc_y2)) + fp.write("%s.xaxisconvert = '%s'\n" % (unique_name, self.xaxisconvert)) + fp.write("%s.yaxisconvert = '%s'\n" % (unique_name, self.yaxisconvert)) # Unique attribute for boxfill - fp.write( - "%s.boxfill_type = '%s'\n" % - (unique_name, self.boxfill_type)) + fp.write("%s.boxfill_type = '%s'\n" % (unique_name, self.boxfill_type)) fp.write("%s.level_1 = %g\n" % (unique_name, self.level_1)) fp.write("%s.level_2 = %g\n" % (unique_name, self.level_2)) fp.write("%s.levels = %s\n" % (unique_name, self.levels)) fp.write("%s.color_1 = %g\n" % (unique_name, self.color_1)) fp.write("%s.color_2 = %g\n" % (unique_name, self.color_2)) - fp.write( - "%s.fillareacolors = %s\n" % - (unique_name, self.fillareacolors)) - fp.write( - "%s.fillareastyle = '%s'\n" % - (unique_name, self.fillareastyle)) - fp.write( - "%s.fillareaindices = %s\n" % - (unique_name, self.fillareaindices)) - fp.write( - "%s.fillareaopacity = %s\n" % - (unique_name, self.fillareaopacity)) - fp.write( - "%s.fillareapixelspacing = %s\n" % - (unique_name, self._fillareapixelspacing)) - fp.write( - "%s.fillareapixelscale = %s\n" % - (unique_name, self.fillareapixelscale)) - fp.write("%s.legend = %s\n" % (unique_name, self.legend)) - fp.write("%s.ext_1 = '%s'\n" % (unique_name, self.ext_1)) - fp.write("%s.ext_2 = '%s'\n" % (unique_name, self.ext_2)) - fp.write("%s.missing = %s\n" % (unique_name, repr(self.missing))) - fp.write( - "%s.datawc_calendar = %g\n" % - (unique_name, self.datawc_calendar)) - fp.write( - "%s.datawc_timeunits = '%s'\n\n" % - (unique_name, self.datawc_timeunits)) - fp.write( - "%s.colormap = '%s'\n\n" % - (unique_name, repr( - self.colormap))) + if self.colormap is not None: + fp.write("%s.colormap = %s\n\n" % (unique_name, repr(self.colormap))) + else: + fp.write("%s.colormap = %s\n\n" % (unique_name, self.colormap)) else: # Json type mode += "+" diff --git a/vcs/dv3d.py b/vcs/dv3d.py index 99b044707..08e7d7b2e 100644 --- a/vcs/dv3d.py +++ b/vcs/dv3d.py @@ -114,24 +114,9 @@ def script(self, script_filename=None, mode=None): gtype = 'xyt' if (self._axes == "Hovmoller3D") else 'default' unique_name = 'gm3d_%s' % str(time.time() % 1)[2:] - if self.g_name == '3d_scalar': - fp.write( - '%s = vcs.get3d_scalar( %s )\n' % - (unique_name, gtype)) - if self.g_name == '3d_vector': - fp.write( - '%s = vcs.get3d_vector( %s )\n' % - (unique_name, gtype)) - if self.g_name == '3d_dual_scalar': - fp.write( - '%s = vcs.get3d_dual_scalar( %s )\n' % - (unique_name, gtype)) + fp.write('%s = vcs.get%s("%s")\n' % (unique_name, self.g_name, gtype)) for param_name in self.parameter_names: - fp.write( - '%s.%s = %s\n' % - (unique_name, - param_name, - self.cfgManager.getParameterValue(param_name))) + fp.write('%s.%s = %s\n' % (unique_name, param_name, self.cfgManager.getParameterValue(param_name))) else: # Json type mode += "+" diff --git a/vcs/fillarea.py b/vcs/fillarea.py index ef53df993..3b6c21659 100755 --- a/vcs/fillarea.py +++ b/vcs/fillarea.py @@ -527,17 +527,12 @@ def script(self, script_filename=None, mode=None): fp.write("v=vcs.init()\n\n") unique_name = '__Tf__' + self.name - fp.write( - "#----------Fillarea (Tf) member (attribute) listings ----------\n") + fp.write("#----------Fillarea (Tf) member (attribute) listings ----------\n") fp.write("tf_list=v.listelements('fillarea')\n") fp.write("if ('%s' in tf_list):\n" % self.name) - fp.write( - " %s = v.getfillarea('%s')\n" % - (unique_name, self.name)) + fp.write(" %s = v.getfillarea('%s')\n" % (unique_name, self.name)) fp.write("else:\n") - fp.write( - " %s = v.createfillarea('%s')\n" % - (unique_name, self.name)) + fp.write(" %s = v.createfillarea('%s')\n" % (unique_name, self.name)) fp.write("%s.style = %s\n" % (unique_name, self.style)) fp.write("%s.index = %s\n" % (unique_name, self.index)) fp.write("%s.color = %s\n\n" % (unique_name, self.color)) @@ -546,16 +541,14 @@ def script(self, script_filename=None, mode=None): fp.write("%s.pixelscale = %s\n\n" % (unique_name, self.pixelscale)) fp.write("%s.priority = %d\n" % (unique_name, self.priority)) fp.write("%s.viewport = %s\n" % (unique_name, self.viewport)) - fp.write( - "%s.worldcoordinate = %s\n" % - (unique_name, self.worldcoordinate)) + fp.write("%s.worldcoordinate = %s\n" % (unique_name, self.worldcoordinate)) fp.write("%s.x = %s\n" % (unique_name, self.x)) fp.write("%s.y = %s\n\n" % (unique_name, self.y)) - fp.write("%s.projection = %s\n\n" % (unique_name, self.projection)) - fp.write( - "%s.colormap = %s\n\n" % - (unique_name, repr( - self.colormap))) + fp.write("%s.projection = '%s'\n\n" % (unique_name, self.projection)) + if self.colormap is not None: + fp.write("%s.colormap = %s\n\n" % (unique_name, repr(self.colormap))) + else: + fp.write("%s.colormap = %s\n\n" % (unique_name, self.colormap)) else: # Json type mode += "+" diff --git a/vcs/isofill.py b/vcs/isofill.py index 268f611b8..a364e862b 100755 --- a/vcs/isofill.py +++ b/vcs/isofill.py @@ -803,69 +803,42 @@ def script(self, script_filename, mode='a'): fp.write("v=vcs.init()\n\n") unique_name = '__Gfi__' + self.name - fp.write( - "#----------Isofill (Gfi) member (attribute) listings ----------\n") + fp.write("#----------Isofill (Gfi) member (attribute) listings ----------\n") fp.write("gfi_list=v.listelements('isofill')\n") fp.write("if ('%s' in gfi_list):\n" % self.name) fp.write(" %s = v.getisofill('%s')\n" % (unique_name, self.name)) fp.write("else:\n") - fp.write( - " %s = v.createisofill('%s')\n" % - (unique_name, self.name)) + fp.write(" %s = v.createisofill('%s')\n" % (unique_name, self.name)) # Common core graphics method attributes fp.write("%s.projection = '%s'\n" % (unique_name, self.projection)) - fp.write( - "%s.xticlabels1 = '%s'\n" % - (unique_name, self.xticlabels1)) - fp.write( - "%s.xticlabels2 = '%s'\n" % - (unique_name, self.xticlabels2)) + fp.write("%s.xticlabels1 = '%s'\n" % (unique_name, self.xticlabels1)) + fp.write("%s.xticlabels2 = '%s'\n" % (unique_name, self.xticlabels2)) fp.write("%s.xmtics1 = '%s'\n" % (unique_name, self.xmtics1)) fp.write("%s.xmtics2 = '%s'\n" % (unique_name, self.xmtics2)) - fp.write( - "%s.yticlabels1 = '%s'\n" % - (unique_name, self.yticlabels1)) - fp.write( - "%s.yticlabels2 = '%s'\n" % - (unique_name, self.yticlabels2)) + fp.write("%s.yticlabels1 = '%s'\n" % (unique_name, self.yticlabels1)) + fp.write("%s.yticlabels2 = '%s'\n" % (unique_name, self.yticlabels2)) fp.write("%s.ymtics1 = '%s'\n" % (unique_name, self.ymtics1)) fp.write("%s.ymtics2 = '%s'\n" % (unique_name, self.ymtics2)) if isinstance(self.datawc_x1, (int, long, float)): fp.write("%s.datawc_x1 = %g\n" % (unique_name, self.datawc_x1)) else: - fp.write( - "%s.datawc_x1 = '%s'\n" % - (unique_name, self.datawc_x1)) + fp.write("%s.datawc_x1 = '%s'\n" % (unique_name, self.datawc_x1)) if isinstance(self.datawc_y1, (int, long, float)): fp.write("%s.datawc_y1 = %g\n" % (unique_name, self.datawc_y1)) else: - fp.write( - "%s.datawc_y1 = '%s'\n" % - (unique_name, self.datawc_y1)) + fp.write("%s.datawc_y1 = '%s'\n" % (unique_name, self.datawc_y1)) if isinstance(self.datawc_x2, (int, long, float)): fp.write("%s.datawc_x2 = %g\n" % (unique_name, self.datawc_x2)) else: - fp.write( - "%s.datawc_x2 = '%s'\n" % - (unique_name, self.datawc_x2)) + fp.write("%s.datawc_x2 = '%s'\n" % (unique_name, self.datawc_x2)) if isinstance(self.datawc_y2, (int, long, float)): fp.write("%s.datawc_y2 = %g\n" % (unique_name, self.datawc_y2)) else: - fp.write( - "%s.datawc_y2 = '%s'\n" % - (unique_name, self.datawc_y2)) - fp.write( - "%s.datawc_calendar = %g\n" % - (unique_name, self.datawc_calendar)) - fp.write( - "%s.datawc_timeunits = '%s'\n\n" % - (unique_name, self.datawc_timeunits)) - fp.write( - "%s.xaxisconvert = '%s'\n" % - (unique_name, self.xaxisconvert)) - fp.write( - "%s.yaxisconvert = '%s'\n" % - (unique_name, self.yaxisconvert)) + fp.write("%s.datawc_y2 = '%s'\n" % (unique_name, self.datawc_y2)) + fp.write("%s.datawc_calendar = %g\n" % (unique_name, self.datawc_calendar)) + fp.write("%s.datawc_timeunits = '%s'\n\n" % (unique_name, self.datawc_timeunits)) + fp.write("%s.xaxisconvert = '%s'\n" % (unique_name, self.xaxisconvert)) + fp.write("%s.yaxisconvert = '%s'\n" % (unique_name, self.yaxisconvert)) # Unique attribute for isofill fp.write("%s.missing = %g\n" % (unique_name, self.missing)) fp.write("%s.ext_1 = '%s'\n" % (unique_name, self.ext_1)) @@ -890,10 +863,10 @@ def script(self, script_filename, mode='a'): (unique_name, self.fillareapixelscale)) fp.write("%s.levels = %s\n" % (unique_name, self.levels)) fp.write("%s.legend = %s\n" % (unique_name, self.legend)) - fp.write( - "%s.colormap = '%s'\n\n" % - (unique_name, repr( - self.colormap))) + if self.colormap is not None: + fp.write("%s.colormap = %s\n\n" % (unique_name, repr(self.colormap))) + else: + fp.write("%s.colormap = %s\n\n" % (unique_name, self.colormap)) else: # Json type mode += "+" diff --git a/vcs/isoline.py b/vcs/isoline.py index d62092e6f..14a283f63 100755 --- a/vcs/isoline.py +++ b/vcs/isoline.py @@ -1108,92 +1108,61 @@ def script(self, script_filename, mode='a'): fp.write("v=vcs.init()\n\n") unique_name = '__Gi__' + self.name - fp.write( - "#----------Isoline (Gi) member (attribute) listings ----------\n") + fp.write("#----------Isoline (Gi) member (attribute) listings ----------\n") fp.write("gi_list=v.listelements('isoline')\n") fp.write("if ('%s' in gi_list):\n" % self.name) fp.write(" %s = v.getisoline('%s')\n" % (unique_name, self.name)) fp.write("else:\n") - fp.write( - " %s = v.createisoline('%s')\n" % - (unique_name, self.name)) + fp.write(" %s = v.createisoline('%s')\n" % (unique_name, self.name)) # Common core graphics method attributes fp.write("%s.projection = '%s'\n" % (unique_name, self.projection)) - fp.write( - "%s.xticlabels1 = '%s'\n" % - (unique_name, self.xticlabels1)) - fp.write( - "%s.xticlabels2 = '%s'\n" % - (unique_name, self.xticlabels2)) + fp.write("%s.xticlabels1 = '%s'\n" % (unique_name, self.xticlabels1)) + fp.write("%s.xticlabels2 = '%s'\n" % (unique_name, self.xticlabels2)) fp.write("%s.xmtics1 = '%s'\n" % (unique_name, self.xmtics1)) fp.write("%s.xmtics2 = '%s'\n" % (unique_name, self.xmtics2)) - fp.write( - "%s.yticlabels1 = '%s'\n" % - (unique_name, self.yticlabels1)) - fp.write( - "%s.yticlabels2 = '%s'\n" % - (unique_name, self.yticlabels2)) + fp.write("%s.yticlabels1 = '%s'\n" % (unique_name, self.yticlabels1)) + fp.write("%s.yticlabels2 = '%s'\n" % (unique_name, self.yticlabels2)) fp.write("%s.ymtics1 = '%s'\n" % (unique_name, self.ymtics1)) fp.write("%s.ymtics2 = '%s'\n" % (unique_name, self.ymtics2)) if isinstance(self.datawc_x1, (int, long, float)): fp.write("%s.datawc_x1 = %g\n" % (unique_name, self.datawc_x1)) else: - fp.write( - "%s.datawc_x1 = '%s'\n" % - (unique_name, self.datawc_x1)) + fp.write("%s.datawc_x1 = '%s'\n" % (unique_name, self.datawc_x1)) if isinstance(self.datawc_y1, (int, long, float)): fp.write("%s.datawc_y1 = %g\n" % (unique_name, self.datawc_y1)) else: - fp.write( - "%s.datawc_y1 = '%s'\n" % - (unique_name, self.datawc_y1)) + fp.write("%s.datawc_y1 = '%s'\n" % (unique_name, self.datawc_y1)) if isinstance(self.datawc_x2, (int, long, float)): fp.write("%s.datawc_x2 = %g\n" % (unique_name, self.datawc_x2)) else: - fp.write( - "%s.datawc_x2 = '%s'\n" % - (unique_name, self.datawc_x2)) + fp.write("%s.datawc_x2 = '%s'\n" % (unique_name, self.datawc_x2)) if isinstance(self.datawc_y2, (int, long, float)): fp.write("%s.datawc_y2 = %g\n" % (unique_name, self.datawc_y2)) else: - fp.write( - "%s.datawc_y2 = '%s'\n" % - (unique_name, self.datawc_y2)) - fp.write( - "%s.datawc_calendar = %g\n" % - (unique_name, self.datawc_calendar)) - fp.write( - "%s.datawc_timeunits = '%s'\n\n" % - (unique_name, self.datawc_timeunits)) - fp.write( - "%s.xaxisconvert = '%s'\n" % - (unique_name, self.xaxisconvert)) - fp.write( - "%s.yaxisconvert = '%s'\n" % - (unique_name, self.yaxisconvert)) + fp.write("%s.datawc_y2 = '%s'\n" % (unique_name, self.datawc_y2)) + fp.write("%s.datawc_calendar = %g\n" % (unique_name, self.datawc_calendar)) + fp.write("%s.datawc_timeunits = '%s'\n\n" % (unique_name, self.datawc_timeunits)) + fp.write("%s.xaxisconvert = '%s'\n" % (unique_name, self.xaxisconvert)) + fp.write("%s.yaxisconvert = '%s'\n" % (unique_name, self.yaxisconvert)) # Unique attribute for isoline - fp.write("%s.label = '%s'\n" % (unique_name, self.label)) - fp.write("%s.labelskipdistance = '%s'\n" % - (unique_name, self.labelskipdistance)) - fp.write("%s.labelbackgroundcolors = '%s'\n" % - (unique_name, self.labelbackgroundcolors)) - fp.write("%s.labelbackgroundopacities = '%s'\n" % - (unique_name, self.labelbackgroundopacities)) + fp.write("%s.label = %s\n" % (unique_name, self.label)) + fp.write("%s.labelskipdistance = %s\n" % (unique_name, self.labelskipdistance)) + fp.write("%s.labelbackgroundcolors = %s\n" % (unique_name, self.labelbackgroundcolors)) + fp.write("%s.labelbackgroundopacities = %s\n" % (unique_name, self.labelbackgroundopacities)) fp.write("%s.linetypes = %s\n" % (unique_name, self.linetypes)) fp.write("%s.linecolors = %s\n" % (unique_name, self.linecolors)) fp.write("%s.linewidths = %s\n" % (unique_name, self.linewidths)) fp.write("%s.text = %s\n" % (unique_name, self.text)) fp.write("%s.textcolors = %s\n" % (unique_name, self.textcolors)) fp.write("%s.level = %s\n\n" % (unique_name, self.level)) - - fp.write("%s.clockwise = '%s'\n" % (unique_name, self.clockwise)) - fp.write("%s.scale = '%s'\n" % (unique_name, self.scale)) - fp.write("%s.angle = '%s'\n" % (unique_name, self.angle)) - fp.write("%s.spacing = '%s'\n" % (unique_name, self.spacing)) - fp.write( - "%s.colormap = '%s'\n\n" % - (unique_name, repr( - self.colormap))) + fp.write("%s.clockwise = %s\n" % (unique_name, self.clockwise)) + fp.write("%s.scale = %s\n" % (unique_name, self.scale)) + fp.write("%s.angle = %s\n" % (unique_name, self.angle)) + fp.write("%s.spacing = %s\n" % (unique_name, self.spacing)) + if self.colormap is not None: + fp.write("%s.colormap = %s\n\n" % (unique_name, repr(self.colormap))) + else: + fp.write("%s.colormap = %s\n\n" % (unique_name, self.colormap)) else: # Json type mode += "+" diff --git a/vcs/line.py b/vcs/line.py index d65584bcf..4c17004a3 100755 --- a/vcs/line.py +++ b/vcs/line.py @@ -437,8 +437,7 @@ def script(self, script_filename=None, mode=None): fp.write("v=vcs.init()\n\n") unique_name = '__Tl__' + self.name - fp.write( - "#----------Line (Tl) member (attribute) listings ----------\n") + fp.write("#----------Line (Tl) member (attribute) listings ----------\n") fp.write("tl_list=v.listelements('line')\n") fp.write("if ('%s' in tl_list):\n" % self.name) fp.write(" %s = v.getline('%s')\n" % (unique_name, self.name)) @@ -449,16 +448,14 @@ def script(self, script_filename=None, mode=None): fp.write("%s.color = %s\n" % (unique_name, self.color)) fp.write("%s.priority = %d\n" % (unique_name, self.priority)) fp.write("%s.viewport = %s\n" % (unique_name, self.viewport)) - fp.write( - "%s.worldcoordinate = %s\n" % - (unique_name, self.worldcoordinate)) + fp.write("%s.worldcoordinate = %s\n" % (unique_name, self.worldcoordinate)) fp.write("%s.x = %s\n" % (unique_name, self.x)) fp.write("%s.y = %s\n\n" % (unique_name, self.y)) - fp.write("%s.projection = %s\n\n" % (unique_name, self.projection)) - fp.write( - "%s.colormap = '%s'\n\n" % - (unique_name, repr( - self.colormap))) + fp.write("%s.projection = '%s'\n\n" % (unique_name, self.projection)) + if self.colormap is not None: + fp.write("%s.colormap = %s\n\n" % (unique_name, repr(self.colormap))) + else: + fp.write("%s.colormap = %s\n\n" % (unique_name, self.colormap)) else: # Json type mode += "+" diff --git a/vcs/manageElements.py b/vcs/manageElements.py index 766904353..f0996ba3c 100644 --- a/vcs/manageElements.py +++ b/vcs/manageElements.py @@ -1428,7 +1428,7 @@ def gettextcombined(Tt_name_src='default', To_name_src=None, string=None, font=N height=None, angle=None, path=None, halign=None, valign=None): """%s - :param Tt_name_src: Name of created object + :param Tt_name_src: Name of parent texttable object :type Tt_name_src: `str`_ :param To_name_src: Name of parent textorientation object diff --git a/vcs/marker.py b/vcs/marker.py index 99290a7c4..22b5bec03 100755 --- a/vcs/marker.py +++ b/vcs/marker.py @@ -487,30 +487,25 @@ def script(self, script_filename=None, mode=None): fp.write("v=vcs.init()\n\n") unique_name = '__Tm__' + self.name - fp.write( - "#----------Marker (Tm) member (attribute) listings ----------\n") + fp.write("#----------Marker (Tm) member (attribute) listings ----------\n") fp.write("tm_list=v.listelements('marker')\n") fp.write("if ('%s' in tm_list):\n" % self.name) fp.write(" %s = v.getmarker('%s')\n" % (unique_name, self.name)) fp.write("else:\n") - fp.write( - " %s = v.createmarker('%s')\n" % - (unique_name, self.name)) + fp.write(" %s = v.createmarker('%s')\n" % (unique_name, self.name)) fp.write("%s.type = %s\n" % (unique_name, self.type)) fp.write("%s.size = %s\n" % (unique_name, self.size)) fp.write("%s.color = %s\n\n" % (unique_name, self.color)) fp.write("%s.priority = %d\n" % (unique_name, self.priority)) fp.write("%s.viewport = %s\n" % (unique_name, self.viewport)) - fp.write( - "%s.worldcoordinate = %s\n" % - (unique_name, self.worldcoordinate)) + fp.write("%s.worldcoordinate = %s\n" % (unique_name, self.worldcoordinate)) fp.write("%s.x = %s\n" % (unique_name, self.x)) fp.write("%s.y = %s\n" % (unique_name, self.y)) - fp.write("%s.projection = %s\n" % (unique_name, self.projection)) - fp.write( - "%s.colormap = '%s'\n\n" % - (unique_name, repr( - self.colormap))) + fp.write("%s.projection = '%s'\n" % (unique_name, self.projection)) + if self.colormap is not None: + fp.write("%s.colormap = %s\n\n" % (unique_name, repr(self.colormap))) + else: + fp.write("%s.colormap = %s\n\n" % (unique_name, self.colormap)) else: # Json type mode += "+" diff --git a/vcs/meshfill.py b/vcs/meshfill.py index 5cd5f03af..ca5acfad7 100644 --- a/vcs/meshfill.py +++ b/vcs/meshfill.py @@ -827,92 +827,57 @@ def script(self, script_filename, mode='a'): fp.write("v=vcs.init()\n\n") unique_name = '__Gfm__' + self.name - fp.write( - "#----------Meshfill (Gfm) member (attribute) listings ----------\n") + fp.write("#----------Meshfill (Gfm) member (attribute) listings ----------\n") fp.write("gfm_list=v.listelements('meshfill')\n") fp.write("if ('%s' in gfm_list):\n" % self.name) - fp.write( - " %s = v.getmeshfill('%s')\n" % - (unique_name, self.name)) + fp.write(" %s = v.getmeshfill('%s')\n" % (unique_name, self.name)) fp.write("else:\n") - fp.write( - " %s = v.createmeshfill('%s')\n" % - (unique_name, self.name)) + fp.write(" %s = v.createmeshfill('%s')\n" % (unique_name, self.name)) # Common core graphics method attributes fp.write("%s.projection = '%s'\n" % (unique_name, self.projection)) - fp.write( - "%s.xticlabels1 = '%s'\n" % - (unique_name, self.xticlabels1)) - fp.write( - "%s.xticlabels2 = '%s'\n" % - (unique_name, self.xticlabels2)) + fp.write("%s.xticlabels1 = '%s'\n" % (unique_name, self.xticlabels1)) + fp.write("%s.xticlabels2 = '%s'\n" % (unique_name, self.xticlabels2)) fp.write("%s.xmtics1 = '%s'\n" % (unique_name, self.xmtics1)) fp.write("%s.xmtics2 = '%s'\n" % (unique_name, self.xmtics2)) - fp.write( - "%s.yticlabels1 = '%s'\n" % - (unique_name, self.yticlabels1)) - fp.write( - "%s.yticlabels2 = '%s'\n" % - (unique_name, self.yticlabels2)) + fp.write("%s.yticlabels1 = '%s'\n" % (unique_name, self.yticlabels1)) + fp.write("%s.yticlabels2 = '%s'\n" % (unique_name, self.yticlabels2)) fp.write("%s.ymtics1 = '%s'\n" % (unique_name, self.ymtics1)) fp.write("%s.ymtics2 = '%s'\n" % (unique_name, self.ymtics2)) if isinstance(self.datawc_x1, (int, long, float)): fp.write("%s.datawc_x1 = %g\n" % (unique_name, self.datawc_x1)) else: - fp.write( - "%s.datawc_x1 = '%s'\n" % - (unique_name, self.datawc_x1)) + fp.write("%s.datawc_x1 = '%s'\n" % (unique_name, self.datawc_x1)) if isinstance(self.datawc_y1, (int, long, float)): fp.write("%s.datawc_y1 = %g\n" % (unique_name, self.datawc_y1)) else: - fp.write( - "%s.datawc_y1 = '%s'\n" % - (unique_name, self.datawc_y1)) + fp.write("%s.datawc_y1 = '%s'\n" % (unique_name, self.datawc_y1)) if isinstance(self.datawc_x2, (int, long, float)): fp.write("%s.datawc_x2 = %g\n" % (unique_name, self.datawc_x2)) else: - fp.write( - "%s.datawc_x2 = '%s'\n" % - (unique_name, self.datawc_x2)) + fp.write("%s.datawc_x2 = '%s'\n" % (unique_name, self.datawc_x2)) if isinstance(self.datawc_y2, (int, long, float)): fp.write("%s.datawc_y2 = %g\n" % (unique_name, self.datawc_y2)) else: - fp.write( - "%s.datawc_y2 = '%s'\n" % - (unique_name, self.datawc_y2)) - fp.write( - "%s.datawc_calendar = %g\n" % - (unique_name, self.datawc_calendar)) - fp.write( - "%s.datawc_timeunits = '%s'\n\n" % - (unique_name, self.datawc_timeunits)) - fp.write( - "%s.xaxisconvert = '%s'\n" % - (unique_name, self.xaxisconvert)) - fp.write( - "%s.yaxisconvert = '%s'\n" % - (unique_name, self.yaxisconvert)) + fp.write("%s.datawc_y2 = '%s'\n" % (unique_name, self.datawc_y2)) + fp.write("%s.datawc_calendar = %g\n" % (unique_name, self.datawc_calendar)) + fp.write("%s.datawc_timeunits = '%s'\n\n" % (unique_name, self.datawc_timeunits)) + fp.write("%s.xaxisconvert = '%s'\n" % (unique_name, self.xaxisconvert)) + fp.write("%s.yaxisconvert = '%s'\n" % (unique_name, self.yaxisconvert)) # Unique attribute for meshfill - fp.write("%s.ext_1 = '%s'\n" % (unique_name, self.ext_1)) - fp.write("%s.ext_2 = '%s'\n" % (unique_name, self.ext_2)) - fp.write("%s.levels = '%s'\n" % (unique_name, self.levels)) - fp.write( - "%s.fillareacolors = '%s'\n" % - (unique_name, self.fillareacolors)) - fp.write( - "%s.fillareastyle = '%s'\n" % - (unique_name, self.fillareastyle)) - fp.write( - "%s.fillareindices = '%s'\n" % - (unique_name, self.fillareaindices)) - fp.write("%s.legend = '%s'\n" % (unique_name, self.legend)) - fp.write("%s.mesh = '%s'\n" % (unique_name, self.mesh)) - fp.write("%s.wrap = '%s'\n" % (unique_name, self.wrap)) - fp.write("%s.missing = %g\n\n" % (unique_name, self.missing)) - fp.write( - "%s.colormap = '%s'\n\n" % - (unique_name, repr( - self.colormap))) + fp.write("%s.ext_1 = %s\n" % (unique_name, self.ext_1)) + fp.write("%s.ext_2 = %s\n" % (unique_name, self.ext_2)) + fp.write("%s.levels = %s\n" % (unique_name, self.levels)) + fp.write("%s.fillareacolors = %s\n" % (unique_name, self.fillareacolors)) + fp.write("%s.fillareastyle = '%s'\n" % (unique_name, self.fillareastyle)) + fp.write("%s.fillareaindices = %s\n" % (unique_name, self.fillareaindices)) + fp.write("%s.legend = %s\n" % (unique_name, self.legend)) + fp.write("%s.mesh = %s\n" % (unique_name, self.mesh)) + fp.write("%s.wrap = %s\n" % (unique_name, self.wrap)) + fp.write("%s.missing = %s\n\n" % (unique_name, repr(self.missing))) + if self.colormap is not None: + fp.write("%s.colormap = %s\n\n" % (unique_name, repr(self.colormap))) + else: + fp.write("%s.colormap = %s\n\n" % (unique_name, self.colormap)) else: # Json type mode += "+" diff --git a/vcs/textcombined.py b/vcs/textcombined.py index 4717412fc..47699dfa6 100644 --- a/vcs/textcombined.py +++ b/vcs/textcombined.py @@ -501,50 +501,48 @@ def script(self, script_filename=None, mode=None): fp.write("v=vcs.init()\n\n") unique_name = '__Tt__' + self.Tt_name - fp.write( - "#----------Text Table (Tt) member (attribute) listings ----------\n") - fp.write("tt_list=v.listelements('texttable')\n") - fp.write("if ('%s' in tt_list):\n" % self.Tt_name) - fp.write( - " %s = v.gettexttable('%s')\n" % - (unique_name, self.Tt_name)) - fp.write("else:\n") - fp.write( - " %s = v.createtexttable('%s')\n" % - (unique_name, self.Tt_name)) + fp.write("%s = v.createtexttable()\n" % unique_name) fp.write("%s.font = %g\n" % (unique_name, self.font)) fp.write("%s.spacing = %g\n" % (unique_name, self.spacing)) fp.write("%s.expansion = %g\n" % (unique_name, self.expansion)) - fp.write("%s.color = %g\n\n" % (unique_name, self.color)) - fp.write( - "%s.fillincolor = %g\n\n" % - (unique_name, self.fillincolor)) + fp.write("%s.color = %s\n\n" % (unique_name, repr(self.color))) + fp.write("%s.fillincolor = %g\n\n" % (unique_name, self.fillincolor)) fp.write("%s.priority = %d\n" % (unique_name, self.priority)) fp.write("%s.viewport = %s\n" % (unique_name, self.viewport)) - fp.write( - "%s.worldcoordinate = %s\n" % - (unique_name, self.worldcoordinate)) + fp.write("%s.worldcoordinate = %s\n" % (unique_name, self.worldcoordinate)) fp.write("%s.x = %s\n" % (unique_name, self.x)) fp.write("%s.y = %s\n\n" % (unique_name, self.y)) - fp.write("%s.projection = %s\n\n" % (unique_name, self.projection)) + fp.write("%s.projection = '%s'\n\n" % (unique_name, self.projection)) + tt_unique = unique_name unique_name = '__To__' + self.To_name - fp.write( - "#----------Text Orientation (To) member (attribute) listings ----------\n") - fp.write("to_list=v.listelements('textorientation')\n") - fp.write("if ('%s' in to_list):\n" % self.To_name) - fp.write( - " %s = v.gettextorientation('%s')\n" % - (unique_name, self.To_name)) - fp.write("else:\n") - fp.write( - " %s = v.createtextorientation('%s')\n" % - (unique_name, self.To_name)) + fp.write("#----------Text Orientation (To) member (attribute) listings ----------\n") + fp.write("%s = v.createtextorientation()\n" % unique_name) fp.write("%s.height = %g\n" % (unique_name, self.height)) fp.write("%s.angle = %g\n" % (unique_name, self.angle)) - fp.write("%s.path = '%s'\n" % (unique_name, self.path)) - fp.write("%s.halign = '%s'\n" % (unique_name, self.halign)) - fp.write("%s.valign = '%s'\n\n" % (unique_name, self.valign)) + if type(self.path) is str: + fp.write("%s.path = '%s'\n" % (unique_name, self.path)) + else: + fp.write("%s.path = %s\n" % (unique_name, self.path)) + if type(self.halign) is str: + fp.write("%s.halign = '%s'\n" % (unique_name, self.halign)) + else: + fp.write("%s.halign = %s\n" % (unique_name, self.halign)) + if type(self.valign) is str: + fp.write("%s.valign = '%s'\n\n" % (unique_name, self.valign)) + else: + fp.write("%s.valign = %s\n" % (unique_name, self.valign)) + fp.write("try:\n") + fp.write(" tt = vcs.gettexttable(%s)\n" % self.Tt_name) + fp.write(" vcs.removeobject(tt)\n") + fp.write("except:\n pass\n\n") + fp.write("try:\n") + fp.write(" to = vcs.gettextorientation(%s)\n" % self.To_name) + fp.write(" vcs.removeobject(to)\n") + fp.write("except:\n pass\n\n") + fp.write("#----------Text Combined (Tc) creation ----------\n") + fp.write("vcs.createtext(Tt_name='%s', To_name='%s', Tt_source=%s, To_source=%s)\n\n" + % (self.Tt_name, self.To_name, tt_unique, unique_name)) fp.close() else: # Json type diff --git a/vcs/textorientation.py b/vcs/textorientation.py index 3316907b5..7ac19de5c 100755 --- a/vcs/textorientation.py +++ b/vcs/textorientation.py @@ -343,22 +343,26 @@ def script(self, script_filename=None, mode=None): fp.write("v=vcs.init()\n\n") unique_name = '__To__' + self.name - fp.write( - "#----------Text Orientation (To) member (attribute) listings ----------\n") + fp.write("#----------Text Orientation (To) member (attribute) listings ----------\n") fp.write("to_list=v.listelements('textorientation')\n") fp.write("if ('%s' in to_list):\n" % self.name) - fp.write( - " %s = v.gettextorientation('%s')\n" % - (unique_name, self.name)) + fp.write(" %s = v.gettextorientation('%s')\n" % (unique_name, self.name)) fp.write("else:\n") - fp.write( - " %s = v.createtextorientation('%s')\n" % - (unique_name, self.name)) + fp.write(" %s = v.createtextorientation('%s')\n" % (unique_name, self.name)) fp.write("%s.height = %g\n" % (unique_name, self.height)) fp.write("%s.angle = %g\n" % (unique_name, self.angle)) - fp.write("%s.path = '%s'\n" % (unique_name, self.path)) - fp.write("%s.halign = '%s'\n" % (unique_name, self.halign)) - fp.write("%s.valign = '%s'\n\n" % (unique_name, self.valign)) + if type(self.path) is str: + fp.write("%s.path = '%s'\n" % (unique_name, self.path)) + else: + fp.write("%s.path = %s\n" % (unique_name, self.path)) + if type(self.halign) is str: + fp.write("%s.halign = '%s'\n" % (unique_name, self.halign)) + else: + fp.write("%s.halign = %s\n" % (unique_name, self.halign)) + if type(self.valign) is str: + fp.write("%s.valign = '%s'\n\n" % (unique_name, self.valign)) + else: + fp.write("%s.valign = %s\n\n" % (unique_name, self.valign)) fp.close() else: # Json type diff --git a/vcs/texttable.py b/vcs/texttable.py index ce60dcde1..29d2ec1dd 100755 --- a/vcs/texttable.py +++ b/vcs/texttable.py @@ -543,38 +543,29 @@ def script(self, script_filename=None, mode=None): fp.write("v=vcs.init()\n\n") unique_name = '__Tt__' + self.name - fp.write( - "#----------Text Table (Tt) member (attribute) listings ----------\n") + fp.write("#----------Text Table (Tt) member (attribute) listings ----------\n") fp.write("tt_list=v.listelements('texttable')\n") fp.write("if ('%s' in tt_list):\n" % self.name) - fp.write( - " %s = v.gettexttable('%s')\n" % - (unique_name, self.name)) + fp.write(" %s = v.gettexttable('%s')\n" % (unique_name, self.name)) fp.write("else:\n") - fp.write( - " %s = v.createtexttable('%s')\n" % - (unique_name, self.name)) + fp.write(" %s = v.createtexttable('%s')\n" % (unique_name, self.name)) fp.write("%s.font = %g\n" % (unique_name, self.font)) fp.write("%s.spacing = %g\n" % (unique_name, self.spacing)) fp.write("%s.expansion = %g\n" % (unique_name, self.expansion)) - fp.write("%s.color = %g\n\n" % (unique_name, self.color)) - fp.write("%s.backgroundcolor = %g\n\n" % (unique_name, self.backgroundcolor)) + fp.write("%s.color = %s\n\n" % (unique_name, repr(self.color))) + fp.write("%s.backgroundcolor = %s\n\n" % (unique_name, repr(self.backgroundcolor))) fp.write("%s.backgroundopacity = %g\n\n" % (unique_name, self.backgroundopacity)) - fp.write( - "%s.fillincolor = %g\n\n" % - (unique_name, self.fillincolor)) + fp.write("%s.fillincolor = %g\n\n" % (unique_name, self.fillincolor)) fp.write("%s.priority = %d\n" % (unique_name, self.priority)) fp.write("%s.viewport = %s\n" % (unique_name, self.viewport)) - fp.write( - "%s.worldcoordinate = %s\n" % - (unique_name, self.worldcoordinate)) + fp.write("%s.worldcoordinate = %s\n" % (unique_name, self.worldcoordinate)) fp.write("%s.x = %s\n" % (unique_name, self.x)) fp.write("%s.y = %s\n\n" % (unique_name, self.y)) - fp.write("%s.projection = %s\n\n" % (unique_name, self.projection)) - fp.write( - "%s.colormap = '%s'\n\n" % - (unique_name, repr( - self.colormap))) + fp.write("%s.projection = '%s'\n\n" % (unique_name, self.projection)) + if self.colormap is not None: + fp.write("%s.colormap = %s\n\n" % (unique_name, repr(self.colormap))) + else: + fp.write("%s.colormap = %s\n\n" % (unique_name, self.colormap)) else: # Json type mode += "+" diff --git a/vcs/unified1D.py b/vcs/unified1D.py index eac3897c9..584c3b5c1 100644 --- a/vcs/unified1D.py +++ b/vcs/unified1D.py @@ -923,17 +923,17 @@ def script(self, script_filename, mode='a'): "%s.yaxisconvert = '%s'\n" % (unique_name, self.yaxisconvert)) # Unique attribute for yxvsx - fp.write("%s.linetype = %s\n" % (unique_name, self.linetype)) + fp.write("%s.linetype = '%s'\n" % (unique_name, self.linetype)) fp.write("%s.linecolor = %s\n" % (unique_name, self.linecolor)) fp.write("%s.linewidth = %s\n" % (unique_name, self.linewidth)) - fp.write("%s.marker = %s\n" % (unique_name, self.marker)) + fp.write("%s.marker = '%s'\n" % (unique_name, self.marker)) fp.write("%s.markercolor = %s\n" % (unique_name, self.markercolor)) fp.write("%s.markersize = %s\n\n" % (unique_name, self.markersize)) - fp.write("%s.flip = '%s'\n\n" % (unique_name, repr(self.flip))) - fp.write( - "%s.colormap = '%s'\n\n" % - (unique_name, repr( - self.colormap))) + fp.write("%s.flip = %s\n\n" % (unique_name, repr(self.flip))) + if self.colormap is not None: + fp.write("%s.colormap = %s\n\n" % (unique_name, repr(self.colormap))) + else: + fp.write("%s.colormap = %s\n\n" % (unique_name, self.colormap)) else: # Json type mode += "+" diff --git a/vcs/vector.py b/vcs/vector.py index 1c35df949..c128d2b90 100755 --- a/vcs/vector.py +++ b/vcs/vector.py @@ -617,10 +617,12 @@ def _setline(self, l): line = property(_getline, _setline) def setLineAttributes(self, line): - ''' + """ Set attributes linecolor, linewidth and linetype from line l. l can be a line name defined in vcs.elements or a line object - ''' + :param line: + :return: + """ vcs.setLineAttributes(self, line) def _gettype(self): @@ -924,20 +926,19 @@ def script(self, script_filename=None, mode=None): "%s.yaxisconvert = '%s'\n" % (unique_name, self.yaxisconvert)) # Unique attribute for vector - fp.write("%s.line = %s\n" % (unique_name, self.line)) + fp.write("%s.linetype = %s\n" % (unique_name, self.linetype)) fp.write("%s.linecolor = %s\n" % (unique_name, self.linecolor)) fp.write("%s.linewidth = %s\n" % (unique_name, self.linewidth)) fp.write("%s.scale = %s\n" % (unique_name, self.scale)) - fp.write("%s.scaletype = %s\n" % (unique_name, self.scaletype)) + fp.write("%s.scaletype = %s\n" % (unique_name, repr(self.scaletype))) fp.write("%s.scalerange = %s\n" % (unique_name, self.scalerange)) - fp.write("%s.scaleoptions = %s\n" % (unique_name, self.scaleoptions)) fp.write("%s.alignment = '%s'\n" % (unique_name, self.alignment)) fp.write("%s.type = '%s'\n" % (unique_name, self.type)) - fp.write("%s.reference = %s\n\n" % (unique_name, self.reference)) - fp.write( - "%s.colormap = '%s'\n\n" % - (unique_name, repr( - self.colormap))) + fp.write("%s.reference = %g\n\n" % (unique_name, self.reference)) + if self.colormap is not None: + fp.write("%s.colormap = %s\n\n" % (unique_name, repr(self.colormap))) + else: + fp.write("%s.colormap = %s\n\n" % (unique_name, self.colormap)) else: # Json type mode += "+"