Commit 094e3120 authored by Aron Helser's avatar Aron Helser Committed by Kitware Robot

Merge topic 'add_test_data'

15263602 Add new test data, knee.ex2, and test behavior.
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Acked-by: David Thompson's avatarDavid Thompson <david.thompson@kitware.com>
Merge-request: !1735
parents 455469b6 15263602
......@@ -33,6 +33,7 @@
#include "vtkObjectFactory.h"
#include "vtkVersion.h"
#include "vtksys/SystemTools.hxx"
namespace
{
......@@ -71,7 +72,6 @@ void pqSMTKAppComponentsAutoStart::startup()
auto rsrcMgr = pqSMTKBehavior::instance(this);
auto renderResourceBehavior = pqSMTKRenderResourceBehavior::instance(this);
auto closeResourceBehavior = pqSMTKCloseResourceBehavior::instance(this);
auto saveOnCloseResourceBehavior = pqSMTKSaveOnCloseResourceBehavior::instance(this);
auto callObserversOnMainThread = pqSMTKCallObserversOnMainThreadBehavior::instance(this);
auto rsrcImportOpMgr = pqSMTKImportOperationBehavior::instance(this);
auto rsrcExportSimMgr = pqSMTKExportSimulationBehavior::instance(this);
......@@ -93,7 +93,12 @@ void pqSMTKAppComponentsAutoStart::startup()
{
pqCore->registerManager("smtk resource", rsrcMgr);
pqCore->registerManager("smtk render resource", renderResourceBehavior);
pqCore->registerManager("smtk save on close resource", saveOnCloseResourceBehavior);
// If we are running inside CTest, don't pop up dialogs on close.
if (!vtksys::SystemTools::GetEnv("DASHBOARD_TEST_FROM_CTEST"))
{
auto saveOnCloseResourceBehavior = pqSMTKSaveOnCloseResourceBehavior::instance(this);
pqCore->registerManager("smtk save on close resource", saveOnCloseResourceBehavior);
}
pqCore->registerManager("call observers on main thread", callObserversOnMainThread);
pqCore->registerManager("smtk close resource", closeResourceBehavior);
pqCore->registerManager("smtk import operation", rsrcImportOpMgr);
......@@ -115,7 +120,10 @@ void pqSMTKAppComponentsAutoStart::shutdown()
{
pqCore->unRegisterManager("smtk resource");
pqCore->unRegisterManager("smtk render resource");
pqCore->unRegisterManager("smtk save on close resource");
if (!vtksys::SystemTools::GetEnv("DASHBOARD_TEST_FROM_CTEST"))
{
pqCore->unRegisterManager("smtk save on close resource");
}
pqCore->unRegisterManager("call observers on main thread");
pqCore->unRegisterManager("smtk close resource");
pqCore->unRegisterManager("smtk import operation");
......
......@@ -96,7 +96,12 @@ vtkCMBParserBase* vtkCMBModelReadOperation::NewParser(vtkPolyData* MasterPoly)
vtkIntArray* version =
vtkIntArray::SafeDownCast(MasterPoly->GetFieldData()->GetArray(CMBFileVersionString));
if (!version || version->GetValue(0) == 1)
if (!version)
{
vtkErrorMacro("No Version in CMB file, unsupported.");
return NULL;
}
else if (version->GetValue(0) == 1)
{
vtkErrorMacro("Version 1 CMB file no longer supported.");
return NULL;
......
......@@ -11,6 +11,9 @@ utilities/gitsetup/SetupGitAliases.sh && echo &&
echo 'Failed to setup GitLab. Run this again to retry.') && echo &&
utilities/gitsetup/tips
echo "Initializing and updating git submodules..."
git submodule update --init --recursive
# Rebase master by default
git config rebase.stat true
git config branch.master.rebase true
......
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