rename hidden to advanced parameters for consistency

This commit is contained in:
alemuntoni 2021-07-06 12:21:38 +02:00
parent e53bab0c45
commit da4e1d5e68
5 changed files with 21 additions and 10 deletions

View File

@ -32,7 +32,7 @@ RichParameter::RichParameter(const RichParameter& rp) :
val(rp.value().clone()),
fieldDesc(rp.fieldDesc),
tooltip(rp.tooltip),
hidden(rp.hidden),
advanced(rp.advanced),
pCategory(rp.pCategory)
{
}
@ -45,7 +45,7 @@ RichParameter::RichParameter(RichParameter&& rp) :
{
val = rp.val;
rp.val = nullptr;
hidden = rp.hidden;
advanced = rp.advanced;
}
RichParameter::RichParameter(
@ -53,13 +53,13 @@ RichParameter::RichParameter(
const Value& v,
const QString& desc,
const QString& tltip,
bool hidden,
bool isAdvanced,
const QString& category) :
pName(nm),
val(v.clone()),
fieldDesc(desc),
tooltip(tltip),
hidden(hidden),
advanced(isAdvanced),
pCategory(category)
{
}
@ -89,9 +89,9 @@ const QString& RichParameter::toolTip() const
return tooltip;
}
bool RichParameter::isHidden() const
bool RichParameter::isAdvanced() const
{
return hidden;
return advanced;
}
const QString& RichParameter::category() const

View File

@ -54,7 +54,7 @@ public:
const Value& v,
const QString& desc = QString(),
const QString& tltip = QString(),
bool hidden = false,
bool isAdvanced = false,
const QString& category = QString());
virtual ~RichParameter();
@ -62,7 +62,7 @@ public:
const Value& value() const;
const QString& fieldDescription() const;
const QString& toolTip() const;
bool isHidden() const;
bool isAdvanced() const;
const QString& category() const;
template <class RichParam>
@ -93,7 +93,7 @@ protected:
Value* val;
QString fieldDesc;
QString tooltip;
bool hidden;
bool advanced;
QString pCategory;
};

View File

@ -316,6 +316,16 @@ const RichParameter& RichParameterList::at(unsigned int i) const
return **it;
}
unsigned int RichParameterList::numberAdvancedParameters() const
{
unsigned int n = 0;
for (const RichParameter& rp : *this){
if (rp.isAdvanced())
++n;
}
return n;
}
/**
* @brief sets the value of the RichParameter having the given name.
* @throws an MLException if the name is not found in the list

View File

@ -120,6 +120,7 @@ public:
const_iterator findParameter(const QString& name) const;
RichParameter& at(unsigned int i);
const RichParameter& at(unsigned int i) const;
unsigned int numberAdvancedParameters() const;
void setValue(const QString& name, const Value& val);
RichParameter& addParam(const RichParameter& pd);

View File

@ -133,7 +133,7 @@ void RichParameterListFrame::loadFrameContent(
std::map<QString, std::vector<const RichParameter*>> hiddenParameters;
for(const RichParameter& fpi : curParSet) {
if (!fpi.isHidden()){
if (!fpi.isAdvanced()){
visibleParameters[fpi.category()].push_back(&fpi);
}
else {