kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Gui: Improve layout expression dialog for varsets

Browse Source 
According to #17075
This commit is contained in:
Pieter Hijma
2025-07-20 09:51:05 +02:00
parent 146c84cf1e
commit acea58f85f
3 changed files with 89 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/Gui/Dialogs/DlgExpressionInput.cpp
View File

@@ -36,6 +36,7 @@
#include <App/DocumentObject.h>
#include <App/ExpressionParser.h>
#include <App/VarSet.h>
#include <Base/Console.h>
#include <Base/Tools.h>
#include "Dialogs/DlgExpressionInput.h"
@@ -50,6 +51,9 @@
using namespace App;
using namespace Gui::Dialog;
FC_LOG_LEVEL_INIT("DlgExpressionInput", true, true)
bool DlgExpressionInput::varSetsVisible = false;
DlgExpressionInput::DlgExpressionInput(const App::ObjectIdentifier & _path,
@@ -204,9 +208,6 @@ bool DlgExpressionInput::typeOkForVarSet()
void DlgExpressionInput::initializeVarSets()
{
ui->labelInfoActive->setAlignment(Qt::AlignTop | Qt::AlignLeft);
ui->labelInfoActive->setWordWrap(true);
#if QT_VERSION >= QT_VERSION_CHECK(6,7,0)
connect(ui->checkBoxVarSets, &QCheckBox::checkStateChanged,
this, &DlgExpressionInput::onCheckVarSets);
@@ -441,7 +442,6 @@ static bool isNamePropOk(const QString& nameProp, App::DocumentObject* obj,
std::string name = nameProp.toStdString();
if (name.empty()) {
message << "Provide a name for the property.";
return false;
}
@@ -688,21 +688,22 @@ static bool isNameGroupOk(const QString& nameGroup,
return true;
}
void DlgExpressionInput::reportVarSetInfo(const char* message)
void DlgExpressionInput::reportVarSetInfo(const std::string& message)
{
ui->labelInfoActive->setText(QString::fromUtf8(message));
if (!message.empty()) {
FC_ERR(message);
}
}
bool DlgExpressionInput::reportGroup(QString& nameGroup)
{
if (nameGroup.isEmpty()) {
reportVarSetInfo("Provide a group.");
return true;
}
std::stringstream message;
if (!isNameGroupOk(nameGroup, message)) {
reportVarSetInfo(message.str().c_str());
reportVarSetInfo(message.str());
return true;
}
@@ -718,7 +719,7 @@ bool DlgExpressionInput::reportName(QTreeWidgetItem* item)
App::DocumentObject* obj = doc->getObject(nameVarSet.toUtf8());
std::stringstream message;
if (!isNamePropOk(nameProp, obj, message)) {
reportVarSetInfo(message.str().c_str());
reportVarSetInfo(message.str());
return true;
}
@@ -743,17 +744,17 @@ void DlgExpressionInput::updateVarSetInfo(bool checkExpr)
return;
}
QString nameProp = ui->lineEditPropNew->text();
QString labelVarSet = getValue(selected, ROLE_VARSET_LABEL);
QString nameDoc = getValue(selected, ROLE_DOC);
std::stringstream message;
message << "Adding property " << nameProp.toStdString() << std::endl
<< "of type " << getType() << std::endl
<< "to variable set " << labelVarSet.toStdString() << std::endl
<< "in group " << nameGroup.toStdString() << std::endl
<< "in document " << nameDoc.toStdString() << ".";
// QString nameProp = ui->lineEditPropNew->text();
// QString labelVarSet = getValue(selected, ROLE_VARSET_LABEL);
// QString nameDoc = getValue(selected, ROLE_DOC);
// std::stringstream message;
// message << "Adding property " << nameProp.toStdString() << std::endl
// << "of type " << getType() << std::endl
// << "to variable set " << labelVarSet.toStdString() << std::endl
// << "in group " << nameGroup.toStdString() << std::endl
// << "in document " << nameDoc.toStdString() << ".";
reportVarSetInfo(message.str().c_str());
// reportVarSetInfo(message.str().c_str());
if (checkExpr) {
// We have to check the text of the expression as well
try {
@@ -767,7 +768,6 @@ void DlgExpressionInput::updateVarSetInfo(bool checkExpr)
}
else {
okBtn->setEnabled(false);
reportVarSetInfo("Select a variable set.");
}
}