add min max def to properties

This commit is contained in:
AndreaRigoni
2026-03-27 15:46:16 +00:00
parent fa7c0f670e
commit 171a07eb79
6 changed files with 222 additions and 18 deletions

View File

@@ -7,6 +7,10 @@
#include "Vtk/uLibVtkInterface.h"
#include "Math/Units.h"
#include "Math/Dense.h"
#include <QPushButton>
#include <QColorDialog>
#include <QFrame>
#include <QSlider>
#include "Settings.h"
namespace uLib {
@@ -19,7 +23,7 @@ PropertyWidgetBase::PropertyWidgetBase(PropertyBase* prop, QWidget* parent)
std::string unit = prop->GetUnits();
QString labelText = QString::fromStdString(prop->GetName());
if (!unit.empty()) {
if (!unit.empty() && unit != "color") {
auto dim = Settings::Instance().IdentifyDimension(unit);
std::string pref = Settings::Instance().GetPreferredUnit(dim);
if (!pref.empty()) {
@@ -203,6 +207,76 @@ BoolPropertyWidget::BoolPropertyWidget(Property<bool>* prop, QWidget* parent)
}
BoolPropertyWidget::~BoolPropertyWidget() {}
RangePropertyWidget::RangePropertyWidget(Property<double>* prop, QWidget* parent)
: PropertyWidgetBase(prop, parent), m_Prop(prop) {
m_Slider = new QSlider(::Qt::Horizontal, this);
m_Slider->setRange(0, 100);
m_Slider->setMinimumWidth(80);
m_Edit = new UnitLineEdit(this);
m_Edit->setFixedWidth(50);
m_Layout->addWidget(m_Slider, 1);
m_Layout->addWidget(m_Edit, 0);
connect(m_Slider, &QSlider::valueChanged, this, &RangePropertyWidget::onSliderChanged);
connect(m_Edit, &UnitLineEdit::valueManualChanged, [this](double val){ m_Prop->Set(val); });
m_Connection = uLib::Object::connect(m_Prop, &Property<double>::PropertyChanged, [this](){
this->updateUi();
});
updateUi();
}
RangePropertyWidget::~RangePropertyWidget() { m_Connection.disconnect(); }
void RangePropertyWidget::updateUi() {
double val = m_Prop->Get();
m_Edit->setValue(val);
if (m_Prop->GetMax() != m_Prop->GetMin()) {
int sliderVal = (int)((val - m_Prop->GetMin()) / (m_Prop->GetMax() - m_Prop->GetMin()) * 100.0);
QSignalBlocker blocker(m_Slider);
m_Slider->setValue(sliderVal);
}
}
void RangePropertyWidget::onSliderChanged(int val) {
double realVal = m_Prop->GetMin() + (val / 100.0) * (m_Prop->GetMax() - m_Prop->GetMin());
m_Prop->Set(realVal);
}
ColorPropertyWidget::ColorPropertyWidget(Property<Vector3d>* prop, QWidget* parent)
: PropertyWidgetBase(prop, parent), m_Prop(prop) {
m_Button = new QPushButton(this);
m_Button->setFixedWidth(60);
this->updateButtonColor();
m_Layout->addWidget(m_Button, 0, ::Qt::AlignRight);
connect(m_Button, &QPushButton::clicked, this, &ColorPropertyWidget::onClicked);
m_Connection = uLib::Object::connect(m_Prop, &Property<Vector3d>::PropertyChanged, [this](){
this->updateButtonColor();
});
}
ColorPropertyWidget::~ColorPropertyWidget() {}
void ColorPropertyWidget::updateButtonColor() {
Vector3d c = m_Prop->Get();
QColor color = QColor::fromRgbF(std::max(0.0, std::min(1.0, c.x())),
std::max(0.0, std::min(1.0, c.y())),
std::max(0.0, std::min(1.0, c.z())));
m_Button->setStyleSheet(QString("background-color: %1; border: 1px solid #555; height: 18px;").arg(color.name()));
}
void ColorPropertyWidget::onClicked() {
Vector3d c = m_Prop->Get();
QColor current = QColor::fromRgbF(std::max(0.0, std::min(1.0, c.x())),
std::max(0.0, std::min(1.0, c.y())),
std::max(0.0, std::min(1.0, c.z())));
QColor selected = QColorDialog::getColor(current, this, "Select Color");
if (selected.isValid()) {
m_Prop->Set(Vector3d(selected.redF(), selected.greenF(), selected.blueF()));
}
}
StringPropertyWidget::StringPropertyWidget(Property<std::string>* prop, QWidget* parent)
: PropertyWidgetBase(prop, parent), m_Prop(prop) {
m_LineEdit = new QLineEdit(this);
@@ -358,6 +432,18 @@ void PropertyEditor::setObject(::uLib::Object* obj, bool displayOnly) {
// Priority 1: Check if it provides enum labels
if (!prop->GetEnumLabels().empty()) {
widget = new EnumPropertyWidget(prop, m_Container);
} else if (prop->GetUnits() == "color") {
// Color Picker for Vector3d
if (auto* pvec = dynamic_cast<Property<Vector3d>*>(prop)) {
widget = new ColorPropertyWidget(pvec, m_Container);
}
} else if (prop->HasRange()) {
// Slider for ranged doubles
if (auto* pdbl = dynamic_cast<Property<double>*>(prop)) {
widget = new RangePropertyWidget(pdbl, m_Container);
} else if (auto* pflt = dynamic_cast<Property<float>*>(prop)) {
// widget = new RangePropertyWidget<float>(pflt, m_Container);
}
} else {
// Priority 2: Standard factory lookup
auto it = m_Factories.find(prop->GetTypeIndex());

View File

@@ -2,6 +2,8 @@
#define PROPERTY_WIDGETS_H
#include <QWidget>
class QPushButton;
class QSlider;
#include <QLabel>
#include <QHBoxLayout>
#include <QVBoxLayout>
@@ -141,6 +143,20 @@ private:
UnitLineEdit* m_Edits[Size];
};
class RangePropertyWidget : public PropertyWidgetBase {
Q_OBJECT
public:
RangePropertyWidget(Property<double>* prop, QWidget* parent = nullptr);
virtual ~RangePropertyWidget();
private slots:
void onSliderChanged(int val);
private:
void updateUi();
Property<double>* m_Prop;
QSlider* m_Slider;
UnitLineEdit* m_Edit;
};
class BoolPropertyWidget : public PropertyWidgetBase {
Q_OBJECT
public:
@@ -151,6 +167,19 @@ private:
QCheckBox* m_CheckBox;
};
class ColorPropertyWidget : public PropertyWidgetBase {
Q_OBJECT
public:
ColorPropertyWidget(Property<Vector3d>* prop, QWidget* parent = nullptr);
virtual ~ColorPropertyWidget();
private slots:
void onClicked();
private:
void updateButtonColor();
Property<Vector3d>* m_Prop;
QPushButton* m_Button;
};
class StringPropertyWidget : public PropertyWidgetBase {
Q_OBJECT
public: