Skip to content

Commit ab0ed9c

Browse files
committed
Merge pull request #1039 from UV-CDAT/issue_1008_invalid_time_units
Fix #1008
2 parents ba6ca37 + 864be50 commit ab0ed9c

File tree

3 files changed

+18
-0
lines changed

3 files changed

+18
-0
lines changed

Packages/vcs/Lib/VTKPlots.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1249,6 +1249,7 @@ def renderTemplate(self,tmpl,data,gm,taxis,zaxis):
12491249
self.canvas.display_names.remove(d.name)
12501250
del(vcs.elements["display"][d.name])
12511251
if taxis is not None:
1252+
try:
12521253
tstr = str(cdtime.reltime(taxis[0],taxis.units).tocomp(taxis.getCalendar()))
12531254
#ok we have a time axis let's display the time
12541255
crdate = vcs2vtk.applyAttributesFromVCStmpl(tmpl,"crdate")
@@ -1280,7 +1281,10 @@ def renderTemplate(self,tmpl,data,gm,taxis,zaxis):
12801281
del(vcs.elements["texttable"][tt.name])
12811282
del(vcs.elements["textorientation"][to.name])
12821283
del(vcs.elements["textcombined"][crtime.name])
1284+
except:
1285+
pass
12831286
if zaxis is not None:
1287+
try:
12841288
# ok we have a zaxis to draw
12851289
zname = vcs2vtk.applyAttributesFromVCStmpl(tmpl,"zname")
12861290
zname.string=zaxis.id
@@ -1324,6 +1328,8 @@ def renderTemplate(self,tmpl,data,gm,taxis,zaxis):
13241328
del(vcs.elements["texttable"][tt.name])
13251329
del(vcs.elements["textorientation"][to.name])
13261330
del(vcs.elements["textcombined"][zvalue.name])
1331+
except:
1332+
pass
13271333
return returned
13281334

13291335

testing/vcs/CMakeLists.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -248,6 +248,10 @@ add_test(vcs_test_taylor_2_quads
248248

249249
# These test actually plot things need sample data
250250
if (CDAT_DOWNLOAD_SAMPLE_DATA)
251+
add_test(vcs_test_bad_time_units
252+
"${PYTHON_EXECUTABLE}"
253+
${cdat_SOURCE_DIR}/testing/vcs/test_vcs_bad_time_units.py
254+
)
251255
add_test(vcs_test_plot_file_varible
252256
"${PYTHON_EXECUTABLE}"
253257
${cdat_SOURCE_DIR}/testing/vcs/test_vcs_plot_file_var.py
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
import cdms2,vcs
2+
import os,sys
3+
4+
f=cdms2.open(os.path.join(sys.prefix,"sample_data","clt.nc"))
5+
s=f("clt",slice(0,1))
6+
s.getTime().units="XXX-))rvv"
7+
x=vcs.init()
8+
x.plot(s,bg=1)

0 commit comments

Comments
 (0)