Skip to content

Replace QDoubleSpinBox by QLineEdit #1252

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
svengoldberg wants to merge 1 commit into
base: add-light-source
Choose a base branch
from
Draft

Replace QDoubleSpinBox by QLineEdit #1252

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 15 additions & 5 deletions TIGLCreator/src/TIGLCreatorAddSpotlightDialog.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
#include <QGroupBox>
#include <QGridLayout>
#include <QLabel>
#include <QDoubleSpinBox>
#include <QDialogButtonBox>

TIGLCreatorAddSpotlightDialog::TIGLCreatorAddSpotlightDialog(QWidget *parent)
Expand All @@ -34,7 +33,7 @@ TIGLCreatorAddSpotlightDialog::TIGLCreatorAddSpotlightDialog(QWidget *parent)
, dx(new QDoubleSpinBox())
, dy(new QDoubleSpinBox())
, dz(new QDoubleSpinBox())
, concentration(new QDoubleSpinBox())
, concentration(new TIGLDoubleLineEdit())
{
setWindowTitle("Add a spotlight");

Expand Down Expand Up @@ -69,7 +68,8 @@ TIGLCreatorAddSpotlightDialog::TIGLCreatorAddSpotlightDialog(QWidget *parent)
dx->setValue(1.);
dy->setValue(1.);
dz->setValue(1.);
concentration->setValue(0.5);

concentration->setValue(0.5, 2);

// The main layout is vertical with a horizontal layout on top
// and the dialog buttons below
Expand Down Expand Up @@ -149,5 +149,15 @@ tigl::CTiglPoint TIGLCreatorAddSpotlightDialog::getDirection() const

double TIGLCreatorAddSpotlightDialog::getConcentration() const
{
return concentration->value();
}
double value = concentration->text().toDouble();

// Probably not needed anymore
// Intention of this part is to round the user input to some defined decimal places
/*if(auto *validator = qobject_cast<const QDoubleValidator*>(concentration->validator())) {
int maxDecimals = validator->decimals();

double factorRounding = std::pow(10., maxDecimals);
value = std::round(value * factorRounding) / factorRounding;
}*/
return value;
}
10 changes: 5 additions & 5 deletions TIGLCreator/src/TIGLCreatorAddSpotlightDialog.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@

#include <QDialog>
#include <CTiglPoint.h>


class QDoubleSpinBox;
#include <QDoubleSpinBox>
#include <QLabel>
#include <TIGLDoubleLineEdit.h>

class TIGLCreatorAddSpotlightDialog : public QDialog
{
Expand All @@ -43,7 +43,7 @@ class TIGLCreatorAddSpotlightDialog : public QDialog
QDoubleSpinBox* dx;
QDoubleSpinBox* dy;
QDoubleSpinBox* dz;
QDoubleSpinBox* concentration;
TIGLDoubleLineEdit* concentration;
};

#endif // TIGLCREATORADDSPOTLIGHTDIALOG_H
#endif // TIGLCREATORADDSPOTLIGHTDIALOG_H
2 changes: 2 additions & 0 deletions TIGLCreator/src/TIGLCreatorApp.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,8 @@ TIGLCreatorApp::TIGLCreatorApp(int& argc, char* argv[])
setlocale(LC_NUMERIC, "C");
#endif

QLocale::setDefault(QLocale(QLocale::English));

mainwindow.reset(new TIGLCreatorWindow);

for (int iarg = 0; iarg < argc; ++iarg) {
Expand Down
45 changes: 45 additions & 0 deletions TIGLCreator/src/TIGLDoubleLineEdit.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
/*
* Copyright (C) 2025 German Aerospace Center (DLR/SC)
*
* Created: 2025-11-04 Sven Goldberg <Sven.Goldberg@dlr.de>
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

#include <TIGLDoubleLineEdit.h>
#include <TIGLDoubleValidator.h>
#include <QString>

TIGLDoubleLineEdit::TIGLDoubleLineEdit()
: QLineEdit()
{}

TIGLDoubleLineEdit::TIGLDoubleLineEdit(double minValue, double maxValue, double value, int nrDecimalsPrint)
: QLineEdit()
{
this->setRange(minValue, maxValue);
this->setValue(value, nrDecimalsPrint);
}

void TIGLDoubleLineEdit::setRange(double minValue, double maxValue)
{
// Do no explicitely forbid a specific number of decimals
// As a value has to be set, we decided to choose a large value here
// For some Qt reasons, the number of decimals places must not be arbitrary large
this->setValidator(new TIGLDoubleValidator(minValue, maxValue, 300., this));
}

void TIGLDoubleLineEdit::setValue(double value, int nrDecimalsPrint)
{
this->setText(QString::number(value, 'f', nrDecimalsPrint));
}
38 changes: 38 additions & 0 deletions TIGLCreator/src/TIGLDoubleLineEdit.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
/*
* Copyright (C) 2025 German Aerospace Center (DLR/SC)
*
* Created: 2025-11-04 Sven Goldberg <Sven.Goldberg@dlr.de>
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

#ifndef TIGLDOUBLELINEEDIT_H
#define TIGLDOUBLELINEEDIT_H

#include <QLineEdit>

class TIGLDoubleLineEdit : public QLineEdit
{
Q_OBJECT

public:
TIGLDoubleLineEdit();
TIGLDoubleLineEdit(double minValue, double maxValue, double value, int nrDecimalsPrint);

void setRange(double minValue, double maxValue);

void setValue(double value, int nrDecimalsPrint);

};

#endif // TIGLDOUBLELINEEDIT_H
46 changes: 46 additions & 0 deletions TIGLCreator/src/TIGLDoubleValidator.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
/*
* Copyright (C) 2025 German Aerospace Center (DLR/SC)
*
* Created: 2025-11-04 Sven Goldberg <Sven.Goldberg@dlr.de>
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

#include "TIGLDoubleValidator.h"

TIGLDoubleValidator::TIGLDoubleValidator(double bottom, double top, int decimals, QObject *parent)
: QDoubleValidator(bottom, top, decimals, parent)
{}

TIGLDoubleValidator::State TIGLDoubleValidator::validate(QString &input, int &pos) const {
Q_UNUSED(pos);

// Allow empty input and number with leading "."
if (input.isEmpty() || input == ".") {
return Intermediate;
}
// A leading "-" is only allowed if the range includes negative values
if (bottom() < 0 && input == "-") {
return Intermediate;
}

bool valueValid = false;
double value = input.toDouble(&valueValid);

// Input that is not convertible to a C++ double or lies outside the defined range is invalid
if (!valueValid || value < bottom() || value > top()) {
return Invalid;
}

return Intermediate;
}
37 changes: 37 additions & 0 deletions TIGLCreator/src/TIGLDoubleValidator.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
/*
* Copyright (C) 2025 German Aerospace Center (DLR/SC)
*
* Created: 2025-11-04 Sven Goldberg <Sven.Goldberg@dlr.de>
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

#ifndef TIGLDOUBLEVALIDATOR_H
#define TIGLDOUBLEVALIDATOR_H

#include <QDoubleValidator>
#include <QString>


class TIGLDoubleValidator : public QDoubleValidator
{
Q_OBJECT

public:
TIGLDoubleValidator(double bottom, double top, int decimals, QObject *parent = nullptr);

// Defines valid status of String inputs
State validate(QString &input, int &pos) const override;
};

#endif // TIGLDOUBLEVALIDATOR_H
Loading