Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Ben Boeckel
SMTK
Commits
2cbbbd8f
Commit
2cbbbd8f
authored
Aug 05, 2020
by
T.J. Corona
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Conditionally include components that require python
parent
77303ceb
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
23 additions
and
7 deletions
+23
-7
smtk/extension/paraview/appcomponents/plugin/CMakeLists.txt
smtk/extension/paraview/appcomponents/plugin/CMakeLists.txt
+12
-5
smtk/extension/paraview/appcomponents/plugin/pqSMTKAppComponentsAutoStart.cxx
...iew/appcomponents/plugin/pqSMTKAppComponentsAutoStart.cxx
+11
-2
No files found.
smtk/extension/paraview/appcomponents/plugin/CMakeLists.txt
View file @
2cbbbd8f
...
...
@@ -13,12 +13,8 @@ set(sources
pqSMTKColorByWidget.h
pqSMTKDisplayAttributeOnLoadBehavior.cxx
pqSMTKDisplayAttributeOnLoadBehavior.h
pqSMTKExportSimulationBehavior.cxx
pqSMTKExportSimulationBehavior.h
pqSMTKImportIntoResourceBehavior.cxx
pqSMTKImportIntoResourceBehavior.h
pqSMTKImportOperationBehavior.cxx
pqSMTKImportOperationBehavior.h
pqSMTKNewResourceBehavior.cxx
pqSMTKNewResourceBehavior.h
pqSMTKPipelineSelectionBehavior.cxx
...
...
@@ -109,10 +105,21 @@ set(CMAKE_AUTOUIC_SEARCH_PATHS
set
(
rc_files
resources/pqSMTKCloseResourceBehavior.qrc
resources/pqSMTKImportOperationBehavior.qrc
resources/pqSMTKSaveResourceBehavior.qrc
resources/pqSMTKSelectionFilterBehavior.qrc
)
if
(
SMTK_ENABLE_PYTHON_WRAPPING
)
list
(
APPEND sources
pqSMTKExportSimulationBehavior.cxx
pqSMTKExportSimulationBehavior.h
pqSMTKImportOperationBehavior.cxx
pqSMTKImportOperationBehavior.h
)
list
(
APPEND rc_files
resources/pqSMTKImportOperationBehavior.qrc
)
endif
()
set
(
interfaces
${
auto_start_interfaces
}
${
action_group_interfaces
}
...
...
smtk/extension/paraview/appcomponents/plugin/pqSMTKAppComponentsAutoStart.cxx
View file @
2cbbbd8f
...
...
@@ -15,9 +15,7 @@
#include "smtk/extension/paraview/appcomponents/plugin/pqSMTKCloseResourceBehavior.h"
#include "smtk/extension/paraview/appcomponents/plugin/pqSMTKCloseWithActiveOperationBehavior.h"
#include "smtk/extension/paraview/appcomponents/plugin/pqSMTKDisplayAttributeOnLoadBehavior.h"
#include "smtk/extension/paraview/appcomponents/plugin/pqSMTKExportSimulationBehavior.h"
#include "smtk/extension/paraview/appcomponents/plugin/pqSMTKImportIntoResourceBehavior.h"
#include "smtk/extension/paraview/appcomponents/plugin/pqSMTKImportOperationBehavior.h"
#include "smtk/extension/paraview/appcomponents/plugin/pqSMTKNewResourceBehavior.h"
#include "smtk/extension/paraview/appcomponents/plugin/pqSMTKPipelineSelectionBehavior.h"
#include "smtk/extension/paraview/appcomponents/plugin/pqSMTKRegisterImportersBehavior.h"
...
...
@@ -28,6 +26,11 @@
#include "smtk/extension/paraview/appcomponents/pqSMTKRenderResourceBehavior.h"
#include "smtk/extension/paraview/server/vtkSMSMTKWrapperProxy.h"
#ifdef SMTK_PYTHON_ENABLED
#include "smtk/extension/paraview/appcomponents/plugin/pqSMTKExportSimulationBehavior.h"
#include "smtk/extension/paraview/appcomponents/plugin/pqSMTKImportOperationBehavior.h"
#endif
#include "smtk/extension/qt/qtSMTKUtilities.h"
#include "pqApplicationCore.h"
...
...
@@ -72,8 +75,10 @@ void pqSMTKAppComponentsAutoStart::startup()
auto
renderResourceBehavior
=
pqSMTKRenderResourceBehavior
::
instance
(
this
);
auto
closeResourceBehavior
=
pqSMTKCloseResourceBehavior
::
instance
(
this
);
auto
callObserversOnMainThread
=
pqSMTKCallObserversOnMainThreadBehavior
::
instance
(
this
);
#ifdef SMTK_PYTHON_ENABLED
auto
rsrcImportOpMgr
=
pqSMTKImportOperationBehavior
::
instance
(
this
);
auto
rsrcExportSimMgr
=
pqSMTKExportSimulationBehavior
::
instance
(
this
);
#endif
auto
pipelineSync
=
pqSMTKPipelineSelectionBehavior
::
instance
(
this
);
auto
displayOnLoad
=
pqSMTKDisplayAttributeOnLoadBehavior
::
instance
(
this
);
...
...
@@ -104,8 +109,10 @@ void pqSMTKAppComponentsAutoStart::startup()
}
pqCore
->
registerManager
(
"call observers on main thread"
,
callObserversOnMainThread
);
pqCore
->
registerManager
(
"smtk close resource"
,
closeResourceBehavior
);
#ifdef SMTK_PYTHON_ENABLED
pqCore
->
registerManager
(
"smtk import operation"
,
rsrcImportOpMgr
);
pqCore
->
registerManager
(
"smtk export simulation"
,
rsrcExportSimMgr
);
#endif
pqCore
->
registerManager
(
"smtk save resource"
,
rsrcSaveMgr
);
pqCore
->
registerManager
(
"smtk new resource"
,
rsrcNewMgr
);
pqCore
->
registerManager
(
"smtk import into resource"
,
rsrcImportIntoMgr
);
...
...
@@ -137,8 +144,10 @@ void pqSMTKAppComponentsAutoStart::shutdown()
}
pqCore
->
unRegisterManager
(
"call observers on main thread"
);
pqCore
->
unRegisterManager
(
"smtk close resource"
);
#ifdef SMTK_PYTHON_ENABLED
pqCore
->
unRegisterManager
(
"smtk import operation"
);
pqCore
->
unRegisterManager
(
"smtk export simulation"
);
#endif
pqCore
->
unRegisterManager
(
"smtk save resource"
);
pqCore
->
unRegisterManager
(
"smtk new resource"
);
pqCore
->
unRegisterManager
(
"smtk import into resource"
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment