diff --git a/docs/source/release/v4.3.0/mantidworkbench.rst b/docs/source/release/v4.3.0/mantidworkbench.rst index fde0e841965ce4d1de39fe679796189cc6a96da9..ec5519a48146681a137b5c158b120df9540940f8 100644 --- a/docs/source/release/v4.3.0/mantidworkbench.rst +++ b/docs/source/release/v4.3.0/mantidworkbench.rst @@ -36,10 +36,10 @@ Improvements - Default values for algorithm properties now appear as placeholder (greyed-out) text on custm algorithm dialogs. - The context menu for WorkspaceGroups now contains plotting options so you can plot all of the workspaces in the group. - A warning now appears if you attempt to plot more than ten spectra. +- The Save menu action in the workspaces toolbox to save using version 1 of the SaveAscii algorithm has been removed as no one was using it and it only added confusion. The option to save using the most recent version of SaveASCII is still available. Bugfixes ######## - - Fixed an issue with Workspace History where unrolling consecutive workflow algorithms would result in only one of the algorithms being unrolled. - Fixed a couple of errors in the python scripts generated from plots for newer versions of Matplotlib. - Colorbar scale no longer vanish on colorfill plots with a logarithmic scale diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/WorkspacePresenter/IWorkspaceDockView.h b/qt/widgets/common/inc/MantidQtWidgets/Common/WorkspacePresenter/IWorkspaceDockView.h index 5988c6d7d1960b026ddfe78c7e27c579b916b12f..abe90d75626e6297d7a3b4d5325765f9f968bdc9 100644 --- a/qt/widgets/common/inc/MantidQtWidgets/Common/WorkspacePresenter/IWorkspaceDockView.h +++ b/qt/widgets/common/inc/MantidQtWidgets/Common/WorkspacePresenter/IWorkspaceDockView.h @@ -31,7 +31,7 @@ class IWorkspaceDockView { public: enum class SortDirection { Ascending, Descending }; enum class SortCriteria { ByName, ByLastModified, ByMemorySize }; - enum class SaveFileType { Nexus, ASCII, ASCIIv1 }; + enum class SaveFileType { Nexus, ASCII }; virtual ~IWorkspaceDockView(){}; diff --git a/qt/widgets/common/src/WorkspacePresenter/WorkspaceTreeWidget.cpp b/qt/widgets/common/src/WorkspacePresenter/WorkspaceTreeWidget.cpp index c41059374e2e43d1505ba66a6ae7b9b7d950a8e6..2d18042acb059997a1624d18f1ccf0bcfaa13fd4 100644 --- a/qt/widgets/common/src/WorkspacePresenter/WorkspaceTreeWidget.cpp +++ b/qt/widgets/common/src/WorkspacePresenter/WorkspaceTreeWidget.cpp @@ -415,8 +415,6 @@ void WorkspaceTreeWidget::handleShowSaveAlgorithm() { m_saveFileType = SaveFileType::Nexus; else if (actionName.compare("ASCII") == 0) m_saveFileType = SaveFileType::ASCII; - else if (actionName.compare("ASCII v1")) - m_saveFileType = SaveFileType::ASCIIv1; } m_presenter->notifyFromView(ViewNotifiable::Flag::SaveSingleWorkspace); @@ -439,8 +437,6 @@ void WorkspaceTreeWidget::saveWorkspace(const std::string &wsName, case SaveFileType::Nexus: algorithmName = "SaveNexus"; break; - case SaveFileType::ASCIIv1: - version = 1; case SaveFileType::ASCII: algorithmName = "SaveAscii"; break; @@ -1180,7 +1176,6 @@ void WorkspaceTreeWidget::workspaceSelected() { // Add some save algorithms addSaveMenuOption("SaveNexus", "Nexus"); addSaveMenuOption("SaveAscii", "ASCII"); - addSaveMenuOption("SaveAscii.1", "ASCII v1"); // Set the button to show the menu m_saveButton->setMenu(m_saveMenu); diff --git a/qt/widgets/common/test/WorkspacePresenter/WorkspacePresenterTest.h b/qt/widgets/common/test/WorkspacePresenter/WorkspacePresenterTest.h index 1ddf87711fd4fb08bde35fe48bc43bf0bb179d2d..16f24a44a49b00cf32321bc5fccf16815d56275f 100644 --- a/qt/widgets/common/test/WorkspacePresenter/WorkspacePresenterTest.h +++ b/qt/widgets/common/test/WorkspacePresenter/WorkspacePresenterTest.h @@ -458,22 +458,6 @@ public: TS_ASSERT(Mock::VerifyAndClearExpectations(&mockView)); } - void testSaveSingleWorkspaceASCIIv1() { - using SaveFileType = IWorkspaceDockView::SaveFileType; - ::testing::DefaultValue<SaveFileType>::Set(SaveFileType::ASCIIv1); - auto ws1 = WorkspaceCreationHelper::create2DWorkspace(10, 10); - - EXPECT_CALL(*mockView.get(), getSelectedWorkspace()).WillOnce(Return(ws1)); - EXPECT_CALL(*mockView.get(), getSaveFileType()).Times(Exactly(1)); - EXPECT_CALL(*mockView.get(), - saveWorkspace(ws1->getName(), SaveFileType::ASCIIv1)) - .Times(Exactly(1)); - - presenter->notifyFromView(ViewNotifiable::Flag::SaveSingleWorkspace); - - TS_ASSERT(Mock::VerifyAndClearExpectations(&mockView)); - } - void testSaveSingleWorkspaceASCII() { using SaveFileType = IWorkspaceDockView::SaveFileType; ::testing::DefaultValue<SaveFileType>::Set(SaveFileType::ASCII);