Skip to content

Fixes issue with '.py' extension in script() functions #104

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
doutriaux1 merged 10 commits into from May 4, 2017
Merged

Fixes issue with '.py' extension in script() functions #104

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
b76a435
Fixes #2, Gfb.rename().
Sep 21, 2016
4f3d02d
Merge branch 'master' of github.com:UV-CDAT/vcs
Nov 14, 2016
ebdb17c
Merge branch 'master' of github.com:UV-CDAT/vcs
Nov 29, 2016
7ec7bb1
Fixes script() functions for:
Nov 30, 2016
489882a
Added test for script() fix
Dec 1, 2016
882fb24
Fixed all script functions to produce valid python scripts.
Dec 21, 2016
3ededeb
Removed old, bad script test
Jan 12, 2017
7bbe3a4
Update boxfill.py
doutriaux1 May 3, 2017
14c5bfd
fixed merge conflicts
doutriaux1 May 3, 2017
01946bd
flake8
doutriaux1 May 3, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
97 changes: 19 additions & 78 deletions vcs/boxfill.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 += "+"
Expand Down
19 changes: 2 additions & 17 deletions vcs/dv3d.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 += "+"
Expand Down
25 changes: 9 additions & 16 deletions vcs/fillarea.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand All @@ -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 += "+"
Expand Down
63 changes: 18 additions & 45 deletions vcs/isofill.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand All @@ -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 += "+"
Expand Down
Loading