Gui: implementation classes don't inherit from UI classes any more
This commit is contained in:
@@ -33,6 +33,7 @@
|
||||
#endif
|
||||
|
||||
#include "DlgSettingsColorGradientImp.h"
|
||||
#include "ui_DlgSettingsColorGradient.h"
|
||||
#include "SpinBox.h"
|
||||
|
||||
using namespace Gui::Dialog;
|
||||
@@ -45,12 +46,13 @@ using namespace Gui::Dialog;
|
||||
*/
|
||||
DlgSettingsColorGradientImp::DlgSettingsColorGradientImp( QWidget* parent, Qt::WindowFlags fl )
|
||||
: QDialog( parent, fl )
|
||||
, ui(new Ui_DlgSettingsColorGradient)
|
||||
{
|
||||
this->setupUi(this);
|
||||
fMaxVal = new QDoubleValidator(-1000,1000,spinBoxDecimals->maximum(),this);
|
||||
floatLineEditMax->setValidator(fMaxVal);
|
||||
fMinVal = new QDoubleValidator(-1000,1000,spinBoxDecimals->maximum(),this);
|
||||
floatLineEditMin->setValidator(fMinVal);
|
||||
ui->setupUi(this);
|
||||
fMaxVal = new QDoubleValidator(-1000,1000,ui->spinBoxDecimals->maximum(),this);
|
||||
ui->floatLineEditMax->setValidator(fMaxVal);
|
||||
fMinVal = new QDoubleValidator(-1000,1000,ui->spinBoxDecimals->maximum(),this);
|
||||
ui->floatLineEditMin->setValidator(fMinVal);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -66,23 +68,23 @@ void DlgSettingsColorGradientImp::setColorModel( App::ColorGradient::TColorModel
|
||||
switch (tModel)
|
||||
{
|
||||
case App::ColorGradient::TRIA:
|
||||
comboBoxModel->setCurrentIndex(0);
|
||||
ui->comboBoxModel->setCurrentIndex(0);
|
||||
break;
|
||||
case App::ColorGradient::INVERSE_TRIA:
|
||||
comboBoxModel->setCurrentIndex(1);
|
||||
ui->comboBoxModel->setCurrentIndex(1);
|
||||
break;
|
||||
case App::ColorGradient::GRAY:
|
||||
comboBoxModel->setCurrentIndex(2);
|
||||
ui->comboBoxModel->setCurrentIndex(2);
|
||||
break;
|
||||
case App::ColorGradient::INVERSE_GRAY:
|
||||
comboBoxModel->setCurrentIndex(3);
|
||||
ui->comboBoxModel->setCurrentIndex(3);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
App::ColorGradient::TColorModel DlgSettingsColorGradientImp::colorModel() const
|
||||
{
|
||||
int item = comboBoxModel->currentIndex();
|
||||
int item = ui->comboBoxModel->currentIndex();
|
||||
if ( item == 0 )
|
||||
return App::ColorGradient::TRIA;
|
||||
else if ( item == 1 )
|
||||
@@ -98,79 +100,79 @@ void DlgSettingsColorGradientImp::setColorStyle( App::ColorGradient::TStyle tSty
|
||||
switch ( tStyle )
|
||||
{
|
||||
case App::ColorGradient::FLOW:
|
||||
radioButtonFlow->setChecked(true);
|
||||
ui->radioButtonFlow->setChecked(true);
|
||||
break;
|
||||
case App::ColorGradient::ZERO_BASED:
|
||||
radioButtonZero->setChecked(true);
|
||||
ui->radioButtonZero->setChecked(true);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
App::ColorGradient::TStyle DlgSettingsColorGradientImp::colorStyle() const
|
||||
{
|
||||
return radioButtonZero->isChecked() ? App::ColorGradient::ZERO_BASED : App::ColorGradient::FLOW;
|
||||
return ui->radioButtonZero->isChecked() ? App::ColorGradient::ZERO_BASED : App::ColorGradient::FLOW;
|
||||
}
|
||||
|
||||
void DlgSettingsColorGradientImp::setOutGrayed( bool grayed )
|
||||
{
|
||||
checkBoxGrayed->setChecked( grayed );
|
||||
ui->checkBoxGrayed->setChecked( grayed );
|
||||
}
|
||||
|
||||
bool DlgSettingsColorGradientImp::isOutGrayed() const
|
||||
{
|
||||
return checkBoxGrayed->isChecked();
|
||||
return ui->checkBoxGrayed->isChecked();
|
||||
}
|
||||
|
||||
void DlgSettingsColorGradientImp::setOutInvisible( bool invisible )
|
||||
{
|
||||
checkBoxInvisible->setChecked( invisible );
|
||||
ui->checkBoxInvisible->setChecked( invisible );
|
||||
}
|
||||
|
||||
bool DlgSettingsColorGradientImp::isOutInvisible() const
|
||||
{
|
||||
return checkBoxInvisible->isChecked();
|
||||
return ui->checkBoxInvisible->isChecked();
|
||||
}
|
||||
|
||||
void DlgSettingsColorGradientImp::setRange( float fMin, float fMax )
|
||||
{
|
||||
floatLineEditMax->blockSignals(true);
|
||||
floatLineEditMax->setText(QLocale::system().toString(fMax, 'f', numberOfDecimals()));
|
||||
floatLineEditMax->blockSignals(false);
|
||||
floatLineEditMin->blockSignals(true);
|
||||
floatLineEditMin->setText(QLocale::system().toString(fMin, 'f', numberOfDecimals()));
|
||||
floatLineEditMin->blockSignals(false);
|
||||
ui->floatLineEditMax->blockSignals(true);
|
||||
ui->floatLineEditMax->setText(QLocale::system().toString(fMax, 'f', numberOfDecimals()));
|
||||
ui->floatLineEditMax->blockSignals(false);
|
||||
ui->floatLineEditMin->blockSignals(true);
|
||||
ui->floatLineEditMin->setText(QLocale::system().toString(fMin, 'f', numberOfDecimals()));
|
||||
ui->floatLineEditMin->blockSignals(false);
|
||||
}
|
||||
|
||||
void DlgSettingsColorGradientImp::getRange(float& fMin, float& fMax) const
|
||||
{
|
||||
fMax = QLocale::system().toFloat(floatLineEditMax->text());
|
||||
fMin = QLocale::system().toFloat(floatLineEditMin->text());
|
||||
fMax = QLocale::system().toFloat(ui->floatLineEditMax->text());
|
||||
fMin = QLocale::system().toFloat(ui->floatLineEditMin->text());
|
||||
}
|
||||
|
||||
void DlgSettingsColorGradientImp::setNumberOfLabels(int val)
|
||||
{
|
||||
spinBoxLabel->setValue( val );
|
||||
ui->spinBoxLabel->setValue( val );
|
||||
}
|
||||
|
||||
int DlgSettingsColorGradientImp::numberOfLabels() const
|
||||
{
|
||||
return spinBoxLabel->value();
|
||||
return ui->spinBoxLabel->value();
|
||||
}
|
||||
|
||||
void DlgSettingsColorGradientImp::setNumberOfDecimals(int val)
|
||||
{
|
||||
spinBoxDecimals->setValue(val);
|
||||
ui->spinBoxDecimals->setValue(val);
|
||||
}
|
||||
|
||||
int DlgSettingsColorGradientImp::numberOfDecimals() const
|
||||
{
|
||||
return spinBoxDecimals->value();
|
||||
return ui->spinBoxDecimals->value();
|
||||
}
|
||||
|
||||
void DlgSettingsColorGradientImp::accept()
|
||||
{
|
||||
double fMax = QLocale::system().toDouble(floatLineEditMax->text());
|
||||
double fMin = QLocale::system().toDouble(floatLineEditMin->text());
|
||||
double fMax = QLocale::system().toDouble(ui->floatLineEditMax->text());
|
||||
double fMin = QLocale::system().toDouble(ui->floatLineEditMin->text());
|
||||
|
||||
if (fMax <= fMin) {
|
||||
QMessageBox::warning(this, tr("Wrong parameter"),
|
||||
|
||||
Reference in New Issue
Block a user