diff --git a/Vates/ParaviewPlugins/CMakeLists.txt b/Vates/ParaviewPlugins/CMakeLists.txt
deleted file mode 100644
index 7ddcbe9c57b204d04c61d7912c145050df3505bb..0000000000000000000000000000000000000000
--- a/Vates/ParaviewPlugins/CMakeLists.txt
+++ /dev/null
@@ -1,45 +0,0 @@
-# bring in Mantid/VATES API dependencies
-set_mantid_subprojects( Vates/VatesAPI )
-
-# vtktypemacro doesn't play nicely with -Wpedantic
-string(REPLACE "-Wpedantic" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
-
-# NonOrthogonalSourcePlugin is necessary for viewing materials with nonorthogonal basis vectors.
-# Copy it over to the pvplugins dir
-if("${CMAKE_CFG_INTDIR}" STREQUAL ".")
- # This is NOT a multi-configuration builder
- find_library(NonOrthogonalSourcePlugin_LOCATION name NonOrthogonalSource HINTS ${ParaView_DIR}/lib)
- file (COPY ${NonOrthogonalSourcePlugin_LOCATION} DESTINATION ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${PVPLUGINS_DIR}/${PVPLUGINS_SUBDIR})
-elseif(MSVC)
- # find_library won't find dlls only import libraries so just hardcode them
- # Release
- set( _pvplugins_dir ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/Release/${PVPLUGINS_DIR}/${PVPLUGINS_SUBDIR} )
- set( RUNTIME_LIB ${ParaView_DIR}/bin/Release/NonOrthogonalSource.dll )
- if (NOT ${_pvplugins_dir} )
- file( MAKE_DIRECTORY ${_pvplugins_dir} )
- file( COPY ${RUNTIME_LIB} DESTINATION ${_pvplugins_dir} )
- endif ()
- set( NonOrthogonalSourcePlugin_LOCATION ${RUNTIME_LIB} )
- # Debug
- set( RUNTIME_LIB_DEBUG ${ParaView_DIR}/bin/Debug/NonOrthogonalSource.dll )
- if (EXISTS ${RUNTIME_LIB_DEBUG})
- set( _pvplugins_dir ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/Debug/${PVPLUGINS_DIR}/${PVPLUGINS_SUBDIR} )
- if (NOT ${_pvplugins_dir} )
- file( MAKE_DIRECTORY ${_pvplugins_dir} )
- file( COPY ${RUNTIME_LIB_DEBUG} DESTINATION ${_pvplugins_dir} )
- endif ()
- # Don't install the debug as the packaging is broken under debug
- endif()
-else ()
- message ( WARNING "Unknown multi-configuration generator. Cannot copy NonOrthogonalSource plugin to our plugin directory." )
-endif()
-
-if ( (NOT APPLE) AND NonOrthogonalSourcePlugin_LOCATION)
- # make_package.rb handles this for OSX
- install( FILES ${NonOrthogonalSourcePlugin_LOCATION} DESTINATION ${PVPLUGINS_DIR}/${PVPLUGINS_SUBDIR} )
-endif()
-
-add_subdirectory( ParaViewFilters )
-add_subdirectory( ParaViewReaders )
-add_subdirectory( ParaViewSources )
-add_subdirectory( ParaViewWidgets )
diff --git a/Vates/VatesSimpleGui/ViewWidgets/CMakeLists.txt b/Vates/VatesSimpleGui/ViewWidgets/CMakeLists.txt
deleted file mode 100644
index ac64efd1a8b388f0ff2fc6b629ce186fa9dc514d..0000000000000000000000000000000000000000
--- a/Vates/VatesSimpleGui/ViewWidgets/CMakeLists.txt
+++ /dev/null
@@ -1,211 +0,0 @@
-project( MantidVatesSimpleGuiViewWidgets )
-
-# These are the C++ files to be compiled.
-set( INCLUDE_FILES
- inc/MantidVatesSimpleGuiViewWidgets/AutoScaleRangeGenerator.h
- inc/MantidVatesSimpleGuiViewWidgets/CameraManager.h
- inc/MantidVatesSimpleGuiViewWidgets/BackgroundRgbProvider.h
- inc/MantidVatesSimpleGuiViewWidgets/ColorMapEditorPanel.h
- inc/MantidVatesSimpleGuiViewWidgets/ColorSelectionWidget.h
- inc/MantidVatesSimpleGuiViewWidgets/ColorUpdater.h
- inc/MantidVatesSimpleGuiViewWidgets/LibHelper.h
- inc/MantidVatesSimpleGuiViewWidgets/MdViewerWidget.h
- inc/MantidVatesSimpleGuiViewWidgets/MultisliceView.h
- inc/MantidVatesSimpleGuiViewWidgets/pqCameraToolbarNonOrthogonalAxes.h
- inc/MantidVatesSimpleGuiViewWidgets/pqCameraReactionNonOrthogonalAxes.h
- inc/MantidVatesSimpleGuiViewWidgets/VatesParaViewApplication.h
- inc/MantidVatesSimpleGuiViewWidgets/RebinAlgorithmDialogProvider.h
- inc/MantidVatesSimpleGuiViewWidgets/PeaksTableControllerVsi.h
- inc/MantidVatesSimpleGuiViewWidgets/PeaksWidget.h
- inc/MantidVatesSimpleGuiViewWidgets/PeaksTabWidget.h
- inc/MantidVatesSimpleGuiViewWidgets/RebinnedSourcesManager.h
- inc/MantidVatesSimpleGuiViewWidgets/VisibleAxesColor.h
- inc/MantidVatesSimpleGuiViewWidgets/StandardView.h
- inc/MantidVatesSimpleGuiViewWidgets/SplatterPlotView.h
- inc/MantidVatesSimpleGuiViewWidgets/ThreesliceView.h
- inc/MantidVatesSimpleGuiViewWidgets/TimeControlWidget.h
- inc/MantidVatesSimpleGuiViewWidgets/ViewBase.h
- inc/MantidVatesSimpleGuiViewWidgets/WidgetDllOption.h
- inc/MantidVatesSimpleGuiViewWidgets/VsiApplyBehaviour.h
-)
-
-set( SOURCE_FILES
- src/AutoScaleRangeGenerator.cpp
- src/CameraManager.cpp
- src/BackgroundRgbProvider.cpp
- src/ColorMapEditorPanel.cpp
- src/ColorSelectionWidget.cpp
- src/ColorUpdater.cpp
- src/MdViewerWidget.cpp
- src/MultisliceView.cpp
- src/RebinAlgorithmDialogProvider.cpp
- src/PeaksTableControllerVsi.cpp
- src/PeaksTabWidget.cpp
- src/PeaksWidget.cpp
- src/pqCameraToolbarNonOrthogonalAxes.cpp
- src/pqCameraReactionNonOrthogonalAxes.cpp
- src/RebinnedSourcesManager.cpp
- src/VisibleAxesColor.cpp
- src/StandardView.cpp
- src/SplatterPlotView.cpp
- src/ThreesliceView.cpp
- src/TimeControlWidget.cpp
- src/VatesParaViewApplication.cpp
- src/ViewBase.cpp
- src/VsiApplyBehaviour.cpp
-)
-
-set( TEST_FILES
-)
-
-# These are the headers to be preprocessed using
-# Qt's moc preprocessor.
-qt4_wrap_cpp( MOC_SOURCES
- inc/MantidVatesSimpleGuiViewWidgets/ColorSelectionWidget.h
- inc/MantidVatesSimpleGuiViewWidgets/ColorMapEditorPanel.h
- inc/MantidVatesSimpleGuiViewWidgets/MdViewerWidget.h
- inc/MantidVatesSimpleGuiViewWidgets/MultisliceView.h
- inc/MantidVatesSimpleGuiViewWidgets/PeaksTableControllerVsi.h
- inc/MantidVatesSimpleGuiViewWidgets/PeaksWidget.h
- inc/MantidVatesSimpleGuiViewWidgets/PeaksTabWidget.h
- inc/MantidVatesSimpleGuiViewWidgets/pqCameraToolbarNonOrthogonalAxes.h
- inc/MantidVatesSimpleGuiViewWidgets/pqCameraReactionNonOrthogonalAxes.h
- inc/MantidVatesSimpleGuiViewWidgets/RebinnedSourcesManager.h
- inc/MantidVatesSimpleGuiViewWidgets/StandardView.h
- inc/MantidVatesSimpleGuiViewWidgets/SplatterPlotView.h
- inc/MantidVatesSimpleGuiViewWidgets/ThreesliceView.h
- inc/MantidVatesSimpleGuiViewWidgets/TimeControlWidget.h
- inc/MantidVatesSimpleGuiViewWidgets/VatesParaViewApplication.h
- inc/MantidVatesSimpleGuiViewWidgets/ViewBase.h
- inc/MantidVatesSimpleGuiViewWidgets/VsiApplyBehaviour.h
-)
-
-# These are the ui files to be processed using
-# Qt's ui file processor.
-qt4_wrap_ui( UI_BUILT_SOURCES
- inc/MantidVatesSimpleGuiViewWidgets/ColorSelectionWidget.ui
- inc/MantidVatesSimpleGuiViewWidgets/ColorMapEditorPanel.ui
- inc/MantidVatesSimpleGuiViewWidgets/MdViewerWidget.ui
- inc/MantidVatesSimpleGuiViewWidgets/MultisliceView.ui
- inc/MantidVatesSimpleGuiViewWidgets/PeaksWidget.ui
- inc/MantidVatesSimpleGuiViewWidgets/PeaksTabWidget.ui
- inc/MantidVatesSimpleGuiViewWidgets/pqCameraToolbarNonOrthogonalAxes.ui
- inc/MantidVatesSimpleGuiViewWidgets/StandardView.ui
- inc/MantidVatesSimpleGuiViewWidgets/SplatterPlotView.ui
- inc/MantidVatesSimpleGuiViewWidgets/ThreesliceView.ui
- inc/MantidVatesSimpleGuiViewWidgets/TimeControlWidget.ui
-)
-
-# Add the QtWidgets icons
-qt4_add_resources( RES_FILES icons/ViewWidgetsIcons.qrc )
-
-# Setup the include locations.
-include_directories(
- inc
- ${CMAKE_SOURCE_DIR}/MantidQt/API/inc
- ${CMAKE_SOURCE_DIR}/MantidQt/MantidWidgets/inc
- ${CMAKE_BINARY_DIR}/MantidQt/MantidWidgets
- ${CMAKE_SOURCE_DIR}/MantidQt/SliceViewer/inc
- ${CMAKE_BINARY_DIR}/MantidQt/SliceViewer
- ${CMAKE_SOURCE_DIR}/MantidQt/Factory/inc
- ${CMAKE_CURRENT_BINARY_DIR}
- ${CMAKE_CURRENT_BINARY_DIR}/../QtWidgets
- ${CMAKE_SOURCE_DIR}/MantidPlot/src
-)
-
-set( ALL_FILES
-${INCLUDE_FILES}
-${SOURCE_FILES}
-${MOC_SOURCES}
-${UI_BUILT_SOURCES}
-${RES_FILES}
-)
-
-set( TEST_SUITES
- test/suite_MDEventWorkspace
- test/suite_MDHistoWorkspace
-)
-
-# For Windows
-add_definitions( -DIN_MANTID_VATES_SIMPLEGUI_VIEWWIDGETS )
-# Add the target for this directory
-add_library( VatesSimpleGuiViewWidgets ${ALL_FILES} )
-# Set the name of the generated library
-set_target_properties( VatesSimpleGuiViewWidgets PROPERTIES OUTPUT_NAME MantidVatesSimpleGuiViewWidgets )
-# Add to the 'VatesSimpleGui' group in VS
-set_property( TARGET VatesSimpleGuiViewWidgets PROPERTY FOLDER MantidVatesSimpleGui )
-
-include_directories( SYSTEM ${PARAVIEW_INCLUDE_DIRS} ${QWT_INCLUDE_DIR} ${PYTHON_INCLUDE_DIR} )
-
-target_link_libraries( VatesSimpleGuiViewWidgets LINK_PRIVATE ${TCMALLOC_LIBRARIES_LINKTIME}
-pqApplicationComponents
-pqComponents
-${vtkjsoncpp_LIBRARIES}
-vtkPVServerManagerRendering
-vtkRenderingFreeType
-vtksys
-${QT_LIBRARIES}
-VatesSimpleGuiQtWidgets
-MantidQtAPI
-VatesAPI
-${MANTID_SUBPROJECT_LIBS}
-MantidQtSliceViewer
-MantidQtFactory
-${PYTHON_LIBRARIES}
-MantidWidgets
-${POCO_LIBRARIES}
-${Boost_LIBRARIES}
-)
-
-if (OSX_VERSION VERSION_GREATER 10.8)
- set_target_properties ( VatesSimpleGuiViewWidgets PROPERTIES INSTALL_RPATH "@loader_path/../Contents/MacOS;@loader_path/../Contents/Libraries")
-endif ()
-
-# Create test file projects
-include_directories ( SYSTEM ${CXXTEST_INCLUDE_DIR} ${GMOCK_INCLUDE_DIR} ${GTEST_INCLUDE_DIR} )
-
-include_directories( inc ../../../Framework/TestHelpers/inc ../../../Framework/DataHandling/inc ../../../Framework/DataObjects/inc)
-set ( TESTHELPER_SRCS ../../../Framework/TestHelpers/src/ComponentCreationHelper.cpp
- ../../../Framework/TestHelpers/src/InstrumentCreationHelper.cpp
- ../../../Framework/TestHelpers/src/WorkspaceCreationHelper.cpp
- ../../../Framework/TestHelpers/src/MDEventsTestHelper.cpp
- ../../../Framework/TestHelpers/src/StartFrameworkManager.cpp )
-cxxtest_add_test( VatesSimpleGuiViewWidgetsTest ${TEST_FILES} )
-
-target_link_libraries( VatesSimpleGuiViewWidgetsTest LINK_PRIVATE ${TCMALLOC_LIBRARIES_LINKTIME}
- VatesSimpleGuiViewWidgets
- ${vtkjsoncpp_LIBRARIES}
- DataHandling
- Kernel
- HistogramData
- DataObjects
- MantidQtAPI
- ${MANTID_SUBPROJECT_LIBS}
- ${POCO_LIBRARIES}
- ${Boost_LIBRARIES}
- ${GMOCK_LIBRARIES}
- ${GTEST_LIBRARIES} )
-
-add_dependencies( AllTests VatesSimpleGuiViewWidgetsTest )
-# Add to the 'UnitTests' group in VS
-set_property ( TARGET VatesSimpleGuiViewWidgetsTest PROPERTY FOLDER "UnitTests" )
-
-configure_file ( ${CMAKE_CURRENT_SOURCE_DIR}/inc/MantidVatesSimpleGuiViewWidgets/LibHelper.h.in
- ${CMAKE_CURRENT_SOURCE_DIR}/inc/MantidVatesSimpleGuiViewWidgets/LibHelper.h )
-
-if( SQUISH_FOUND )
- # Need to set the AUT first
- set( SQUISH_AUT MantidPlot )
- set( SQUISH_AUT_PATH $<TARGET_FILE_DIR:${SQUISH_AUT}> )
-
- # Need to set environmental variables next
- set( SQUISH_ENV_VARS
- PV_PLUGIN_PATH=$<TARGET_FILE_DIR:${SQUISH_AUT}>/${PVPLUGINS_DIR}/${PVPLUGINS_DIR}
- SCRIPTS_DIR=${CMAKE_CURRENT_SOURCE_DIR}/test/mp_scripts
- SQUISH_SCRIPT_DIR=${VSI_GLOBAL_SCRIPTS}:${CMAKE_CURRENT_SOURCE_DIR}/test/common/scripts
- )
- squish_add_test_suite( ${TEST_SUITES} )
-
-endif()
-
-install( TARGETS VatesSimpleGuiViewWidgets ${SYSTEM_PACKAGE_TARGET} DESTINATION ${PVPLUGINS_DIR} )
diff --git a/Vates/VatesSimpleGui/ViewWidgets/inc/MantidVatesSimpleGuiViewWidgets/MdViewerWidget.h b/Vates/VatesSimpleGui/ViewWidgets/inc/MantidVatesSimpleGuiViewWidgets/MdViewerWidget.h
deleted file mode 100644
index 67818824efba12da926825040e0d2c744fd8731b..0000000000000000000000000000000000000000
--- a/Vates/VatesSimpleGui/ViewWidgets/inc/MantidVatesSimpleGuiViewWidgets/MdViewerWidget.h
+++ /dev/null
@@ -1,300 +0,0 @@
-#ifndef MDVIEWERWIDGET_H_
-#define MDVIEWERWIDGET_H_
-
-#ifdef ERROR
-#undef ERROR
-#endif
-#include "ui_MdViewerWidget.h"
-#include "MantidQtAPI/MdConstants.h"
-#include "MantidQtAPI/MdSettings.h"
-#include "MantidQtAPI/VatesViewerInterface.h"
-#include "MantidQtAPI/WorkspaceObserver.h"
-#include "MantidVatesSimpleGuiViewWidgets/RebinAlgorithmDialogProvider.h"
-#include "MantidVatesSimpleGuiViewWidgets/RebinnedSourcesManager.h"
-#include "MantidVatesSimpleGuiViewWidgets/WidgetDllOption.h"
-#include "MantidVatesAPI/ColorScaleGuard.h"
-
-#include "vtkSmartPointer.h"
-
-#include "boost/optional.hpp"
-#include "boost/shared_ptr.hpp"
-
-// forward declaration of ParaQ classes
-class pqApplicationSettingsReaction;
-class pqLoadDataReaction;
-class pqPipelineSource;
-class pqSaveScreenshotReaction;
-
-// forward declaration of Qt classes
-class QAction;
-class QDragEnterEvent;
-class QDropEvent;
-class QEvent;
-class QHBoxLayout;
-class QObject;
-class QWidget;
-
-namespace Mantid {
-namespace Vates {
-namespace SimpleGui {
-
-class RotationPointDialog;
-class ViewBase;
-class RebinDialog;
-class ColorMapEditorPanel;
-/**
- *
- This class represents the central widget for handling VATES visualization
- operations for 3D and 4D datasets.
-
- @date 11/08/2011
-
- Copyright © 2011 ISIS Rutherford Appleton Laboratory, NScD Oak Ridge
- National Laboratory & European Spallation Source
-
- This file is part of Mantid.
-
- Mantid is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 3 of the License, or
- (at your option) any later version.
-
- Mantid is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
-
- File change history is stored at: <https://github.com/mantidproject/mantid>
- Code Documentation is available at: <http://doxygen.mantidproject.org>
- */
-class EXPORT_OPT_MANTIDVATES_SIMPLEGUI_VIEWWIDGETS MdViewerWidget
- : public MantidQt::API::VatesViewerInterface,
- MantidQt::API::WorkspaceObserver {
- Q_OBJECT
-
-public:
- /// Plugin mode constructor.
- MdViewerWidget();
- /// Standalone mode constructor.
- MdViewerWidget(QWidget *parent);
- /// Default destructor.
- ~MdViewerWidget() override;
-
- /// Add extra menus for standalone mode.
- void addMenus();
- /// Connect data loader.
- void connectLoadDataReaction(QAction *action);
- /// Filter events to check for hide.
- bool eventFilter(QObject *obj, QEvent *ev) override;
- /// See MantidQt::API::VatesViewerInterface
- void renderWorkspace(QString workspaceName, int workspaceType,
- std::string instrumentName) override;
- /// See MantidQt::API::VatesViewerInterface
- void setupPluginMode(int WsType, const std::string &instrumentName) override;
- /// Load the state of the window from a Mantid project file
- void loadFromProject(const std::string &lines) override;
- /// Save the state of the window to a Mantid project file
- std::string saveToProject(ApplicationWindow *app) override;
- /// Returns a list of workspace names that are used by this window
- std::vector<std::string> getWorkspaceNames() override;
- /// Returns the user friendly name of the window
- std::string getWindowName() override;
- /// Returns the type of the window
- std::string getWindowType() override;
-
-public slots:
- /// See MantidQt::API::VatesViewerInterface
- void shutdown() override;
-
-protected slots:
- /// Check for certain updates when an accept is fired.
- void checkForUpdates();
- /// Turn on/off the LOD threshold.
- void onLodToggled(bool state);
- /// Pop-up the rotation point dialog.
- void onRotationPoint();
- /// Show the wiki help in a browser.
- void onWikiHelp();
- /// Load and render data.
- void onDataLoaded(pqPipelineSource *source);
- /// Perform actions when rendering is done.
- void renderingDone();
- /// Execute view switch.
- void switchViews(ModeControlWidget::Views v);
- /// Triggered when panel is changed.
- void panelChanged();
- /// On rebin
- void onRebin(const std::string &algorithmType);
- /// On unbin
- void onUnbin();
- /// On switching an MDEvent source to a temporary source.
- void onSwitchSources(std::string rebinnedWorkspaceName,
- std::string sourceType);
- /// reset state of all the views
- void onResetViewsStateToAllData();
- void showOutputWidget();
-
-protected:
- /// Handle workspace preDeletion tasks.
- void
- preDeleteHandle(const std::string &wsName,
- const boost::shared_ptr<Mantid::API::Workspace> ws) override;
- /// Handle workspace replacement tasks.
- void afterReplaceHandle(
- const std::string &wsName,
- const boost::shared_ptr<Mantid::API::Workspace> ws) override;
- /// Detects if something is dragged onto the VSI
- void dragEnterEvent(QDragEnterEvent *e) override;
- /// Reacts to something being dropped onto the VSI
- void dropEvent(QDropEvent *e) override;
-
-private:
- Q_DISABLE_COPY(MdViewerWidget)
- boost::optional<unsigned long> m_axesTag;
- QString m_widgetName;
-
- ViewBase *currentView; ///< Holder for the current (shown) view
- ViewBase *hiddenView; ///< Holder for the view that is being switched from
- bool viewSwitched;
-
- pqLoadDataReaction *dataLoader; ///< Holder for the load data reaction
- double lodThreshold; ///< Default value for the LOD threshold (5 MB)
- QAction *lodAction; ///< Holder for the LOD threshold menu item
- bool pluginMode; ///< Flag to say widget is in plugin mode
- RotationPointDialog *rotPointDialog; ///< Holder for the rotation point dialog
- pqSaveScreenshotReaction *screenShot; ///< Holder for the screen shot reaction
- Ui::MdViewerWidgetClass ui; ///< The MD viewer's UI form
- QHBoxLayout *viewLayout; ///< Layout manager for the view widget
- pqApplicationSettingsReaction *
- viewSettings; ///< Holder for the view settings reaction
- bool useCurrentColorSettings;
- ModeControlWidget::Views initialView; ///< Holds the initial view
- MantidQt::API::MdSettings
- mdSettings; ///<Holds the MD settings which are used to persist data
- MantidQt::API::MdConstants mdConstants; /// < Holds the MD constants
- RebinAlgorithmDialogProvider m_rebinAlgorithmDialogProvider; ///<Provides
- /// dialogs to
- /// execute rebin
- /// algorithms
- RebinnedSourcesManager
- m_rebinnedSourcesManager; ///<Holds the rebinned sources manager
- QString m_rebinnedWorkspaceIdentifier; ///< Holds the identifier for temporary
- /// workspaces
- ColorMapEditorPanel *
- m_colorMapEditorPanel; ///< Holder for the color map editor panel.
- bool m_gridAxesStartUpOn; /// flag for the initial grid axes setting
- Mantid::VATES::ColorScaleLock
- m_colorScaleLock; ///< Holds a color scale lock object
-
- /// Holds the 'visual state' of the views. This relies on Load/SaveXMLState
- /// which
- /// produce/consume a vtk XML tree object. Otherwise, the properties to save
- /// would be,
- /// at least, the following. vtkCamera: Position, FocalPpoint, ViewUp,
- /// ViewAngle,
- /// ClippingRange. pqRenderView: CenterOfRotation, CenterAxesVisibility
- struct AllVSIViewsState {
- AllVSIViewsState();
- ~AllVSIViewsState();
- void initialize();
-
- vtkSmartPointer<vtkPVXMLElement> stateStandard;
- vtkSmartPointer<vtkPVXMLElement> stateMulti;
- vtkSmartPointer<vtkPVXMLElement> stateThreeSlice;
- vtkSmartPointer<vtkPVXMLElement> stateSplatter;
- };
- AllVSIViewsState m_allViews;
-
- /// Setup color selection widget connections.
- void connectColorSelectionWidget();
- /// Setup connections for all dialogs.
- void connectDialogs();
- /// Setup rotation point dialog connections.
- void connectRotationPointDialog();
- /// Add view specific stuff to a menu.
- void createMenus();
- /// Disconnect dialog connections.
- void disconnectDialogs();
- /// Consolidate constructor related items.
- void internalSetup(bool pMode);
- /// Perform first render and final setup for mode buttons.
- void renderAndFinalSetup();
- /// Set the signals/slots for the ParaView components based on the view.
- void setParaViewComponentsForView();
- /// Run the necessary setup for the main view.
- void setupMainView(ModeControlWidget::Views viewType);
- /// Creates the UI and mode switch connection.
- void setupUiAndConnections();
- /// Create the requested view.
- ViewBase *createAndSetMainViewWidget(QWidget *container,
- ModeControlWidget::Views v,
- bool createRenderProxy = true);
- /// Helper function to swap current and hidden view pointers.
- void swapViews();
- /// Update the state of application widgets.
- void updateAppState();
- /// Get the initial view for the current workspace and user setting
- ModeControlWidget::Views getInitialView(int workspaceType,
- const std::string &instrumentName);
- /// Check that the view is valid for teh workspace type
- ModeControlWidget::Views
- checkViewAgainstWorkspace(ModeControlWidget::Views view, int workspaceType);
- /// Get the technique associated with an instrument.
- const std::string
- getTechniqueForInstrument(const std::string &instrumentName) const;
- /// Get the view for a specified instrument
- QString getViewForInstrument(const std::string &instrument) const;
- /// Check if a technique contains a keyword
- bool checkIfTechniqueContainsKeyword(const std::set<std::string> &techniques,
- const std::string &keyword) const;
- /// Reset the current view to the appropriate initial view.
- void resetCurrentView(int workspaceType, const std::string &instrumentName);
- /// Render rebinned workspace
- pqPipelineSource *
- prepareRebinnedWorkspace(const std::string &rebinnedWorkspaceName,
- const std::string &sourceType);
- /// Handle drag and drop of peaks workspcaes
- void handleDragAndDropPeaksWorkspaces(QEvent *e, const QString &text,
- QStringList &wsNames);
- /// Set up the default color for the background of the view.
- void setColorForBackground();
- /// Sets axes colors that are visible against the background.
- void setVisibleAxesColors();
- /// Set the color map
- void setColorMap();
- /// Render the original workspace
- pqPipelineSource *
- renderOriginalWorkspace(const std::string &originalWorkspaceName);
-
- /// Remove the rebinning when switching views or otherwise.
- void
- removeRebinning(pqPipelineSource *source, bool forced,
- ModeControlWidget::Views view = ModeControlWidget::STANDARD);
- /// Remove all rebinned sources
- void removeAllRebinning(ModeControlWidget::Views view);
- /// Sets a listener for when sources are being destroyed
- void setDestroyedListener();
-
- /// Save the state of the currently shown view so its state can be restored
- /// when switching back to it
- void saveViewState(ViewBase *view);
- /// Restore the state of the next (new) view when switching to it
- void restoreViewState(ViewBase *view, ModeControlWidget::Views vtype);
- /// Get the current grid axes setting
- bool areGridAxesOn();
- /// Load the state of VSI from an XML file
- bool loadVSIState(const std::string &fileName);
- /// Setup the view using the last active view and source from a project
- void setupViewFromProject(ModeControlWidget::Views vtype);
- /// Set the active objects on the current server
- void setActiveObjects(pqView *view, pqPipelineSource *source);
-};
-
-} // SimpleGui
-} // Vates
-} // Mantid
-
-#endif // MDVIEWERWIDGET_H_
diff --git a/Vates/VatesSimpleGui/ViewWidgets/src/MdViewerWidget.cpp b/Vates/VatesSimpleGui/ViewWidgets/src/MdViewerWidget.cpp
deleted file mode 100644
index d2d4a02ecfa6027ef2985e4b41bb2976ba2c1d82..0000000000000000000000000000000000000000
--- a/Vates/VatesSimpleGui/ViewWidgets/src/MdViewerWidget.cpp
+++ /dev/null
@@ -1,1813 +0,0 @@
-#include <Poco/File.h>
-#include <boost/regex.hpp>
-#include <boost/shared_ptr.hpp>
-#include <set>
-#include <string>
-#include <utility>
-#include <vector>
-
-#include "MantidAPI/AnalysisDataService.h"
-#include "MantidAPI/IMDEventWorkspace.h"
-#include "MantidAPI/IMDHistoWorkspace.h"
-#include "MantidAPI/IPeaksWorkspace.h"
-#include "MantidKernel/ConfigService.h"
-#include "MantidKernel/DynamicFactory.h"
-#include "MantidKernel/InstrumentInfo.h"
-#include "MantidKernel/Logger.h"
-#include "MantidKernel/UsageService.h"
-#include "MantidQtAPI/InterfaceManager.h"
-#include "MantidQtAPI/MantidDesktopServices.h"
-#include "MantidQtAPI/MdConstants.h"
-#include "MantidQtAPI/MdSettings.h"
-#include "MantidQtAPI/TSVSerialiser.h"
-#include "MantidVatesSimpleGuiQtWidgets/ModeControlWidget.h"
-#include "MantidVatesSimpleGuiQtWidgets/RotationPointDialog.h"
-#include "MantidVatesSimpleGuiViewWidgets/ColorMapEditorPanel.h"
-#include "MantidVatesSimpleGuiViewWidgets/ColorSelectionWidget.h"
-#include "MantidVatesSimpleGuiViewWidgets/MdViewerWidget.h"
-#include "MantidVatesSimpleGuiViewWidgets/MultisliceView.h"
-#include "MantidVatesSimpleGuiViewWidgets/SplatterPlotView.h"
-#include "MantidVatesSimpleGuiViewWidgets/StandardView.h"
-#include "MantidVatesSimpleGuiViewWidgets/ThreesliceView.h"
-#include "MantidVatesSimpleGuiViewWidgets/TimeControlWidget.h"
-#include "MantidVatesSimpleGuiViewWidgets/VatesParaViewApplication.h"
-#include "MantidVatesSimpleGuiViewWidgets/VsiApplyBehaviour.h"
-
-#include "boost/shared_ptr.hpp"
-#include "boost/scoped_ptr.hpp"
-
-#include <pqActiveObjects.h>
-#include <pqAnimationManager.h>
-#include <pqAnimationScene.h>
-#include <pqApplicationCore.h>
-#include <pqApplicationSettingsReaction.h>
-#include <pqApplyBehavior.h>
-#include <pqDeleteReaction.h>
-#include <pqLoadDataReaction.h>
-#include <pqObjectBuilder.h>
-#include <pqPVApplicationCore.h>
-#include <pqParaViewBehaviors.h>
-#include <pqPipelineFilter.h>
-#include <pqPipelineRepresentation.h>
-#include <pqPipelineSource.h>
-#include <pqRenderView.h>
-#include <pqSaveScreenshotReaction.h>
-#include <pqServer.h>
-#include <pqServerManagerModel.h>
-#include <pqSettings.h>
-#include <pqStatusBar.h>
-#include <vtkCamera.h>
-#include <vtkCommand.h>
-#include <vtkMathTextUtilities.h>
-#include <vtkPVOrthographicSliceView.h>
-#include <vtkPVXMLElement.h>
-#include <vtkPVXMLParser.h>
-#include <vtkSMDoubleVectorProperty.h>
-#include <vtkSMPropertyHelper.h>
-#include <vtkSMProxy.h>
-#include <vtkSMProxyManager.h>
-#include <vtkSMReaderFactory.h>
-#include <vtkSMRenderViewProxy.h>
-#include <vtkSMSessionProxyManager.h>
-#include <vtkSMSourceProxy.h>
-#include <vtkSMViewProxy.h>
-#include <vtksys/SystemTools.hxx>
-
-// Used for plugin mode
-#include <pqAlwaysConnectedBehavior.h>
-#include <pqAutoLoadPluginXMLBehavior.h>
-#include <pqCollaborationBehavior.h>
-#include <pqCommandLineOptionsBehavior.h>
-#include <pqCrashRecoveryBehavior.h>
-#include <pqDataTimeStepBehavior.h>
-#include <pqDataRepresentation.h>
-#include <pqDefaultViewBehavior.h>
-#include <pqInterfaceTracker.h>
-#include <pqObjectPickingBehavior.h>
-#include <pqPipelineContextMenuBehavior.h>
-#include <pqPipelineSource.h>
-#include <pqPluginManager.h>
-#include <pqPluginSettingsBehavior.h>
-#include <pqServer.h>
-#include <pqServerManagerModel.h>
-#include <pqSpreadSheetVisibilityBehavior.h>
-#include <pqStandardPropertyWidgetInterface.h>
-#include <pqStandardViewFrameActionsImplementation.h>
-#include <pqUndoRedoBehavior.h>
-#include <pqView.h>
-#include <pqViewStreamingBehavior.h>
-#include <pqVerifyRequiredPluginBehavior.h>
-#include <pqSaveDataReaction.h>
-
-#include <QAction>
-#include <QDragEnterEvent>
-#include <QDropEvent>
-#include <QHBoxLayout>
-#include <QMainWindow>
-#include <QMenuBar>
-#include <QModelIndex>
-#include <QUrl>
-#include <QWidget>
-#include <QMessageBox>
-#include <QRect>
-
-namespace Mantid {
-namespace Vates {
-namespace SimpleGui {
-using namespace Mantid::API;
-using namespace MantidQt::API;
-
-namespace {
-Mantid::Kernel::Logger g_log("MdViewerWidget");
-}
-
-REGISTER_VATESGUI(MdViewerWidget)
-
-MdViewerWidget::AllVSIViewsState::AllVSIViewsState() { initialize(); }
-
-/**
- * Initializes the views states with new empty values. This can be
- * used to contruct or to re-initialize (forget) the states.
- */
-void MdViewerWidget::AllVSIViewsState::initialize() {
- // these will be assigned from vtkSMProxy::SaveXMLState which
- // allocates a new tree with vtkPVXMLElement::New();
- stateStandard = vtkSmartPointer<vtkPVXMLElement>::New();
- stateMulti = vtkSmartPointer<vtkPVXMLElement>::New();
- stateThreeSlice = vtkSmartPointer<vtkPVXMLElement>::New();
- stateSplatter = vtkSmartPointer<vtkPVXMLElement>::New();
-}
-
-MdViewerWidget::AllVSIViewsState::~AllVSIViewsState() {}
-
-/**
- * This constructor is used in the plugin mode operation of the VSI.
- */
-MdViewerWidget::MdViewerWidget()
- : VatesViewerInterface(), currentView(nullptr),
-
- hiddenView(nullptr), viewSwitched(false), dataLoader(nullptr),
- lodAction(nullptr), screenShot(nullptr), viewLayout(nullptr),
- viewSettings(nullptr), useCurrentColorSettings(false),
- initialView(ModeControlWidget::STANDARD),
- m_rebinAlgorithmDialogProvider(this),
- m_rebinnedWorkspaceIdentifier("_tempvsi"), m_colorMapEditorPanel(nullptr),
- m_gridAxesStartUpOn(true), m_allViews() {
- // this will initialize the ParaView application if needed.
- VatesParaViewApplication::instance();
-
- // Calling workspace observer functions.
- observeAfterReplace();
- observePreDelete();
- observeADSClear();
-
- this->internalSetup(true);
-
- setAcceptDrops(true);
- // Connect the rebinned sources manager
- QObject::connect(&m_rebinnedSourcesManager,
- SIGNAL(switchSources(std::string, std::string)), this,
- SLOT(onSwitchSources(std::string, std::string)));
-}
-
-/**
- * This constructor is used in the standalone mode operation of the VSI.
- * @param parent the parent widget for the main window
- */
-MdViewerWidget::MdViewerWidget(QWidget *parent)
- : VatesViewerInterface(parent), m_rebinAlgorithmDialogProvider(this) {
-
- // this will initialize the ParaView application if needed.
- VatesParaViewApplication::instance();
-
- // We're in the standalone application mode
- this->internalSetup(false);
- this->setupUiAndConnections();
- this->setupMainView(ModeControlWidget::STANDARD);
-}
-
-MdViewerWidget::~MdViewerWidget() {}
-
-/**
- * This function consolidates setting up some of the internal members between
- * the standalone and plugin modes.
- * @param pMode flag to set the plugin mode
- */
-void MdViewerWidget::internalSetup(bool pMode) {
- static int widgetNumber = 0;
- this->m_widgetName = QString("MdViewerWidget%1").arg(widgetNumber++);
- this->pluginMode = pMode;
- this->rotPointDialog = nullptr;
- this->lodThreshold = 5.0;
- this->viewSwitched = false;
-}
-
-/**
- * This function sets up the UI components and connects some of the main
- * window's control buttons.
- */
-void MdViewerWidget::setupUiAndConnections() {
- this->ui.setupUi(this);
- this->ui.splitter_2->setStretchFactor(1, 1);
- this->ui.splitter_3->setStretchFactor(0, 1);
- this->ui.statusBar->setSizeGripEnabled(false);
-
- QObject::connect(this->ui.modeControlWidget,
- SIGNAL(executeSwitchViews(ModeControlWidget::Views)), this,
- SLOT(switchViews(ModeControlWidget::Views)));
-
- // Setup rotation point button
- QObject::connect(this->ui.resetViewsStateToAllData, SIGNAL(released()), this,
- SLOT(onResetViewsStateToAllData()));
-
- // Setup rotation point button
- QObject::connect(this->ui.resetCenterToPointButton, SIGNAL(clicked()), this,
- SLOT(onRotationPoint()));
-
- QObject::connect(this->ui.outputWidget,
- SIGNAL(messageDisplayed(const QString &, int)),
- SLOT(showOutputWidget()));
-
- this->ui.outputWidget->setWindowFlags(Qt::Window);
- this->ui.outputWidget->setWindowTitle("Output Messages");
- this->ui.outputWidget->hide();
-
- /// Provide access to the color-editor panel for the application.
- if (!m_colorMapEditorPanel) {
- m_colorMapEditorPanel = new ColorMapEditorPanel(this);
- m_colorMapEditorPanel->setUpPanel();
- }
-
- QAction *temp = new QAction(this);
- pqDeleteReaction *deleteHandler = new pqDeleteReaction(temp);
- deleteHandler->connect(this->ui.propertiesPanel,
- SIGNAL(deleteRequested(pqPipelineSource *)),
- SLOT(deleteSource(pqPipelineSource *)));
-
- VsiApplyBehaviour *applyBehavior =
- new VsiApplyBehaviour(&m_colorScaleLock, this);
-
- applyBehavior->registerPanel(this->ui.propertiesPanel);
- VatesParaViewApplication::instance()->setupParaViewBehaviors();
- g_log.warning("Annotation Name: " + m_widgetName.toStdString());
-
- // Connect the rebinned sources manager
- QObject::connect(&m_rebinnedSourcesManager,
- SIGNAL(triggerAcceptForNewFilters()),
- this->ui.propertiesPanel, SLOT(apply()));
-
- // Add the color scale lock to the ColoSelectionWidget, which should
- // now be initialized
- ui.colorSelectionWidget->setColorScaleLock(&m_colorScaleLock);
-}
-
-void MdViewerWidget::panelChanged() { this->currentView->renderAll(); }
-
-/**
- * This function places the standard view to the main window, installs an
- * event filter, tweaks the UI layout for the view and calls the routine that
- * sets up connections between ParaView and the main window widgets.
- */
-void MdViewerWidget::setupMainView(ModeControlWidget::Views viewType) {
- // Commented this out to only use Mantid supplied readers
- // Initialize all readers available to ParaView. Now our application can load
- // all types of datasets supported by ParaView.
- // vtkSMProxyManager::GetProxyManager()->GetReaderFactory()->RegisterPrototypes("sources");
-
- // Set the view at startup to view, the view will be changed, depending on
- // the workspace
- this->currentView =
- this->createAndSetMainViewWidget(this->ui.viewWidget, viewType);
- this->initialView = viewType;
- this->currentView->installEventFilter(this);
-
- // Create a layout to manage the view properly
- this->viewLayout = new QHBoxLayout(this->ui.viewWidget);
- this->viewLayout->setMargin(0);
- this->viewLayout->setStretch(0, 1);
- this->viewLayout->addWidget(this->currentView);
-
- this->setParaViewComponentsForView();
-}
-
-/**
- * This function connects ParaView's data loader the given action.
- * @param action the action to connect data loading to
- */
-void MdViewerWidget::connectLoadDataReaction(QAction *action) {
- // We want the actionLoad to result in the showing up the ParaView's OpenData
- // dialog letting the user pick from one of the supported file formats.
- this->dataLoader = new pqLoadDataReaction(action);
- QObject::connect(this->dataLoader, SIGNAL(loadedData(pqPipelineSource *)),
- this, SLOT(onDataLoaded(pqPipelineSource *)));
-}
-
-/**
- * This function creates the requested view on the main window. It also
- * registers a usage of the view with the UsageService.
- * @param container the UI widget to associate the view mode with
- * @param v the view mode to set on the main window
- * @param createRenderProxy :: whether to create a default render proxy for
- * the view
- * @return the requested view
- */
-ViewBase *MdViewerWidget::createAndSetMainViewWidget(QWidget *container,
- ModeControlWidget::Views v,
- bool createRenderProxy) {
- ViewBase *view;
- std::string featureName("VSI:");
- switch (v) {
- case ModeControlWidget::STANDARD: {
- view = new StandardView(container, &m_rebinnedSourcesManager,
- createRenderProxy);
- featureName += "StandardView";
- } break;
- case ModeControlWidget::THREESLICE: {
- view = new ThreeSliceView(container, &m_rebinnedSourcesManager,
- createRenderProxy);
- featureName += "ThreeSliceView";
- } break;
- case ModeControlWidget::MULTISLICE: {
- view = new MultiSliceView(container, &m_rebinnedSourcesManager,
- createRenderProxy);
- featureName += "MultiSliceView";
- } break;
- case ModeControlWidget::SPLATTERPLOT: {
- view = new SplatterPlotView(container, &m_rebinnedSourcesManager,
- createRenderProxy);
- featureName += "SplatterPlotView";
- } break;
- default:
- view = nullptr;
- break;
- }
-
- // Set the colorscale lock
- view->setColorScaleLock(&m_colorScaleLock);
-
- using Mantid::Kernel::UsageService;
- UsageService::Instance().registerFeatureUsage("Interface", featureName,
- false);
- return view;
-}
-
-/**
- * This function is responsible for setting up all the connections between
- * ParaView's pqPipelineBrowser and pqProxyTabWidget and cetatin main window
- * widgets.
- */
-void MdViewerWidget::setParaViewComponentsForView() {
- // Extra setup stuff to hook up view to other items
- // this->ui.propertiesPanel->setView(this->currentView->getView());
- this->ui.pipelineBrowser->setActiveView(this->currentView->getView());
-
- pqActiveObjects *activeObjects = &pqActiveObjects::instance();
- QObject::connect(activeObjects, SIGNAL(portChanged(pqOutputPort *)),
- this->ui.propertiesPanel,
- SLOT(setOutputPort(pqOutputPort *)));
-
- QObject::connect(activeObjects,
- SIGNAL(representationChanged(pqDataRepresentation *)),
- this->ui.propertiesPanel,
- SLOT(setRepresentation(pqDataRepresentation *)));
-
- QObject::connect(activeObjects, SIGNAL(viewChanged(pqView *)),
- this->ui.propertiesPanel, SLOT(setView(pqView *)));
-
- QObject::connect(this->currentView, SIGNAL(triggerAccept()),
- this->ui.propertiesPanel, SLOT(apply()));
- QObject::connect(this->ui.propertiesPanel, SIGNAL(applied()), this,
- SLOT(checkForUpdates()));
-
- QObject::connect(this->currentView, SIGNAL(renderingDone()), this,
- SLOT(renderingDone()));
-
- SplatterPlotView *spv = dynamic_cast<SplatterPlotView *>(this->currentView);
- if (spv) {
- QObject::connect(this->ui.propertiesPanel, SIGNAL(applied()), spv,
- SLOT(checkPeaksCoordinates()));
- QObject::connect(spv, SIGNAL(toggleOrthographicProjection(bool)),
- this->ui.parallelProjButton, SLOT(setChecked(bool)));
- QObject::connect(spv, SIGNAL(resetToStandardView()),
- this->ui.modeControlWidget, SLOT(setToStandardView()));
- }
-
- QObject::connect(this->currentView,
- SIGNAL(setViewsStatus(ModeControlWidget::Views, bool)),
- this->ui.modeControlWidget,
- SLOT(enableViewButtons(ModeControlWidget::Views, bool)));
- // note the diff: Buttons <> Button
- QObject::connect(this->currentView,
- SIGNAL(setViewStatus(ModeControlWidget::Views, bool)),
- this->ui.modeControlWidget,
- SLOT(enableViewButton(ModeControlWidget::Views, bool)));
-
- this->connectColorSelectionWidget();
-
- // Connect the reset view state button, which is between the color selection
- // widget and the ParaQ toolbars
- QObject::connect(this->ui.resetViewsStateToAllData, SIGNAL(released()), this,
- SLOT(onResetViewsStateToAllData()));
-
- // Set animation (time) control widget <-> view signals/slots.
- QObject::connect(this->currentView, SIGNAL(setAnimationControlState(bool)),
- this->ui.timeControlWidget,
- SLOT(enableAnimationControls(bool)));
- QObject::connect(this->currentView,
- SIGNAL(setAnimationControlInfo(double, double, int)),
- this->ui.timeControlWidget,
- SLOT(updateAnimationControls(double, double, int)));
-
- // Set the connection for the parallel projection button
- QObject::connect(this->ui.parallelProjButton, SIGNAL(toggled(bool)),
- this->currentView, SLOT(onParallelProjection(bool)));
-
- // Start listening to a rebinning event
- QObject::connect(this->currentView, SIGNAL(rebin(std::string)), this,
- SLOT(onRebin(std::string)), Qt::UniqueConnection);
-
- // Start listening to an unbinning event
- QObject::connect(this->currentView, SIGNAL(unbin()), this, SLOT(onUnbin()),
- Qt::UniqueConnection);
-}
-
-/**
- * Reaction for a rebin event
- * @param algorithmType The type of rebinning algorithm
- */
-void MdViewerWidget::onRebin(const std::string &algorithmType) {
- pqPipelineSource *source = pqActiveObjects::instance().activeSource();
-
- std::string inputWorkspaceName;
- std::string outputWorkspaceName;
- m_rebinnedSourcesManager.checkSource(source, inputWorkspaceName,
- outputWorkspaceName, algorithmType);
- m_rebinAlgorithmDialogProvider.showDialog(inputWorkspaceName,
- outputWorkspaceName, algorithmType);
-}
-
-/**
- * Switch a source.
- * @param rebinnedWorkspaceName The name of the rebinned workspace.
- * @param sourceType The type of the source.
- */
-void MdViewerWidget::onSwitchSources(std::string rebinnedWorkspaceName,
- std::string sourceType) {
- // Create the rebinned workspace
- pqPipelineSource *rebinnedSource = prepareRebinnedWorkspace(
- std::move(rebinnedWorkspaceName), std::move(sourceType));
-
- try {
- // Repipe the filters to the rebinned source
- m_rebinnedSourcesManager.repipeRebinnedSource();
-
- // Update the animation controls in order to get the correct time slice
- this->currentView->updateAnimationControls();
-
- // Update the color scale
- this->currentView->onAutoScale(this->ui.colorSelectionWidget);
-
- // Set the splatterplot button explicitly
- this->currentView->setSplatterplot(true);
-
- pqActiveObjects::instance().setActiveSource(nullptr);
- pqActiveObjects::instance().setActiveSource(rebinnedSource);
- } catch (const std::runtime_error &error) {
- g_log.warning() << error.what();
- }
-}
-
-/**
- * This gives the user a simple way to reset the state and forget all
- * the interactions to start anew. Resets to all data and resets the
- * center point and direction/rotation/angle.
- */
-void MdViewerWidget::onResetViewsStateToAllData() {
- // forget alll the view saved states
- m_allViews.initialize();
-
- if (!this->currentView)
- return;
-
- // reset direction/rotation
- pqRenderView *pqv = this->currentView->getView();
- if (!pqv) {
- g_log.warning() << "Serious inconsistency found: could not retrieve a "
- "pqRenderView while "
- "trying to reset the state of the views.";
- return;
- }
- pqv->resetViewDirection(0, 0, -1, 0, 0, 0);
-
- // reset current view
- this->currentView->resetDisplay(); // includes a resetCamera() or more
- this->currentView->render();
-}
-
-/**
- * Creates and renders a rebinned workspace source
- * @param rebinnedWorkspaceName The name of the rebinned workspace.
- * @param sourceType The name of the source plugin.
- */
-pqPipelineSource *MdViewerWidget::prepareRebinnedWorkspace(
- const std::string &rebinnedWorkspaceName, const std::string &sourceType) {
- // Load a new source plugin
- auto gridAxesOn = areGridAxesOn();
- pqPipelineSource *newRebinnedSource = this->currentView->setPluginSource(
- QString::fromStdString(sourceType),
- QString::fromStdString(rebinnedWorkspaceName), gridAxesOn);
-
- // It seems that the new source gets set as active before it is fully
- // constructed. We therefore reset it.
- pqActiveObjects::instance().setActiveSource(nullptr);
- pqActiveObjects::instance().setActiveSource(newRebinnedSource);
-
- this->renderAndFinalSetup();
-
- this->currentView->onAutoScale(this->ui.colorSelectionWidget);
-
- // Register the source
- m_rebinnedSourcesManager.registerRebinnedSource(newRebinnedSource);
-
- return newRebinnedSource;
-}
-
-/**
- * Creates and renders back to the original source
- * @param originalWorkspaceName The name of the original workspace
- */
-pqPipelineSource *MdViewerWidget::renderOriginalWorkspace(
- const std::string &originalWorkspaceName) {
- // Load a new source plugin
- QString sourcePlugin = "MDEW Source";
- auto gridAxesOn = areGridAxesOn();
- pqPipelineSource *source = this->currentView->setPluginSource(
- sourcePlugin, QString::fromStdString(originalWorkspaceName), gridAxesOn);
-
- // Render and final setup
- this->renderAndFinalSetup();
-
- return source;
-}
-
-/**
- * Gets triggered by an unbin event. It removes the rebinning on a workspace
- * which has been rebinned from within the VSI.
- */
-void MdViewerWidget::onUnbin() {
- // Force the removal of the rebinning
- pqPipelineSource *activeSource = pqActiveObjects::instance().activeSource();
-
- removeRebinning(activeSource, true);
-}
-
-/**
- * Remove the rebinning.
- * @param source The pipeline source for which the rebinning will be removed.
- * @param forced If it should be removed under all circumstances.
- * @param view If switched, to which view is it being switched
- */
-void MdViewerWidget::removeRebinning(pqPipelineSource *source, bool forced,
- ModeControlWidget::Views view) {
- if (forced || view == ModeControlWidget::SPLATTERPLOT) {
- std::string originalWorkspaceName;
- std::string rebinnedWorkspaceName;
- m_rebinnedSourcesManager.getStoredWorkspaceNames(
- source, originalWorkspaceName, rebinnedWorkspaceName);
-
- // If the active source has not been rebinned, then send a reminder to the
- // user that only rebinned sources
- // can be unbinned
- if (originalWorkspaceName.empty() || rebinnedWorkspaceName.empty()) {
- if (forced == true) {
- QMessageBox::warning(
- this, QApplication::tr("Unbin Warning"),
- QApplication::tr(
- "You cannot unbin a source which has not be rebinned. \n"
- "To unbin, select a rebinned source and \n"
- "press Remove Rebinning again"));
- }
- return;
- }
-
- // We need to check that the rebinned workspace name has still a source
- // associated to it
- if (!m_rebinnedSourcesManager.isRebinnedSourceBeingTracked(source)) {
- return;
- }
-
- // Create the original source
- pqPipelineSource *originalSource =
- renderOriginalWorkspace(originalWorkspaceName);
-
- // Repipe the filters to the original source
- try {
- m_rebinnedSourcesManager.repipeOriginalSource(source, originalSource);
- } catch (const std::runtime_error &error) {
- g_log.warning() << error.what();
- }
-
- // Render and final setup
- pqActiveObjects::instance().activeView()->forceRender();
-
- // Set the buttons correctly if we switch to splatterplot
- if (view == ModeControlWidget::SPLATTERPLOT) {
- this->currentView->setSplatterplot(false);
- this->currentView->setStandard(true);
- }
- }
-}
-
-/**
- * Remove rebinning from all rebinned sources
- * @param view The view mode.
- */
-void MdViewerWidget::removeAllRebinning(ModeControlWidget::Views view) {
- // Iterate over all rebinned sources and remove them
- pqServer *server = pqActiveObjects::instance().activeServer();
- pqServerManagerModel *smModel =
- pqApplicationCore::instance()->getServerManagerModel();
- const QList<pqPipelineSource *> sources =
- smModel->findItems<pqPipelineSource *>(server);
-
- // We need to record all true sources, The filters will be removed in the
- // removeRebinning step
- // Hence the iterator will not point to a valid object anymore.
- QList<pqPipelineSource *> sourcesToAlter;
- foreach (pqPipelineSource *source, sources) {
- const QString srcProxyName = source->getProxy()->GetXMLGroup();
- if (srcProxyName == QString("sources")) {
- sourcesToAlter.push_back(source);
- }
- }
-
- foreach (pqPipelineSource *source, sourcesToAlter) {
- removeRebinning(source, false, view);
- }
-}
-
-/**
- * This function loads and renders data from the given source for the
- * standalone mode.
- * @param source a ParaView compatible source
- */
-void MdViewerWidget::onDataLoaded(pqPipelineSource *source) {
- source->updatePipeline();
- this->renderAndFinalSetup();
-}
-
-/**
- * This function is responsible for carrying out actions when ParaView
- * says the rendering is completed. It currently handles making sure the
- * color selection widget state is passed between views.
- */
-void MdViewerWidget::renderingDone() {
- if (this->viewSwitched) {
- Mantid::VATES::ColorScaleLockGuard colorScaleLockGuard(&m_colorScaleLock);
- this->setColorMap(); // Load the default color map
- this->currentView->setColorsForView(this->ui.colorSelectionWidget);
- this->viewSwitched = false;
- }
-}
-
-/**
- * This function determines the type of source plugin and sets the workspace
- * name so that the data can be retrieved and rendered.
- * @param workspaceName The workspace name for the data.
- * @param workspaceType A numeric indicator of the workspace type.
- * @param instrumentName The name of the instrument which measured the workspace
- * data.
- */
-void MdViewerWidget::renderWorkspace(QString workspaceName, int workspaceType,
- std::string instrumentName) {
- Mantid::VATES::ColorScaleLockGuard colorScaleLockGuard(&m_colorScaleLock);
- // Workaround: Note that setting to the standard view was part of the
- // eventFilter. This causes the
- // VSI window to not close properly. Moving it here ensures that
- // we have the switch, but
- // after the window is started again.
- if (this->currentView->getNumSources() == 0) {
- this->setColorForBackground();
- this->setVisibleAxesColors();
- this->setColorMap();
-
- if (VatesViewerInterface::PEAKS != workspaceType) {
- resetCurrentView(workspaceType, instrumentName);
- }
-
- this->currentView->hide();
- // Set the auto log scale state
- this->currentView->initializeColorScale();
-
- // Set the grid axs to on. This should be set whenever we have 0 sources in
- // the view.
- m_gridAxesStartUpOn = true;
- }
-
- // Set usage of current color settings to true, since we have loade the VSI
- if (!this->useCurrentColorSettings) {
- this->useCurrentColorSettings = true;
- }
-
- QString sourcePlugin;
- if (VatesViewerInterface::PEAKS == workspaceType) {
- sourcePlugin = "Peaks Source";
- } else if (VatesViewerInterface::MDHW == workspaceType) {
- sourcePlugin = "MDHW Source";
- } else {
- sourcePlugin = "MDEW Source";
- }
-
- // Load a new source plugin
- auto gridAxesOn = areGridAxesOn();
- pqPipelineSource *source = this->currentView->setPluginSource(
- sourcePlugin, workspaceName, gridAxesOn);
- source->getProxy()->SetAnnotation(this->m_widgetName.toLatin1().data(), "1");
- this->renderAndFinalSetup();
- this->currentView->show();
-}
-
-/**
- * Reset the current view if this is required
- * @param workspaceType The type of workspace.
- * @param instrumentName The name of the instrument.
- */
-void MdViewerWidget::resetCurrentView(int workspaceType,
- const std::string &instrumentName) {
- // Check if the current view is the correct initial view for the workspace
- // type and the instrument
- ModeControlWidget::Views initialView =
- getInitialView(workspaceType, instrumentName);
- auto currentViewType = currentView->getViewType();
-
- if (initialView != currentViewType) {
- this->ui.modeControlWidget->setToSelectedView(initialView);
- } else {
- this->currentView->show();
- }
-
- this->initialView = initialView;
-}
-
-/*
- * Provides an initial view. This view is specified either in the
- * Mantid.user.properties file or by the most common technique of the
- * instrument which is associated with the workspace data.
- * @param workspaceType The work space type.
- * @param instrumentName The name of the instrument with which the workspace
- * data was measured.
- * @returns An initial view.
-*/
-ModeControlWidget::Views
-MdViewerWidget::getInitialView(int workspaceType,
- const std::string &instrumentName) {
- // Get the possible initial views
- QString initialViewFromUserProperties =
- mdSettings.getUserSettingInitialView();
- QString initialViewFromTechnique = getViewForInstrument(instrumentName);
-
- // The user-properties-defined default view takes precedence over the
- // technique-defined default view
- QString initialView;
- if (initialViewFromUserProperties == mdConstants.getTechniqueDependence()) {
- initialView = initialViewFromTechnique;
- } else {
- initialView = initialViewFromUserProperties;
- }
-
- ModeControlWidget::Views view =
- this->ui.modeControlWidget->getViewFromString(initialView);
-
- // Make sure that the default view is compatible with the current workspace,
- // e.g. a a histo workspace cannot have a splatter plot
- return checkViewAgainstWorkspace(view, workspaceType);
-}
-
-/**
- * Get the view which is adequat for a specified machine
- * @param instrumentName The name of the instrument with which the workspace
- * data was measured.
- * @returns A view.
- */
-QString
-MdViewerWidget::getViewForInstrument(const std::string &instrumentName) const {
- // If nothing is specified the standard view is chosen
- if (instrumentName.empty()) {
- return mdConstants.getStandardView();
- }
-
- // Check for techniques
- // Precedence is 1. Single Crystal Diffraction -->SPLATTERPLOT
- // 2. Neutron Diffraction --> SPLATTERPLOT
- // 3. *Spectroscopy* --> MULTISLICE
- // 4. Other --> STANDARD
- QString associatedView;
- try {
- const auto techniques = Mantid::Kernel::ConfigService::Instance()
- .getInstrument(instrumentName)
- .techniques();
-
- if (techniques.count("Single Crystal Diffraction") > 0) {
- associatedView = mdConstants.getSplatterPlotView();
- } else if (checkIfTechniqueContainsKeyword(techniques, "Spectroscopy")) {
- associatedView = mdConstants.getMultiSliceView();
- } else if (techniques.count("Neutron Diffraction") > 0) {
- associatedView = mdConstants.getSplatterPlotView();
- } else {
- associatedView = mdConstants.getStandardView();
- }
- } catch (...) {
- associatedView = mdConstants.getStandardView();
- }
- return associatedView;
-}
-
-/**
- * Check if a set of techniques contains a technique which matches specified
- * keyword
- * @param techniques A set of techniques
- * @param keyword A keyword
- * @returns True if the keyword is contained in at least one technique else
- * false.
- */
-bool MdViewerWidget::checkIfTechniqueContainsKeyword(
- const std::set<std::string> &techniques, const std::string &keyword) const {
- boost::regex pattern("(.*)" + keyword + "(.*)");
-
- for (auto const &technique : techniques) {
- if (boost::regex_match(technique, pattern)) {
- return true;
- }
- }
-
- return false;
-}
-
-/*
- * Check that the selected default view is compatible with the workspace type
- *
- * @param view An initial view.
- * @param workspaceType The type of workspace.
- * @returns A user-specified inital view or the standard view.
-*/
-ModeControlWidget::Views
-MdViewerWidget::checkViewAgainstWorkspace(ModeControlWidget::Views view,
- int workspaceType) {
- ModeControlWidget::Views selectedView;
-
- if (VatesViewerInterface::MDHW == workspaceType) {
- // Histo workspaces cannot have a splatter plot,
- if (view == ModeControlWidget::SPLATTERPLOT) {
- g_log.notice("The preferred initial view favours the splatterplot "
- "as initial view, but an MDHisto workspace is being "
- "loaded. A MDHisto workspace cannot be loaded into a "
- "splatterplot view. Defaulted to MultiSlice view.");
-
- selectedView = ModeControlWidget::MULTISLICE;
- } else {
- selectedView = view;
- }
- } else {
- selectedView = view;
- }
-
- return selectedView;
-}
-
-/**
- * This function performs setup for the plugin mode of the Vates Simple
- * Interface. It calls a number of defined functions to complete the process.
- */
-void MdViewerWidget::setupPluginMode(int WsType,
- const std::string &instrumentName) {
- // Don't use the current color map at start up.
- this->useCurrentColorSettings = false;
- this->setupUiAndConnections();
- this->createMenus();
- ModeControlWidget::Views initialView =
- this->getInitialView(WsType, instrumentName);
- this->setupMainView(initialView);
-}
-
-/**
- * Load the state of the Vates window from a Mantid project file
- *
- * @param lines :: a string representing the state of the Vates window
- */
-void MdViewerWidget::loadFromProject(const std::string &lines) {
- this->useCurrentColorSettings = false;
- this->setupUiAndConnections();
- this->createMenus();
-
- TSVSerialiser tsv(lines);
-
- int viewType;
- std::string viewName, sourceName, originalSourceName, originalRepName;
- tsv.selectLine("ViewName");
- tsv >> viewName;
- tsv.selectLine("SourceName");
- tsv >> sourceName;
- tsv.selectLine("OriginalSourceName");
- tsv >> originalSourceName;
- tsv.selectLine("OriginalRepresentationName");
- tsv >> originalRepName;
- tsv.selectLine("ViewType");
- tsv >> viewType;
-
- auto vtype = static_cast<ModeControlWidget::Views>(viewType);
-
- // Set the view type on the widget
- this->ui.modeControlWidget->blockSignals(true);
- this->ui.modeControlWidget->setToSelectedView(vtype);
- this->ui.modeControlWidget->blockSignals(false);
-
- // Load the state of VSI from the XML dump
- QSettings settings;
- auto workingDir = settings.value("Project/WorkingDirectory", "").toString();
- auto fileName = workingDir.toStdString() + "/VSI.xml";
- Poco::File file(fileName);
- if (!file.exists())
- return; // file path invalid.
-
- auto success = loadVSIState(fileName);
- if (!success)
- return; // state could not be loaded. There's nothing left to do!
-
- auto &activeObjects = pqActiveObjects::instance();
- auto proxyManager = activeObjects.activeServer()->proxyManager();
- auto viewProxy = proxyManager->GetProxy("views", viewName.c_str());
- auto sourceProxy = proxyManager->GetProxy("sources", sourceName.c_str());
-
- if (!viewProxy || !sourceProxy)
- return; // could not find the active view/source from last session.
-
- // Get the active objects from the last session
- auto model = pqApplicationCore::instance()->getServerManagerModel();
- auto view = model->findItem<pqRenderView *>(viewProxy);
- auto source = model->findItem<pqPipelineSource *>(sourceProxy);
-
- if (!view || !source)
- return; // could not find the active PV view/source from last session.
-
- setActiveObjects(view, source);
- setupViewFromProject(vtype);
- auto origSrcProxy =
- proxyManager->GetProxy("sources", originalSourceName.c_str());
- auto origSrc = model->findItem<pqPipelineSource *>(origSrcProxy);
- this->currentView->origSrc = qobject_cast<pqPipelineSource *>(origSrc);
-
- // Work around to force the update of the shader preset.
- auto rep = pqActiveObjects::instance().activeRepresentation()->getProxy();
- rep->UpdateProperty("ShaderPreset", 1);
-
- if (tsv.selectSection("colormap")) {
- std::string colorMapLines;
- tsv >> colorMapLines;
- ui.colorSelectionWidget->loadFromProject(colorMapLines);
- }
-
- if (tsv.selectSection("rebinning")) {
- std::string rebinningLines;
- tsv >> rebinningLines;
- m_rebinnedSourcesManager.loadFromProject(rebinningLines);
- }
-
- currentView->show();
-
- // Don't call render on ViewBase here as that will reset the camera.
- // Instead just directly render the view proxy using render all.
- this->currentView->renderAll();
- this->currentView->updateAnimationControls();
- this->setDestroyedListener();
- this->currentView->setVisibilityListener();
-}
-
-/**
- * Load the state of VSI from an XML file.
- *
- * @param fileName
- * @return true if the state was successfully loaded
- */
-bool MdViewerWidget::loadVSIState(const std::string &fileName) {
- auto proxyManager =
- pqActiveObjects::instance().activeServer()->proxyManager();
-
- try {
- proxyManager->LoadXMLState(fileName.c_str());
- } catch (...) {
- return false;
- }
-
- // Update all registered proxies.
- // Some things may have been incorrectly setup during the loading step
- // due to the load order.
- proxyManager->UpdateRegisteredProxiesInOrder(0);
- return true;
-}
-
-/**
- * Setup the current view from a project file.
- *
- * There's need to create an entirely new view as it already exists in the
- * loaded project state.
- *
- * @param vtype :: the type of view to be created (e.g. Multislice)
- */
-void MdViewerWidget::setupViewFromProject(ModeControlWidget::Views vtype) {
- // Initilise the current view to something and setup
- currentView = createAndSetMainViewWidget(ui.viewWidget, vtype, false);
- initialView = vtype;
- currentView->installEventFilter(this);
- viewLayout = new QHBoxLayout(ui.viewWidget);
- viewLayout->setMargin(0);
- viewLayout->setStretch(0, 1);
- viewLayout->addWidget(currentView);
-
- auto source = pqActiveObjects::instance().activeSource();
- auto view = pqActiveObjects::instance().activeView();
- // Swap out the existing view for the newly loaded source and representation
- currentView->origSrc = qobject_cast<pqPipelineSource *>(source);
- currentView->setView(qobject_cast<pqRenderView *>(view));
- setParaViewComponentsForView();
-}
-
-/**
- * Set the active objects. This will trigger events to update the properties
- * panel and the pipeline viewer.
- *
- * @param view :: the view to set as currently active
- * @param source :: the source to set as currently active
- */
-void MdViewerWidget::setActiveObjects(pqView *view, pqPipelineSource *source) {
-
- auto &activeObjects = pqActiveObjects::instance();
- activeObjects.setActiveView(view);
- activeObjects.setActiveSource(source);
- activeObjects.setActivePort(source->getOutputPort(0));
-}
-
-/**
- * Save the state of the Vates window to a Mantid project file
- *
- * @param app :: handle to the main application window instance
- * @return a string representing the current state of the window
- */
-std::string MdViewerWidget::saveToProject(ApplicationWindow *app) {
- UNUSED_ARG(app);
- TSVSerialiser tsv, contents;
-
- // save window position & size
- contents.writeLine("geometry") << parentWidget()->geometry();
-
- QSettings settings;
- auto workingDir = settings.value("Project/WorkingDirectory", "").toString();
- auto fileName = workingDir.toStdString() + "/VSI.xml";
-
- // Dump the state of VSI to a XML file
- auto session = pqActiveObjects::instance().activeServer()->proxyManager();
- session->SaveXMLState(fileName.c_str());
- contents.writeLine("FileName") << fileName;
-
- // Save the view type. e.g. Splatterplot, Multislice...
- auto vtype = currentView->getViewType();
- contents.writeLine("ViewType") << static_cast<int>(vtype);
-
- auto &activeObjects = pqActiveObjects::instance();
- auto proxyManager = activeObjects.activeServer()->proxyManager();
- auto view = activeObjects.activeView()->getProxy();
- auto source = activeObjects.activeSource()->getProxy();
-
- auto viewName = proxyManager->GetProxyName("views", view);
- auto sourceName = proxyManager->GetProxyName("sources", source);
-
- contents.writeLine("ViewName") << viewName;
- contents.writeLine("SourceName") << sourceName;
-
- if (this->currentView->origRep) {
- auto repName = proxyManager->GetProxyName(
- "representations", this->currentView->origRep->getProxy());
- contents.writeLine("OriginalRepresentationName") << repName;
- }
-
- if (this->currentView->origSrc) {
- auto srcName = proxyManager->GetProxyName(
- "sources", this->currentView->origSrc->getProxy());
- contents.writeLine("OriginalSourceName") << srcName;
- }
-
- contents.writeSection("colormap", ui.colorSelectionWidget->saveToProject());
- contents.writeSection("rebinning", m_rebinnedSourcesManager.saveToProject());
- tsv.writeSection("vsi", contents.outputLines());
-
- return tsv.outputLines();
-}
-
-std::vector<std::string> MdViewerWidget::getWorkspaceNames() {
- auto server = pqActiveObjects::instance().activeServer();
- auto model = pqApplicationCore::instance()->getServerManagerModel();
- const auto sources = model->findItems<pqPipelineSource *>(server);
-
- std::vector<std::string> workspaceNames;
- for (auto source : sources) {
- const auto proxy = source->getProxy();
- const auto srcProxyName = proxy->GetXMLGroup();
- if (srcProxyName == QString("sources")) {
- std::string wsName(
- vtkSMPropertyHelper(proxy, "WorkspaceName", true).GetAsString());
- workspaceNames.push_back(wsName);
- }
- }
-
- return workspaceNames;
-}
-
-std::string MdViewerWidget::getWindowName() {
- return m_widgetName.toStdString();
-}
-
-std::string MdViewerWidget::getWindowType() { return "VSIWindow"; }
-
-/**
- * This function tells the current view to render the data, perform any
- * necessary checks on the view given the workspace type and update the
- * animation controls if necessary.
- */
-void MdViewerWidget::renderAndFinalSetup() {
- Mantid::VATES::ColorScaleLockGuard colorScaleLockGuard(&m_colorScaleLock);
- this->setColorForBackground();
- this->setVisibleAxesColors();
- this->currentView->render();
- this->setColorMap();
- this->currentView->setColorsForView(this->ui.colorSelectionWidget);
- this->currentView->checkView(this->initialView);
- this->currentView->updateAnimationControls();
- this->setDestroyedListener();
- this->currentView->setVisibilityListener();
- this->currentView->onAutoScale(this->ui.colorSelectionWidget);
-}
-
-/**
- * Set the background color for this view.
- */
-void MdViewerWidget::setColorForBackground() {
- this->currentView->setColorForBackground(this->useCurrentColorSettings);
-}
-
-void MdViewerWidget::setVisibleAxesColors() {
- if (mdSettings.getUserSettingAutoColorAxes()) {
- // Only add the observer once.
- if (!m_axesTag) {
- m_axesTag = this->currentView->setVisibleAxesColors();
- }
- } else if (m_axesTag) {
- this->currentView->getView()
- ->getViewProxy()
- ->GetProperty("Background")
- ->RemoveObserver(*m_axesTag);
- }
-}
-
-/**
- * This function is used during the post-apply process of particular pipeline
- * filters to check for updates to anything that relies on information from the
- * rendered data.
- */
-void MdViewerWidget::checkForUpdates() {
- Mantid::VATES::ColorScaleLockGuard colorScaleLockGuard(&m_colorScaleLock);
- pqPipelineSource *src = pqActiveObjects::instance().activeSource();
- if (!src) {
- return;
- }
- vtkSMProxy *proxy = src->getProxy();
-
- if (QString(proxy->GetXMLName()).contains("Threshold")) {
- this->ui.colorSelectionWidget->enableControls(true);
- vtkSMDoubleVectorProperty *range = vtkSMDoubleVectorProperty::SafeDownCast(
- proxy->GetProperty("ThresholdBetween"));
- this->ui.colorSelectionWidget->setColorScaleRange(range->GetElement(0),
- range->GetElement(1));
- }
- if (QString(proxy->GetXMLName()).contains("ScaleWorkspace")) {
- this->currentView->resetDisplay();
- }
-
- // Make sure that the color scale is calculated
- if (this->ui.colorSelectionWidget->getAutoScaleState()) {
- this->currentView->onAutoScale(this->ui.colorSelectionWidget);
- }
-}
-
-/**
- * This function executes the logic for switching views on the main level
- * window.
- *
- * @param v the view mode to switch to
- */
-void MdViewerWidget::switchViews(ModeControlWidget::Views v) {
- this->removeAllRebinning(v);
- this->viewSwitched = true;
-
- // normally it will just close child SliceView windows
- auto axesGridOn = areGridAxesOn();
- this->currentView->closeSubWindows();
- this->disconnectDialogs();
- this->hiddenView = this->createAndSetMainViewWidget(this->ui.viewWidget, v);
- this->ui.colorSelectionWidget->ignoreColorChangeCallbacks(true);
- this->hiddenView->setColorScaleState(this->ui.colorSelectionWidget);
- auto viewSize = this->hiddenView->size();
- this->hiddenView->hide();
- this->viewLayout->removeWidget(this->currentView);
-
- // save all the current visual state before switching.
- saveViewState(this->currentView);
- this->swapViews();
-
- this->viewLayout->addWidget(this->currentView);
- this->currentView->installEventFilter(this);
- this->currentView->show();
- this->hiddenView->hide();
- this->setParaViewComponentsForView();
- this->connectDialogs();
-
- this->hiddenView->close();
- this->hiddenView->destroyView();
- this->hiddenView->deleteLater();
- this->currentView->setAxesGrid(axesGridOn);
- // Currently this render will do one or more resetCamera() and even
- // resetDisplay() for different views, see for example
- // StandardView::onRenderDone().
- this->currentView->render();
- // so because of that, after render() we restore the view state =>
- // visual glitch from initial/reset camera to restored camera. This
- // should improved in the future but requires reorganization of
- // ViewBase and the specialized VSI view classes (trac ticket #11739).
- restoreViewState(this->currentView, v);
- this->currentView->setColorsForView(this->ui.colorSelectionWidget);
- this->setColorForBackground();
- this->setVisibleAxesColors();
-
- this->currentView->checkViewOnSwitch();
- this->updateAppState();
- this->initialView = v;
-
- this->setDestroyedListener();
- this->currentView->setVisibilityListener();
-
- // A workaround to make the view redraw itself properly
- // after switching from a resized view
- this->currentView->resize(viewSize);
-
- // ignore callbacks until as late as possible to keep desired state
- // regardless of what the Paraview widgets are doing
- this->ui.colorSelectionWidget->ignoreColorChangeCallbacks(false);
-}
-
-/**
- * This function performs a standard pointer swap for the view switching.
- */
-void MdViewerWidget::swapViews() {
- if (!this->currentView)
- g_log.error(
- "Inconsistency found when swapping views, the current view is NULL");
- if (!this->hiddenView)
- g_log.error(
- "Inconsistency found when swapping views, the next view is NULL");
- std::swap(this->currentView, this->hiddenView);
-}
-
-/**
- * This function allows one to filter the Qt events and look for a hide
- * event. As long as the event does not come from the system (minimize VSI
- * window or switch virtual desktops), it then executes source cleanup and
- * view mode switch if the viewer is in plugin mode.
- * @param obj the subject of the event
- * @param ev the actual event
- * @return true if the event was handled
- */
-bool MdViewerWidget::eventFilter(QObject *obj, QEvent *ev) {
- if (this->currentView == obj) {
- if (this->pluginMode && QEvent::Hide == ev->type() && !ev->spontaneous()) {
- if (this->ui.parallelProjButton->isChecked()) {
- this->ui.parallelProjButton->toggle();
- }
-
- this->ui.colorSelectionWidget->reset();
- this->currentView->setColorScaleState(this->ui.colorSelectionWidget);
- this->currentView->destroyAllSourcesInView();
- this->currentView->updateSettings();
- this->currentView->hide();
- this->useCurrentColorSettings = false;
-
- this->m_colorMapEditorPanel->hide();
-
- return true;
- }
- }
-// IMPORTANT FOR MULTIPLE VSI INSTANCES:
-// The following code block seems to be intended for use with multiple instances
-// but it introduces an undesired behaviour in its current form. This is
-// especially visible when we are dealing with source-filter chains (the active
-// source is more likely to be the filter than the underlying source).
-// Instead of setting oricSrc as the active source we need to devise an
-// alternative
-// strategy, e.g. keep track of the last active source of the particlar
-// VSI instance and set this as the active source.
-#if 0
- if(ev->type() == QEvent::WindowActivate)
- {
- if(this->currentView)
- {
- pqView* view = this->currentView->getView();
- pqActiveObjects::instance().setActiveView(view);
- pqActiveObjects::instance().setActiveSource(this->currentView->origSrc);
- }
- }
-#endif
- return VatesViewerInterface::eventFilter(obj, ev);
-}
-
-/**
- * This function performs shutdown procedures when MantidPlot is shut down,
- */
-void MdViewerWidget::shutdown() {
- // This seems to cure a XInitThreads error.
- pqPVApplicationCore::instance()->deleteLater();
- // Ensure that the MathText utilties are cleaned up as they call Python
- // cleanup code
- // and we need to make sure this can happen before MantidPlot shuts down the
- // interpreter
- vtkMathTextUtilitiesCleanup();
-}
-
-/**
- * This function creates the main view widget specific menu items.
- */
-void MdViewerWidget::createMenus() {
- QMenuBar *menubar;
- if (this->pluginMode) {
- menubar = new QMenuBar(this->parentWidget());
- QSizePolicy policy(QSizePolicy::Preferred, QSizePolicy::Fixed);
- menubar->setSizePolicy(policy);
- } else {
- menubar = qobject_cast<QMainWindow *>(this->parentWidget())->menuBar();
- }
-
- QMenu *viewMenu = menubar->addMenu(QApplication::tr("&View"));
-
- this->lodAction =
- new QAction(QApplication::tr("Level-of-Detail (LOD...)"), this);
- this->lodAction->setShortcut(QKeySequence::fromString("Ctrl+Shift+L"));
- this->lodAction->setStatusTip(
- QApplication::tr("Enable/disable level-of-detail threshold."));
- this->lodAction->setCheckable(true);
- this->lodAction->setChecked(true);
- QObject::connect(this->lodAction, SIGNAL(toggled(bool)), this,
- SLOT(onLodToggled(bool)));
- viewMenu->addAction(this->lodAction);
-
- QAction *screenShotAction =
- new QAction(QApplication::tr("Save Screenshot"), this);
- screenShotAction->setShortcut(QKeySequence::fromString("Ctrl+Shift+R"));
- screenShotAction->setStatusTip(
- QApplication::tr("Save a screenshot of the current view."));
- this->screenShot = new pqSaveScreenshotReaction(screenShotAction);
- viewMenu->addAction(screenShotAction);
-
- QAction *settingsAction = new QAction(QApplication::tr("Settings..."), this);
- settingsAction->setShortcut(QKeySequence::fromString("Ctrl+Shift+S"));
- settingsAction->setStatusTip(
- QApplication::tr("Show the settings for the current view."));
- this->viewSettings = new pqApplicationSettingsReaction(settingsAction);
- viewMenu->addAction(settingsAction);
-
- QMenu *helpMenu = menubar->addMenu(QApplication::tr("&Help"));
-
- QAction *wikiHelpAction =
- new QAction(QApplication::tr("Show Wiki Help"), this);
- wikiHelpAction->setShortcut(QKeySequence::fromString("Ctrl+Shift+H"));
- wikiHelpAction->setStatusTip(
- QApplication::tr("Show the wiki help page in a browser."));
- QObject::connect(wikiHelpAction, SIGNAL(triggered()), this,
- SLOT(onWikiHelp()));
- helpMenu->addAction(wikiHelpAction);
-
- if (this->pluginMode) {
- this->ui.verticalLayout_4->insertWidget(0, menubar);
- }
-}
-
-/**
- * This function adds the menus defined here to a QMainWindow menu bar.
- * This must be done after the setup of the standalone application so that
- * the MdViewerWidget menus aren't added before the standalone ones.
- */
-void MdViewerWidget::addMenus() { this->createMenus(); }
-
-/**
- * This function intercepts the LOD menu action checking and calls the
- * correct slot on the current view.
- * @param state : whether the action is checked or not
- */
-void MdViewerWidget::onLodToggled(bool state) {
- this->currentView->onLodThresholdChange(state, this->lodThreshold);
-}
-
-/**
- * This function handles creating the rotation point input dialog box and
- * setting the communication between it and the current view.
- */
-void MdViewerWidget::onRotationPoint() {
- if (!this->rotPointDialog) {
- this->rotPointDialog = new RotationPointDialog(this);
- this->connectRotationPointDialog();
- }
- this->rotPointDialog->show();
- this->rotPointDialog->raise();
- this->rotPointDialog->activateWindow();
-}
-
-/**
- * This function shows the wiki help page for the simple interface in a
- * browser.
- */
-void MdViewerWidget::onWikiHelp() {
- MantidDesktopServices::openUrl(QUrl(QString("http://www.mantidproject.org/") +
- "VatesSimpleInterface_v2"));
-}
-
-/**
- * This function disconnects the present instances of the color options and the
- * point rotation dialog boxes from the current view. This is necessary on
- * switch view since the connection to the current view is destroyed.
- */
-void MdViewerWidget::disconnectDialogs() {
- if (this->rotPointDialog) {
- this->rotPointDialog->close();
- QObject::disconnect(this->rotPointDialog, nullptr, this->currentView,
- nullptr);
- }
-}
-
-/**
- * This function sets up the connections between the color selection widget
- * items and the current view.
- */
-void MdViewerWidget::connectColorSelectionWidget() {
- // Set the color selection widget signal -> view slot connection
- QObject::connect(this->ui.colorSelectionWidget,
- SIGNAL(colorMapChanged(const Json::Value &)),
- this->currentView,
- SLOT(onColorMapChange(const Json::Value &)));
- QObject::connect(this->ui.colorSelectionWidget,
- SIGNAL(colorScaleChanged(double, double)), this->currentView,
- SLOT(onColorScaleChange(double, double)));
-
- // Set the view signal -> color selection widget slot connection
- QObject::connect(this->currentView, SIGNAL(dataRange(double, double)),
- this->ui.colorSelectionWidget,
- SLOT(setColorScaleRange(double, double)));
- QObject::connect(this->ui.colorSelectionWidget,
- SIGNAL(autoScale(ColorSelectionWidget *)), this->currentView,
- SLOT(onAutoScale(ColorSelectionWidget *)));
- QObject::connect(this->ui.colorSelectionWidget, SIGNAL(logScale(int)),
- this->currentView, SLOT(onLogScale(int)));
- QObject::connect(this->currentView, SIGNAL(lockColorControls(bool)),
- this->ui.colorSelectionWidget, SLOT(enableControls(bool)));
-
- QObject::connect(this->currentView, SIGNAL(setLogScale(bool)),
- this->ui.colorSelectionWidget, SLOT(onSetLogScale(bool)));
-}
-
-/**
- * This function sets up the connections between the rotation point dialog and
- * the current view.
- */
-void MdViewerWidget::connectRotationPointDialog() {
- if (this->rotPointDialog) {
- QObject::connect(
- this->rotPointDialog, SIGNAL(sendCoordinates(double, double, double)),
- this->currentView, SLOT(onResetCenterToPoint(double, double, double)));
- }
-}
-
-/**
- * This function sets up the connections for all the dialogs associated with
- * the MdViewerWidget.
- */
-void MdViewerWidget::connectDialogs() { this->connectRotationPointDialog(); }
-
-/**
- * This function handles any update to the state of application components
- * like menus, menu items, buttons, views etc.
- */
-void MdViewerWidget::updateAppState() {
- auto type = currentView->getViewType();
- if (type == ModeControlWidget::THREESLICE ||
- type == ModeControlWidget::SPLATTERPLOT) {
- this->currentView->onLodThresholdChange(false, this->lodThreshold);
- this->lodAction->setChecked(false);
- } else {
- this->currentView->onLodThresholdChange(true, this->lodThreshold);
- this->lodAction->setChecked(true);
- }
-}
-
-/**
- * This function responds to the replacement of a workspace. It does not
- * handle workspace renaming. Also, by default it replaces the original
- * representation with a new one, deleting the old one first.
- * @param wsName : Name of workspace changing
- * @param ws : Pointer to changing workspace
- */
-void MdViewerWidget::afterReplaceHandle(
- const std::string &wsName,
- const boost::shared_ptr<Mantid::API::Workspace> ws) {
- UNUSED_ARG(ws);
- pqPipelineSource *src = this->currentView->hasWorkspace(wsName.c_str());
- if (src) {
- // Have to mark the filter as modified to get it to update. Do this by
- // changing the requested workspace name to a dummy name and then change
- // back. However, push the change all the way down for it to work.
- vtkSMProxy *proxy = src->getProxy();
- vtkSMPropertyHelper(proxy, "Mantid Workspace Name").Set("ChangeMe!");
- proxy->UpdateVTKObjects();
-
- vtkSMPropertyHelper(proxy, "Mantid Workspace Name").Set(wsName.c_str());
- // Update the source so that it retrieves the data from the Mantid workspace
- proxy->UpdateVTKObjects();
- src->updatePipeline();
-
- this->currentView->setColorsForView(this->ui.colorSelectionWidget);
- this->currentView->renderAll();
- }
-}
-
-/**
- * This function responds to a workspace being deleted. If there are one or
- * more PeaksWorkspaces present, the requested one will be deleted.
- * Otherwise, if it is an IMDWorkspace, everything goes!
- * @param wsName : Name of workspace being deleted
- * @param ws : Pointer to workspace being deleted
- */
-void MdViewerWidget::preDeleteHandle(const std::string &wsName,
- const boost::shared_ptr<Workspace> ws) {
- UNUSED_ARG(ws);
-
- pqPipelineSource *src = this->currentView->hasWorkspace(wsName.c_str());
- if (src) {
- long long numSources = this->currentView->getNumSources();
- if (numSources > 1) {
- pqObjectBuilder *builder =
- pqApplicationCore::instance()->getObjectBuilder();
- if (this->currentView->isPeaksWorkspace(src)) {
- builder->destroy(src);
- return;
- }
- }
-
- // Remove all visibility listeners
- this->currentView->removeVisibilityListener();
-
- emit this->requestClose();
- }
-}
-
-/**
-* Set the listener for when sources are being destroyed
-*/
-void MdViewerWidget::setDestroyedListener() {
- pqServer *server = pqActiveObjects::instance().activeServer();
- pqServerManagerModel *smModel =
- pqApplicationCore::instance()->getServerManagerModel();
- const QList<pqPipelineSource *> sources =
- smModel->findItems<pqPipelineSource *>(server);
-
- // Attach the destroyd signal of all sources to the viewbase.
- foreach (pqPipelineSource *source, sources) {
- QObject::connect(source, SIGNAL(destroyed()), this->currentView,
- SLOT(onSourceDestroyed()), Qt::UniqueConnection);
- }
-}
-
-/**
- * Dectect when a PeaksWorkspace is dragged into the VSI.
- * @param e A drag event.
- */
-void MdViewerWidget::dragEnterEvent(QDragEnterEvent *e) {
- QString name = e->mimeData()->objectName();
- if (name == "MantidWorkspace") {
- QString text = e->mimeData()->text();
- QStringList wsNames;
- handleDragAndDropPeaksWorkspaces(e, text, wsNames);
- } else {
- e->ignore();
- }
-}
-
-/**
- * React to dropping a PeaksWorkspace onto the VSI.
- * @param e Drop event.
- */
-void MdViewerWidget::dropEvent(QDropEvent *e) {
- QString name = e->mimeData()->objectName();
- if (name == "MantidWorkspace") {
- QString text = e->mimeData()->text();
- QStringList wsNames;
- handleDragAndDropPeaksWorkspaces(e, text, wsNames);
- if (!wsNames.empty()) {
- // We render the first workspace name, it is a peak workspace and the
- // instrument is not relevant
- renderWorkspace(wsNames[0], 1, "");
- }
- }
-}
-
-/* Verify that at least one source other than a "Peaks Source" has been loaded
- * in the VSI.
- * @return true if something other than a Peaks Source is found.
- */
-bool otherWorkspacePresent() {
- pqServer *server = pqActiveObjects::instance().activeServer();
- pqServerManagerModel *smModel =
- pqApplicationCore::instance()->getServerManagerModel();
- auto sources = smModel->findItems<pqPipelineSource *>(server);
- auto result = std::find_if(
- sources.begin(), sources.end(), [](const pqPipelineSource *src) {
- return strcmp(src->getProxy()->GetXMLName(), "Peaks Source") != 0;
- });
- return result != sources.end();
-}
-
-/**
- * Handle the drag and drop events of peaks workspaces.
- * @param e The event.
- * @param text String containing information regarding the workspace name.
- * @param wsNames Reference to a list of workspaces names, which are being
- * extracted.
- */
-void MdViewerWidget::handleDragAndDropPeaksWorkspaces(QEvent *e,
- const QString &text,
- QStringList &wsNames) {
- int endIndex = 0;
- while (text.indexOf("[\"", endIndex) > -1) {
- int startIndex = text.indexOf("[\"", endIndex) + 2;
- endIndex = text.indexOf("\"]", startIndex);
- QString candidate = text.mid(startIndex, endIndex - startIndex);
- // Only append the candidate if SplattorPlotView is selected and an
- // MDWorkspace is loaded.
- if (currentView->getViewType() == ModeControlWidget::Views::SPLATTERPLOT &&
- otherWorkspacePresent()) {
- if (boost::dynamic_pointer_cast<IPeaksWorkspace>(
- AnalysisDataService::Instance().retrieve(
- candidate.toStdString()))) {
- wsNames.append(candidate);
- e->accept();
- } else {
- e->ignore();
- }
- } else {
- e->ignore();
- }
- }
-}
-
-/**
- * Set the color map
- */
-void MdViewerWidget::setColorMap() {
- // If it is not the first startup of the color map, then we want to use the
- // current color map
- this->ui.colorSelectionWidget->loadColorMap(this->useCurrentColorSettings);
-}
-
-/**
- * Save the state of a view. Normally you use this to save the state
- * of the current view before switching to a different view, so when
- * the user switches back to the original view its state can be
- * restored. @see restoreViewState(). This class saves one state for
- * every type of view. The state of a view includes the main
- * properties of the camera (vtkCamera) namely Position, FocalPoint,
- * ViewUp, ViewAngle, ClippingRange) and also properties of the
- * pqRenderView (CenterOfRotation, CenterAxesVisibility, etc.). And
- * for the slice views you'll also need to save the slices status.
- *
- * The state is saved using vtkSMProxy's saveXMLState which returns
- * the XML tree that can be reloaded to reproduce the same state in
- * another (render view) proxy. Note that the alternative
- * GetFullState()/ methods do not seem to be usable in this way but is
- * meant to support undo/do in ParaView.
- *
- * @param view A VSI view (subclass of ViewBase) which can be for
- * example of types: standard, multislice, threeslice, splatter, its
- * state will be saved
- */
-void MdViewerWidget::saveViewState(ViewBase *view) {
- if (!view)
- return;
-
- auto vtype = currentView->getViewType();
- switch (vtype) {
- case ModeControlWidget::Views::STANDARD: {
- m_allViews.stateStandard.TakeReference(
- view->getView()->getRenderViewProxy()->SaveXMLState(nullptr));
- } break;
- case ModeControlWidget::Views::THREESLICE: {
- m_allViews.stateThreeSlice.TakeReference(
- view->getView()->getRenderViewProxy()->SaveXMLState(nullptr));
- } break;
- case ModeControlWidget::Views::MULTISLICE: {
- m_allViews.stateMulti.TakeReference(
- view->getView()->getRenderViewProxy()->SaveXMLState(nullptr));
- } break;
- case ModeControlWidget::Views::SPLATTERPLOT: {
- m_allViews.stateSplatter.TakeReference(
- view->getView()->getRenderViewProxy()->SaveXMLState(nullptr));
- } break;
- default:
- view = nullptr;
- break;
- }
-}
-
-/**
- * Restores the state of a view (if there's a saved state for this
- * type of view, which should happen if the user has been in that view
- * before and is switching back to it. @see saveViewState().
- *
- * @param view View where we want to restore the previous state
- * @param vtype Type of view (standard, multislice, etc.)
- */
-void MdViewerWidget::restoreViewState(ViewBase *view,
- ModeControlWidget::Views vtype) {
- if (!view)
- return;
-
- int loaded = 0;
-
- switch (vtype) {
- case ModeControlWidget::STANDARD: {
- if (m_allViews.stateStandard)
- loaded = view->getView()->getRenderViewProxy()->LoadXMLState(
- m_allViews.stateStandard.GetPointer(), nullptr);
- } break;
- case ModeControlWidget::THREESLICE: {
- if (m_allViews.stateThreeSlice)
- loaded = view->getView()->getRenderViewProxy()->LoadXMLState(
- m_allViews.stateThreeSlice.GetPointer(), nullptr);
- } break;
- case ModeControlWidget::MULTISLICE: {
- if (m_allViews.stateMulti)
- loaded = view->getView()->getRenderViewProxy()->LoadXMLState(
- m_allViews.stateMulti.GetPointer(), nullptr);
- } break;
- case ModeControlWidget::SPLATTERPLOT: {
- if (m_allViews.stateSplatter)
- loaded = view->getView()->getRenderViewProxy()->LoadXMLState(
- m_allViews.stateSplatter.GetPointer(), nullptr);
- } break;
- default:
- view = nullptr;
- break;
- }
-
- if (!loaded)
- g_log.warning() << "Failed to restore the state of the current view even "
- "though I thought I had "
- "a state saved from before. The current state may not "
- "be consistent.";
-}
-
-/**
- * Get the current grid axes setting
- * @returns the true if the grid axes are on, else false
- */
-bool MdViewerWidget::areGridAxesOn() {
- // If we start up then we want to have the grid axes on
- if (m_gridAxesStartUpOn) {
- m_gridAxesStartUpOn = false;
- return true;
- }
-
- // Get the state of the Grid Axes
- auto renderView = this->currentView->getView();
- vtkSMProxy *gridAxes3DActor =
- vtkSMPropertyHelper(renderView->getProxy(), "AxesGrid", true)
- .GetAsProxy();
- auto gridAxesSetting =
- vtkSMPropertyHelper(gridAxes3DActor, "Visibility").GetAsInt();
- if (gridAxesSetting == 0) {
- return false;
- } else {
- return true;
- }
-}
-
-//-----------------------------------------------------------------------------
-void MdViewerWidget::showOutputWidget() {
- this->ui.outputWidget->raise();
- this->ui.outputWidget->show();
-}
-
-} // namespace SimpleGui
-} // namespace Vates
-} // namespace Mantid
diff --git a/qt/paraview_ext/VatesSimpleGui/CMakeLists.txt b/qt/paraview_ext/VatesSimpleGui/CMakeLists.txt
index f9619f72b6c8e62b76435bbd865d3c58c69037bb..5eadecf411cf1229f4c8b02673d4a3fe5502e195 100644
--- a/qt/paraview_ext/VatesSimpleGui/CMakeLists.txt
+++ b/qt/paraview_ext/VatesSimpleGui/CMakeLists.txt
@@ -8,5 +8,3 @@ include_directories( QtWidgets/inc )
set_mantid_subprojects( qt/paraview_ext/VatesAPI )
add_subdirectory( ViewWidgets )
include_directories( ViewWidgets/inc )
-
-add_subdirectory( StandAloneExec )
diff --git a/qt/paraview_ext/VatesSimpleGui/StandAloneExec/CMakeLists.txt b/qt/paraview_ext/VatesSimpleGui/StandAloneExec/CMakeLists.txt
deleted file mode 100644
index e2fcc82da74252343b65ee27377e7e7209594cd7..0000000000000000000000000000000000000000
--- a/qt/paraview_ext/VatesSimpleGui/StandAloneExec/CMakeLists.txt
+++ /dev/null
@@ -1,77 +0,0 @@
-cmake_minimum_required( VERSION 3.5 )
-project( VatesSimpleGui )
-set( PROJECT_NAME VatesSimpleGui )
-
-# Setup the include locations.
-include_directories(
- inc
- ${CMAKE_CURRENT_BINARY_DIR}
- ${CMAKE_CURRENT_BINARY_DIR}/../QtWidgets
- ${CMAKE_CURRENT_BINARY_DIR}/../ViewWidgets
-)
-
-# These are the C++ files to be compiled.
-set( INCLUDE_FILES
- inc/SimpleGuiApp.h
- inc/VsgMainWindow.h
-)
-
-set( SOURCE_FILES
- src/main.cpp
- src/SimpleGuiApp.cpp
- src/VsgMainWindow.cpp
-)
-
-# These are the headers to be preprocessed using
-# Qt's moc preprocessor.
-qt4_wrap_cpp( MOC_SRCS
- inc/SimpleGuiApp.h
- inc/VsgMainWindow.h
-)
-
-set( TEST_SUITES
- test/suite_StandAloneVsi
-)
-
-add_executable( ${PROJECT_NAME} ${INCLUDE_FILES} ${SOURCE_FILES} ${MOC_SRCS} )
-
-include_directories( SYSTEM ${PARAVIEW_INCLUDE_DIRS} )
-
-target_link_libraries( ${PROJECT_NAME} LINK_PRIVATE ${TCMALLOC_LIBRARIES_LINKTIME}
-pqCore pqComponents pqApplicationComponents
-${QT_LIBRARIES}
-API
-Kernel
-VatesAPI
-VatesSimpleGuiQtWidgets
-VatesSimpleGuiViewWidgets
-qtwidgetscommon
-vtkInteractionStyle
-vtkRenderingFreeType
-${POCO_LIBRARIES}
-${Boost_LIBRARIES}
-)
-
-if (OSX_VERSION VERSION_GREATER 10.8)
- set_target_properties ( ${PROJECT_NAME} PROPERTIES INSTALL_RPATH "@loader_path/../Libraries;@loader_path/../MacOS")
-endif ()
-
-if( SQUISH_FOUND )
- # Need to set the AUT first
- set( SQUISH_AUT VatesSimpleGui )
- set( SQUISH_AUT_PATH $<TARGET_FILE_DIR:${SQUISH_AUT}> )
-
- # Need to set environmental variables next
- set( auto_test_dir ${CMAKE_SOURCE_DIR} )
- string( REGEX REPLACE "Code/Mantid" "Test/AutoTestData" auto_test_dir ${auto_test_dir} )
- set( SQUISH_ENV_VARS
- PV_PLUGIN_PATH=$<TARGET_FILE_DIR:${SQUISH_AUT}>/${PVPLUGINS_DIR}/${PVPLUGINS_DIR}
- MANTID_AUTOTEST_DATA=${auto_test_dir}
- SQUISH_SCRIPT_DIR=${VSI_GLOBAL_SCRIPTS}
- )
-
- squish_add_test_suite( ${TEST_SUITES} )
-
-endif()
-
-install( TARGETS VatesSimpleGui RUNTIME DESTINATION ${BIN_DIR} )
diff --git a/qt/paraview_ext/VatesSimpleGui/StandAloneExec/inc/SimpleGuiApp.h b/qt/paraview_ext/VatesSimpleGui/StandAloneExec/inc/SimpleGuiApp.h
deleted file mode 100644
index 5d31ed330b6799942a521a342d8994bb2d046a0f..0000000000000000000000000000000000000000
--- a/qt/paraview_ext/VatesSimpleGui/StandAloneExec/inc/SimpleGuiApp.h
+++ /dev/null
@@ -1,57 +0,0 @@
-#ifndef SIMPLEGUIAPP_H
-#define SIMPLEGUIAPP_H
-
-#include <QApplication>
-
-class pqPVApplicationCore;
-/**
- *
- This is a wrapper to QApplication in order to handle exceptions and present
- them to the user in dialog boxes for better error reporting.
-
- @author Michael Reuter
- @date 04/08/2011
-
- Copyright © 2011 ISIS Rutherford Appleton Laboratory, NScD Oak Ridge
- National Laboratory & European Spallation Source
-
- This file is part of Mantid.
-
- Mantid is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 3 of the License, or
- (at your option) any later version.
-
- Mantid is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
-
- File change history is stored at: <https://github.com/mantidproject/mantid>
- Code Documentation is available at: <http://doxygen.mantidproject.org>
- */
-class SimpleGuiApp : public QApplication {
- Q_OBJECT
-public:
- /**
- * Object constructor.
- * @param argc number of command-line arguments
- * @param argv list of command-line agruments
- */
- SimpleGuiApp(int &argc, char **argv);
- /**
- * Intercept exceptions and print them in dialog boxes.
- * @param receiver receipient of an event
- * @param event the event to pass to the receiver
- * @return value from the receiver's event handler
- */
- bool notify(QObject *receiver, QEvent *event) override;
-
-private:
- pqPVApplicationCore *pvApp; ///< ParaView application engine
-};
-
-#endif // SIMPLEGUIAPP_H
diff --git a/qt/paraview_ext/VatesSimpleGui/StandAloneExec/inc/VsgMainWindow.h b/qt/paraview_ext/VatesSimpleGui/StandAloneExec/inc/VsgMainWindow.h
deleted file mode 100644
index 96bfd6c10a9851114e020b7f8e6d8fdf69e0a91e..0000000000000000000000000000000000000000
--- a/qt/paraview_ext/VatesSimpleGui/StandAloneExec/inc/VsgMainWindow.h
+++ /dev/null
@@ -1,68 +0,0 @@
-#ifndef VSGMAINWINDOW_H_
-#define VSGMAINWINDOW_H_
-
-#include <QMainWindow>
-
-namespace Mantid {
-namespace Vates {
-namespace SimpleGui {
-class MdViewerWidget;
-}
-}
-}
-
-class QAction;
-class QMenu;
-/**
- *
- This class represents the main level program.
-
- @author Michael Reuter
- @date 24/05/2011
-
- Copyright © 2011 ISIS Rutherford Appleton Laboratory, NScD Oak Ridge
- National Laboratory & European Spallation Source
-
- This file is part of Mantid.
-
- Mantid is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 3 of the License, or
- (at your option) any later version.
-
- Mantid is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
-
- File change history is stored at: <https://github.com/mantidproject/mantid>
- Code Documentation is available at: <http://doxygen.mantidproject.org>
- */
-class VsgMainWindow : public QMainWindow {
- Q_OBJECT
-
-public:
- /**
- * Default constructor.
- * @param parent the parent widget for the main window
- */
- VsgMainWindow(QWidget *parent = nullptr);
- /// Default destructor.
- ~VsgMainWindow() override;
-
-private:
- /// Create the actions for the main program.
- void createActions();
- /// Create the menus for the main program.
- void createMenus();
-
- QAction *openAction; ///< Action for opening files
- QAction *exitAction; ///< Action for exiting the program
- QMenu *fileMenu; ///< File actions menu
- Mantid::Vates::SimpleGui::MdViewerWidget *mdViewer; ///< The VATES viz widget
-};
-
-#endif // VSGMAINWINDOW_H_
diff --git a/qt/paraview_ext/VatesSimpleGui/StandAloneExec/src/SimpleGuiApp.cpp b/qt/paraview_ext/VatesSimpleGui/StandAloneExec/src/SimpleGuiApp.cpp
deleted file mode 100644
index 4b7a63d5c7fe30cfe6cd72114c3a9c0c258244fd..0000000000000000000000000000000000000000
--- a/qt/paraview_ext/VatesSimpleGui/StandAloneExec/src/SimpleGuiApp.cpp
+++ /dev/null
@@ -1,67 +0,0 @@
-#include "SimpleGuiApp.h"
-#include "MantidKernel/Logger.h"
-
-#include <pqPVApplicationCore.h>
-
-#include <QMessageBox>
-#include <QPushButton>
-
-#include <exception>
-#include <iostream>
-
-namespace {
-// static logger
-Mantid::Kernel::Logger g_log("VatesSimpleGui");
-}
-
-SimpleGuiApp::SimpleGuiApp(int &argc, char **argv) : QApplication(argc, argv) {
- this->pvApp = new pqPVApplicationCore(argc, argv);
-}
-
-bool SimpleGuiApp::notify(QObject *receiver, QEvent *event) {
- bool res = false;
- try {
- res = QApplication::notify(receiver, event);
- } catch (std::exception &e) {
- // Restore possible override cursor
- while (QApplication::overrideCursor()) {
- QApplication::restoreOverrideCursor();
- }
-
- g_log.fatal() << "Unexpected exception: " << e.what() << "\n";
- QMessageBox ask;
- QAbstractButton *terminateButton =
- ask.addButton(tr("Terminate"), QMessageBox::ActionRole);
- ask.addButton(tr("Continue"), QMessageBox::ActionRole);
- ask.setText(
- "Sorry, VatesSimpleGui has caught an unexpected exception:\n\n" +
- QString::fromStdString(e.what()) +
- "\n\nWould you like to terminate VatesSimpleGui or try to "
- "continue working?\n\nIf you choose to continue it is advisable "
- "to save your data and restart the application.");
- ask.setIcon(QMessageBox::Critical);
- ask.exec();
- if (ask.clickedButton() == terminateButton) {
- g_log.fatal("Terminated by user.");
- quit();
- }
- } catch (...) {
- g_log.fatal() << "Unknown exception\n";
- QMessageBox ask;
- QAbstractButton *terminateButton =
- ask.addButton(tr("Terminate"), QMessageBox::ActionRole);
- ask.addButton(tr("Continue"), QMessageBox::ActionRole);
- ask.setText("Sorry, VatesSimpleGui has caught an unexpected exception\n\n"
- "Would you like to terminate VatesSimpleGui or try to continue "
- "working?\n\nIf you choose to continue it is advisable to save "
- "your data and restart the application.");
- ask.setIcon(QMessageBox::Critical);
- ask.exec();
- if (ask.clickedButton() == terminateButton) {
- g_log.fatal("Terminated by user.");
- quit();
- }
- }
-
- return res;
-}
diff --git a/qt/paraview_ext/VatesSimpleGui/StandAloneExec/src/VsgMainWindow.cpp b/qt/paraview_ext/VatesSimpleGui/StandAloneExec/src/VsgMainWindow.cpp
deleted file mode 100644
index 0b8393897b05500a042623c3a80800d79d1e7af2..0000000000000000000000000000000000000000
--- a/qt/paraview_ext/VatesSimpleGui/StandAloneExec/src/VsgMainWindow.cpp
+++ /dev/null
@@ -1,41 +0,0 @@
-#include "VsgMainWindow.h"
-
-#include "MantidVatesSimpleGuiViewWidgets/MdViewerWidget.h"
-
-#include <QAction>
-#include <QMenu>
-#include <QMenuBar>
-
-using namespace Mantid::Vates::SimpleGui;
-
-VsgMainWindow::VsgMainWindow(QWidget *parent) : QMainWindow(parent) {
- this->mdViewer = new MdViewerWidget(this);
- this->setCentralWidget(this->mdViewer);
-
- this->createActions();
- this->createMenus();
- this->mdViewer->addMenus();
-}
-
-VsgMainWindow::~VsgMainWindow() {}
-
-void VsgMainWindow::createActions() {
- // File loading
- this->openAction = new QAction(QApplication::tr("&Open"), this);
- this->openAction->setShortcut(QApplication::tr("Ctrl+O"));
- this->openAction->setStatusTip(QApplication::tr("Open a file for viewing"));
- this->mdViewer->connectLoadDataReaction(this->openAction);
-
- // Program exit
- this->exitAction = new QAction(QApplication::tr("&Exit"), this);
- this->exitAction->setShortcut(QApplication::tr("Ctrl+Q"));
- this->exitAction->setStatusTip(QApplication::tr("Exit the program."));
- QObject::connect(this->exitAction, SIGNAL(triggered()), this, SLOT(close()));
-}
-
-void VsgMainWindow::createMenus() {
- this->fileMenu = this->menuBar()->addMenu(QApplication::tr("&File"));
- this->fileMenu->addAction(this->openAction);
- this->fileMenu->addSeparator();
- this->fileMenu->addAction(this->exitAction);
-}
diff --git a/qt/paraview_ext/VatesSimpleGui/StandAloneExec/src/main.cpp b/qt/paraview_ext/VatesSimpleGui/StandAloneExec/src/main.cpp
deleted file mode 100644
index 52b4b76048795fc5d0258493687788585f24bf59..0000000000000000000000000000000000000000
--- a/qt/paraview_ext/VatesSimpleGui/StandAloneExec/src/main.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-#include "SimpleGuiApp.h"
-#include "VsgMainWindow.h"
-
-#include <QMessageBox>
-
-int main(int argc, char **argv) {
- SimpleGuiApp app(argc, argv);
- try {
- VsgMainWindow window;
- window.show();
- return app.exec();
- } catch (std::exception &e) {
- QMessageBox::critical(nullptr, "VatesSimpleGui - Error",
- QString("An unhandled exception has been caught. "
- "VatesSimpleGui will have to close. "
- "Details:\n\n") +
- e.what());
- } catch (...) {
- QMessageBox::critical(nullptr, "VatesSimpleGui - Error",
- "An unhandled exception has been caught. "
- "VatesSimpleGui will have to close.");
- }
-}
diff --git a/qt/paraview_ext/VatesSimpleGui/StandAloneExec/test/suite_StandAloneVsi/.gitignore b/qt/paraview_ext/VatesSimpleGui/StandAloneExec/test/suite_StandAloneVsi/.gitignore
deleted file mode 100644
index 7ce55ba25d9969ff51444183fb1cfa69859897c0..0000000000000000000000000000000000000000
--- a/qt/paraview_ext/VatesSimpleGui/StandAloneExec/test/suite_StandAloneVsi/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-envvars
diff --git a/qt/paraview_ext/VatesSimpleGui/StandAloneExec/test/suite_StandAloneVsi/config.xml b/qt/paraview_ext/VatesSimpleGui/StandAloneExec/test/suite_StandAloneVsi/config.xml
deleted file mode 100644
index cd9af7bd98c957b67fffc6f620c2b4babf0d2798..0000000000000000000000000000000000000000
--- a/qt/paraview_ext/VatesSimpleGui/StandAloneExec/test/suite_StandAloneVsi/config.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<testconfig version="1.0">
-<information>
-<summary>Tests for the VatesSimpleGui</summary>
-<description>These are a collection of tests that excercise the standalone version of the Vates Simple User Interface.</description>
-</information>
-</testconfig>
diff --git a/qt/paraview_ext/VatesSimpleGui/StandAloneExec/test/suite_StandAloneVsi/objects.map b/qt/paraview_ext/VatesSimpleGui/StandAloneExec/test/suite_StandAloneVsi/objects.map
deleted file mode 100644
index c261097b06d2d7fe3210c3d614d9d7c2cbbe7740..0000000000000000000000000000000000000000
--- a/qt/paraview_ext/VatesSimpleGui/StandAloneExec/test/suite_StandAloneVsi/objects.map
+++ /dev/null
@@ -1,108 +0,0 @@
-:+X_QToolButton {text='+X' type='QToolButton' unnamed='1' visible='1' window=':_VsgMainWindow'}
-:-X_QToolButton {text='-X' type='QToolButton' unnamed='1' visible='1' window=':_VsgMainWindow'}
-:Automatic Color Scaling_QCheckBox {name='autoColorScaleCheckBox' text='Automatic Color Scaling' type='QCheckBox' visible='1' window=':_VsgMainWindow'}
-:CurrentTimeIndex_pqSpinBox {name='CurrentTimeIndex' type='pqSpinBox' visible='1' window=':_VsgMainWindow'}
-:CurrentTime_QLineEdit {name='CurrentTime' type='QLineEdit' visible='1' window=':_VsgMainWindow'}
-:File_QMenu {title='File' type='QMenu' unnamed='1' visible='1' window=':_VsgMainWindow'}
-:Next Frame_QToolButton {text='Next Frame' type='QToolButton' unnamed='1' visible='1' window=':_VsgMainWindow'}
-:Open File: (open multiple files with <ctrl> key.).Cancel_QPushButton {name='Cancel' text='Cancel' type='QPushButton' visible='1' window=':Open File: (open multiple files with <ctrl> key.)_pqFileDialog'}
-:Open File: (open multiple files with <ctrl> key.).Favorites_QListView {name='Favorites' type='QListView' visible='1' window=':Open File: (open multiple files with <ctrl> key.)_pqFileDialog'}
-:Open File: (open multiple files with <ctrl> key.).FileName_QLineEdit {name='FileName' type='QLineEdit' visible='1' window=':Open File: (open multiple files with <ctrl> key.)_pqFileDialog'}
-:Open File: (open multiple files with <ctrl> key.).FileType_QComboBox {name='FileType' type='QComboBox' visible='1' window=':Open File: (open multiple files with <ctrl> key.)_pqFileDialog'}
-:Open File: (open multiple files with <ctrl> key.).Files_QTreeView {name='Files' type='QTreeView' visible='1' window=':Open File: (open multiple files with <ctrl> key.)_pqFileDialog'}
-:Open File: (open multiple files with <ctrl> key.).NavigateUp_QToolButton {name='NavigateUp' type='QToolButton' visible='1' window=':Open File: (open multiple files with <ctrl> key.)_pqFileDialog'}
-:Open File: (open multiple files with <ctrl> key.).OK_QPushButton {name='OK' text='OK' type='QPushButton' visible='1' window=':Open File: (open multiple files with <ctrl> key.)_pqFileDialog'}
-:Open File: (open multiple files with <ctrl> key.).Parents_QComboBox {name='Parents' type='QComboBox' visible='1' window=':Open File: (open multiple files with <ctrl> key.)_pqFileDialog'}
-:Open File: (open multiple files with <ctrl> key.).Recent_QListView {name='Recent' type='QListView' visible='1' window=':Open File: (open multiple files with <ctrl> key.)_pqFileDialog'}
-:Open File: (open multiple files with <ctrl> key.)_pqFileDialog {name='FileOpenDialog' type='pqFileDialog' visible='1' windowTitle='Open File: (open multiple files with <ctrl> key.)'}
-:Play_QToolButton {text='Play' type='QToolButton' unnamed='1' visible='1' window=':_VsgMainWindow'}
-:Previous Frame_QToolButton {text='Previous Frame' type='QToolButton' unnamed='1' visible='1' window=':_VsgMainWindow'}
-:Reset Camera_QToolButton {text='Reset Camera' type='QToolButton' unnamed='1' visible='1' window=':_VsgMainWindow'}
-:ScrollArea.Bins_QLabel {container=':objectInspector.ScrollArea_QScrollArea' text='Bins' type='QLabel' unnamed='1' visible='1'}
-:ScrollArea.Bins_QLabel_2 {container=':objectInspector.ScrollArea_QScrollArea' occurrence='2' text='Bins' type='QLabel' unnamed='1' visible='1'}
-:ScrollArea.Bins_QLabel_3 {container=':objectInspector.ScrollArea_QScrollArea' occurrence='3' text='Bins' type='QLabel' unnamed='1' visible='1'}
-:ScrollArea.Bins_QLabel_4 {container=':objectInspector.ScrollArea_QScrollArea' occurrence='4' text='Bins' type='QLabel' unnamed='1' visible='1'}
-:ScrollArea.Bins_QLineEdit {container=':objectInspector.ScrollArea_QScrollArea' leftWidget=':ScrollArea.Bins_QLabel' type='QLineEdit' unnamed='1' visible='1'}
-:ScrollArea.Bins_QLineEdit_2 {container=':objectInspector.ScrollArea_QScrollArea' leftWidget=':ScrollArea.Bins_QLabel_2' type='QLineEdit' unnamed='1' visible='1'}
-:ScrollArea.Bins_QLineEdit_3 {container=':objectInspector.ScrollArea_QScrollArea' leftWidget=':ScrollArea.Bins_QLabel_3' type='QLineEdit' unnamed='1' visible='1'}
-:ScrollArea.Bins_QLineEdit_4 {container=':objectInspector.ScrollArea_QScrollArea' leftWidget=':ScrollArea.Bins_QLabel_4' type='QLineEdit' unnamed='1' visible='1'}
-:ScrollArea.DeltaE_QComboBox {container=':objectInspector.ScrollArea_QScrollArea' leftWidget=':ScrollArea.DeltaE_QLabel' type='QComboBox' unnamed='1' visible='1'}
-:ScrollArea.DeltaE_QLabel {container=':objectInspector.ScrollArea_QScrollArea' text='DeltaE' type='QLabel' unnamed='1' visible='1'}
-:ScrollArea.E_QComboBox {container=':objectInspector.ScrollArea_QScrollArea' leftWidget=':ScrollArea.E_QLabel' type='QComboBox' unnamed='1' visible='1'}
-:ScrollArea.E_QLabel {container=':objectInspector.ScrollArea_QScrollArea' text='E' type='QLabel' unnamed='1' visible='1'}
-:ScrollArea.Editor_RebinningCutterObjectPanel {container=':objectInspector.ScrollArea_QScrollArea' name='Editor' type='RebinningCutterObjectPanel' visible='1'}
-:ScrollArea.Int_QCheckBox {container=':objectInspector.ScrollArea_QScrollArea' leftWidget=':ScrollArea.Int_QLabel' type='QCheckBox' unnamed='1' visible='1'}
-:ScrollArea.Int_QCheckBox_2 {container=':objectInspector.ScrollArea_QScrollArea' leftWidget=':ScrollArea.Int_QLabel_2' type='QCheckBox' unnamed='1' visible='1'}
-:ScrollArea.Int_QCheckBox_3 {container=':objectInspector.ScrollArea_QScrollArea' leftWidget=':ScrollArea.Int_QLabel_3' type='QCheckBox' unnamed='1' visible='1'}
-:ScrollArea.Int_QCheckBox_4 {container=':objectInspector.ScrollArea_QScrollArea' leftWidget=':ScrollArea.Int_QLabel_4' type='QCheckBox' unnamed='1' visible='1'}
-:ScrollArea.Int_QLabel {container=':objectInspector.ScrollArea_QScrollArea' text='Int' type='QLabel' unnamed='1' visible='1'}
-:ScrollArea.Int_QLabel_2 {container=':objectInspector.ScrollArea_QScrollArea' occurrence='2' text='Int' type='QLabel' unnamed='1' visible='1'}
-:ScrollArea.Int_QLabel_3 {container=':objectInspector.ScrollArea_QScrollArea' occurrence='3' text='Int' type='QLabel' unnamed='1' visible='1'}
-:ScrollArea.Int_QLabel_4 {container=':objectInspector.ScrollArea_QScrollArea' occurrence='4' text='Int' type='QLabel' unnamed='1' visible='1'}
-:ScrollArea.LineEdit_QLineEdit {container=':objectInspector.ScrollArea_QScrollArea' name='LineEdit' occurrence='2' type='QLineEdit' visible='1'}
-:ScrollArea.Max_QLabel {container=':objectInspector.ScrollArea_QScrollArea' occurrence='2' text='Max' type='QLabel' unnamed='1' visible='1'}
-:ScrollArea.Max_QLabel_2 {container=':objectInspector.ScrollArea_QScrollArea' occurrence='3' text='Max' type='QLabel' unnamed='1' visible='1'}
-:ScrollArea.Max_QLabel_3 {container=':objectInspector.ScrollArea_QScrollArea' occurrence='4' text='Max' type='QLabel' unnamed='1' visible='1'}
-:ScrollArea.Max_QLabel_4 {container=':objectInspector.ScrollArea_QScrollArea' occurrence='5' text='Max' type='QLabel' unnamed='1' visible='1'}
-:ScrollArea.Max_QLineEdit {container=':objectInspector.ScrollArea_QScrollArea' leftWidget=':ScrollArea.Max_QLabel' type='QLineEdit' unnamed='1' visible='1'}
-:ScrollArea.Max_QLineEdit_2 {container=':objectInspector.ScrollArea_QScrollArea' leftWidget=':ScrollArea.Max_QLabel_2' type='QLineEdit' unnamed='1' visible='1'}
-:ScrollArea.Max_QLineEdit_3 {container=':objectInspector.ScrollArea_QScrollArea' leftWidget=':ScrollArea.Max_QLabel_3' type='QLineEdit' unnamed='1' visible='1'}
-:ScrollArea.Max_QLineEdit_4 {container=':objectInspector.ScrollArea_QScrollArea' leftWidget=':ScrollArea.Max_QLabel_4' type='QLineEdit' unnamed='1' visible='1'}
-:ScrollArea.Min_QLabel {container=':objectInspector.ScrollArea_QScrollArea' occurrence='2' text='Min' type='QLabel' unnamed='1' visible='1'}
-:ScrollArea.Min_QLabel_2 {container=':objectInspector.ScrollArea_QScrollArea' occurrence='3' text='Min' type='QLabel' unnamed='1' visible='1'}
-:ScrollArea.Min_QLabel_3 {container=':objectInspector.ScrollArea_QScrollArea' occurrence='4' text='Min' type='QLabel' unnamed='1' visible='1'}
-:ScrollArea.Min_QLabel_4 {container=':objectInspector.ScrollArea_QScrollArea' occurrence='5' text='Min' type='QLabel' unnamed='1' visible='1'}
-:ScrollArea.Min_QLineEdit {container=':objectInspector.ScrollArea_QScrollArea' leftWidget=':ScrollArea.Min_QLabel' type='QLineEdit' unnamed='1' visible='1'}
-:ScrollArea.Min_QLineEdit_2 {container=':objectInspector.ScrollArea_QScrollArea' leftWidget=':ScrollArea.Min_QLabel_2' type='QLineEdit' unnamed='1' visible='1'}
-:ScrollArea.Min_QLineEdit_3 {container=':objectInspector.ScrollArea_QScrollArea' leftWidget=':ScrollArea.Min_QLabel_3' type='QLineEdit' unnamed='1' visible='1'}
-:ScrollArea.Min_QLineEdit_4 {container=':objectInspector.ScrollArea_QScrollArea' leftWidget=':ScrollArea.Min_QLabel_4' type='QLineEdit' unnamed='1' visible='1'}
-:ScrollArea.Number of Points_QLineEdit {container=':objectInspector.ScrollArea_QScrollArea' name='Number of Points' type='QLineEdit' visible='1'}
-:ScrollArea.h_QComboBox {container=':objectInspector.ScrollArea_QScrollArea' leftWidget=':ScrollArea.h_QLabel' type='QComboBox' unnamed='1' visible='1'}
-:ScrollArea.h_QLabel {container=':objectInspector.ScrollArea_QScrollArea' text='h' type='QLabel' unnamed='1' visible='1'}
-:ScrollArea.k_QComboBox {container=':objectInspector.ScrollArea_QScrollArea' leftWidget=':ScrollArea.k_QLabel' type='QComboBox' unnamed='1' visible='1'}
-:ScrollArea.k_QLabel {container=':objectInspector.ScrollArea_QScrollArea' text='k' type='QLabel' unnamed='1' visible='1'}
-:ScrollArea.l_QComboBox {container=':objectInspector.ScrollArea_QScrollArea' leftWidget=':ScrollArea.l_QLabel' type='QComboBox' unnamed='1' visible='1'}
-:ScrollArea.l_QLabel {container=':objectInspector.ScrollArea_QScrollArea' text='l' type='QLabel' unnamed='1' visible='1'}
-:ScrollArea_DimensionWidget {container=':objectInspector.ScrollArea_QScrollArea' occurrence='4' type='DimensionWidget' unnamed='1' visible='1'}
-:ScrollArea_GeometryWidget {container=':objectInspector.ScrollArea_QScrollArea' type='GeometryWidget' unnamed='1' visible='1'}
-:ScrollArea_QScrollBar {container=':objectInspector.ScrollArea_QScrollArea' type='QScrollBar' unnamed='1' visible='1'}
-:TimeControlWidget_Mantid::Vates::SimpleGui::TimeControlWidget {name='timeControlWidget' type='Mantid::Vates::SimpleGui::TimeControlWidget' visible='1' window=':_VsgMainWindow' windowTitle='TimeControlWidget'}
-:Viewport_pqQVTKWidget {name='Viewport' occurrence='2' type='pqQVTKWidget' visible='0'}
-:_QGraphicsScene {type='QGraphicsScene' unnamed='1'}
-:_QGraphicsScene_2 {occurrence='2' type='QGraphicsScene' unnamed='1'}
-:_QGraphicsScene_3 {occurrence='3' type='QGraphicsScene' unnamed='1'}
-:_QItemSelectionModel {occurrence='13' type='QItemSelectionModel' unnamed='1'}
-:_QMenuBar {type='QMenuBar' unnamed='1' visible='1' window=':_VsgMainWindow'}
-:_QVTKInteractorAdapter {occurrence='2' type='QVTKInteractorAdapter' unnamed='1'}
-:_VsgMainWindow {type='VsgMainWindow' unnamed='1' visible='1'}
-:_pqPipelineModel {type='pqPipelineModel' unnamed='1'}
-:mainRenderFrame.Viewport_pqQVTKWidget {container=':splitter_2.mainRenderFrame_QFrame' name='Viewport' type='pqQVTKWidget' visible='1'}
-:multiSliceButton_QPushButton {name='multiSliceButton' type='QPushButton' visible='1' window=':_VsgMainWindow'}
-:objectInspector.Apply_QPushButton {container=':qt_tabwidget_stackedwidget.objectInspector_pqObjectInspectorWidget' name='Accept' text='Apply' type='QPushButton' visible='1'}
-:objectInspector.Delete_QPushButton {container=':qt_tabwidget_stackedwidget.objectInspector_pqObjectInspectorWidget' name='Delete' text='Delete' type='QPushButton' visible='1'}
-:objectInspector.ScrollArea_QScrollArea {container=':qt_tabwidget_stackedwidget.objectInspector_pqObjectInspectorWidget' name='ScrollArea' type='QScrollArea' visible='1'}
-:parallelProjButton_QToolButton {name='parallelProjButton' type='QToolButton' visible='1' window=':_VsgMainWindow'}
-:qt_spinbox_lineedit_QLineEdit {name='qt_spinbox_lineedit' type='QLineEdit' visible='1' window=':_VsgMainWindow'}
-:qt_tabwidget_stackedwidget.objectInspector_pqObjectInspectorWidget {container=':splitter.qt_tabwidget_stackedwidget_QStackedWidget' name='objectInspector' type='pqObjectInspectorWidget' visible='1'}
-:renderFrame.Viewport_pqQVTKWidget {container=':splitter_2.renderFrame_QFrame' name='Viewport' type='pqQVTKWidget' visible='1'}
-:splatterPlotButton_QPushButton {name='splatterPlotButton' type='QPushButton' visible='1' window=':_VsgMainWindow'}
-:splitter.Properties_pqProxyTabWidget {container=':splitter_2.splitter_QSplitter' name='proxyTabWidget' text='Properties' type='pqProxyTabWidget' visible='1'}
-:splitter.pipelineBrowser_pqPipelineBrowserWidget {container=':splitter_2.splitter_QSplitter' name='pipelineBrowser' type='pqPipelineBrowserWidget' visible='1'}
-:splitter.qt_tabwidget_stackedwidget_QStackedWidget {container=':splitter_2.splitter_QSplitter' name='qt_tabwidget_stackedwidget' type='QStackedWidget' visible='1'}
-:splitter_2.Rebin_QPushButton {container=':splitter_2_QSplitter' name='rebinButton' text='Rebin' type='QPushButton' visible='1'}
-:splitter_2.Threshold_QPushButton {container=':splitter_2_QSplitter' name='thresholdButton' text='Threshold' type='QPushButton' visible='1'}
-:splitter_2.mainRenderFrame_QFrame {container=':splitter_2_QSplitter' name='mainRenderFrame' type='QFrame' visible='1'}
-:splitter_2.renderFrame_QFrame {container=':splitter_2_QSplitter' name='renderFrame' type='QFrame' visible='1'}
-:splitter_2.splitter_QSplitter {container=':splitter_2_QSplitter' name='splitter' type='QSplitter' visible='1'}
-:splitter_2.xAxisWidget_Mantid::Vates::SimpleGui::AxisInteractor {container=':splitter_2_QSplitter' name='xAxisWidget' type='Mantid::Vates::SimpleGui::AxisInteractor' visible='1'}
-:splitter_2.yAxisWidget_Mantid::Vates::SimpleGui::AxisInteractor {container=':splitter_2_QSplitter' name='yAxisWidget' type='Mantid::Vates::SimpleGui::AxisInteractor' visible='1'}
-:splitter_2.zAxisWidget_Mantid::Vates::SimpleGui::AxisInteractor {container=':splitter_2_QSplitter' name='zAxisWidget' type='Mantid::Vates::SimpleGui::AxisInteractor' visible='1'}
-:splitter_2_QGraphicsView {container=':splitter_2_QSplitter' type='QGraphicsView' unnamed='1' visible='1'}
-:splitter_2_QGraphicsView_2 {container=':splitter_2_QSplitter' occurrence='2' type='QGraphicsView' unnamed='1' visible='1'}
-:splitter_2_QGraphicsView_3 {container=':splitter_2_QSplitter' occurrence='3' type='QGraphicsView' unnamed='1' visible='1'}
-:splitter_2_QSplitter {name='splitter_2' type='QSplitter' visible='1' window=':_VsgMainWindow'}
-:splitter_2_QwtScaleWidget {container=':splitter_2_QSplitter' occurrence='2' type='QwtScaleWidget' unnamed='1' visible='1'}
-:splitter_2_QwtScaleWidget_2 {container=':splitter_2_QSplitter' type='QwtScaleWidget' unnamed='1' visible='1'}
-:splitter_2_QwtScaleWidget_3 {container=':splitter_2_QSplitter' occurrence='3' type='QwtScaleWidget' unnamed='1' visible='1'}
-:standardButton_QPushButton {name='standardButton' type='QPushButton' visible='1' window=':_VsgMainWindow'}
-:threeSliceButton_QPushButton {name='threeSliceButton' type='QPushButton' visible='1' window=':_VsgMainWindow'}
diff --git a/qt/paraview_ext/VatesSimpleGui/StandAloneExec/test/suite_StandAloneVsi/shared/scripts/common_checks.py b/qt/paraview_ext/VatesSimpleGui/StandAloneExec/test/suite_StandAloneVsi/shared/scripts/common_checks.py
deleted file mode 100644
index 03986d2023a2229ede797a81fdd820a1e57771b6..0000000000000000000000000000000000000000
--- a/qt/paraview_ext/VatesSimpleGui/StandAloneExec/test/suite_StandAloneVsi/shared/scripts/common_checks.py
+++ /dev/null
@@ -1,29 +0,0 @@
-source(findFile("scripts", "global_checks.py"))
-
-def check_mode_buttons(std, ms, ts, sp):
- waitFor("object.exists(':standardButton_QPushButton')", 20000)
- test.compare(fix_bool(findObject(":standardButton_QPushButton").enabled), std)
- waitFor("object.exists(':multiSliceButton_QPushButton')", 20000)
- test.compare(fix_bool(findObject(":multiSliceButton_QPushButton").enabled), ms)
- waitFor("object.exists(':threeSliceButton_QPushButton')", 20000)
- test.compare(fix_bool(findObject(":threeSliceButton_QPushButton").enabled), ts)
- waitFor("object.exists(':splatterPlotButton_QPushButton')", 20000)
- test.compare(fix_bool(findObject(":splatterPlotButton_QPushButton").enabled), sp)
-
-def check_time_controls(mode):
- waitFor("object.exists(':TimeControlWidget_Mantid::Vates::SimpleGui::TimeControlWidget')", 20000)
- test.compare(fix_bool(findObject(":TimeControlWidget_Mantid::Vates::SimpleGui::TimeControlWidget").enabled),
- mode)
-
-def check_slices(axisScaleName, indicatorsRequired):
- ext = None
- if axisScaleName[0] == "y":
- ext = ""
- if axisScaleName[0] == "x":
- ext = "_2"
- if axisScaleName[0] == "z":
- ext = "_3"
-
- graphScene = waitForObject(":_QGraphicsScene%s" % ext)
- indicatorsPresent = graphScene.items().size()
- test.compare(indicatorsPresent, indicatorsRequired)
diff --git a/qt/paraview_ext/VatesSimpleGui/StandAloneExec/test/suite_StandAloneVsi/shared/scripts/test_helpers.py b/qt/paraview_ext/VatesSimpleGui/StandAloneExec/test/suite_StandAloneVsi/shared/scripts/test_helpers.py
deleted file mode 100644
index 6e43571f50cb0fccc56ad97fcec08fcbc52c4588..0000000000000000000000000000000000000000
--- a/qt/paraview_ext/VatesSimpleGui/StandAloneExec/test/suite_StandAloneVsi/shared/scripts/test_helpers.py
+++ /dev/null
@@ -1,52 +0,0 @@
-source(findFile("scripts", "global_helpers.py"))
-
-import os
-def open_file(filename):
- activateItem(waitForObjectItem(":_QMenuBar", "File"))
- activateItem(waitForObjectItem(":File_QMenu", "Open"))
- ctx = currentApplicationContext()
- dirname = ctx.environmentVariable("MANTID_AUTOTEST_DATA")
- #test.log("Data Dir: %s" % dirname)
- fileDialog = waitForObject(":Open File: (open multiple files with <ctrl> key.)_pqFileDialog")
-
- fileDialog_NavigateUp = waitForObject(":Open File: (open multiple files with <ctrl> key.).NavigateUp_QToolButton")
- fileDialog_Files = waitForObject(":Open File: (open multiple files with <ctrl> key.).Files_QTreeView")
- fileDialog_Parents = waitForObject(":Open File: (open multiple files with <ctrl> key.).Parents_QComboBox")
- # Reset to top-level directory
- count = fileDialog_Parents.count
- for i in range(count):
- clickButton(fileDialog_NavigateUp)
-
- # Now, click down the file path. CMake uses Linux slashes on Windows too.
- dirs = dirname.split('/')
- for dir in dirs:
- # Left: Linux, Right: Windows
- if '' == dir or ':' in dir:
- continue
- dir = fix_slashes(dir)
- #test.log("Clicking Dir %s" % dir)
- waitForObjectItem(":Open File: (open multiple files with <ctrl> key.).Files_QTreeView", dir)
- doubleClickItem(":Open File: (open multiple files with <ctrl> key.).Files_QTreeView", dir, 27, 11, 0, Qt.LeftButton)
-
- fileDialog_FileName = waitForObject(":Open File: (open multiple files with <ctrl> key.).FileName_QLineEdit")
- fileDialog_FileName.setText(filename)
- fileDialog_OkButton = waitForObject(":Open File: (open multiple files with <ctrl> key.).OK_QPushButton")
- clickButton(fileDialog_OkButton)
-
-def quit_program():
- activateItem(waitForObjectItem(":_QMenuBar", "File"))
- activateItem(waitForObjectItem(":File_QMenu", "Exit"))
-
-def switch_mode(mode):
- clickButton(":%sButton_QPushButton" % mode)
-
-def set_ptw_lineedit_property(value, property, ext=""):
- if ext != "":
- ext = "_" + ext
- object = ":ScrollArea.%s_QLineEdit%s" % (property, ext)
- lineedit = waitForObject(object)
- N = lineedit.text.length()
- for i in range(N):
- lineedit.cursorBackward(True)
- type(lineedit, "<Del>")
- lineedit.text = str(value)
diff --git a/qt/paraview_ext/VatesSimpleGui/StandAloneExec/test/suite_StandAloneVsi/suite.conf b/qt/paraview_ext/VatesSimpleGui/StandAloneExec/test/suite_StandAloneVsi/suite.conf
deleted file mode 100644
index 2f2985b0f0aefcf69338c76b27b85aa200f6c3e4..0000000000000000000000000000000000000000
--- a/qt/paraview_ext/VatesSimpleGui/StandAloneExec/test/suite_StandAloneVsi/suite.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-CLASS=
-CLASSPATH=
-CWD=<CWD_of_Server>
-ENVVARS=envvars
-HOOK_SUB_PROCESSES=false
-IMPLICITAUTSTART=0
-LANGUAGE=Python
-TEST_CASES=tst_Startup tst_Load3dMdew tst_Load4dMdew tst_LoadPeaks tst_Splatter tst_MultiSlice tst_ThreeSlice tst_PeaksOverlay tst_RebinExtents_MultiSlice
-VERSION=2
-WRAPPERS=Qt
diff --git a/qt/paraview_ext/VatesSimpleGui/StandAloneExec/test/suite_StandAloneVsi/tst_ChangeAxes_MultiSlice/test.py b/qt/paraview_ext/VatesSimpleGui/StandAloneExec/test/suite_StandAloneVsi/tst_ChangeAxes_MultiSlice/test.py
deleted file mode 100644
index ce037f31cf6691a4f539b87a118cd30de75805f5..0000000000000000000000000000000000000000
--- a/qt/paraview_ext/VatesSimpleGui/StandAloneExec/test/suite_StandAloneVsi/tst_ChangeAxes_MultiSlice/test.py
+++ /dev/null
@@ -1,52 +0,0 @@
-
-def main():
- source(findFile("scripts", "test_helpers.py"))
- source(findFile("scripts", "common_checks.py"))
- startApplication("VatesSimpleGui")
- open_file("SEQ_MDEW.nxs")
-
- clickButton(":splitter_2.Rebin_QPushButton")
- set_ptw_lineedit_property(20, "Bins")
- set_ptw_lineedit_property(20, "Bins", "2")
- set_ptw_lineedit_property(20, "Bins", "3")
- set_ptw_lineedit_property(20, "Bins", "4")
- apply_ptw_settings()
-
- switch_mode("multiSlice")
-
- # Num slices: X = 3, Y = 2, Z = 1
- make_slice("xAxisWidget", 0.1)
- make_slice("yAxisWidget", -0.7)
- make_slice("zAxisWidget", -0.7)
- make_slice("xAxisWidget", 0.3)
- make_slice("yAxisWidget", -0.4)
- make_slice("xAxisWidget", 0.4)
- apply_ptw_settings()
-
- mouseClick(waitForObject(":splitter.pipelineBrowser_pqPipelineBrowserWidget"), 51, 56, 0, Qt.LeftButton)
-
- # Change the axis orientations
- set_ptw_combobox_property("DeltaE", 1)
- apply_ptw_settings()
-
- check_axis_parameters("xAxisWidget", "DeltaE", 17.0, 19.0)
-
- check_slices("xAxisWidget", 0)
- check_slices("yAxisWidget", 2)
- check_slices("zAxisWidget", 1)
-
-def set_ptw_combobox_property(property, index):
- object = ":ScrollArea.%s_QComboBox" % property
- combobox = waitForObject(object)
- comboboxItem = combobox.itemText(index)
- clickItem(object, comboboxItem, 5, 5, 0, Qt.LeftButton)
-
-def check_axis_parameters(axisScaleName, title, min, max):
- axisScale = waitForObject(":splitter_2.%s_Mantid::Vates::SimpleGui::AxisInteractor" % axisScaleName)
- min_curr = axisScale.getMinimum
- max_curr = axisScale.getMaximum
- title_curr = axisScale.getTitle
-
- test.compare(title, title_curr)
- test.compare(min, min_curr)
- test.compare(max, max_curr)
diff --git a/qt/paraview_ext/VatesSimpleGui/StandAloneExec/test/suite_StandAloneVsi/tst_Load3dMdew/test.py b/qt/paraview_ext/VatesSimpleGui/StandAloneExec/test/suite_StandAloneVsi/tst_Load3dMdew/test.py
deleted file mode 100644
index f740e9f048c04b29e43e3f607a0866cd8647361b..0000000000000000000000000000000000000000
--- a/qt/paraview_ext/VatesSimpleGui/StandAloneExec/test/suite_StandAloneVsi/tst_Load3dMdew/test.py
+++ /dev/null
@@ -1,10 +0,0 @@
-
-def main():
- source(findFile("scripts", "test_helpers.py"))
- source(findFile("scripts", "common_checks.py"))
- startApplication("VatesSimpleGui")
- open_file("TOPAZ_3680_5_sec_MDEW.nxs")
- check_mode_buttons(std=False, ms=True, ts=True, sp=True)
- check_time_controls(False)
- quit_program()
-
diff --git a/qt/paraview_ext/VatesSimpleGui/StandAloneExec/test/suite_StandAloneVsi/tst_Load4dMdew/config.xml b/qt/paraview_ext/VatesSimpleGui/StandAloneExec/test/suite_StandAloneVsi/tst_Load4dMdew/config.xml
deleted file mode 100644
index d038a39f73ded1e77a1ef5c0eb14779e933e8e77..0000000000000000000000000000000000000000
--- a/qt/paraview_ext/VatesSimpleGui/StandAloneExec/test/suite_StandAloneVsi/tst_Load4dMdew/config.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<testconfig version="1.0">
-<information>
-<summary/>
-<description/>
-</information>
-</testconfig>
diff --git a/qt/paraview_ext/VatesSimpleGui/StandAloneExec/test/suite_StandAloneVsi/tst_Load4dMdew/test.py b/qt/paraview_ext/VatesSimpleGui/StandAloneExec/test/suite_StandAloneVsi/tst_Load4dMdew/test.py
deleted file mode 100644
index debaf2f216bb565efe6cb609d6eb910fae654254..0000000000000000000000000000000000000000
--- a/qt/paraview_ext/VatesSimpleGui/StandAloneExec/test/suite_StandAloneVsi/tst_Load4dMdew/test.py
+++ /dev/null
@@ -1,10 +0,0 @@
-
-def main():
- source(findFile("scripts", "test_helpers.py"))
- source(findFile("scripts", "common_checks.py"))
- startApplication("VatesSimpleGui")
- open_file("SEQ_MDEW.nxs")
- check_mode_buttons(std=False, ms=True, ts=True, sp=True)
- check_time_controls(True)
- quit_program()
-
diff --git a/qt/paraview_ext/VatesSimpleGui/StandAloneExec/test/suite_StandAloneVsi/tst_LoadPeaks/test.py b/qt/paraview_ext/VatesSimpleGui/StandAloneExec/test/suite_StandAloneVsi/tst_LoadPeaks/test.py
deleted file mode 100644
index fb915bf7aae2f70fc166400ccf631867d027b702..0000000000000000000000000000000000000000
--- a/qt/paraview_ext/VatesSimpleGui/StandAloneExec/test/suite_StandAloneVsi/tst_LoadPeaks/test.py
+++ /dev/null
@@ -1,10 +0,0 @@
-
-def main():
- source(findFile("scripts", "test_helpers.py"))
- source(findFile("scripts", "common_checks.py"))
- startApplication("VatesSimpleGui")
- open_file("TOPAZ_3680_10_sec_40.peaks")
- check_mode_buttons(std=False, ms=False, ts=False, sp=False)
- check_time_controls(False)
- quit_program()
-
diff --git a/qt/paraview_ext/VatesSimpleGui/StandAloneExec/test/suite_StandAloneVsi/tst_MultiSlice/config.xml b/qt/paraview_ext/VatesSimpleGui/StandAloneExec/test/suite_StandAloneVsi/tst_MultiSlice/config.xml
deleted file mode 100644
index d038a39f73ded1e77a1ef5c0eb14779e933e8e77..0000000000000000000000000000000000000000
--- a/qt/paraview_ext/VatesSimpleGui/StandAloneExec/test/suite_StandAloneVsi/tst_MultiSlice/config.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<testconfig version="1.0">
-<information>
-<summary/>
-<description/>
-</information>
-</testconfig>
diff --git a/qt/paraview_ext/VatesSimpleGui/StandAloneExec/test/suite_StandAloneVsi/tst_MultiSlice/test.py b/qt/paraview_ext/VatesSimpleGui/StandAloneExec/test/suite_StandAloneVsi/tst_MultiSlice/test.py
deleted file mode 100644
index a8f49e54703438c0229bea274e53e236214d5cce..0000000000000000000000000000000000000000
--- a/qt/paraview_ext/VatesSimpleGui/StandAloneExec/test/suite_StandAloneVsi/tst_MultiSlice/test.py
+++ /dev/null
@@ -1,33 +0,0 @@
-
-def main():
- source(findFile("scripts", "test_helpers.py"))
- source(findFile("scripts", "common_checks.py"))
- startApplication("VatesSimpleGui")
- open_file("SEQ_MDEW.nxs")
-
- clickButton(":splitter_2.Rebin_QPushButton")
- set_ptw_lineedit_property(20, "Bins")
- set_ptw_lineedit_property(20, "Bins", "2")
- set_ptw_lineedit_property(20, "Bins", "3")
- set_ptw_lineedit_property(20, "Bins", "4")
- apply_ptw_settings()
-
- switch_mode("multiSlice")
- check_mode_buttons(std=True, ms=False, ts=True, sp=True)
-
- make_slice("xAxisWidget", 0.1)
- make_slice("yAxisWidget", -0.7)
- make_slice("zAxisWidget", -0.7)
- make_slice("xAxisWidget", 0.3)
- make_slice("yAxisWidget", -0.4)
- make_slice("xAxisWidget", 0.4)
- apply_ptw_settings()
-
- check_slices("xAxisWidget", 3)
- check_slices("yAxisWidget", 2)
- check_slices("zAxisWidget", 1)
-
- mouseDrag(waitForObject(":renderFrame.Viewport_pqQVTKWidget"), 137, 170, -95, 9, 1, Qt.LeftButton)
-
- quit_program()
-
diff --git a/qt/paraview_ext/VatesSimpleGui/StandAloneExec/test/suite_StandAloneVsi/tst_PeaksOverlay/test.py b/qt/paraview_ext/VatesSimpleGui/StandAloneExec/test/suite_StandAloneVsi/tst_PeaksOverlay/test.py
deleted file mode 100644
index bfff4d3c03bcf13ba2a2ec1c815422eb760ed551..0000000000000000000000000000000000000000
--- a/qt/paraview_ext/VatesSimpleGui/StandAloneExec/test/suite_StandAloneVsi/tst_PeaksOverlay/test.py
+++ /dev/null
@@ -1,26 +0,0 @@
-
-def main():
- source(findFile("scripts", "test_helpers.py"))
- source(findFile("scripts", "common_checks.py"))
- startApplication("VatesSimpleGui")
- open_file("TOPAZ_3680_5_sec_MDEW.nxs")
- switch_mode("splatterPlot")
- check_mode_buttons(std=True, ms=True, ts=True, sp=False)
-
- set_ptw_lineedit_property(10000, "Number of Points")
- apply_ptw_settings()
-
- open_file("TOPAZ_3680_10_sec_40.peaks")
-
- sendEvent("QWheelEvent", waitForObject(":renderFrame.Viewport_pqQVTKWidget"), 386, 329, 120, 0, 2)
- sendEvent("QWheelEvent", waitForObject(":renderFrame.Viewport_pqQVTKWidget"), 386, 329, 120, 0, 2)
- sendEvent("QWheelEvent", waitForObject(":renderFrame.Viewport_pqQVTKWidget"), 386, 329, 120, 0, 2)
- sendEvent("QWheelEvent", waitForObject(":renderFrame.Viewport_pqQVTKWidget"), 386, 329, 120, 0, 2)
- sendEvent("QWheelEvent", waitForObject(":renderFrame.Viewport_pqQVTKWidget"), 386, 329, 120, 0, 2)
- sendEvent("QWheelEvent", waitForObject(":renderFrame.Viewport_pqQVTKWidget"), 386, 329, 120, 0, 2)
- sendEvent("QWheelEvent", waitForObject(":renderFrame.Viewport_pqQVTKWidget"), 386, 329, 120, 0, 2)
- sendEvent("QWheelEvent", waitForObject(":renderFrame.Viewport_pqQVTKWidget"), 386, 329, 120, 0, 2)
- sendEvent("QWheelEvent", waitForObject(":renderFrame.Viewport_pqQVTKWidget"), 386, 329, 120, 0, 2)
- mouseDrag(waitForObject(":renderFrame.Viewport_pqQVTKWidget"), 384, 329, -79, 4, 1, Qt.LeftButton)
-
- quit_program()
diff --git a/qt/paraview_ext/VatesSimpleGui/StandAloneExec/test/suite_StandAloneVsi/tst_RebinExtents_MultiSlice/test.py b/qt/paraview_ext/VatesSimpleGui/StandAloneExec/test/suite_StandAloneVsi/tst_RebinExtents_MultiSlice/test.py
deleted file mode 100644
index 9216f76de044d6c70d8995ff7f2dc0b4e4e18cf4..0000000000000000000000000000000000000000
--- a/qt/paraview_ext/VatesSimpleGui/StandAloneExec/test/suite_StandAloneVsi/tst_RebinExtents_MultiSlice/test.py
+++ /dev/null
@@ -1,39 +0,0 @@
-def main():
- source(findFile("scripts", "test_helpers.py"))
- source(findFile("scripts", "common_checks.py"))
- startApplication("VatesSimpleGui")
- open_file("SEQ_MDEW.nxs")
-
- clickButton(":splitter_2.Rebin_QPushButton")
- set_ptw_lineedit_property(20, "Bins")
- set_ptw_lineedit_property(20, "Bins", "2")
- set_ptw_lineedit_property(20, "Bins", "3")
- set_ptw_lineedit_property(20, "Bins", "4")
- apply_ptw_settings()
-
- switch_mode("multiSlice")
-
- # Num slices: X = 3, Y = 2, Z = 1
- make_slice("xAxisWidget", 0.1)
- make_slice("yAxisWidget", -0.7)
- make_slice("zAxisWidget", -0.7)
- make_slice("xAxisWidget", 0.3)
- make_slice("yAxisWidget", -0.4)
- make_slice("xAxisWidget", 0.4)
- apply_ptw_settings()
-
- mouseClick(waitForObject(":splitter.pipelineBrowser_pqPipelineBrowserWidget"), 87, 54, 0, Qt.LeftButton)
-
- # Change extents on dataset
- mouseClick(waitForObject(":qt_tabwidget_stackedwidget.objectInspector_pqObjectInspectorWidget"), 10, 20, 0, Qt.LeftButton)
- set_ptw_lineedit_property(0.2, "Min")
- set_ptw_lineedit_property(0.35, "Max")
- set_ptw_lineedit_property(-0.5, "Max", "2")
- apply_ptw_settings()
-
- # New num slices: X = 1, Y = 1, Z = 1
- check_slices("xAxisWidget", 1)
- check_slices("yAxisWidget", 1)
- check_slices("zAxisWidget", 1)
-
- quit_program()
diff --git a/qt/paraview_ext/VatesSimpleGui/StandAloneExec/test/suite_StandAloneVsi/tst_Splatter/test.py b/qt/paraview_ext/VatesSimpleGui/StandAloneExec/test/suite_StandAloneVsi/tst_Splatter/test.py
deleted file mode 100644
index e7b33818b5c672c9c29b493df57240a3595802e2..0000000000000000000000000000000000000000
--- a/qt/paraview_ext/VatesSimpleGui/StandAloneExec/test/suite_StandAloneVsi/tst_Splatter/test.py
+++ /dev/null
@@ -1,15 +0,0 @@
-
-def main():
- source(findFile("scripts", "test_helpers.py"))
- source(findFile("scripts", "common_checks.py"))
- startApplication("VatesSimpleGui")
- open_file("TOPAZ_3680_5_sec_MDEW.nxs")
- switch_mode("splatterPlot")
- check_mode_buttons(std=True, ms=True, ts=True, sp=False)
-
- set_ptw_lineedit_property(10000, "Number of Points")
- apply_ptw_settings()
-
- mouseDrag(waitForObject(":renderFrame.Viewport_pqQVTKWidget"), 505, 223, -35, 9, 1, Qt.LeftButton)
- quit_program()
-
diff --git a/qt/paraview_ext/VatesSimpleGui/StandAloneExec/test/suite_StandAloneVsi/tst_Startup/config.xml b/qt/paraview_ext/VatesSimpleGui/StandAloneExec/test/suite_StandAloneVsi/tst_Startup/config.xml
deleted file mode 100644
index d131f69cfea2ff7424890b07539ef97b028d2c3b..0000000000000000000000000000000000000000
--- a/qt/paraview_ext/VatesSimpleGui/StandAloneExec/test/suite_StandAloneVsi/tst_Startup/config.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<testconfig version="1.0">
-<information>
-<summary>Startup/Shutdown program</summary>
-<description>This test looks to see if you can startup and then shutdown the program cleanly without loading
-any data or looking at any view.</description>
-</information>
-</testconfig>
diff --git a/qt/paraview_ext/VatesSimpleGui/StandAloneExec/test/suite_StandAloneVsi/tst_Startup/test.py b/qt/paraview_ext/VatesSimpleGui/StandAloneExec/test/suite_StandAloneVsi/tst_Startup/test.py
deleted file mode 100644
index 2832cf969621270eed4455bdd111af6b52a70d3c..0000000000000000000000000000000000000000
--- a/qt/paraview_ext/VatesSimpleGui/StandAloneExec/test/suite_StandAloneVsi/tst_Startup/test.py
+++ /dev/null
@@ -1,6 +0,0 @@
-
-def main():
- source(findFile("scripts", "test_helpers.py"))
- startApplication("VatesSimpleGui")
- quit_program()
-
diff --git a/qt/paraview_ext/VatesSimpleGui/StandAloneExec/test/suite_StandAloneVsi/tst_ThreeSlice/test.py b/qt/paraview_ext/VatesSimpleGui/StandAloneExec/test/suite_StandAloneVsi/tst_ThreeSlice/test.py
deleted file mode 100644
index 5fb5ce160cca1ef271128db94ea8b2d933650b41..0000000000000000000000000000000000000000
--- a/qt/paraview_ext/VatesSimpleGui/StandAloneExec/test/suite_StandAloneVsi/tst_ThreeSlice/test.py
+++ /dev/null
@@ -1,16 +0,0 @@
-
-def main():
- source(findFile("scripts", "test_helpers.py"))
- source(findFile("scripts", "common_checks.py"))
- startApplication("VatesSimpleGui")
- open_file("TOPAZ_3680_5_sec_MDEW.nxs")
-
- switch_mode("threeSlice")
- check_mode_buttons(std=True, ms=True, ts=False, sp=True)
-
- mouseDrag(waitForObject(":mainRenderFrame.Viewport_pqQVTKWidget"), 219, 225, 0, 12, 1, Qt.LeftButton)
- mouseClick(waitForObject(":mainRenderFrame.Viewport_pqQVTKWidget"), 184, 191, 0, Qt.LeftButton)
- mouseDrag(waitForObject(":mainRenderFrame.Viewport_pqQVTKWidget"), 156, 214, 1, -20, 1, Qt.LeftButton)
-
- quit_program()
-
diff --git a/qt/paraview_ext/VatesSimpleGui/StandAloneExec/ui/VsgMainWindow.ui b/qt/paraview_ext/VatesSimpleGui/StandAloneExec/ui/VsgMainWindow.ui
deleted file mode 100644
index ccb6a4143451f90c8a72be51278ab1121177e63e..0000000000000000000000000000000000000000
--- a/qt/paraview_ext/VatesSimpleGui/StandAloneExec/ui/VsgMainWindow.ui
+++ /dev/null
@@ -1,242 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>vsgMainWindow</class>
- <widget class="QMainWindow" name="vsgMainWindow">
- <property name="geometry">
- <rect>
- <x>0</x>
- <y>0</y>
- <width>774</width>
- <height>593</height>
- </rect>
- </property>
- <property name="windowTitle">
- <string>Mantid Vates Simple Interface</string>
- </property>
- <property name="windowIcon">
- <iconset resource="../../ViewWidgets/icons/ViewWidgetsIcons.qrc">
- <normaloff>:/VatesSimpleGuiViewWidgets/icons/pvIcon.png</normaloff>:/VatesSimpleGuiViewWidgets/icons/pvIcon.png</iconset>
- </property>
- <widget class="QWidget" name="centralwidget">
- <layout class="QVBoxLayout" name="verticalLayout">
- <item>
- <layout class="QHBoxLayout" name="horizontalLayout">
- <item>
- <spacer name="horizontalSpacer">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>40</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
- <item>
- <widget class="TimeControlWidget" name="timeControlWidget" native="true"/>
- </item>
- <item>
- <widget class="ModeControlWidget" name="modeControlWidget" native="true"/>
- </item>
- <item>
- <widget class="ColorSelectionWidget" name="colorSelectionWidget" native="true"/>
- </item>
- <item>
- <spacer name="horizontalSpacer_3">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>40</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
- </layout>
- </item>
- <item>
- <widget class="QSplitter" name="splitter_2">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <widget class="QSplitter" name="splitter">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="minimumSize">
- <size>
- <width>0</width>
- <height>0</height>
- </size>
- </property>
- <property name="orientation">
- <enum>Qt::Vertical</enum>
- </property>
- <widget class="pqPipelineBrowserWidget" name="pipelineBrowser">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="minimumSize">
- <size>
- <width>150</width>
- <height>50</height>
- </size>
- </property>
- <property name="contextMenuPolicy">
- <enum>Qt::ActionsContextMenu</enum>
- </property>
- <property name="frameShape">
- <enum>QFrame::StyledPanel</enum>
- </property>
- <property name="frameShadow">
- <enum>QFrame::Raised</enum>
- </property>
- </widget>
- <widget class="pqProxyTabWidget" name="proxyTabWidget">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
- <horstretch>0</horstretch>
- <verstretch>30</verstretch>
- </sizepolicy>
- </property>
- <property name="minimumSize">
- <size>
- <width>150</width>
- <height>50</height>
- </size>
- </property>
- </widget>
- </widget>
- <widget class="QWidget" name="viewWidget" native="true">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="minimumSize">
- <size>
- <width>600</width>
- <height>500</height>
- </size>
- </property>
- </widget>
- </widget>
- </item>
- </layout>
- </widget>
- <widget class="QMenuBar" name="menubar">
- <property name="geometry">
- <rect>
- <x>0</x>
- <y>0</y>
- <width>774</width>
- <height>25</height>
- </rect>
- </property>
- <widget class="QMenu" name="menu_File">
- <property name="title">
- <string>&File</string>
- </property>
- <addaction name="action_Open"/>
- <addaction name="separator"/>
- <addaction name="action_Exit"/>
- </widget>
- <addaction name="menu_File"/>
- </widget>
- <widget class="QStatusBar" name="statusbar"/>
- <action name="action_Open">
- <property name="text">
- <string>&Open</string>
- </property>
- <property name="shortcut">
- <string>Ctrl+O</string>
- </property>
- </action>
- <action name="action_Exit">
- <property name="text">
- <string>&Exit</string>
- </property>
- <property name="shortcut">
- <string>Ctrl+Q</string>
- </property>
- </action>
- <action name="action_Undo">
- <property name="text">
- <string>&Undo</string>
- </property>
- <property name="shortcut">
- <string>Ctrl+Z</string>
- </property>
- </action>
- </widget>
- <customwidgets>
- <customwidget>
- <class>pqProxyTabWidget</class>
- <extends>QTabWidget</extends>
- <header>pqProxyTabWidget.h</header>
- <container>1</container>
- </customwidget>
- <customwidget>
- <class>pqPipelineBrowserWidget</class>
- <extends>QFrame</extends>
- <header>pqPipelineBrowserWidget.h</header>
- <container>1</container>
- </customwidget>
- <customwidget>
- <class>TimeControlWidget</class>
- <extends>QWidget</extends>
- <header>TimeControlWidget.h</header>
- <container>1</container>
- </customwidget>
- <customwidget>
- <class>ModeControlWidget</class>
- <extends>QWidget</extends>
- <header>ModeControlWidget.h</header>
- <container>1</container>
- </customwidget>
- <customwidget>
- <class>ColorSelectionWidget</class>
- <extends>QWidget</extends>
- <header>ColorSelectionWidget.h</header>
- <container>1</container>
- </customwidget>
- </customwidgets>
- <resources>
- <include location="../../ViewWidgets/icons/ViewWidgetsIcons.qrc"/>
- </resources>
- <connections>
- <connection>
- <sender>action_Exit</sender>
- <signal>triggered()</signal>
- <receiver>vsgMainWindow</receiver>
- <slot>close()</slot>
- <hints>
- <hint type="sourcelabel">
- <x>-1</x>
- <y>-1</y>
- </hint>
- <hint type="destinationlabel">
- <x>399</x>
- <y>299</y>
- </hint>
- </hints>
- </connection>
- </connections>
-</ui>