Sketcher: change DSH framework so that tab cycle through OVP and widget parameters.

This commit is contained in:
PaddleStroke
2024-02-06 17:02:31 +01:00
parent f56bd4ea5a
commit fc1e978fc0
4 changed files with 122 additions and 70 deletions

View File

@@ -157,6 +157,16 @@ bool SketcherToolDefaultWidget::eventFilter(QObject* object, QEvent* event)
}
}
}
else if (event->type() == QEvent::FocusOut) {
for (int i = 0; i < nParameters; i++) {
auto parameterSpinBox = getParameterSpinBox(i);
if (object == parameterSpinBox) {
signalParameterFocusOut(i);
break;
}
}
}
return false;
}
@@ -200,10 +210,10 @@ void SketcherToolDefaultWidget::parameterOne_valueChanged(double val)
{
if (!blockParameterSlots) {
isSet[Parameter::First] = true;
setParameterFontStyle(Parameter::First, FontStyle::Bold);
/*setParameterFontStyle(Parameter::First, FontStyle::Bold);
if (!blockParameterFocusPassing) {
setParameterFocus(Parameter::Second);
}
}*/
signalParameterValueChanged(Parameter::First, val);
}
}
@@ -211,10 +221,6 @@ void SketcherToolDefaultWidget::parameterTwo_valueChanged(double val)
{
if (!blockParameterSlots) {
isSet[Parameter::Second] = true;
setParameterFontStyle(Parameter::Second, FontStyle::Bold);
if (!blockParameterFocusPassing) {
setParameterFocus(Parameter::Third);
}
signalParameterValueChanged(Parameter::Second, val);
}
}
@@ -222,10 +228,6 @@ void SketcherToolDefaultWidget::parameterThree_valueChanged(double val)
{
if (!blockParameterSlots) {
isSet[Parameter::Third] = true;
setParameterFontStyle(Parameter::Third, FontStyle::Bold);
if (!blockParameterFocusPassing) {
setParameterFocus(Parameter::Fourth);
}
signalParameterValueChanged(Parameter::Third, val);
}
}
@@ -233,10 +235,6 @@ void SketcherToolDefaultWidget::parameterFour_valueChanged(double val)
{
if (!blockParameterSlots) {
isSet[Parameter::Fourth] = true;
setParameterFontStyle(Parameter::Fourth, FontStyle::Bold);
if (!blockParameterFocusPassing) {
setParameterFocus(Parameter::Fifth);
}
signalParameterValueChanged(Parameter::Fourth, val);
}
}
@@ -244,10 +242,6 @@ void SketcherToolDefaultWidget::parameterFive_valueChanged(double val)
{
if (!blockParameterSlots) {
isSet[Parameter::Fifth] = true;
setParameterFontStyle(Parameter::Fifth, FontStyle::Bold);
if (!blockParameterFocusPassing) {
setParameterFocus(Parameter::Sixth);
}
signalParameterValueChanged(Parameter::Fifth, val);
}
}
@@ -255,10 +249,6 @@ void SketcherToolDefaultWidget::parameterSix_valueChanged(double val)
{
if (!blockParameterSlots) {
isSet[Parameter::Sixth] = true;
setParameterFontStyle(Parameter::Sixth, FontStyle::Bold);
if (!blockParameterFocusPassing) {
setParameterFocus(Parameter::Seventh);
}
signalParameterValueChanged(Parameter::Sixth, val);
}
}
@@ -266,10 +256,6 @@ void SketcherToolDefaultWidget::parameterSeven_valueChanged(double val)
{
if (!blockParameterSlots) {
isSet[Parameter::Seventh] = true;
setParameterFontStyle(Parameter::Seventh, FontStyle::Bold);
if (!blockParameterFocusPassing) {
setParameterFocus(Parameter::Eighth);
}
signalParameterValueChanged(Parameter::Seventh, val);
}
}
@@ -277,10 +263,6 @@ void SketcherToolDefaultWidget::parameterEight_valueChanged(double val)
{
if (!blockParameterSlots) {
isSet[Parameter::Eighth] = true;
setParameterFontStyle(Parameter::Eighth, FontStyle::Bold);
if (!blockParameterFocusPassing) {
setParameterFocus(Parameter::Ninth);
}
signalParameterValueChanged(Parameter::Eighth, val);
}
}
@@ -288,10 +270,6 @@ void SketcherToolDefaultWidget::parameterNine_valueChanged(double val)
{
if (!blockParameterSlots) {
isSet[Parameter::Ninth] = true;
setParameterFontStyle(Parameter::Ninth, FontStyle::Bold);
if (!blockParameterFocusPassing) {
setParameterFocus(Parameter::Tenth);
}
signalParameterValueChanged(Parameter::Ninth, val);
}
}
@@ -299,7 +277,6 @@ void SketcherToolDefaultWidget::parameterTen_valueChanged(double val)
{
if (!blockParameterSlots) {
isSet[Parameter::Tenth] = true;
setParameterFontStyle(Parameter::Tenth, FontStyle::Bold);
signalParameterValueChanged(Parameter::Tenth, val);
}
}
@@ -316,7 +293,7 @@ void SketcherToolDefaultWidget::initNParameters(int nparameters, QObject* filter
setParameterVisible(i, (i < nparameters));
setParameter(i, 0.F);
setParameterFilteringObject(i, filteringObject);
setParameterFontStyle(i, FontStyle::Italic);
// setParameterFontStyle(i, FontStyle::Italic);
}
setParameterFocus(Parameter::First);