ENH: refs #990. Use new modular app, and use WAMP authentication feat…

…ures

modules/pvw/apps/midas.py

@@ -15,31 +15,20 @@
 from autobahn.wamp import exportRpc
 
 # import paraview modules.
-from paraview import simple, web, servermanager, web_helper
+from paraview import simple, web, servermanager, web_helper, paraviewweb_wamp, paraviewweb_protocols
 
 # Setup global variables
 timesteps = []
 currentTimeIndex = 0
-timekeeper = servermanager.ProxyManager().GetProxy("timekeeper", "TimeKeeper")
-pipeline = web_helper.Pipeline('Kitware')
 lutManager = web_helper.LookupTableManager()
 view = None
 dataPath = None
-
-# Initialize the render window
-def initView(width, height):
-  global view, lutManager
-
-  view = simple.GetRenderView()
-  simple.Render()
-  view.ViewSize = [width, height]
-  view.Background = [1, 1, 1]
-  view.OrientationAxesLabelColor = [0, 0, 0]
-  lutManager.setView(view)
-  print 'View created successfully (%dx%d)' % (width, height)
+authKey = None
+width = None
+height = None
 
 # This class defines the exposed RPC methods for the midas application
-class MidasApp(web.ParaViewServerProtocol):
+class MidasApp(paraviewweb_wamp.ServerProtocol):
   DISTANCE_FACTOR = 2.0
   CONTOUR_LINE_WIDTH = 2.0
 
@@ -59,6 +48,25 @@ class MidasApp(web.ParaViewServerProtocol):
   meshSlice = None
   surfaces = []
 
+  def initialize(self):
+    global view, lutManager, authKey, width, height
+    # Bring used components
+    self.registerParaViewWebProtocol(paraviewweb_protocols.ParaViewWebMouseHandler())
+    self.registerParaViewWebProtocol(paraviewweb_protocols.ParaViewWebViewPort())
+    self.registerParaViewWebProtocol(paraviewweb_protocols.ParaViewWebViewPortImageDelivery())
+    self.registerParaViewWebProtocol(paraviewweb_protocols.ParaViewWebViewPortGeometryDelivery())
+
+    view = simple.GetRenderView()
+    simple.Render()
+    view.ViewSize = [width, height]
+    view.Background = [1, 1, 1]
+    view.OrientationAxesLabelColor = [0, 0, 0]
+    lutManager.setView(view)
+    print 'View created successfully (%dx%d)' % (width, height)
+
+    # Update authentication key to use
+    self.updateSecret(authKey)
+
   def _extractVolumeImageData(self):
     if(self.srcObj.GetPointDataInformation().GetNumberOfArrays() == 0):
       print 'Error: no data information arrays'
@@ -422,5 +430,8 @@ def extractSubgrid(self, bounds):
     args = parser.parse_args()
 
     dataPath = args.path
-    initView(width=args.width, height=args.height)
+    authKey = args.authKey
+    width = args.width
+    height = args.height
+
     web.start_webserver(options=args, protocol=MidasApp)

modules/pvw/controllers/components/ParaviewComponent.php

@@ -80,7 +80,7 @@ public function createAndStartInstance($item, $meshItems, $appname, $progressDao
     $cmdArray = array($pvpython, $application,
                       '--port', $port,
                       '--data', $dataPath,
-                      //'--authkey', $instance->getSecret(),
+                      '-a', $instance->getSecret(),
                       '--timeout', '900');
 
     // Now start the instance

modules/pvw/public/js/paraview/paraview.common.js

@@ -52,7 +52,7 @@ midas.pvw._commonStart = function (text) {
             sessionURL: 'ws://'+location.hostname+':'+midas.pvw.instance.port+'/ws',
             id: midas.pvw.instance.instance_id,
             sessionManagerURL: json.global.webroot + '/pvw/paraview/instance',
-            authKey: midas.pvw.instance.secret,
+            secret: midas.pvw.instance.secret,
             interactiveQuality: 50
         };
         midas.pvw.start();