Skip to content

Commit d4e9de3

Browse files
committed
Adhere to changed theming API
1 parent 0d9a251 commit d4e9de3

2 files changed

Lines changed: 9 additions & 14 deletions

File tree

src/DualAnalysisPlugin.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1896,14 +1896,14 @@ QVariantMap DualAnalysisPlugin::toVariantMap() const
18961896
// Plugin Factory
18971897
// =============================================================================
18981898

1899-
QIcon DualAnalysisPluginFactory::getIcon(const QColor& color /*= Qt::black*/) const
1899+
AnalysisPlugin* DualAnalysisPluginFactory::produce()
19001900
{
1901-
return createPluginIcon("DUAL", color);
1901+
return new DualAnalysisPlugin(this);
19021902
}
19031903

1904-
AnalysisPlugin* DualAnalysisPluginFactory::produce()
1904+
DualAnalysisPluginFactory::DualAnalysisPluginFactory()
19051905
{
1906-
return new DualAnalysisPlugin(this);
1906+
setIcon(StyledIcon(createPluginIcon("DUAL")));
19071907
}
19081908

19091909
PluginTriggerActions DualAnalysisPluginFactory::getPluginTriggerActions(const mv::Datasets& datasets) const
@@ -1916,7 +1916,7 @@ PluginTriggerActions DualAnalysisPluginFactory::getPluginTriggerActions(const mv
19161916

19171917
if (PluginFactory::areAllDatasetsOfTheSameType(datasets, PointType)) {
19181918
if (datasets.count() >= 1) {
1919-
auto pluginTriggerAction = new PluginTriggerAction(const_cast<DualAnalysisPluginFactory*>(this), this, "Dual", "Perform dual analysis on selected datasets", getIcon(), [this, getPluginInstance, datasets](PluginTriggerAction& pluginTriggerAction) -> void {
1919+
auto pluginTriggerAction = new PluginTriggerAction(const_cast<DualAnalysisPluginFactory*>(this), this, "Dual", "Perform dual analysis on selected datasets", icon(), [this, getPluginInstance, datasets](PluginTriggerAction& pluginTriggerAction) -> void {
19201920
for (const auto& dataset : datasets)
19211921
getPluginInstance(dataset);
19221922
});
@@ -1925,7 +1925,7 @@ PluginTriggerActions DualAnalysisPluginFactory::getPluginTriggerActions(const mv
19251925
}
19261926

19271927
if (datasets.count() >= 2) {
1928-
auto pluginTriggerAction = new PluginTriggerAction(const_cast<DualAnalysisPluginFactory*>(this), this, "Group/Dual", "Group datasets and perform dual analysis on it", getIcon(), [this, getPluginInstance, datasets](PluginTriggerAction& pluginTriggerAction) -> void {
1928+
auto pluginTriggerAction = new PluginTriggerAction(const_cast<DualAnalysisPluginFactory*>(this), this, "Group/Dual", "Group datasets and perform dual analysis on it", icon(), [this, getPluginInstance, datasets](PluginTriggerAction& pluginTriggerAction) -> void {
19291929
getPluginInstance(mv::data().groupDatasets(datasets));
19301930
});
19311931

src/DualAnalysisPlugin.h

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -195,15 +195,10 @@ class DualAnalysisPluginFactory : public AnalysisPluginFactory
195195
FILE "DualAnalysisPlugin.json")
196196

197197
public:
198-
DualAnalysisPluginFactory(void) {}
199-
~DualAnalysisPluginFactory(void) override {}
200198

201-
/**
202-
* Get plugin icon
203-
* @param color Icon color for flat (font) icons
204-
* @return Icon
205-
*/
206-
QIcon getIcon(const QColor& color = Qt::black) const override;
199+
DualAnalysisPluginFactory();
200+
201+
~DualAnalysisPluginFactory() override {};
207202

208203
/**
209204
* Produces the plugin

0 commit comments

Comments
 (0)