ParkerBritt/Enzo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: add consistant padding

Browse Source
This commit is contained in:
parker
2025-08-03 20:44:38 +01:00
parent 21a27648d6
commit abc9419998
3 changed files with 36 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/Gui/Parameters/AbstractFormParm.cpp
View File

@@ -13,12 +13,12 @@ enzo::ui::AbstractFormParm::AbstractFormParm(std::weak_ptr<prm::Parameter> param
if(auto sharedParameter=parameter_.lock()) if(auto sharedParameter=parameter_.lock())
{ {
std::string name = sharedParameter->getName(); std::string name = sharedParameter->getName();
auto label = new QLabel(QString::fromStdString(name+":")); label_ = new QLabel(QString::fromStdString(name+":"));
label->setStyleSheet("QLabel{background: none}"); label_->setStyleSheet("QLabel{background: none}");
label->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Preferred); label_->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Preferred);
mainLayout_ = new QHBoxLayout(); mainLayout_ = new QHBoxLayout();
mainLayout_->addWidget(label); mainLayout_->addWidget(label_);
mainLayout_->setContentsMargins(0,0,0,0); mainLayout_->setContentsMargins(0,0,0,0);
switch(sharedParameter->getType()) switch(sharedParameter->getType())
@@ -65,6 +65,18 @@ enzo::ui::AbstractFormParm::AbstractFormParm(std::weak_ptr<prm::Parameter> param
} }
int enzo::ui::AbstractFormParm::getLeftPadding()
{
return label_->minimumSizeHint().width();
}
void enzo::ui::AbstractFormParm::setLeftPadding(int padding)
{
label_->setFixedWidth(padding);
}
void enzo::ui::AbstractFormParm::changeValue(enzo::bt::floatT value, unsigned int index) void enzo::ui::AbstractFormParm::changeValue(enzo::bt::floatT value, unsigned int index)
{ {

4
src/Gui/Parameters/AbstractFormParm.h
View File

@@ -3,6 +3,7 @@
#include <QHBoxLayout> #include <QHBoxLayout>
#include <memory> #include <memory>
#include <qtmetamacros.h> #include <qtmetamacros.h>
#include <QLabel>
namespace enzo::ui namespace enzo::ui
{ {
@@ -13,12 +14,15 @@ class AbstractFormParm
Q_OBJECT Q_OBJECT
public: public:
AbstractFormParm(std::weak_ptr<prm::Parameter> parameter); AbstractFormParm(std::weak_ptr<prm::Parameter> parameter);
int getLeftPadding();
void setLeftPadding(int padding);
protected Q_SLOTS: protected Q_SLOTS:
void changeValue(bt::floatT value, unsigned int index=0); void changeValue(bt::floatT value, unsigned int index=0);
private: private:
QHBoxLayout* mainLayout_; QHBoxLayout* mainLayout_;
QLabel* label_;
std::weak_ptr<prm::Parameter> parameter_; std::weak_ptr<prm::Parameter> parameter_;
}; };

35
src/Gui/ParametersPanel/ParametersPanel.cpp
View File

@@ -33,12 +33,6 @@ ParametersPanel::ParametersPanel(QWidget *parent, Qt::WindowFlags f)
mainLayout_->addWidget(bgWidget_); mainLayout_->addWidget(bgWidget_);
// parametersLayout_->addWidget(new enzo::ui::AbstractFormParm());
// parametersLayout_->addWidget(new enzo::ui::AbstractFormParm());
// parametersLayout_->addWidget(new enzo::ui::AbstractFormParm());
// parametersLayout_->addWidget(new enzo::ui::AbstractFormParm());
setLayout(mainLayout_); setLayout(mainLayout_);
} }
@@ -59,27 +53,30 @@ void ParametersPanel::selectionChanged()
enzo::nt::GeometryOperator& displayOp = nm.getGeoOperator(displayOpId.value()); enzo::nt::GeometryOperator& displayOp = nm.getGeoOperator(displayOpId.value());
auto parameters = displayOp.getParameters(); auto parameters = displayOp.getParameters();
std::vector<enzo::ui::AbstractFormParm*> parameterWidgets;
parameterWidgets.reserve(parameters.size());
int maxLeftPadding = 0;
for(auto parameter : parameters) for(auto parameter : parameters)
{ {
auto parameterShared = parameter.lock(); auto parameterShared = parameter.lock();
if(!parameterShared) throw std::runtime_error("Failed to lock parameter"); if(!parameterShared) throw std::runtime_error("Failed to lock parameter");
enzo::ui::AbstractFormParm* parameterWidget = new enzo::ui::AbstractFormParm(parameter);
int leftPadding = parameterWidget->getLeftPadding();
if(leftPadding > maxLeftPadding) maxLeftPadding = leftPadding;
parameterWidgets.push_back(parameterWidget);
}
parametersLayout_->addWidget(new enzo::ui::AbstractFormParm(parameter)); const int leftPadding = maxLeftPadding + 5;
// switch(parameterShared->getType())
// {
// case prm::Type::FLOAT:
// parametersLayout_->addWidget(new enzo::ui::AbstractFormParm(parameter));
// break;
// case prm::Type::VECTOR3:
// parametersLayout_->addWidget(new enzo::ui::VectorParr(parameter));
// break;
// default:
// throw std::runtime_error("Parameter panel: paremeter type not accounted for");
// }
for(auto parameterWidget : parameterWidgets)
{
parameterWidget->setLeftPadding(leftPadding);
parametersLayout_->addWidget(parameterWidget);
} }
} }