Mercurial > hg > svapp
changeset 514:68ab0fe3bce4 3.0-integration
Merge from branch "tony-2.0-integration"
| author | Chris Cannam |
|---|---|
| date | Thu, 04 Feb 2016 11:19:01 +0000 |
| parents | aecd5bdfc71f (diff) 83c60632bac0 (current diff) |
| children | 51befd6165a3 36777aa80e15 |
| files | framework/MainWindowBase.cpp |
| diffstat | 2 files changed, 3 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/framework/MainWindowBase.cpp Wed Oct 14 16:39:14 2015 +0100 +++ b/framework/MainWindowBase.cpp Thu Feb 04 11:19:01 2016 +0000 @@ -196,6 +196,7 @@ settings.setValue("view-font-size", viewFontSize); settings.endGroup(); +#ifdef NOT_DEFINED // This no longer works correctly on any platform AFAICS Preferences::BackgroundMode mode = Preferences::getInstance()->getBackgroundMode(); m_initialDarkBackground = m_viewManager->getGlobalDarkBackground(); @@ -203,6 +204,7 @@ m_viewManager->setGlobalDarkBackground (mode == Preferences::DarkBackground); } +#endif m_paneStack = new PaneStack(0, m_viewManager); connect(m_paneStack, SIGNAL(currentPaneChanged(Pane *)),
--- a/framework/SVFileReader.cpp Wed Oct 14 16:39:14 2015 +0100 +++ b/framework/SVFileReader.cpp Thu Feb 04 11:19:01 2016 +0000 @@ -1166,7 +1166,7 @@ for (QStringList::iterator i = data.begin(); i != data.end(); ++i) { - if (values.size() == (int)dtdm->getHeight()) { + if (int(values.size()) == dtdm->getHeight()) { if (!warned) { cerr << "WARNING: SV-XML: Too many y-bins in 3-D dataset row " << m_rowNumber << endl;