Skip to content

Commit

Permalink
disable state loading for elements deemed dangerous
Browse files Browse the repository at this point in the history
affects open docks/viewports, selected false coloring
temporary action until new data handling is incorporated
see #34
  • Loading branch information
ypnos committed Feb 19, 2017
1 parent 6faeb91 commit 94f7044
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 4 deletions.
5 changes: 3 additions & 2 deletions gui/controller/controller_docks.cpp
Expand Up @@ -53,8 +53,9 @@ void Controller::initDocks()
#endif
roiDock->raise();
// restore dock widget positions
mainWindow()->restoreState(
settings.value("mainWindow/windowState").toByteArray());
if (false) /* TODO: disabled to avoid crashes */
mainWindow()->restoreState(
settings.value("mainWindow/windowState").toByteArray());

imageModel()->computeFullRgb();
}
Expand Down
2 changes: 1 addition & 1 deletion gui/controller/distviewcontroller.cpp
Expand Up @@ -46,7 +46,7 @@ void DistViewController::init()
// NOTE that we did not connect signals yet! This is actually good as we
// will not get stray signals before the content is ready.
QSettings settings;
if (settings.contains("viewports/IMGfolded")) {
if (false && settings.contains("viewports/IMGfolded")) { /* TODO: disabled to avoid crashes */
// settings are available
QString activeStr = settings.value("viewports/active").value<QString>();
activeView = representation::fromStr(activeStr);
Expand Down
6 changes: 5 additions & 1 deletion gui/docks/falsecolordock.cpp
Expand Up @@ -386,7 +386,11 @@ void FalseColorDock::restoreState()
auto selectedColoring = settings.value("FalseColorDock/selectedColoringIndex", 0);

QComboBox *src = uisel->sourceBox;
src->setCurrentIndex(selectedColoring.toInt());
/* TODO: disabled to avoid crashes */
if (false)
src->setCurrentIndex(selectedColoring.toInt());
else
src->setCurrentIndex(0);
processSelectedColoring();

// TODO: state of spectral distance map
Expand Down

0 comments on commit 94f7044

Please sign in to comment.