Merge pull request #1157 from UV-CDAT/vcs3D-return_to_shell_on_q_keypress_event

vcs3D-return_to_shell_on_q_keypress_event

Author: doutriaux1

Packages/DV3D/DV3DPlot.py

@@ -316,13 +316,12 @@ def refresh(self):
     def onClosing(self, cell ):
         print " ------> Closing!"
         self.stopAnimation()
-        if cell <> None:
-            self.cfgManager.parent.clear( cell )
-            self.terminate()
-            self.renderer.RemoveAllViewProps()
-            self.clearReferrents()
-            if self.renderWindowInteractor <> None:
-                self.renderWindowInteractor.TerminateApp()
+        self.cfgManager.parent.clear( cell )
+        self.terminate()
+        self.renderer.RemoveAllViewProps()
+        self.clearReferrents()
+        if self.renderWindowInteractor <> None:
+            self.renderWindowInteractor.TerminateApp()
 
 #         pipeline = DV3DPipelineHelper.getPipeline( cell_address, sheetName )
 #         if pipeline == None: pipeline = self.getCurrentPipeline()
@@ -338,11 +337,11 @@ def terminate( self ):
         pass
 
     def quit( self, **args ):
+        self.saveState()
+        self.onClosing(None)
         eventArgs = args.get( 'args', None )
         if eventArgs and ( eventArgs[1] == 'Q' ):
-            self.saveState()
-        self.onClosing(None)
-        sys.exit( 0 )
+            sys.exit( 0 )
 
     def stepAnimation(self, **args):
         if self.record_animation: self.captureFrame()

Packages/DV3D/demo/demo_plots/clt_demo.py

@@ -4,6 +4,6 @@
 f = cdms2.open(vcs.prefix+"/sample_data/clt.nc")
 v = f["clt"]
 dv3d = vcs.get3d_scalar()
-x.plot( v, dv3d )
+d = x.plot( v, dv3d )
 x.interact()