-// Copyright (C) 2014-20xx CEA/DEN, EDF R&D
-
-// File: ModuleBase_WidgetConcealedObjects.cpp
-// Created: 29 Jul 2016
-// Author: Natalia ERMOLAEVA
+// Copyright (C) 2014-2022 CEA/DEN, EDF R&D
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
#include <ModuleBase_WidgetConcealedObjects.h>
#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 <QWidget>
#include <QTableWidget>
#include <QHeaderView>
-#include <QToolButton>
+#include <QCheckBox>
+#include <QVBoxLayout>
+
+#include <algorithm>
const int DEFAULT_NAME_COLUMN_WIDTH = 200;
: 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++) {
- QToolButton* aButton = dynamic_cast<QToolButton*>(myView->cellWidget(i, 0));;
+ 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];
- QToolButton* aButton = dynamic_cast<QToolButton*>(myView->cellWidget(i, 0));
+ QCheckBox* aButton =
+ dynamic_cast<QCheckBox*>(myView->cellWidget(i, 0)->findChild<QCheckBox*>());
bool isChecked = anAttributeList->isInList(aResult);
bool aBlocked = aButton->blockSignals(true);
aButton->setChecked(isChecked);
- this->updateItemIcon(aButton);
aButton->blockSignals(aBlocked);
}
return true;
int anId = myView->rowCount();
myView->setRowCount(anId+1);
- QToolButton* aVisibilityBtn = new QToolButton(this);
+ QWidget* aVisibilityWdg = new QWidget(this);
+ QVBoxLayout* aVisibilityLay = new QVBoxLayout(aVisibilityWdg);
+ aVisibilityLay->setContentsMargins(2, 2, 2, 2);
+ QCheckBox* aVisibilityBtn = new QCheckBox(aVisibilityWdg);
+ aVisibilityLay->addWidget(aVisibilityBtn, 0, Qt::AlignHCenter);
connect(aVisibilityBtn, SIGNAL(toggled(bool)), this, SLOT(onItemToggled(bool)));
- aVisibilityBtn->setCheckable(true);
aVisibilityBtn->setChecked(false);
- updateItemIcon(aVisibilityBtn);
- myView->setCellWidget(anId, 0, aVisibilityBtn);
- myView->setItem(anId, 1, new QTableWidgetItem(theResult->data()->name().c_str()));
+ myView->setCellWidget(anId, 0, aVisibilityWdg);
+ 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);
}
-void ModuleBase_WidgetConcealedObjects::updateItemIcon(QToolButton* theButton)
-{
- bool isChecked = theButton->isChecked();
- theButton->setIcon(isChecked ? QIcon(":icons/concealed_on.png")
- : QIcon(":icons/concealed_off.png"));
- theButton->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
-}
