Deleted check after build for transformations.

[modules/shaper.git] / src / ModuleBase / ModuleBase_WidgetConcealedObjects.cpp

diff --git a/src/ModuleBase/ModuleBase_WidgetConcealedObjects.cpp b/src/ModuleBase/ModuleBase_WidgetConcealedObjects.cpp
index ba83b7734a1d921d8047e7163659a2857fa42f4e..be55ed84b7e976efff2e47217fa1eb23a45d20f5 100644 (file)
--- a/src/ModuleBase/ModuleBase_WidgetConcealedObjects.cpp
+++ b/src/ModuleBase/ModuleBase_WidgetConcealedObjects.cpp
@@ -10,15 +10,21 @@
 #include <ModelAPI_Result.h>
 #include <ModelAPI_AttributeReference.h>
 #include <ModelAPI_AttributeRefList.h>
+#include <ModelAPI_Session.h>
+#include <ModelAPI_Validator.h>
+#include <ModelAPI_Tools.h>
 
 #include <Config_WidgetAPI.h>
 
 #include <QGridLayout>
-#include <QCheckBox>
 
 #include <QWidget>
 #include <QTableWidget>
 #include <QHeaderView>
+#include <QCheckBox>
+#include <QVBoxLayout>
+
+const int DEFAULT_NAME_COLUMN_WIDTH = 200;
 
 ModuleBase_WidgetConcealedObjects::ModuleBase_WidgetConcealedObjects(QWidget* theParent,
                                                      const Config_WidgetAPI* theData)
@@ -49,7 +55,8 @@ bool ModuleBase_WidgetConcealedObjects::storeValueCustom()
   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));
+    QCheckBox* aButton =
+        dynamic_cast<QCheckBox*>(myView->cellWidget(i, 0)->findChild<QCheckBox*>());
     if (aButton->isChecked())
       anAttributeList->append(myConcealedResults[i]);
   }
@@ -71,31 +78,27 @@ bool ModuleBase_WidgetConcealedObjects::restoreValueCustom()
     myConcealedResults.clear();
     myBaseFeature = aBaseFeature;
     if (myBaseFeature.get()) {
-      std::list<std::pair<std::string, std::list<std::shared_ptr<ModelAPI_Object> > > > aRefs;
-      myBaseFeature->data()->referencesToObjects(aRefs);
-      std::list<std::pair<std::string, std::list<ObjectPtr> > >::const_iterator
-                                                      anIt = aRefs.begin(), aLast = aRefs.end();
+      std::list<std::shared_ptr<ModelAPI_Result> > aResults;
+      ModelAPI_Tools::getConcealedResults(myBaseFeature, aResults);
+      std::list<std::shared_ptr<ModelAPI_Result> >::const_iterator anIt = aResults.begin(),
+                                                                   aLast = aResults.end();
       for (; anIt != aLast; anIt++) {
-        std::list<ObjectPtr> anObjects = (*anIt).second;
-        std::list<ObjectPtr>::const_iterator anOIt = anObjects.begin(), anOLast = anObjects.end();
-        for (; anOIt != anOLast; anOIt++) {
-          ResultPtr aResult = std::dynamic_pointer_cast<ModelAPI_Result>(*anOIt);
-          if (aResult->isConcealed()) {
-            int aRowId = myView->rowCount();
-            addViewRow(aResult);
-            myConcealedResults[aRowId] = aResult;
-          }
-        }
+        ResultPtr aResult = *anIt;
+
+        int aRowId = myView->rowCount();
+        addViewRow(aResult);
+        myConcealedResults[aRowId] = 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 = dynamic_cast<QCheckBox*>(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);
@@ -112,16 +115,27 @@ QList<QWidget*> ModuleBase_WidgetConcealedObjects::getControls() const
   return result;
 }
 
-void ModuleBase_WidgetConcealedObjects::addViewRow(const std::shared_ptr<ModelAPI_Result>& theResult)
+void ModuleBase_WidgetConcealedObjects::addViewRow(
+                                const std::shared_ptr<ModelAPI_Result>& theResult)
 {
   int anId = myView->rowCount();
   myView->setRowCount(anId+1);
 
-  QCheckBox* aVisibilityBox = new QCheckBox(this);
-  connect(aVisibilityBox, SIGNAL(toggled(bool)), this, SLOT(onItemToggled(bool)));
-  aVisibilityBox->setChecked(false);
-  myView->setCellWidget(anId, 0, aVisibilityBox);
+  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->setChecked(false);
+
+  myView->setCellWidget(anId, 0, aVisibilityWdg);
   myView->setItem(anId, 1, new QTableWidgetItem(theResult->data()->name().c_str()));
+
+  if (anId == 1) {
+    myView->setColumnWidth(0, myView->verticalHeader()->defaultSectionSize());
+    myView->setColumnWidth(1, DEFAULT_NAME_COLUMN_WIDTH);
+  }
 }
 
 void ModuleBase_WidgetConcealedObjects::onItemToggled(bool theState)
@@ -129,3 +143,4 @@ void ModuleBase_WidgetConcealedObjects::onItemToggled(bool theState)
   emit valuesChanged();
   updateObject(myFeature);
 }
+