Skip to content

Commit

Permalink
When adding a new sink, also add a plot for it (#174)
Browse files Browse the repository at this point in the history
* When adding a new sink, also add a plot for it
* Update opencmw-cpp
* service: Fix DNS signal unregistration
  • Loading branch information
frankosterfeld authored Mar 15, 2024
1 parent 19a33e5 commit 236692c
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 3 deletions.
2 changes: 1 addition & 1 deletion cmake/Dependencies.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ include(FetchContent)
FetchContent_Declare(
opencmw-cpp
GIT_REPOSITORY https://github.com/fair-acc/opencmw-cpp.git
GIT_TAG 48e9305d1a72dcb406ff8a6e7ae0b791b0d0802a # main as of 2024-02-29
GIT_TAG c7236c423f4f1f4de8a762c1e946f6ad76cd0a8d # main as of 2024-03-13
)

FetchContent_Declare(
Expand Down
1 change: 1 addition & 0 deletions src/service/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -199,6 +199,7 @@ int main(int argc, char **argv) {
toRegisterEntries.insert(toRegisterEntries.end(), dns.begin(), dns.end());
}
dns_client.registerSignals(std::move(toRegisterEntries));
registeredSignals = std::move(signals);
});

std::jthread grAcqWorkerThread([&grAcqWorker] { grAcqWorker.run(); });
Expand Down
2 changes: 1 addition & 1 deletion src/ui/cmake/Dependencies.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ FetchContent_Declare( # needed to load images in ImGui
FetchContent_Declare(
opencmw-cpp
GIT_REPOSITORY https://github.com/fair-acc/opencmw-cpp.git
GIT_TAG 48e9305d1a72dcb406ff8a6e7ae0b791b0d0802a # main as of 2024-02-29
GIT_TAG c7236c423f4f1f4de8a762c1e946f6ad76cd0a8d # main as of 2024-03-13
)

FetchContent_Declare(
Expand Down
6 changes: 5 additions & 1 deletion src/ui/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,11 @@ int main(int argc, char **argv) {
app.sdlState = &sdlState;

app.fgItem.newSinkCallback = [&](DigitizerUi::FlowGraph *) mutable {
return app.dashboard->createSink();
auto newSink = app.dashboard->createSink();
app.dashboardPage.newPlot(app.dashboard.get());
auto &plot = app.dashboard->plots().back();
plot.sourceNames.push_back(newSink->name);
return newSink;
};
app.fgItem.newSinkSourceCallback = [&](DigitizerUi::FlowGraph *) mutable {
return app.dashboard->createSource();
Expand Down

0 comments on commit 236692c

Please sign in to comment.