Commit c7d5c163 authored by Mikhail Svechnikov's avatar Mikhail Svechnikov
Browse files

cleanup

parent 0ee21b9e
Pipeline #67174 failed with stage
in 5 minutes and 16 seconds
...@@ -23,7 +23,7 @@ void DataItem::setDatafield(Datafield* data) ...@@ -23,7 +23,7 @@ void DataItem::setDatafield(Datafield* data)
m_data.reset(data); m_data.reset(data);
setLastModified(QDateTime::currentDateTime()); setLastModified(QDateTime::currentDateTime());
emit datafieldChanged(data); emit datafieldChanged();
#ifdef USE_MAPPERS #ifdef USE_MAPPERS
emitDataChanged(); emitDataChanged();
#endif #endif
......
...@@ -76,7 +76,7 @@ public: ...@@ -76,7 +76,7 @@ public:
virtual void reset(ImportDataInfo data) = 0; virtual void reset(ImportDataInfo data) = 0;
signals: signals:
void datafieldChanged(Datafield* data); void datafieldChanged();
void rawDataVectorChanged(const std::vector<double>& data); void rawDataVectorChanged(const std::vector<double>& data);
void fileNameChanged(const QString& filename); void fileNameChanged(const QString& filename);
void axesUnitsChanged(); void axesUnitsChanged();
......
...@@ -177,7 +177,7 @@ void DiffItemController::subscribe() ...@@ -177,7 +177,7 @@ void DiffItemController::subscribe()
m_current_item->dataItem()->mapper()->setOnValueChange([this]() { updateDiffData(); }, this); m_current_item->dataItem()->mapper()->setOnValueChange([this]() { updateDiffData(); }, this);
#else #else
connect(m_current_item->dataItem(), &DataItem::datafieldChanged, this, connect(m_current_item->dataItem(), &DataItem::datafieldChanged, this,
[=](Datafield*) { updateDiffData(); }); &DiffItemController::updateDiffData, Qt::UniqueConnection);
#endif #endif
// on diff item units change // on diff item units change
......
...@@ -168,7 +168,7 @@ void DiffItemController::subscribe() ...@@ -168,7 +168,7 @@ void DiffItemController::subscribe()
m_current_item->dataItem()->mapper()->setOnValueChange([this]() { updateDiffData(); }, this); m_current_item->dataItem()->mapper()->setOnValueChange([this]() { updateDiffData(); }, this);
#else #else
connect(m_current_item->dataItem(), &DataItem::datafieldChanged, this, connect(m_current_item->dataItem(), &DataItem::datafieldChanged, this,
[=](Datafield*) { updateDiffData(); }); &DiffItemController::updateDiffData, Qt::UniqueConnection);
#endif #endif
} }
......
...@@ -134,7 +134,7 @@ void Plot1D::subscribeToItem() ...@@ -134,7 +134,7 @@ void Plot1D::subscribeToItem()
#else #else
DataItem* dataItem = pair.first->dataItem(); DataItem* dataItem = pair.first->dataItem();
connect(dataItem, &DataItem::datafieldChanged, caller, connect(dataItem, &DataItem::datafieldChanged, caller,
[caller](Datafield*) { caller->refreshPlotData(); }); [caller]() { caller->refreshPlotData(); });
#endif #endif
}); });
setConnected(true); setConnected(true);
......
...@@ -225,9 +225,8 @@ void ColorMap::subscribeToItem() ...@@ -225,9 +225,8 @@ void ColorMap::subscribeToItem()
intensityItem()->mapper()->setOnValueChange([this]() { onIntensityModified(); }, this); intensityItem()->mapper()->setOnValueChange([this]() { onIntensityModified(); }, this);
#else #else
// datafield // datafield
connect(intensityItem(), &IntensityDataItem::datafieldChanged, this, [=]() { connect(intensityItem(), &IntensityDataItem::datafieldChanged, this,
onIntensityModified(); &ColorMap::onIntensityModified, Qt::UniqueConnection);
});
// units // units
connect(intensityItem(), &IntensityDataItem::axesUnitsReplotRequested, this, [=]() { connect(intensityItem(), &IntensityDataItem::axesUnitsReplotRequested, this, [=]() {
setAxesRangeFromItem(intensityItem()); setAxesRangeFromItem(intensityItem());
......
...@@ -120,7 +120,6 @@ void ProjectionsPlot::subscribeToItem() ...@@ -120,7 +120,6 @@ void ProjectionsPlot::subscribeToItem()
&ProjectionsPlot::updateAxesRange, Qt::UniqueConnection); &ProjectionsPlot::updateAxesRange, Qt::UniqueConnection);
// if axes are changed externally, from the properties panel: // if axes are changed externally, from the properties panel:
// axes range // axes range
connect(intensityItem()->xAxisItem(), &BasicAxisItem::axisRangeChanged, this, connect(intensityItem()->xAxisItem(), &BasicAxisItem::axisRangeChanged, this,
&ProjectionsPlot::updateAxesRange, Qt::UniqueConnection); &ProjectionsPlot::updateAxesRange, Qt::UniqueConnection);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment