From 139d8b71e617b138dd17ddf12d54fe2e676d9089 Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Wed, 23 Oct 2013 09:10:33 +0200 Subject: redo layout Signed-off-by: Stanislaw Halik --- .../ftnoir_accela_filtercontrols.ui | 807 +++++++++++---------- .../ftnoir_filter_accela_dialog.cpp | 3 - 2 files changed, 420 insertions(+), 390 deletions(-) diff --git a/ftnoir_filter_accela/ftnoir_accela_filtercontrols.ui b/ftnoir_filter_accela/ftnoir_accela_filtercontrols.ui index df730fad..bc66fdc2 100644 --- a/ftnoir_filter_accela/ftnoir_accela_filtercontrols.ui +++ b/ftnoir_filter_accela/ftnoir_accela_filtercontrols.ui @@ -9,8 +9,8 @@ 0 0 - 670 - 320 + 450 + 350 @@ -21,8 +21,8 @@ - 670 - 320 + 450 + 350 @@ -41,395 +41,428 @@ - - - QLayout::SetMinAndMaxSize + + + + 260 + 4 + 160 + 201 + - - - - Axis speed - - - - QFormLayout::ExpandingFieldsGrow - - - 20 - - - - - X - - - - - - - 4 - - - 0.100000000000000 - - - 3.000000000000000 - - - 0.100000000000000 - - - 1.000000000000000 - - - - - - - Y - - - - - - - 4 - - - 0.100000000000000 - - - 3.000000000000000 - - - 0.100000000000000 - - - 1.000000000000000 - - - - - - - Z - - - - - - - 4 - - - 0.100000000000000 - - - 3.000000000000000 - - - 0.100000000000000 - - - 1.000000000000000 - - - - - - - Yaw - - - - - - - false - - - 4 - - - 0.100000000000000 - - - 3.000000000000000 - - - 0.100000000000000 - - - 1.000000000000000 - - - - - - - Pitch - - - - - - - false - - - 4 - - - 0.100000000000000 - - - 3.000000000000000 - - - 0.100000000000000 - - - 1.000000000000000 - - - - - - - Roll - - - - - - - false - - - 4 - - - 0.100000000000000 - - - 3.000000000000000 - - - 0.100000000000000 - - - 1.000000000000000 - - - - - - - - - - Cancel - - - - - - - - 8 - - - - QFrame::NoFrame - - - Accela filter by Stanisław Halik <sthalik@misaki.pl> + + + 150 + 100 + + + + Axis speed + + + + QFormLayout::ExpandingFieldsGrow + + + 20 + + + 2 + + + 20 + + + 7 + + + 10 + + + 15 + + + + + X + + + + + + + 4 + + + 0.100000000000000 + + + 3.000000000000000 + + + 0.100000000000000 + + + 1.000000000000000 + + + + + + + Y + + + + + + + 4 + + + 0.100000000000000 + + + 3.000000000000000 + + + 0.100000000000000 + + + 1.000000000000000 + + + + + + + Z + + + + + + + 4 + + + 0.100000000000000 + + + 3.000000000000000 + + + 0.100000000000000 + + + 1.000000000000000 + + + + + + + Yaw + + + + + + + false + + + 4 + + + 0.100000000000000 + + + 3.000000000000000 + + + 0.100000000000000 + + + 1.000000000000000 + + + + + + + Pitch + + + + + + + false + + + 4 + + + 0.100000000000000 + + + 3.000000000000000 + + + 0.100000000000000 + + + 1.000000000000000 + + + + + + + Roll + + + + + + + false + + + 4 + + + 0.100000000000000 + + + 3.000000000000000 + + + 0.100000000000000 + + + 1.000000000000000 + + + + + + + + + 50 + 270 + 321 + 71 + + + + + 0 + 0 + + + + + 9 + + + + QFrame::NoFrame + + + Accela filter by Stanisław Halik <sthalik@misaki.pl> With kind help from Donovan Baarda. 2012-2013 - - - Qt::AutoText - - - false - - - Qt::AlignJustify|Qt::AlignTop - - - true - - - 0 - - - - - - - 3 - - - 0.100000000000000 - - - 65535.000000000000000 - - - 1.000000000000000 - - - - - - - OK - - - - - - - Translation smoothing - - - - - - - - 50 - 15 - - - - 0 - - - 200 - - - 1 - - - 100 - - - Qt::Horizontal - - - QSlider::NoTicks - - - - - - - - 35 - 22 - - - - background:none; - - - false - - - 0 - - - 200 - - - 45 - - - - - - - Rotation smoothing - - - - - - - 3 - - - 0.100000000000000 - - - 65535.000000000000000 - - - 1.000000000000000 - - - - - - - - 25 - 0 - - - - - 150 - 16777215 - - - - color:#0; + + + Qt::AutoText + + + false + + + Qt::AlignJustify|Qt::AlignTop + + + true + + + 0 + + + + + + 350 + 210 + 69 + 31 + + + + + 0 + 0 + + + + Cancel + + + + + + 260 + 210 + 91 + 31 + + + + + 0 + 0 + + + + OK + + + + + + 4 + 4 + 252 + 108 + + + + Basic settings + + + + + + + 0 + 0 + + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + QAbstractSpinBox::CorrectToPreviousValue + + + 3 + + + 0.100000000000000 + + + 65535.000000000000000 + + + 1.000000000000000 + + + + + + + Translation smoothing + + + + + + + + 35 + 22 + + + + background:none; + + + false + + + 0 + + + 200 + + + 45 + + + + + + + + 0 + 0 + + + + Rotation smoothing + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + + + + + 3 + + + 0.100000000000000 + + + 65535.000000000000000 + + + 1.000000000000000 + + + + + + + + 25 + 0 + + + + + 150 + 16777215 + + + + color:#0; background:none; - - - Zoom speed - - - - + + + Zoom speed + + + + + - - - slideZoom - valueChanged(int) - spinZoom - setValue(int) - - - 463 - 19 - - - 537 - 20 - - - - - spinZoom - valueChanged(int) - slideZoom - setValue(int) - - - 533 - 20 - - - 426 - 20 - - - - + startEngineClicked() stopEngineClicked() diff --git a/ftnoir_filter_accela/ftnoir_filter_accela_dialog.cpp b/ftnoir_filter_accela/ftnoir_filter_accela_dialog.cpp index 4cd45910..feff0ba9 100644 --- a/ftnoir_filter_accela/ftnoir_filter_accela_dialog.cpp +++ b/ftnoir_filter_accela/ftnoir_filter_accela_dialog.cpp @@ -47,7 +47,6 @@ FilterControls::FilterControls() : connect(ui.rotation_alpha, SIGNAL(valueChanged(double)), this, SLOT(settingChanged(double))); connect(ui.translation_alpha, SIGNAL(valueChanged(double)), this, SLOT(settingChanged(double))); - connect(ui.slideZoom, SIGNAL(valueChanged(int)), this, SLOT(settingChanged(int))); connect(ui.spinZoom, SIGNAL(valueChanged(int)), this, SLOT(settingChanged(int))); QDoubleSpinBox* boxen[] = { @@ -156,7 +155,6 @@ void FilterControls::loadSettings() { //qDebug() << "FTNoIR_Filter::loadSettings2 says: size = " << NUM_OF(defScaleRotation); iniFile.beginGroup ( "Accela" ); - ui.slideZoom->setValue(iniFile.value("zoom-slowness", ACCELA_ZOOM_SLOWNESS).toInt()); ui.spinZoom->setValue(iniFile.value("zoom-slowness", ACCELA_ZOOM_SLOWNESS).toInt()); ui.rotation_alpha->setValue(iniFile.value("rotation-alpha", ACCELA_SMOOTHING_ROTATION).toDouble()); ui.translation_alpha->setValue(iniFile.value("translation-alpha", ACCELA_SMOOTHING_TRANSLATION).toDouble()); @@ -207,7 +205,6 @@ void FilterControls::save() { double rot, trans, zoom; iniFile.beginGroup ( "Accela" ); - iniFile.setValue("zoom-slowness", zoom = ui.slideZoom->value()); iniFile.setValue("rotation-alpha", rot = ui.rotation_alpha->value()); iniFile.setValue("translation-alpha", trans = ui.translation_alpha->value()); iniFile.endGroup (); -- cgit v1.2.3