Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
mlz
BornAgain
Commits
c7d5c163
Commit
c7d5c163
authored
Jun 14, 2022
by
Mikhail Svechnikov
Browse files
cleanup
parent
0ee21b9e
Pipeline
#67174
failed with stage
in 5 minutes and 16 seconds
Changes
7
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
GUI/Model/Data/DataItem.cpp
View file @
c7d5c163
...
...
@@ -23,7 +23,7 @@ void DataItem::setDatafield(Datafield* data)
m_data
.
reset
(
data
);
setLastModified
(
QDateTime
::
currentDateTime
());
emit
datafieldChanged
(
data
);
emit
datafieldChanged
();
#ifdef USE_MAPPERS
emitDataChanged
();
#endif
...
...
GUI/Model/Data/DataItem.h
View file @
c7d5c163
...
...
@@ -76,7 +76,7 @@ public:
virtual
void
reset
(
ImportDataInfo
data
)
=
0
;
signals:
void
datafieldChanged
(
Datafield
*
data
);
void
datafieldChanged
();
void
rawDataVectorChanged
(
const
std
::
vector
<
double
>&
data
);
void
fileNameChanged
(
const
QString
&
filename
);
void
axesUnitsChanged
();
...
...
GUI/View/PlotComparison/FitComparisonController.cpp
View file @
c7d5c163
...
...
@@ -177,7 +177,7 @@ void DiffItemController::subscribe()
m_current_item
->
dataItem
()
->
mapper
()
->
setOnValueChange
([
this
]()
{
updateDiffData
();
},
this
);
#else
connect
(
m_current_item
->
dataItem
(),
&
DataItem
::
datafieldChanged
,
this
,
[
=
](
Datafield
*
)
{
updateDiffData
();
}
);
&
DiffItemController
::
updateDiffData
,
Qt
::
UniqueConnection
);
#endif
// on diff item units change
...
...
GUI/View/PlotComparison/FitComparisonViewController.cpp
View file @
c7d5c163
...
...
@@ -168,7 +168,7 @@ void DiffItemController::subscribe()
m_current_item
->
dataItem
()
->
mapper
()
->
setOnValueChange
([
this
]()
{
updateDiffData
();
},
this
);
#else
connect
(
m_current_item
->
dataItem
(),
&
DataItem
::
datafieldChanged
,
this
,
[
=
](
Datafield
*
)
{
updateDiffData
();
}
);
&
DiffItemController
::
updateDiffData
,
Qt
::
UniqueConnection
);
#endif
}
...
...
GUI/View/PlotComparison/Plot1D.cpp
View file @
c7d5c163
...
...
@@ -134,7 +134,7 @@ void Plot1D::subscribeToItem()
#else
DataItem
*
dataItem
=
pair
.
first
->
dataItem
();
connect
(
dataItem
,
&
DataItem
::
datafieldChanged
,
caller
,
[
caller
](
Datafield
*
)
{
caller
->
refreshPlotData
();
});
[
caller
]()
{
caller
->
refreshPlotData
();
});
#endif
});
setConnected
(
true
);
...
...
GUI/View/PlotUtil/ColorMap.cpp
View file @
c7d5c163
...
...
@@ -225,9 +225,8 @@ void ColorMap::subscribeToItem()
intensityItem
()
->
mapper
()
->
setOnValueChange
([
this
]()
{
onIntensityModified
();
},
this
);
#else
// datafield
connect
(
intensityItem
(),
&
IntensityDataItem
::
datafieldChanged
,
this
,
[
=
]()
{
onIntensityModified
();
});
connect
(
intensityItem
(),
&
IntensityDataItem
::
datafieldChanged
,
this
,
&
ColorMap
::
onIntensityModified
,
Qt
::
UniqueConnection
);
// units
connect
(
intensityItem
(),
&
IntensityDataItem
::
axesUnitsReplotRequested
,
this
,
[
=
]()
{
setAxesRangeFromItem
(
intensityItem
());
...
...
GUI/View/Projection/ProjectionsPlot.cpp
View file @
c7d5c163
...
...
@@ -120,7 +120,6 @@ void ProjectionsPlot::subscribeToItem()
&
ProjectionsPlot
::
updateAxesRange
,
Qt
::
UniqueConnection
);
// if axes are changed externally, from the properties panel:
// axes range
connect
(
intensityItem
()
->
xAxisItem
(),
&
BasicAxisItem
::
axisRangeChanged
,
this
,
&
ProjectionsPlot
::
updateAxesRange
,
Qt
::
UniqueConnection
);
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment