diff --git a/src/common/parameters/rich_parameter.cpp b/src/common/parameters/rich_parameter.cpp index 36c550195..a7cc1c312 100644 --- a/src/common/parameters/rich_parameter.cpp +++ b/src/common/parameters/rich_parameter.cpp @@ -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 diff --git a/src/common/parameters/rich_parameter.h b/src/common/parameters/rich_parameter.h index 28661bc87..1a8c7b29f 100644 --- a/src/common/parameters/rich_parameter.h +++ b/src/common/parameters/rich_parameter.h @@ -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 @@ -93,7 +93,7 @@ protected: Value* val; QString fieldDesc; QString tooltip; - bool hidden; + bool advanced; QString pCategory; }; diff --git a/src/common/parameters/rich_parameter_list.cpp b/src/common/parameters/rich_parameter_list.cpp index 56afe185f..faa185c12 100644 --- a/src/common/parameters/rich_parameter_list.cpp +++ b/src/common/parameters/rich_parameter_list.cpp @@ -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 diff --git a/src/common/parameters/rich_parameter_list.h b/src/common/parameters/rich_parameter_list.h index 7b49f21d3..13bb2af3f 100644 --- a/src/common/parameters/rich_parameter_list.h +++ b/src/common/parameters/rich_parameter_list.h @@ -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); diff --git a/src/meshlab/rich_parameter_gui/richparameterlistframe.cpp b/src/meshlab/rich_parameter_gui/richparameterlistframe.cpp index ab9c7b37f..9105f4bed 100644 --- a/src/meshlab/rich_parameter_gui/richparameterlistframe.cpp +++ b/src/meshlab/rich_parameter_gui/richparameterlistframe.cpp @@ -133,7 +133,7 @@ void RichParameterListFrame::loadFrameContent( std::map> hiddenParameters; for(const RichParameter& fpi : curParSet) { - if (!fpi.isHidden()){ + if (!fpi.isAdvanced()){ visibleParameters[fpi.category()].push_back(&fpi); } else {