Commit 90963207 authored by Chris Harris's avatar Chris Harris
Browse files

Revert "Made some modules and proxies optional."

This reverts commit 80d8fcca.

Change-Id: I4e433d5355d6351afc09b3ccf00e89e70e5815a7
parent 80d8fcca
......@@ -47,17 +47,19 @@ if not paraview.compatibility.minor:
if not paraview.compatibility.major:
paraview.compatibility.minor = 5
from vtkPVServerImplementationCorePython import *
from vtkPVClientServerCoreCorePython import *
from vtkPVClientServerCoreRenderingPython import *
from vtkPVClientServerCoreDefaultPython import *
from vtkPVServerImplementationCorePython import *
from vtkPVServerImplementationRenderingPython import *
from vtkPVServerImplementationDefaultPython import *
from vtkPVServerManagerCorePython import *
try:
from vtkPVServerManagerRenderingPython import *
except:
print "Error: Cannot import vtkPVServerManagerRenderingPython"
try:
from vtkPVServerManagerApplicationPython import *
except:
print "Error: Cannot import vtkPVServerManagerApplicationPython"
from vtkPVServerManagerRenderingPython import *
from vtkPVServerManagerDefaultPython import *
from vtkPVServerManagerApplicationPython import *
from vtkPVCommonPython import *
def _wrap_property(proxy, smproperty):
......
......@@ -76,19 +76,13 @@ def Connect(ds_host=None, ds_port=11111, rs_host=None, rs_port=11111):
servermanager.ProxyManager().UpdateFromRemote()
tk = servermanager.ProxyManager().GetProxy("timekeeper", "TimeKeeper")
if not tk:
try:
tk = servermanager.misc.TimeKeeper()
servermanager.ProxyManager().RegisterProxy("timekeeper", "TimeKeeper", tk)
except AttributeError:
print "Error: Could not create TimeKeeper"
tk = servermanager.misc.TimeKeeper()
servermanager.ProxyManager().RegisterProxy("timekeeper", "TimeKeeper", tk)
scene = servermanager.ProxyManager().GetProxy("animation", "AnimationScene")
if not scene:
try:
scene = AnimationScene()
scene.TimeKeeper = tk
except NameError:
print "Error: Could not create AnimationScene"
scene = AnimationScene()
scene.TimeKeeper = tk
servermanager.ProxyManager().EnableStateUpdateNotification()
servermanager.ProxyManager().TriggerStateUpdate()
......@@ -660,15 +654,10 @@ def _create_func(key, module):
# Register pipeline objects with the time keeper. This is used to extract time values
# from sources. NOTE: This should really be in the servermanager controller layer.
if group == "sources":
has_tk = True
try:
tk = servermanager.ProxyManager().GetProxiesInGroup("timekeeper").values()[0]
except IndexError:
has_tk = False
if has_tk:
sources = tk.TimeSources
if not px in sources:
sources.append(px)
tk = servermanager.ProxyManager().GetProxiesInGroup("timekeeper").values()[0]
sources = tk.TimeSources
if not px in sources:
sources.append(px)
active_objects.source = px
except servermanager.MissingRegistrationInformation:
......
try:
from vtkCommonComputationalGeometryPython import *
except ImportError:
print "Error: Could not import vtkCommonComputationalGeometryPython"
from vtkCommonComputationalGeometryPython import *
from vtkCommonCorePython import *
from vtkCommonDataModelPython import *
from vtkCommonExecutionModelPython import *
try:
from vtkCommonMathPython import *
except ImportError:
print "Error: Could not import vtkCommonMathPython"
try:
from vtkCommonMiscPython import *
except ImportError:
print "Error: Could not import vtkCommonMiscPython"
try:
from vtkCommonSystemPython import *
except ImportError:
print "Error: Could not import vtkCommonSystemPython"
try:
from vtkCommonTransformsPython import *
except ImportError:
print "Error: Could not import vtkCommonTransformsPython"
from vtkCommonMathPython import *
from vtkCommonMiscPython import *
from vtkCommonSystemPython import *
from vtkCommonTransformsPython import *
from vtkFiltersProgrammablePython import *
from vtkParallelCorePython import *
try:
from vtkRenderingCorePython import vtkCamera
except ImportError:
print "Error: Could not import vtkRenderingCorePython"
from vtkRenderingCorePython import vtkCamera
# --------------------------------------
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment