Skip to content
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

Jump to bottom

[SofaQtGui] Restore GraphWidget for Momentum and Energy using QtCharts instead of Qwt #1508

Merged
merged 9 commits into from
Oct 7, 2020
Merged

[SofaQtGui] Restore GraphWidget for Momentum and Energy using QtCharts instead of Qwt #1508

merged 9 commits into from
Oct 7, 2020

Conversation

epernod
Copy link
Contributor

@epernod epernod commented Sep 30, 2020 •
edited
Loading

graph_energy_new
graph_momentum_new

This PR:

  • builds with SUCCESS for all platforms on the CI.
  • does not generate new warnings.
  • does not generate new unit test failures.
  • does not generate new scene test failures.
  • does not break API compatibility.
  • is more than 1 week old (or has fast-merge label).

Reviewers will merge only if all these checks are true.

@epernod epernod added the pr: status to review To notify reviewers to review this pull-request label Sep 30, 2020
@epernod epernod self-assigned this Sep 30, 2020
@hugtalbot hugtalbot added the enhancement About a possible enhancement label Sep 30, 2020
@epernod epernod mentioned this pull request Sep 30, 2020
Merged
6 tasks
@epernod
Copy link
Contributor Author

epernod commented Sep 30, 2020

[ci-build][with-all-tests]

guparan
guparan suggested changes Oct 6, 2020
View reviewed changes
modules/SofaGuiQt/src/sofa/gui/qt/ModifyObject.cpp Outdated
@@ -275,6 +275,29 @@ void ModifyObject::createDialog(core::objectmodel::Base* base)
}
}

#ifdef SOFAGUIQT_HAVE_QT5_CHARTS
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

SOFAGUIQT_HAVE_QT5_CHARTS is always defined (0 or 1).
You must use #if.

@fredroy fredroy added pr: status ready Approved a pull-request, ready to be squashed and removed pr: status to review To notify reviewers to review this pull-request labels Oct 7, 2020
@damienmarchal damienmarchal merged commit 59c128a into sofa-framework:master Oct 7, 2020
@epernod epernod deleted the inf_graph branch October 9, 2020 22:26
@guparan guparan added this to the v20.12 milestone Nov 17, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@guparan guparan guparan requested changes

Assignees

@epernod epernod

Labels
enhancement About a possible enhancement pr: status ready Approved a pull-request, ready to be squashed
Projects
None yet
Milestone
v20.12
Development

Successfully merging this pull request may close these issues.
5 participants
@epernod @guparan @fredroy @damienmarchal @hugtalbot