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.

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

mrmetric: fix cross correlation metric looping #1637

Merged
merged 2 commits into from Jul 9, 2019

Conversation

Projects
None yet
2 participants
@maxpietsch
Copy link
Member

commented Jul 9, 2019

fixes the cross-correlation metric, updated mrmetric's command description.
reported and discussed here

@maxpietsch maxpietsch added the bug label Jul 9, 2019

@maxpietsch

This comment has been minimized.

Copy link
Member Author

commented Jul 9, 2019

There is something wrong with the macos GUI build: https://travis-ci.org/MRtrix3/mrtrix3/jobs/556216368

src/gui/projection.h:205:31: error: 'width' is deprecated: Use QFontMetrics::horizontalAdvance [-Werror,-Wdeprecated-declarations]
          int w = font.metric.width (s);
                              ^
/usr/local/Cellar/qt/5.13.0/lib/QtGui.framework/Headers/qfontmetrics.h:107:5: note: 'width' has been explicitly marked deprecated here
    QT_DEPRECATED_X("Use QFontMetrics::horizontalAdvance")
@jdtournier

This comment has been minimized.

Copy link
Member

commented Jul 9, 2019

Guess the version of Qt used for the macOS build is a bit more up to date than on the Linux side... Should be an easy fix if you're happy to give it a shot?

@maxpietsch

This comment has been minimized.

Copy link
Member Author

commented Jul 9, 2019

Yes, QFontMetrics::width is now obsolete but QFontMetrics::horizontalAdvance is only available in qt5.11. I added macros to check the QT version for backwards compatibility.

@jdtournier jdtournier merged commit cac05b6 into master Jul 9, 2019

2 checks passed

continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details

@jdtournier jdtournier deleted the cross_correlation_fix branch Jul 9, 2019

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.