New QtWebEngine Implementation of HelpWindow

.github/workflows/close_issues.yml

@@ -11,6 +11,6 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Closes issues related to a merged pull request.
-        uses: ldez/gha-mjolnir@v1.4.1
+        uses: ldez/gha-mjolnir@v1.5.0
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.pre-commit-config.yaml

@@ -24,13 +24,13 @@ repos:
         exclude: .md5$|^external/|^tools/|Testing/Tools/cxxtest
 
   - repo: https://github.com/pre-commit/mirrors-clang-format
-    rev: v19.1.3 # updating to a new version should wait until maintenance
+    rev: v19.1.5 # updating to a new version should wait until maintenance
     hooks:
     - id: clang-format
       exclude: Testing/Tools/cxxtest|tools|qt/icons/resources/
 
   - repo: https://github.com/mantidproject/pre-commit-hooks.git
-    rev: 17c2842277953a4afcbca26bf84e8956f729e765
+    rev: 15c7c52cf8eeb0d74c736a1f100743a244c2f0a8
     hooks:
       - id: cmake-missing-pytest-files
         # Exclude sphinx / template file
@@ -59,7 +59,7 @@ repos:
           )$
 
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.7.4
+    rev: v0.8.4
     # ruff must appear before black in the list of hooks
     hooks:
       - id: ruff

CMakeLists.txt

@@ -12,6 +12,10 @@ endif()
 if(POLICY CMP0074)
   cmake_policy(SET CMP0074 NEW)
 endif()
+# install() DESTINATION paths are normalized. https://cmake.org/cmake/help/latest/policy/CMP0177.html
+if(POLICY CMP0177)
+  cmake_policy(SET CMP0177 NEW)
+endif()
 
 # Add the path to our custom 'find' modules
 set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/buildconfig/CMake")

Framework/API/CMakeLists.txt

@@ -81,6 +81,7 @@ set(SRC_FILES
     src/IPeaksWorkspace.cpp
     src/IPowderDiffPeakFunction.cpp
     src/ISISInstrumentDataCache.cpp
+    src/ISISRunLogs.cpp
     src/ISpectrum.cpp
     src/ITableWorkspace.cpp
     src/ImmutableCompositeFunction.cpp
@@ -265,6 +266,7 @@ set(INC_FILES
     inc/MantidAPI/IPeaksWorkspace_fwd.h
     inc/MantidAPI/IPowderDiffPeakFunction.h
     inc/MantidAPI/ISISInstrumentDataCache.h
+    inc/MantidAPI/ISISRunLogs.h
     inc/MantidAPI/IPreview.h
     inc/MantidAPI/ISpectrum.h
     inc/MantidAPI/ISplittersWorkspace.h
@@ -409,7 +411,6 @@ set(TEST_FILES
     HistogramValidatorTest.h
     HistoryItemTest.h
     HistoryViewTest.h
-    IEventListTest.h
     IFunction1DSpectrumTest.h
     IFunction1DTest.h
     IFunctionMDTest.h
@@ -534,7 +535,7 @@ target_link_libraries(
          Mantid::Geometry
          Mantid::Indexing
          Mantid::Parallel
-         Nexus::nexus
+         Mantid::NexusCpp
   PRIVATE ${WINSOCK} ${BCRYPT} Mantid::Beamline Mantid::Json
 )
 

Framework/API/inc/MantidAPI/AlgorithmHistory.h

@@ -12,7 +12,7 @@
 #include "MantidAPI/DllConfig.h"
 #include "MantidKernel/DateAndTime.h"
 #include "MantidKernel/PropertyHistory.h"
-#include <nexus/NeXusFile.hpp>
+#include "MantidNexusCpp/NeXusFile.hpp"
 
 #include <ctime>
 #include <set>

Framework/API/inc/MantidAPI/BoxController.h

@@ -12,7 +12,7 @@
 #include "MantidKernel/Exception.h"
 #include "MantidKernel/System.h"
 #include "MantidKernel/ThreadPool.h"
-#include <nexus/NeXusFile.hpp>
+#include "MantidNexusCpp/NeXusFile.hpp"
 
 #include <numeric>
 #include <optional>

Framework/API/inc/MantidAPI/Citation.h

@@ -7,12 +7,11 @@
 #pragma once
 
 #include "MantidAPI/DllConfig.h"
+#include "MantidNexusCpp/NeXusFile.hpp"
 
 #include <string>
 #include <vector>
 
-#include <nexus/NeXusFile.hpp>
-
 namespace Mantid {
 namespace API {
 

Framework/DataHandling/inc/MantidDataHandling/ISISRunLogs.h → Framework/API/inc/MantidAPI/ISISRunLogs.h

@@ -6,15 +6,15 @@
 // SPDX - License - Identifier: GPL - 3.0 +
 #pragma once
 
-#include "MantidDataHandling/DllConfig.h"
+#include "MantidAPI/DllConfig.h"
 #include "MantidKernel/LogParser.h"
 
 #include "MantidAPI/Run.h"
 
 #include <memory>
 
 namespace Mantid {
-namespace DataHandling {
+namespace API {
 
 /**
 
@@ -25,7 +25,7 @@ namespace DataHandling {
     - current period log: "period x"
     - all periods: "periods"
  */
-class MANTID_DATAHANDLING_DLL ISISRunLogs {
+class MANTID_API_DLL ISISRunLogs {
 public:
   /// Construct this object using a run that has the required ICP event log
   /// and the number of periods
@@ -48,5 +48,5 @@ class MANTID_DATAHANDLING_DLL ISISRunLogs {
   std::unique_ptr<Kernel::LogParser> m_logParser;
 };
 
-} // namespace DataHandling
+} // namespace API
 } // namespace Mantid

Framework/API/inc/MantidAPI/MatrixWorkspace.h

@@ -32,6 +32,8 @@ namespace Geometry {
 class ParameterMap;
 }
 
+const std::vector<std::string> validPlotTypes{"plot", "marker", "histogram", "errorbar_x", "errorbar_y", "errorbar_xy"};
+
 namespace API {
 class Axis;
 class SpectrumDetectorMapping;
@@ -134,6 +136,21 @@ class MANTID_API_DLL MatrixWorkspace : public IMDWorkspace, public ExperimentInf
   /// Gets MatrixWorkspace title (same as Run object run_title property)
   const std::string getTitle() const override;
 
+  /// Sets MatrixWorkspace plot_type
+  void setPlotType(const std::string &);
+  /// Gets MatrixWorkspace plot_type
+  std::string getPlotType() const;
+
+  /// Set the marker style for plotting
+  void setMarkerStyle(const std::string &markerType);
+  /// Get the marker style for plotting
+  std::string getMarkerStyle() const;
+
+  /// Set the size of the marker for plotting
+  void setMarkerSize(const float markerSize);
+  /// Get the size of the marker for plotting
+  float getMarkerSize() const;
+
   virtual Types::Core::DateAndTime getFirstPulseTime() const;
   Types::Core::DateAndTime getLastPulseTime() const;
 
@@ -513,6 +530,10 @@ class MANTID_API_DLL MatrixWorkspace : public IMDWorkspace, public ExperimentInf
   mutable std::atomic<bool> m_indexInfoNeedsUpdate{true};
   mutable std::mutex m_indexInfoMutex;
 
+  // Marker style and size, used for plotting
+  std::string m_marker;
+  float m_marker_size;
+
 protected:
   /// Getter for the dimension id based on the axis.
   std::string getDimensionIdFromAxis(const int &axisIndex) const;

Framework/API/inc/MantidAPI/WorkspaceOpOverloads.h

@@ -54,9 +54,10 @@ MatrixWorkspace_sptr MANTID_API_DLL operator/=(const MatrixWorkspace_sptr &lhs,
 */
 struct MANTID_API_DLL WorkspaceHelpers {
   // Checks whether the binning is the same in two workspaces
-  static bool matchingBins(const MatrixWorkspace &ws1, const MatrixWorkspace &ws2, const bool firstOnly = false);
+  static bool matchingBins(const std::shared_ptr<const MatrixWorkspace> &ws1,
+                           const std::shared_ptr<const MatrixWorkspace> &ws2, const bool firstOnly = false);
   // Checks whether a the X vectors in a workspace are actually the same vector
-  static bool sharedXData(const MatrixWorkspace &WS);
+  static bool sharedXData(const std::shared_ptr<const MatrixWorkspace> &WS);
   // Divides the data in a workspace by the bin width to make it a distribution
   // (or the reverse)
   static void makeDistribution(const MatrixWorkspace_sptr &workspace, const bool forwards = true);

Framework/API/src/BoxController.cpp

@@ -8,7 +8,6 @@
 
 #include "MantidAPI/BoxController.h"
 #include "MantidKernel/Strings.h"
-#include "MantidKernel/System.h"
 #include "MantidKernel/VectorHelper.h"
 
 #include <Poco/DOM/Attr.h>

Framework/API/src/BoxControllerSettingsAlgorithm.cpp

@@ -12,8 +12,8 @@
 #include "MantidKernel/ArrayProperty.h"
 #include "MantidKernel/BoundedValidator.h"
 #include "MantidKernel/StringTokenizer.h"
+
 #include "MantidKernel/Strings.h"
-#include "MantidKernel/System.h"
 
 using namespace Mantid::Kernel;
 

Framework/API/src/Citation.cpp

@@ -6,7 +6,7 @@
 // SPDX - License - Identifier: GPL - 3.0 +
 #include "MantidAPI/Citation.h"
 
-#include <nexus/NeXusFile.hpp>
+#include "MantidNexusCpp/NeXusFile.hpp"
 #include <stdexcept>
 
 #include <stdexcept>

Framework/API/src/CoordTransform.cpp

@@ -8,7 +8,6 @@
 #include "MantidGeometry/MDGeometry/MDTypes.h"
 #include "MantidKernel/Exception.h"
 #include "MantidKernel/Matrix.h"
-#include "MantidKernel/System.h"
 #include "MantidKernel/VMD.h"
 #include <boost/algorithm/string.hpp>
 #include <boost/format.hpp>

Framework/API/src/DataProcessorAlgorithm.cpp

@@ -16,7 +16,6 @@
 #include "MantidKernel/FacilityInfo.h"
 #include "MantidKernel/PropertyManager.h"
 #include "MantidKernel/PropertyManagerDataService.h"
-#include "MantidKernel/System.h"
 #include "Poco/Path.h"
 #include <stdexcept>
 #include <utility>

Framework/API/src/EnabledWhenWorkspaceIsType.cpp

@@ -5,7 +5,6 @@
 //   Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
 // SPDX - License - Identifier: GPL - 3.0 +
 #include "MantidAPI/EnabledWhenWorkspaceIsType.h"
-#include "MantidKernel/System.h"
 
 using namespace Mantid::Kernel;
 using namespace Mantid::API;

Framework/API/src/ExperimentInfo.cpp

@@ -37,6 +37,7 @@
 #include "MantidKernel/Property.h"
 #include "MantidKernel/StringTokenizer.h"
 #include "MantidKernel/Strings.h"
+#include "MantidNexusCpp/NeXusException.hpp"
 
 #include "MantidTypes/SpectrumDefinition.h"
 
@@ -45,7 +46,6 @@
 #include <boost/regex.hpp>
 
 #include <Poco/Path.h>
-#include <nexus/NeXusException.hpp>
 
 #include <algorithm>
 #include <memory>

Framework/API/src/FileBackedExperimentInfo.cpp

@@ -8,11 +8,11 @@
 #include "MantidKernel/Logger.h"
 
 #include <sstream>
+#include <utility>
 
 // clang-format off
-#include <nexus/NeXusFile.hpp>
-#include <nexus/NeXusException.hpp>
-#include <utility>
+#include "MantidNexusCpp/NeXusFile.hpp"
+#include "MantidNexusCpp/NeXusException.hpp"
 // clang-format on
 
 namespace Mantid::API {

Framework/API/src/FrameworkManager.cpp

@@ -16,12 +16,11 @@
 #include "MantidKernel/MultiThreaded.h"
 #include "MantidKernel/PropertyManagerDataService.h"
 #include "MantidKernel/UsageService.h"
+#include "MantidNexusCpp/NeXusFile.hpp"
 
 #include <boost/algorithm/string/classification.hpp>
 #include <boost/algorithm/string/split.hpp>
 
-#include <nexus/NeXusFile.hpp>
-
 #include <Poco/ActiveResult.h>
 
 #include <clocale>
@@ -70,7 +69,7 @@ const char *PLUGINS_EXCLUDE_KEY = "framework.plugins.exclude";
  */
 // Prevent clang-tidy trying to change the signature for ext. interface
 // NOLINTNEXTLINE(readability-non-const-parameter)
-void NexusErrorFunction(void *, char *) {
+void NexusErrorFunction(void *, const char *) {
   // Do nothing.
 }
 

Framework/API/src/IEventList.cpp

@@ -5,4 +5,3 @@
 //   Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
 // SPDX - License - Identifier: GPL - 3.0 +
 #include "MantidAPI/IEventList.h"
-#include "MantidKernel/System.h"

Framework/API/src/IMDHistoWorkspace.cpp

@@ -8,8 +8,8 @@
 #include "MantidAPI/ExperimentInfo.h"
 #include "MantidAPI/Sample.h"
 #include "MantidKernel/Exception.h"
+
 #include "MantidKernel/IPropertyManager.h"
-#include "MantidKernel/System.h"
 
 #include <sstream>
 

Framework/DataHandling/src/ISISRunLogs.cpp → Framework/API/src/ISISRunLogs.cpp

@@ -5,12 +5,12 @@
 //   Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
 // SPDX - License - Identifier: GPL - 3.0 +
 // Includes
-#include "MantidDataHandling/ISISRunLogs.h"
+#include "MantidAPI/ISISRunLogs.h"
 
 #include "MantidKernel/LogFilter.h"
 #include "MantidKernel/TimeSeriesProperty.h"
 
-namespace Mantid::DataHandling {
+namespace Mantid::API {
 namespace {
 /// static logger
 Kernel::Logger g_log("ISISRunLogs");
@@ -142,4 +142,4 @@ std::vector<std::string> ISISRunLogs::getLogNamesExcludedFromFiltering(const API
   return retVal;
 }
 
-} // namespace Mantid::DataHandling
+} // namespace Mantid::API

Framework/API/src/ISpectrum.cpp

@@ -6,8 +6,8 @@
 // SPDX - License - Identifier: GPL - 3.0 +
 #include "MantidAPI/ISpectrum.h"
 #include "MantidAPI/MatrixWorkspace.h"
+
 #include "MantidHistogramData/Histogram.h"
-#include "MantidKernel/System.h"
 
 namespace Mantid::API {
 

Framework/API/src/LogManager.cpp

@@ -10,9 +10,7 @@
 #include "MantidKernel/PropertyNexus.h"
 #include "MantidKernel/TimeROI.h"
 #include "MantidKernel/TimeSeriesProperty.h"
-
-#include <nexus/NeXusFile.hpp>
-#include <numeric>
+#include "MantidNexusCpp/NeXusFile.hpp"
 
 namespace Mantid::API {
 

Framework/API/src/MDGeometry.cpp

@@ -7,10 +7,10 @@
 #include "MantidAPI/MDGeometry.h"
 #include "MantidAPI/AnalysisDataService.h"
 #include "MantidAPI/CoordTransform.h"
+
 #include "MantidGeometry/MDGeometry/IMDDimension.h"
 #include "MantidGeometry/MDGeometry/MDGeometryXMLBuilder.h"
 #include "MantidGeometry/MDGeometry/MDHistoDimension.h"
-#include "MantidKernel/System.h"
 
 #include <Poco/NObserver.h>
 #include <memory>