Colormap resampler

.clang-format

@@ -13,6 +13,8 @@ AccessModifierOffset: -4 # -IndentWidth
 ConstructorInitializerIndentWidth: 8 # 2 * IndentWidth
 
 BreakBeforeBraces: Allman
+SeparateDefinitionBlocks: Always
+EmptyLineBeforeAccessModifier: Always
 
 AllowShortFunctionsOnASingleLine: Inline
 AlwaysBreakTemplateDeclarations: true
@@ -24,3 +26,7 @@ MaxEmptyLinesToKeep: 2
 Standard: Cpp11
 UseTab: Never
 
+ContinuationIndentWidth: 4
+AlignAfterOpenBracket: true
+LambdaBodyIndentation: Signature
+

.github/workflows/build_wheels.yml

@@ -8,7 +8,7 @@ on:
 
 env:
   PYSIDE_VERSION: 6.7.1
-  PIP_EXTRA_INDEX_URL: "https://download.qt.io/official_releases/QtForPython/"
+  #PIP_EXTRA_INDEX_URL: "https://download.qt.io/official_releases/QtForPython/"
 
 jobs:
   build_sdist:
@@ -36,7 +36,7 @@ jobs:
         include:
           - os: ubuntu-latest
             arch: x86_64
-          - os: windows-latest
+          - os: windows-2019
             arch: x86_64
           - os: macos-13  # Intel
             arch: x86_64
@@ -53,7 +53,7 @@ jobs:
         run: |
           echo "GITHUB_WORKSPACE=$GITHUB_WORKSPACE" >> $GITHUB_ENV
       - name: Build wheels
-        uses: pypa/cibuildwheel@v2.18.1
+        uses: pypa/cibuildwheel@v2.20.0
         env:
           PYSIDE_VERSION: ${{ env.PYSIDE_VERSION }}
           PIP_EXTRA_INDEX_URL: ${{ env.PIP_EXTRA_INDEX_URL }}
@@ -73,7 +73,7 @@ jobs:
             auditwheel repair -w {dest_dir} --exclude libpyside6.abi3.so.6.7 --exclude libshiboken6.abi3.so.6.7 --exclude libQt6Core.so.6 --exclude libQt6Widgets.so.6 --exclude libQt6Gui.so.6 --exclude libpyside6qml.abi3.so.6.7 --exclude libGLX.so.0 --exclude libOpenGL.so.0 --exclude libxcb.so.1 --only-plat --plat manylinux_2_28_x86_64 {wheel}
           CIBW_REPAIR_WHEEL_COMMAND_MACOS:
           CIBW_MANYLINUX_X86_64_IMAGE: manylinux_2_28
-          CIBW_SKIP: "*-win32 *i686 *38-* pp* *musllinux*"
+          CIBW_SKIP: "*-win32 *i686 *38-* pp* *musllinux* *313*"
           CIBW_BUILD_VERBOSITY: 3
           CIBW_ARCH: ${{ matrix.arch }}
 

SciQLopPlots/bindings/bindings.h

@@ -10,6 +10,15 @@
 
 #include "_QCustomPlot.hpp"
 #include <SciQLopPlots/DataProducer/DataProducer.hpp>
+#include <SciQLopPlots/DragNDrop/PlotDragNDropCallback.hpp>
+#include <SciQLopPlots/Inspector/InspectorBase.hpp>
+#include <SciQLopPlots/Inspector/Inspectors.hpp>
+#include <SciQLopPlots/Inspector/Model/Model.hpp>
+#include <SciQLopPlots/Inspector/Model/Node.hpp>
+#include <SciQLopPlots/Inspector/PropertyDelegateBase.hpp>
+#include <SciQLopPlots/Inspector/View/InspectorView.hpp>
+#include <SciQLopPlots/Inspector/View/PropertiesPanel.hpp>
+#include <SciQLopPlots/Inspector/View/TreeView.hpp>
 #include <SciQLopPlots/Items/SciQLopVerticalSpan.hpp>
 #include <SciQLopPlots/MultiPlots/MultiPlotsVSpan.hpp>
 #include <SciQLopPlots/MultiPlots/SciQLopMultiPlotObject.hpp>
@@ -20,13 +29,22 @@
 #include <SciQLopPlots/Plotables/QCPAbstractPlottableWrapper.hpp>
 #include <SciQLopPlots/Plotables/SciQLopColorMap.hpp>
 #include <SciQLopPlots/Plotables/SciQLopCurve.hpp>
+#include <SciQLopPlots/Plotables/SciQLopGraphComponentInterface.hpp>
+#include <SciQLopPlots/Plotables/SciQLopGraphInterface.hpp>
 #include <SciQLopPlots/Plotables/SciQLopLineGraph.hpp>
 #include <SciQLopPlots/SciQLopPlot.hpp>
 #include <SciQLopPlots/SciQLopPlotAxis.hpp>
 #include <SciQLopPlots/SciQLopPlotInterface.hpp>
 #include <SciQLopPlots/SciQLopPlotRange.hpp>
 #include <SciQLopPlots/SciQLopTimeSeriesPlot.hpp>
 #include <SciQLopPlots/enums.hpp>
+
+#include <SciQLopPlots/Products/ProductsModel.hpp>
+#include <SciQLopPlots/Products/ProductsNode.hpp>
+#include <SciQLopPlots/Products/ProductsView.hpp>
+
+#include <SciQLopPlots/Icons/icons.hpp>
+
 #include <qcustomplot.h>
 
 #endif // SCIQLOPPLOTS_BINDINGS_H

SciQLopPlots/bindings/bindings.xml

@@ -14,6 +14,14 @@
     <enum-type name="GraphType"/>
     <enum-type name="PlotType"/>
     <enum-type name="AxisType"/>
+    <enum-type name="GraphMarkerShape"/>
+    <enum-type name="GraphLineStyle"/>
+    <enum-type name="ColorGradient"/>
+    <enum-type name="ProductsModelNodeType"/>
+    <enum-type name="ParameterType"/>
+
+    <smart-pointer-type name="QPointer" type="handle" getter="data" null-check-method="isNull" instantiations="SciQLopPlotInterface=SciQLopPlotInterfacePtr"/>
+
 
     <inject-code class="native" position="beginning" file="snippets.cpp" snippet="CheckIsBuffer"/>
     <primitive-type name="PyBuffer" target-lang-api-name="PyObject">
@@ -84,7 +92,9 @@
         </add-function>
     </value-type>
     <object-type name="SQPQCPAbstractPlottableWrapper" parent-management="yes"/>
+    <object-type name="SciQLopPlottableInterface" parent-management="yes"/>
     <object-type name="SciQLopGraphInterface" parent-management="yes" allow-thread="yes"/>
+    <object-type name="SciQLopColorMapInterface" parent-management="yes" allow-thread="yes"/>
     <object-type name="SciQLopPlotInterface" parent-management="yes">
         <modify-function signature="line(const PyBuffer&amp;,const PyBuffer&amp;,QStringList,QList&lt;QColor&gt;)">
             <modify-argument index="3" rename="labels"/>
@@ -115,20 +125,28 @@
             <modify-argument index="4" rename="z_log_scale"/>
             <modify-argument index="5" rename="sync_with"/>
         </modify-function>
+        <property name="name" type="QString" get="objectName" set="setObjectName" generate-getsetdef="yes"/>
     </object-type>
     <object-type name="SciQLopPlotAxisInterface" parent-management="yes"/>
     <object-type name="SciQLopPlotAxis" parent-management="yes"/>
 
     <object-type name="SciQLopPlot" parent-management="yes">
     </object-type>
+
     <object-type name="SciQLopTimeSeriesPlot" parent-management="yes"/>
 
     <object-type name="SciQlopItemWithToolTip">
     </object-type>
 
-    <object-type name="SciQLopLineGraph" parent-management="yes"/>
-    <object-type name="SciQLopCurve" parent-management="yes"/>
-    <object-type name="SciQLopColorMap" parent-management="yes"/>
+    <object-type name="SciQLopLineGraph" parent-management="yes">
+        <property name="name" type="QString" get="objectName" set="setObjectName" generate-getsetdef="yes"/>
+    </object-type>
+    <object-type name="SciQLopCurve" parent-management="yes">
+        <property name="name" type="QString" get="objectName" set="setObjectName" generate-getsetdef="yes"/>
+    </object-type>
+    <object-type name="SciQLopColorMap" parent-management="yes">
+        <property name="name" type="QString" get="objectName" set="setObjectName" generate-getsetdef="yes"/>
+    </object-type>
 
     <object-type name="SciQLopVerticalSpan" parent-management="yes">
     </object-type>
@@ -175,13 +193,6 @@
             <modify-argument index="7" rename="index"/>
         </modify-function>
     </object-type>
-    <object-type name="SciQLopPlotCollection" parent-management="yes">
-        <modify-function signature="register_behavior(SciQLopPlotCollectionBehavior*)">
-          <modify-argument index="1">
-            <parent index="this" action="add"/>
-          </modify-argument>
-        </modify-function>
-    </object-type>
     <object-type name="SciQLopMultiPlotPanel" parent-management="yes">
         <modify-function signature="SciQLopMultiPlotPanel(QWidget*,bool,bool)">
             <modify-argument index="2" rename="synchronize_x"/>
@@ -202,6 +213,7 @@
             <parent index="this" action="add"/>
           </modify-argument>
         </modify-function>
+        <property name="name" type="QString" get="objectName" set="setObjectName" generate-getsetdef="yes"/>
     </object-type>
     <object-type name="MultiPlotsVerticalSpan" parent-management="yes">
         <property name="range" type="QCPRange" get="get_range" set="set_range" generate-getsetdef="yes"/>
@@ -228,6 +240,34 @@
           </modify-argument>
         </modify-function>
     </object-type>
+    <object-type name="PlotDragNDropCallback" parent-management="yes"/>
+
+    <object-type name="InspectorBase" parent-management="yes"/>
+    <object-type name="Inspectors" parent-management="yes"/>
+    <object-type name="PlotsModelNode" parent-management="yes"/>
+    <object-type name="PlotsModel" parent-management="yes"/>
+    <object-type name="PlotsTreeView" parent-management="yes"/>
+    <object-type name="InspectorView" parent-management="yes"/>
+    <object-type name="PropertyDelegateBase" parent-management="yes"/>
+    <object-type name="PropertiesPanel" parent-management="yes"/>
+
+    <object-type name="ProductsView" parent-management="yes"/>
+    <object-type name="ProductsModel" parent-management="yes">
+        <modify-function signature="add_node(QStringList, ProductsModelNode*)">
+          <modify-argument index="2">
+            <parent index="this" action="add"/>
+          </modify-argument>
+        </modify-function>
+    </object-type>
+    <object-type name="ProductsModelNode" parent-management="yes">
+        <modify-function signature="add_child(ProductsModelNode*)">
+          <modify-argument index="1">
+            <parent index="this" action="add"/>
+          </modify-argument>
+        </modify-function>
+    </object-type>
+
+    <object-type name="Icons" parent-management="yes"/>
 </typesystem>
 
 

SciQLopPlots/bindings/helper_scripts/src_list.py

@@ -28,6 +28,7 @@ def find_all_objects(node, found=None):
     for sp in smart_ptrs:
         classes = sp.attrib.get('instantiations', '').split(',')
         for c in classes:
+            c = c.split('=')[0].strip()
             found.append(f"{sp.attrib['name']}_{c}")
     for item in node.findall('namespace-type'):
         if item.attrib.get('visible', 'true') in ['true', 'auto']:

SciQLopPlots/meson.build

@@ -53,6 +53,9 @@ shiboken_dep = declare_dependency(compile_args: shiboken_build_flags, link_args:
 
 moc_headers = [
     'bindings/_QCustomPlot.hpp',
+    project_source_root + '/include/SciQLopPlots/Debug.hpp',
+    project_source_root + '/include/SciQLopPlots/Profiling.hpp',
+    project_source_root + '/include/SciQLopPlots/unique_names_factory.hpp',
     project_source_root + '/include/SciQLopPlots/enums.hpp',
     project_source_root + '/include/SciQLopPlots/SciQLopPlotRange.hpp',
     project_source_root + '/include/SciQLopPlots/SciQLopPlotInterface.hpp',
@@ -69,18 +72,51 @@ moc_headers = [
     project_source_root + '/include/SciQLopPlots/MultiPlots/TimeAxisSynchronizer.hpp',
     project_source_root + '/include/SciQLopPlots/MultiPlots/VPlotsAlign.hpp',
     project_source_root + '/include/SciQLopPlots/Plotables/SciQLopGraphInterface.hpp',
+    project_source_root + '/include/SciQLopPlots/Plotables/SciQLopGraphComponentInterface.hpp',
+    project_source_root + '/include/SciQLopPlots/Plotables/SciQLopGraphComponent.hpp',
     project_source_root + '/include/SciQLopPlots/Plotables/QCPAbstractPlottableWrapper.hpp',
     project_source_root + '/include/SciQLopPlots/Plotables/SciQLopCurve.hpp',
     project_source_root + '/include/SciQLopPlots/Plotables/SciQLopLineGraph.hpp',
     project_source_root + '/include/SciQLopPlots/Plotables/SciQLopColorMap.hpp',
-    project_source_root + '/include/SciQLopPlots/Plotables/SciQLopLineGraphResampler.hpp',
-    project_source_root + '/include/SciQLopPlots/Plotables/SciQLopCurveResampler.hpp',
-    project_source_root + '/include/SciQLopPlots/Plotables/SciQLopColorMapResampler.hpp',
+    project_source_root + '/include/SciQLopPlots/Plotables/Resamplers/AbstractResampler.hpp',
+    project_source_root + '/include/SciQLopPlots/Plotables/Resamplers/SciQLopLineGraphResampler.hpp',
+    project_source_root + '/include/SciQLopPlots/Plotables/Resamplers/SciQLopCurveResampler.hpp',
+    project_source_root + '/include/SciQLopPlots/Plotables/Resamplers/SciQLopColorMapResampler.hpp',
     project_source_root + '/include/SciQLopPlots/Items/SciQLopVerticalSpan.hpp',
     project_source_root + '/include/SciQLopPlots/Items/SciQLopPlotItem.hpp',
     project_source_root + '/include/SciQLopPlots/Items/SciQLopTracer.hpp',
     project_source_root + '/include/SciQLopPlots/Items/QCPItemRichText.hpp',
     project_source_root + '/include/SciQLopPlots/DataProducer/DataProducer.hpp',
+    project_source_root + '/include/SciQLopPlots/DragNDrop/PlotDragNDropCallback.hpp',
+    project_source_root + '/include/SciQLopPlots/DragNDrop/PlaceHolderManager.hpp',
+    project_source_root + '/include/SciQLopPlots/Inspector/InspectorBase.hpp',
+    project_source_root + '/include/SciQLopPlots/Inspector/Inspectors.hpp',
+    project_source_root + '/include/SciQLopPlots/Inspector/Model/Model.hpp',
+    project_source_root + '/include/SciQLopPlots/Inspector/Model/Node.hpp',
+    project_source_root + '/include/SciQLopPlots/Inspector/Inspectors/SciQLopMultiPlotPanelInspector.hpp',
+    project_source_root + '/include/SciQLopPlots/Inspector/Inspectors/SciQLopPlotInspector.hpp',
+    project_source_root + '/include/SciQLopPlots/Inspector/Inspectors/SciQLopGraphInterfaceInspector.hpp',
+    project_source_root + '/include/SciQLopPlots/Inspector/Inspectors/SciQLopGraphComponentInspector.hpp',
+    project_source_root + '/include/SciQLopPlots/Inspector/Inspectors/SciQLopColorMapInspector.hpp',
+    project_source_root + '/include/SciQLopPlots/Inspector/View/TreeView.hpp',
+    project_source_root + '/include/SciQLopPlots/Inspector/View/InspectorView.hpp',
+    project_source_root + '/include/SciQLopPlots/Inspector/PropertyDelegateBase.hpp',
+    project_source_root + '/include/SciQLopPlots/Inspector/PropertyDelegates.hpp',
+    project_source_root + '/include/SciQLopPlots/Inspector/PropertiesDelegates/SciQLopMultiPlotPanelDelegate.hpp',
+    project_source_root + '/include/SciQLopPlots/Inspector/View/PropertiesPanel.hpp',
+    project_source_root + '/include/SciQLopPlots/Inspector/View/PropertiesView.hpp',
+    project_source_root + '/include/SciQLopPlots/Inspector/PropertiesDelegates/Delegates/ColorDelegate.hpp',
+    project_source_root + '/include/SciQLopPlots/Inspector/PropertiesDelegates/Delegates/LineDelegate.hpp',
+    project_source_root + '/include/SciQLopPlots/Inspector/PropertiesDelegates/Delegates/ColorGradientDelegate.hpp',
+    project_source_root + '/include/SciQLopPlots/Inspector/PropertiesDelegates/SciQLopPlotAxisDelegate.hpp',
+    project_source_root + '/include/SciQLopPlots/Inspector/PropertiesDelegates/SciQLopPlotDelegate.hpp',
+    project_source_root + '/include/SciQLopPlots/Inspector/PropertiesDelegates/SciQLopGraphDelegate.hpp',
+    project_source_root + '/include/SciQLopPlots/Inspector/PropertiesDelegates/SciQLopColorMapDelegate.hpp',
+    project_source_root + '/include/SciQLopPlots/Inspector/PropertiesDelegates/SciQLopGraphComponentDelegate.hpp',
+    project_source_root + '/include/SciQLopPlots/Products/ProductsModel.hpp',
+    project_source_root + '/include/SciQLopPlots/Products/ProductsNode.hpp',
+    project_source_root + '/include/SciQLopPlots/Products/ProductsView.hpp',
+    project_source_root + '/include/SciQLopPlots/Icons/icons.hpp',
     project_source_root + '/qcustomplot-source/qcustomplot.h'
 ]
 
@@ -91,17 +127,21 @@ headers = moc_headers + \
 
 includes = include_directories(['../include', '../qcustomplot-source'])
 
-moc_files = qtmod.preprocess(
-                            moc_headers : moc_headers,
-                            moc_sources : moc_sources,
+moc_files = qtmod.compile_moc(
+                            headers : moc_headers,
+                            sources : moc_sources,
                             include_directories : includes)
 
+resources_files = qtmod.compile_resources(sources : ['../resources/resources.qrc'])
 
 sources = moc_files \
+        + resources_files \
         + sciqlopplots_bindings_src \
         + shiboken_generator_out \
         + [
+            '../src/Profiling.cpp',
             '../src/PythonInterface.cpp',
+            '../src/SciQLopPlotInterface.cpp',
             '../src/SciQLopPlot.cpp',
             '../src/SciQLopTimeSeriesPlot.cpp',
             '../src/SciQLopPlotAxis.cpp',
@@ -115,18 +155,48 @@ sources = moc_files \
             '../src/SciQLopPlotContainer.cpp',
             '../src/MultiPlotsVSpan.cpp',
             '../src/SciQLopGraphInterface.cpp',
+            '../src/SciQLopGraphComponentInterface.cpp',
+            '../src/SciQLopGraphComponent.cpp',
             '../src/QCPAbstractPlottableWrapper.cpp',
             '../src/SciQLopPlotItem.cpp',
             '../src/SciQLopVerticalSpan.cpp',
             '../src/SciQLopLineGraph.cpp',
-            '../src/SciQLopLineGraphResampler.cpp',
             '../src/SciQLopCurve.cpp',
-            '../src/SciQLopCurveResampler.cpp',
             '../src/SciQLopColorMap.cpp',
+            '../src/AbstractResampler.cpp',
+            '../src/SciQLopLineGraphResampler.cpp',
+            '../src/SciQLopCurveResampler.cpp',
             '../src/SciQLopColorMapResampler.cpp',
             '../src/SciQLopTracer.cpp',
             '../src/QCPItemRichText.cpp',
             '../src/DataProducer.cpp',
+            '../src/InspectorBase.cpp',
+            '../src/Inspectors.cpp',
+            '../src/Model.cpp',
+            '../src/Node.cpp',
+            '../src/SciQLopMultiPlotPanelInspector.cpp',
+            '../src/SciQLopPlotInspector.cpp',
+            '../src/SciQLopGraphInterfaceInspector.cpp',
+            '../src/SciQLopGraphComponentInspector.cpp',
+            '../src/SciQLopColorMapInspector.cpp',
+            '../src/TreeView.cpp',
+            '../src/InspectorView.cpp',
+            '../src/PropertyDelegateBase.cpp',
+            '../src/SciQLopMultiPlotPanelDelegate.cpp',
+            '../src/PropertiesPanel.cpp',
+            '../src/PropertiesView.cpp',
+            '../src/SciQLopPlotDelegate.cpp',
+            '../src/SciQLopGraphDelegate.cpp',
+            '../src/SciQLopColorMapDelegate.cpp',
+            '../src/SciQLopGraphComponentDelegate.cpp',
+            '../src/SciQLopPlotAxisDelegate.cpp',
+            '../src/ColorDelegate.cpp',
+            '../src/LineDelegate.cpp',
+            '../src/ColorGradientDelegate.cpp',
+            '../src/ProductsModel.cpp',
+            '../src/ProductsNode.cpp',
+            '../src/ProductsView.cpp',
+            '../src/icons.cpp',
             '../qcustomplot-source/qcustomplot.cpp'
         ]
 
@@ -140,9 +210,19 @@ if get_option('trace_refcount') == true
     cpp_args += ['-D_TRACE_REF_COUNT']
 endif
 
+optional_deps = []
+
+if get_option ( 'tracy_enable')
+    if get_option ( 'buildtype') != 'debugoptimized'
+        warning ( 'Profiling builds should set -- buildtype = debugoptimized')
+    endif
+    tracy = dependency ( 'tracy', static : true )
+    optional_deps += [ tracy ]
+endif
+
 sciqlopplots_bindings = python3.extension_module('SciQLopPlotsBindings',
         sources,
-        dependencies : [ python3_dep, shiboken_dep, qtdeps, cpp_utils_dep, gl_dep, fmt_dep],
+        dependencies : [ python3_dep, shiboken_dep, qtdeps, cpp_utils_dep, gl_dep, fmt_dep] + optional_deps,
         cpp_args: cpp_args,
         subdir : 'SciQLopPlots',
         install: true,