Skip to content

Feature/inportonchange #284

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
martinfalk merged 3 commits into from
Jul 2, 2026
Merged

Feature/inportonchange #284

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0c8836d
DataFrameClustering: Inport onChange deprecation
martinfalk Jun 30, 2026
644fa47
VTK: Inport onChange deprecation
martinfalk Jun 30, 2026
662343a
GHA: linux core dump *test*
martinfalk Jul 1, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions misc/dataframeclustering/src/processors/dataframeclustering.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,11 +112,13 @@ DataFrameClustering::DataFrameClustering()
method_, [](const auto& p) { return p.getSelectedIdentifier() == "spectral"; });

method_.set("agglo");

dataFrame_.onChange([&]() { onDataFrameChange(); });
}

void DataFrameClustering::process() {
if (dataFrame_.isChanged()) {
onDataFrameChange();
}

pybind11::list cols;
for (auto& p : columns_.getPropertiesByType<BoolProperty>()) {
if (p->getVisible() && p->get()) {
Expand Down
20 changes: 13 additions & 7 deletions misc/vtk/include/inviwo/vtk/processors/vtkgenericprocessor.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,11 +152,6 @@ inline void updateFieldSelection(vtkDataObject::FieldAssociations assoc, vtkData

void setupFieldSelection(Inport* inport, auto& wrapper) {
if (auto* vtkinport = dynamic_cast<vtk::VtkInport*>(inport)) {
vtkinport->onChange([port = vtkinport, w = &wrapper]() {
if (port->isReady()) {
updateFieldSelection(w->fieldAssociation.get(), port->getData(), w->name);
}
});
wrapper.fieldAssociation.onChange([port = vtkinport, w = &wrapper]() {
if (port->isReady()) {
updateFieldSelection(w->fieldAssociation.get(), port->getData(), w->name);
Expand Down Expand Up @@ -269,8 +264,19 @@ class VTKGenericProcessor : public Processor {

virtual void process() override {
bool ready = true;
util::for_each_in_tuple([&](auto& wrapper) { ready &= wrapper.set(*filter_); },
traits_.properties);
util::for_each_in_tuple(
[&](auto& wrapper) {
if constexpr (std::is_base_of_v<FieldSelection, std::decay_t<decltype(wrapper)>>) {
auto* inport = getInport(wrapper.inport);
if (const auto* vtkinport = dynamic_cast<vtk::VtkInport*>(inport);
vtkinport && vtkinport->isChanged() && vtkinport->isReady()) {
updateFieldSelection(wrapper.fieldAssociation.get(), vtkinport->getData(),
wrapper.name);
}
}
ready &= wrapper.set(*filter_);
},
traits_.properties);

if (!ready) return;

Expand Down
Loading