merged conflict with master

two tests were inserted at the same location

Author: doutriaux1

Packages/vcs/Lib/configurator.py

@@ -553,7 +553,7 @@ def setup_animation(self):
             def get_frame():
                 return self.canvas.animate.frame_num
             anim_toolbar.add_slider_button(get_frame, 0, self.canvas.animate.number_of_frames(), "Time Slider", update=self.set_animation_frame)
-            anim_toolbar.add_slider_button(self.animation_speed, 1, 30, "Frames Per Second", update=self.set_animation_speed)
+            anim_toolbar.add_slider_button(self.animation_speed, 1, 100, "Speed (Step Delay)", update=self.set_animation_speed)
             self.save_anim_button = anim_toolbar.add_button(["Save Animation", "Cancel Save"], action=self.save_animation_press)
             self.initialized = True
 
@@ -582,7 +582,7 @@ def save_animation_press(self, state):
 
     def save_animation(self):
         # Save the animation
-        self.canvas.animate.fps(self.animation_speed)
+        self.canvas.animate.fps(int(1000.0 / self.animation_speed))
 
         data_titles = {}
         name_to_type = {}
@@ -625,10 +625,10 @@ def save_tick(self, obj, event):
 
     def set_animation_speed(self, value):
         v = int(value)
-        self.animation_speed = v
+        self.animation_speed = 10 * v
         if self.animation_timer is not None:
             self.interactor.DestroyTimer(self.animation_timer)
-            self.animation_timer = self.interactor.CreateRepeatingTimer(int(1000.0 / self.animation_speed))
+            self.animation_timer = self.interactor.CreateRepeatingTimer(self.animation_speed)
         return v
 
     def animate(self, obj, event):
@@ -638,7 +638,7 @@ def animate(self, obj, event):
 
     def start_animating(self):
         if self.animation_timer is None:
-            self.animation_timer = self.interactor.CreateRepeatingTimer(int(1000.0 / self.animation_speed))
+            self.animation_timer = self.interactor.CreateRepeatingTimer(self.animation_speed)
 
     def stop_animating(self):
         if self.animation_timer is not None:

Packages/vcs/Lib/template.py

@@ -912,7 +912,7 @@ def drawTicks(self,slab,gm,x,axis,number,vp,wc,bg=0,X=None,Y=None,**kargs):
                 for t in loc.keys():
                     loc[t]=''
         if isinstance(loc,str):
-          loc = vcs.elements["list"].get(loc,{})
+          loc = copy.copy(vcs.elements["list"].get(loc,{}))
         # Make sure the label passed are not outside the world coordinates
         dw1=1.E20
         dw2=1.E20

testing/vcs/CMakeLists.txt

@@ -247,7 +247,7 @@ cdat_add_test(vcs_test_taylor_2_quads
   cdat_add_test(vcs_test_1d_marker_not_shown_if_xaxis_flipped
     "${PYTHON_EXECUTABLE}"
     ${cdat_SOURCE_DIR}/testing/vcs/test_1d_marker_not_shown_if_xaxis_flipped.py
-    ${BASELINE_DIR}/test_1d_marker_not_shown_if_xaxis_flipped.png
+    "${BASELINE_DIR}/test_1d_marker_not_shown_if_xaxis_flipped.png"
     )
 
 
@@ -258,10 +258,15 @@ cdat_add_test(vcs_test_taylor_2_quads
       ${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
+      "${BASELINE_DIR}/test_lon_axes_freak_out.png"
+      )
     cdat_add_test(test_vcs_isofill_mask_cell_shift
       "${PYTHON_EXECUTABLE}"
       ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_isofill_mask_cell_shift.py
-      ${BASELINE_DIR}/test_vcs_isofill_mask_cell_shift.png
+      "${BASELINE_DIR}/test_vcs_isofill_mask_cell_shift.png"
       )
     cdat_add_test(vcs_test_bad_time_units
       "${PYTHON_EXECUTABLE}"

testing/vcs/test_lon_axes_freak_out.py

@@ -0,0 +1,29 @@
+import os,sys,vcs,cdms2
+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")
+s3=f("clt",longitude=(0,360))
+
+print s.shape,s3.shape
+
+
+x=vcs.init()
+x.drawlogooff()
+x.setbgoutputdimensions(1200,1091,units="pixels")
+
+x.plot(s,bg=1)
+x.clear()
+x.plot(s3,bg=1)
+
+fnm = "test_lon_axes_freak_out.png"
+
+x.png(fnm)
+print "fnm:",fnm
+print "src:",src
+ret = checkimage.check_result_image(fnm,src,checkimage.defaultThreshold)
+sys.exit(ret)