[j.div1] minor ()

Merging branch 'j.div1'  into 'main'.

See merge request !2000

GUI/View/Mask/MaskGraphicsProxy.cpp

@@ -34,9 +34,9 @@ MaskGraphicsProxy::~MaskGraphicsProxy()
         m_sceneAdaptor->setColorMapPlot(nullptr);
 }
 
-void MaskGraphicsProxy::setData2DItem(Data2DItem* data2DItem)
+void MaskGraphicsProxy::itemToMGProxy(Data2DItem* item)
 {
-    m_colorMap->setData2DItem(data2DItem);
+    m_colorMap->itemToMap(item);
     if (widget() != m_colorMap)
         setWidget(m_colorMap);
 }

GUI/View/Mask/MaskGraphicsProxy.h

@@ -33,7 +33,7 @@ public:
 
     int type() const override { return MaskEditorHelper::MASKGRAPHICSPROXY; }
 
-    void setData2DItem(Data2DItem* data2DItem);
+    void itemToMGProxy(Data2DItem* item);
     void setSceneAdaptor(SceneAdaptor* sceneAdaptor);
     void setInZoomMode(bool value);
 

GUI/View/Mask/MaskGraphicsScene.cpp

@@ -374,7 +374,7 @@ void MaskGraphicsScene::updateProxyWidget()
 
     m_proxy = new MaskGraphicsProxy; // TODO: check if m_proxy is released at the end
     m_proxy->setParent(this);
-    m_proxy->setData2DItem(m_data2DItem);
+    m_proxy->itemToMGProxy(m_data2DItem);
     m_proxy->setSceneAdaptor(m_adaptor.data());
     addItem(m_proxy);
 }

GUI/View/Plot2D/ColorMapCanvas.cpp

@@ -38,9 +38,9 @@ ColorMapCanvas::ColorMapCanvas(QWidget* parent)
     setStatusLabelEnabled(false);
 }
 
-void ColorMapCanvas::setData2DItem(Data2DItem* data2DItem)
+void ColorMapCanvas::itemToCanvas(Data2DItem* item)
 {
-    m_colorMap->setData2DItem(data2DItem);
+    m_colorMap->itemToMap(item);
 }
 
 ColorMap* ColorMapCanvas::colorMap()

GUI/View/Plot2D/ColorMapCanvas.h

@@ -18,8 +18,8 @@
 #include <QWidget>
 
 class ColorMap;
-class FontScalingEvent;
 class Data2DItem;
+class FontScalingEvent;
 class PlotStatusLabel;
 class QCustomPlot;
 
@@ -31,7 +31,7 @@ class ColorMapCanvas : public QWidget {
 public:
     explicit ColorMapCanvas(QWidget* parent = nullptr);
 
-    void setData2DItem(Data2DItem* data2DItem);
+    void itemToCanvas(Data2DItem* item);
 
     ColorMap* colorMap();
     QCustomPlot* customPlot();

GUI/View/Plot2D/IntensityDataCanvas.cpp

@@ -73,7 +73,7 @@ IntensityDataCanvas::IntensityDataCanvas(QWidget* parent)
 void IntensityDataCanvas::setJobOrRealItem(QObject* job_or_real_Item)
 {
     DataAccessWidget::setJobOrRealItem(job_or_real_Item);
-    m_colorMapCanvas->setData2DItem(currentData2DItem());
+    m_colorMapCanvas->itemToCanvas(currentData2DItem());
 
     if (!m_rotateDataAction)
         initRotation();
@@ -82,7 +82,7 @@ void IntensityDataCanvas::setJobOrRealItem(QObject* job_or_real_Item)
 void IntensityDataCanvas::setFourierItem(Data2DItem* fftItem)
 {
     DataAccessWidget::setFourierItem(fftItem);
-    m_colorMapCanvas->setData2DItem(currentData2DItem());
+    m_colorMapCanvas->itemToCanvas(currentData2DItem());
 }
 
 QSize IntensityDataCanvas::sizeHint() const

GUI/View/PlotComparison/Fitpair2DWidget.cpp

@@ -95,9 +95,9 @@ void Fitpair2DWidget::setJobOrRealItem(QObject* job_item)
     updateDiffData();
     connectItems();
 
-    m_simuCanvas->setData2DItem(simuData2DItem());
-    m_realCanvas->setData2DItem(realData2DItem());
-    m_diffCanvas->setData2DItem(diffData2DItem());
+    m_simuCanvas->itemToCanvas(simuData2DItem());
+    m_realCanvas->itemToCanvas(realData2DItem());
+    m_diffCanvas->itemToCanvas(diffData2DItem());
     m_fitFlowWidget->setJobOrRealItem(job_item);
     m_propertyWidget->setJobOrRealItem(job_item);
 }

GUI/View/PlotScale/ColorMap.cpp

@@ -44,32 +44,29 @@ QCPRange qcpRange(double xmin, double xmax, int nbins)
 
 ColorMap::ColorMap(QWidget* parent)
     : ScientificPlot(parent, PLOT_TYPE::Plot2D)
-    , m_colorMap(nullptr)
-    , m_colorScale(nullptr)
-    , m_colorBarLayout(new QCPLayoutGrid)
     , m_updateTimer(new UpdateTimer(replot_update_interval, this))
 {
-    m_colorMap = new QCPColorMap(m_plot->xAxis, m_plot->yAxis);
-    m_colorScale = new QCPColorScale(m_plot);
-    m_colorMap->setColorScale(m_colorScale);
+    m_plot->xAxis->setTickLabelFont(
+        QFont(QFont().family(), GUI::Constants::plot_tick_label_size()));
+    m_plot->yAxis->setTickLabelFont(
+        QFont(QFont().family(), GUI::Constants::plot_tick_label_size()));
+    m_plot->setAttribute(Qt::WA_NoMousePropagation, false);
 
-    m_colorBarLayout->addElement(0, 0, m_colorScale);
-    m_colorBarLayout->setMinimumSize(colorbar_width_logz, 10);
-    auto base_size = GUI::Style::SizeOfLetterM(this).width() * 0.5;
-    m_colorBarLayout->setMargins(QMargins(base_size, 0, base_size, 0));
+    m_colorMap = new QCPColorMap(m_plot->xAxis, m_plot->yAxis);
 
+    m_colorScale = new QCPColorScale(m_plot);
     m_colorScale->axis()->axisRect()->setMargins(QMargins(0, 0, 0, 0));
     m_colorScale->axis()->axisRect()->setAutoMargins(QCP::msNone);
-
     m_colorScale->setBarWidth(GUI::Constants::plot_colorbar_size());
     m_colorScale->axis()->setTickLabelFont(
         QFont(QFont().family(), GUI::Constants::plot_tick_label_size()));
+    m_colorMap->setColorScale(m_colorScale);
 
-    m_plot->xAxis->setTickLabelFont(
-        QFont(QFont().family(), GUI::Constants::plot_tick_label_size()));
-    m_plot->yAxis->setTickLabelFont(
-        QFont(QFont().family(), GUI::Constants::plot_tick_label_size()));
-    m_plot->setAttribute(Qt::WA_NoMousePropagation, false);
+    m_colorBarLayout = new QCPLayoutGrid;
+    m_colorBarLayout->addElement(0, 0, m_colorScale);
+    m_colorBarLayout->setMinimumSize(colorbar_width_logz, 10);
+    const auto base_size = GUI::Style::SizeOfLetterM(this).width() * 0.5;
+    m_colorBarLayout->setMargins(QMargins(base_size, 0, base_size, 0));
 
     connect(m_plot, &QCustomPlot::afterReplot, this, &ColorMap::marginsChangedNotify);
 
@@ -83,7 +80,7 @@ ColorMap::ColorMap(QWidget* parent)
     //    setFixedColorMapMargins();
 }
 
-void ColorMap::setData2DItem(Data2DItem* item)
+void ColorMap::itemToMap(Data2DItem* item)
 {
     m_data2DItem = item;
 

GUI/View/PlotScale/ColorMap.h

@@ -35,7 +35,7 @@ class ColorMap : public ScientificPlot {
 public:
     explicit ColorMap(QWidget* parent = nullptr);
 
-    void setData2DItem(Data2DItem* item);
+    void itemToMap(Data2DItem* item);
 
     QSize sizeHint() const override { return QSize(500, 400); }
     QSize minimumSizeHint() const override { return QSize(128, 128); }