Merge branch 'dev' into newlocallab
This commit is contained in:
@@ -287,6 +287,7 @@ void ToolPanelCoordinator::imageTypeChanged (bool isRaw, bool isBayer, bool isXt
|
||||
self->sensorbayer->FoldableToolPanel::show();
|
||||
self->preprocess->FoldableToolPanel::show();
|
||||
self->flatfield->FoldableToolPanel::show();
|
||||
self->retinex->FoldableToolPanel::setGrayedOut(false);
|
||||
|
||||
return FALSE;
|
||||
};
|
||||
@@ -301,6 +302,7 @@ void ToolPanelCoordinator::imageTypeChanged (bool isRaw, bool isBayer, bool isXt
|
||||
self->sensorbayer->FoldableToolPanel::hide();
|
||||
self->preprocess->FoldableToolPanel::show();
|
||||
self->flatfield->FoldableToolPanel::show();
|
||||
self->retinex->FoldableToolPanel::setGrayedOut(false);
|
||||
|
||||
return FALSE;
|
||||
};
|
||||
@@ -315,6 +317,7 @@ void ToolPanelCoordinator::imageTypeChanged (bool isRaw, bool isBayer, bool isXt
|
||||
self->sensorxtrans->FoldableToolPanel::hide();
|
||||
self->preprocess->FoldableToolPanel::hide();
|
||||
self->flatfield->FoldableToolPanel::show();
|
||||
self->retinex->FoldableToolPanel::setGrayedOut(false);
|
||||
|
||||
return FALSE;
|
||||
};
|
||||
@@ -328,6 +331,7 @@ void ToolPanelCoordinator::imageTypeChanged (bool isRaw, bool isBayer, bool isXt
|
||||
self->sensorxtrans->FoldableToolPanel::hide();
|
||||
self->preprocess->FoldableToolPanel::hide();
|
||||
self->flatfield->FoldableToolPanel::hide();
|
||||
self->retinex->FoldableToolPanel::setGrayedOut(false);
|
||||
|
||||
return FALSE;
|
||||
};
|
||||
@@ -338,6 +342,7 @@ void ToolPanelCoordinator::imageTypeChanged (bool isRaw, bool isBayer, bool isXt
|
||||
ToolPanelCoordinator* const self = static_cast<ToolPanelCoordinator*>(data);
|
||||
|
||||
self->rawPanelSW->set_sensitive (false);
|
||||
self->retinex->FoldableToolPanel::setGrayedOut(true);
|
||||
|
||||
return FALSE;
|
||||
};
|
||||
|
Reference in New Issue
Block a user