merge with dev
This commit is contained in:
@@ -348,13 +348,17 @@ void ToolPanelCoordinator::imageTypeChanged(bool isRaw, bool isBayer, bool isXtr
|
||||
{
|
||||
rawPanelSW->set_sensitive(true);
|
||||
sensorxtrans->FoldableToolPanel::hide();
|
||||
xtransprocess->FoldableToolPanel::hide();
|
||||
xtransrawexposure->FoldableToolPanel::hide();
|
||||
sensorbayer->FoldableToolPanel::show();
|
||||
bayerprocess->FoldableToolPanel::show();
|
||||
bayerpreprocess->FoldableToolPanel::show();
|
||||
rawcacorrection->FoldableToolPanel::show();
|
||||
preprocess->FoldableToolPanel::show();
|
||||
flatfield->FoldableToolPanel::show();
|
||||
filmNegative->FoldableToolPanel::show();
|
||||
pdSharpening->FoldableToolPanel::show();
|
||||
retinex->FoldableToolPanel::setGrayedOut(false);
|
||||
|
||||
return false;
|
||||
}
|
||||
);
|
||||
@@ -364,13 +368,17 @@ void ToolPanelCoordinator::imageTypeChanged(bool isRaw, bool isBayer, bool isXtr
|
||||
{
|
||||
rawPanelSW->set_sensitive(true);
|
||||
sensorxtrans->FoldableToolPanel::show();
|
||||
xtransprocess->FoldableToolPanel::show();
|
||||
xtransrawexposure->FoldableToolPanel::show();
|
||||
sensorbayer->FoldableToolPanel::hide();
|
||||
bayerprocess->FoldableToolPanel::hide();
|
||||
bayerpreprocess->FoldableToolPanel::hide();
|
||||
rawcacorrection->FoldableToolPanel::hide();
|
||||
preprocess->FoldableToolPanel::show();
|
||||
flatfield->FoldableToolPanel::show();
|
||||
filmNegative->FoldableToolPanel::show();
|
||||
pdSharpening->FoldableToolPanel::show();
|
||||
retinex->FoldableToolPanel::setGrayedOut(false);
|
||||
|
||||
return false;
|
||||
}
|
||||
);
|
||||
@@ -380,13 +388,17 @@ void ToolPanelCoordinator::imageTypeChanged(bool isRaw, bool isBayer, bool isXtr
|
||||
{
|
||||
rawPanelSW->set_sensitive(true);
|
||||
sensorbayer->FoldableToolPanel::hide();
|
||||
bayerprocess->FoldableToolPanel::hide();
|
||||
bayerpreprocess->FoldableToolPanel::hide();
|
||||
rawcacorrection->FoldableToolPanel::hide();
|
||||
sensorxtrans->FoldableToolPanel::hide();
|
||||
xtransprocess->FoldableToolPanel::hide();
|
||||
xtransrawexposure->FoldableToolPanel::hide();
|
||||
preprocess->FoldableToolPanel::hide();
|
||||
flatfield->FoldableToolPanel::show();
|
||||
filmNegative->FoldableToolPanel::hide();
|
||||
pdSharpening->FoldableToolPanel::show();
|
||||
retinex->FoldableToolPanel::setGrayedOut(false);
|
||||
|
||||
return false;
|
||||
}
|
||||
);
|
||||
@@ -396,13 +408,17 @@ void ToolPanelCoordinator::imageTypeChanged(bool isRaw, bool isBayer, bool isXtr
|
||||
{
|
||||
rawPanelSW->set_sensitive(true);
|
||||
sensorbayer->FoldableToolPanel::hide();
|
||||
bayerprocess->FoldableToolPanel::hide();
|
||||
bayerpreprocess->FoldableToolPanel::hide();
|
||||
rawcacorrection->FoldableToolPanel::hide();
|
||||
sensorxtrans->FoldableToolPanel::hide();
|
||||
xtransprocess->FoldableToolPanel::hide();
|
||||
xtransrawexposure->FoldableToolPanel::hide();
|
||||
preprocess->FoldableToolPanel::hide();
|
||||
flatfield->FoldableToolPanel::hide();
|
||||
filmNegative->FoldableToolPanel::hide();
|
||||
pdSharpening->FoldableToolPanel::hide();
|
||||
retinex->FoldableToolPanel::setGrayedOut(false);
|
||||
|
||||
return false;
|
||||
}
|
||||
);
|
||||
@@ -412,10 +428,18 @@ void ToolPanelCoordinator::imageTypeChanged(bool isRaw, bool isBayer, bool isXtr
|
||||
[this]() -> bool
|
||||
{
|
||||
rawPanelSW->set_sensitive(false);
|
||||
sensorbayer->FoldableToolPanel::hide();
|
||||
bayerprocess->FoldableToolPanel::hide();
|
||||
bayerpreprocess->FoldableToolPanel::hide();
|
||||
rawcacorrection->FoldableToolPanel::hide();
|
||||
sensorxtrans->FoldableToolPanel::hide();
|
||||
xtransprocess->FoldableToolPanel::hide();
|
||||
xtransrawexposure->FoldableToolPanel::hide();
|
||||
preprocess->FoldableToolPanel::hide();
|
||||
flatfield->FoldableToolPanel::hide();
|
||||
filmNegative->FoldableToolPanel::hide();
|
||||
pdSharpening->FoldableToolPanel::hide();
|
||||
retinex->FoldableToolPanel::setGrayedOut(true);
|
||||
|
||||
return false;
|
||||
}
|
||||
);
|
||||
|
Reference in New Issue
Block a user