-// Copyright (C) 2014-2019 CEA/DEN, EDF R&D
+// Copyright (C) 2014-2023 CEA, EDF
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
#include <ModuleBase_Tools.h>
#include <ModelAPI_Result.h>
+#include <ModelAPI_ResultBody.h>
#include <ModelAPI_AttributeReference.h>
#include <ModelAPI_AttributeRefList.h>
#include <ModelAPI_Session.h>
#include <QCheckBox>
#include <QVBoxLayout>
+#include <algorithm>
+
const int DEFAULT_NAME_COLUMN_WIDTH = 200;
ModuleBase_WidgetConcealedObjects::ModuleBase_WidgetConcealedObjects(QWidget* theParent,
: ModuleBase_ModelWidget(theParent, theData)
{
myBaseShapeAttribute = theData->getProperty("base_shape_attribute");
+ std::string aPickParents = theData->getProperty("pick_concealed_parents");
+ std::transform(aPickParents.begin(), aPickParents.end(), aPickParents.begin(), ::tolower);
+ myPickConcealedParents = aPickParents == "1" || aPickParents == "true" || aPickParents == "yes";
+
QGridLayout* aMainLay = new QGridLayout(this);
ModuleBase_Tools::adjustMargins(aMainLay);
DataPtr aData = myFeature->data();
AttributeRefListPtr anAttributeList = aData->reflist(attributeID());
anAttributeList->clear();
- int aSize1 = anAttributeList->size(false);
for (int i = 0, aSize = myView->rowCount(); i < aSize; i++) {
QCheckBox* aButton =
dynamic_cast<QCheckBox*>(myView->cellWidget(i, 0)->findChild<QCheckBox*>());
if (aButton->isChecked())
anAttributeList->append(myConcealedResults[i]);
}
- int aSize = anAttributeList->size(false);
return true;
}
myBaseFeature = aBaseFeature;
if (myBaseFeature.get()) {
std::list<std::shared_ptr<ModelAPI_Result> > aResults;
+ std::set<ResultBodyPtr> aParents;
ModelAPI_Tools::getConcealedResults(myBaseFeature, aResults);
std::list<std::shared_ptr<ModelAPI_Result> >::const_iterator anIt = aResults.begin(),
aLast = aResults.end();
for (; anIt != aLast; anIt++) {
ResultPtr aResult = *anIt;
+ if (myPickConcealedParents) {
+ // pick the parent result of the concealed object
+ ResultBodyPtr aRootParent = ModelAPI_Tools::bodyOwner(aResult, true);
+ if (aRootParent) {
+ if (aParents.find(aRootParent) == aParents.end()) {
+ aResult = aRootParent;
+ aParents.insert(aRootParent);
+ }
+ else // do not add parent compound once again
+ continue;
+ }
+ }
int aRowId = myView->rowCount();
addViewRow(aResult);
DataPtr aData = myFeature->data();
AttributeRefListPtr anAttributeList = aData->reflist(attributeID());
- int aSize = anAttributeList->size();
for (int i = 0, aSize = myView->rowCount(); i < aSize; i++) {
ResultPtr aResult = myConcealedResults[i];
QCheckBox* aButton =
aVisibilityBtn->setChecked(false);
myView->setCellWidget(anId, 0, aVisibilityWdg);
- myView->setItem(anId, 1, new QTableWidgetItem(theResult->data()->name().c_str()));
+ myView->setItem(anId, 1,
+ new QTableWidgetItem(QString::fromStdWString(theResult->data()->name())));
if (anId == 1) {
myView->setColumnWidth(0, myView->verticalHeader()->defaultSectionSize());
}
}
-void ModuleBase_WidgetConcealedObjects::onItemToggled(bool theState)
+void ModuleBase_WidgetConcealedObjects::onItemToggled(bool /*theState*/)
{
emit valuesChanged();
updateObject(myFeature);