Merge pull request #1178 from UV-CDAT/issue_1158_auto_magic_time_labels

Issue 1158 auto magic time labels

Author: David Lonie

Packages/vcs/Lib/utils.py

@@ -1472,6 +1472,8 @@ def monotonic(x):
     return numpy.all(dx <= 0) or numpy.all(dx >= 0)
 
 def getgraphicsmethod(type,name):
+    if type=="default":
+        type="boxfill"
     if isinstance(type,vcsaddons.core.VCSaddon):
         func = type.getgm
         copy_mthd=func(source = name)

testing/vcs/CMakeLists.txt

@@ -253,6 +253,11 @@ cdat_add_test(vcs_test_taylor_2_quads
 
   # These test actually plot things need sample data
   if (CDAT_DOWNLOAD_SAMPLE_DATA)
+    cdat_add_test(test_vcs_auto_time_labels
+      "${PYTHON_EXECUTABLE}"
+      ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_auto_time_labels.py
+      "${BASELINE_DIR}/test_vcs_auto_time_labels.png"
+      )
     cdat_add_test(test_vcs_lon_axes_freak_out
       "${PYTHON_EXECUTABLE}"
       ${cdat_SOURCE_DIR}/testing/vcs/test_lon_axes_freak_out.py

testing/vcs/test_vcs_auto_time_labels.py

@@ -0,0 +1,17 @@
+import vcs,cdms2,os,sys
+src=sys.argv[1]
+pth = os.path.join(os.path.dirname(__file__),"..")
+sys.path.append(pth)
+import checkimage
+f=cdms2.open(os.path.join(vcs.prefix,"sample_data","clt.nc"))
+s=f("clt",longitude=slice(34,35),squeeze=1)
+x=vcs.init()
+x.drawlogooff()
+x.setbgoutputdimensions(1200,1091,units="pixels")
+x.plot(s,bg=1)
+fnm = "test_vcs_auto_time_labels.png"
+x.png(fnm)
+print "fnm:",fnm
+print "src:",src
+ret = checkimage.check_result_image(fnm,src,checkimage.defaultThreshold)
+sys.exit(ret)