-// Copyright (C) 2014-20xx CEA/DEN, EDF R&D -->
-
-// File: ModuleBase_IDocumentDataModel.cpp
-// Created: 28 Apr 2015
-// Author: Vitaly SMETANNIKOV
+// Copyright (C) 2014-2017 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<mailto:webmaster.salome@opencascade.com>
+//
#include "XGUI_DataModel.h"
+#include "XGUI_Workshop.h"
+#include "XGUI_ObjectsBrowser.h"
+#include "XGUI_Displayer.h"
#include <ModuleBase_IconFactory.h>
#include <ModelAPI_Feature.h>
#include <ModelAPI_CompositeFeature.h>
#include <ModelAPI_ResultCompSolid.h>
+#include <ModelAPI_ResultField.h>
#include <ModelAPI_Tools.h>
#include <Config_FeatureMessage.h>
#include <QIcon>
#include <QBrush>
-#define ACTIVE_COLOR Qt::black
+#define ACTIVE_COLOR QColor(Qt::black)
//#define ACTIVE_COLOR QColor(0,72,140)
//#define PASSIVE_COLOR Qt::black
#define SELECTABLE_COLOR QColor(80, 80, 80)
#define DISABLED_COLOR QColor(200, 200, 200)
+
ResultPartPtr getPartResult(ModelAPI_Object* theObj)
{
ModelAPI_Feature* aFeature = dynamic_cast<ModelAPI_Feature*>(theObj);
// Constructor *************************************************
-XGUI_DataModel::XGUI_DataModel(QObject* theParent) : QAbstractItemModel(theParent),
- myIsEventsProcessingStopped(false)
+XGUI_DataModel::XGUI_DataModel(QObject* theParent) : QAbstractItemModel(theParent)//,
+ //myIsEventsProcessingBlocked(false)
{
+ XGUI_ObjectsBrowser* aOB = qobject_cast<XGUI_ObjectsBrowser*>(theParent);
+ myWorkshop = aOB->workshop();
+
Events_Loop* aLoop = Events_Loop::loop();
aLoop->registerListener(this, Events_Loop::eventByName(EVENT_OBJECT_CREATED));
aLoop->registerListener(this, Events_Loop::eventByName(EVENT_OBJECT_DELETED));
XGUI_DataModel::~XGUI_DataModel()
{
+ clear();
}
//******************************************************
void XGUI_DataModel::processEvent(const std::shared_ptr<Events_Message>& theMessage)
{
- if (myIsEventsProcessingStopped)
- return;
+ //if (myIsEventsProcessingBlocked)
+ // return;
DocumentPtr aRootDoc = ModelAPI_Session::get()->moduleDocument();
std::string aRootType = myXMLReader->rootType();
std::string aSubType = myXMLReader->subType();
// Check that new folders could appear
QStringList aNotEmptyFolders = listOfShowNotEmptyFolders();
foreach (QString aNotEmptyFolder, aNotEmptyFolders) {
- if ((aNotEmptyFolder.toStdString() == aObjType) && (aRootDoc->size(aObjType) == 1))
+ if ((aNotEmptyFolder.toStdString() == aObjType) && (aRootDoc->size(aObjType) > 0)) {
// Appears first object in folder which can not be shown empty
- insertRow(myXMLReader->rootFolderId(aObjType));
+ if (!hasShownFolder(aRootDoc, aNotEmptyFolder)) {
+ insertRow(myXMLReader->rootFolderId(aObjType));
+ addShownFolder(aRootDoc, aNotEmptyFolder);
+ }
+ }
}
// Insert new object
int aRow = aRootDoc->size(aObjType) - 1;
} else {
int aFolderId = myXMLReader->rootFolderId(aObjType);
if (aFolderId != -1) {
- insertRow(aRow, createIndex(aFolderId, 0, -1));
+ insertRow(aRow, createIndex(aFolderId, 0, (void*)Q_NULLPTR));
}
}
}
} else {
// Object created in sub-document
- QModelIndex aDocRoot = findDocumentRootIndex(aDoc.get());
+ QModelIndex aDocRoot = findDocumentRootIndex(aDoc.get(), 0);
if (aDocRoot.isValid()) {
// Check that new folders could appear
QStringList aNotEmptyFolders = listOfShowNotEmptyFolders(false);
foreach (QString aNotEmptyFolder, aNotEmptyFolders) {
- if ((aNotEmptyFolder.toStdString() == aObjType) && (aDoc->size(aObjType) == 1))
+ if ((aNotEmptyFolder.toStdString() == aObjType) && (aDoc->size(aObjType) > 0)) {
// Appears first object in folder which can not be shown empty
- insertRow(myXMLReader->subFolderId(aObjType), aDocRoot);
- }
+ if (!hasShownFolder(aDoc, aNotEmptyFolder)) {
+ insertRow(myXMLReader->subFolderId(aObjType), aDocRoot);
+ addShownFolder(aDoc, aNotEmptyFolder);
+ }
+ }
+ }
int aRow = aDoc->index(aObject);
if (aRow != -1) {
int aNbSubFolders = foldersCount(aDoc.get());
}
}
}
+ } else {
+ rebuildDataTree();
+ break;
}
} else {
rebuildDataTree();
// Process root sub-folder
int aFolderId = myXMLReader->rootFolderId(aGroup);
if (aFolderId != -1) {
- QModelIndex aFolderIndex = createIndex(aFolderId, 0, -1);
+ QModelIndex aFolderIndex = createIndex(aFolderId, 0, (void*)Q_NULLPTR);
removeRow(aRow, aFolderIndex);
//rebuildBranch(0, aRow);
}
if ((aNotEmptyFolder.toStdString() == aGroup) && (aRootDoc->size(aGroup) == 0)) {
// Appears first object in folder which can not be shown empty
removeRow(myXMLReader->rootFolderId(aGroup));
+ removeShownFolder(aRootDoc, aNotEmptyFolder);
//rebuildBranch(0, aNbFolders + aDoc->size(myXMLReader->rootType()));
break;
}
}
} else {
// Remove row for sub-document
- QModelIndex aDocRoot = findDocumentRootIndex(aDoc.get());
+ QModelIndex aDocRoot = findDocumentRootIndex(aDoc.get(), 0);
if (aDocRoot.isValid()) {
int aRow = aDoc->size(aGroup);
int aNbSubFolders = foldersCount(aDoc.get());
if ((aNotEmptyFolder.toStdString() == aGroup) && (aSize == 0)) {
// Appears first object in folder which can not be shown empty
removeRow(myXMLReader->subFolderId(aGroup), aDocRoot);
+ removeShownFolder(aDoc, aNotEmptyFolder);
//rebuildBranch(0, aNbSubFolders + aDoc->size(myXMLReader->subType()), aDocRoot);
break;
}
for (aIt = aObjects.begin(); aIt != aObjects.end(); ++aIt) {
ObjectPtr aObject = (*aIt);
if (aObject->data()->isValid()) {
- QModelIndex aIndex = objectIndex(aObject);
- if (aIndex.isValid()) {
- emit dataChanged(aIndex, aIndex);
+ FeaturePtr aFeature = std::dynamic_pointer_cast<ModelAPI_Feature>(aObject);
+ if (aFeature.get() && aFeature->firstResult().get()
+ && (aFeature->firstResult()->groupName() == ModelAPI_ResultField::group())) {
+ ResultFieldPtr aResult =
+ std::dynamic_pointer_cast<ModelAPI_ResultField>(aFeature->firstResult());
+ QModelIndex aIndex = objectIndex(aResult, 0);
+ removeRows(0, aResult->stepsSize(), aIndex);
+ } else {
+ QModelIndex aIndex = objectIndex(aObject, 0);
+ if (aIndex.isValid()) {
+ emit dataChanged(aIndex, aIndex);
+ }
}
} else {
rebuildDataTree();
if (aGroup == myXMLReader->rootType()) // Update objects under root
aStartId = foldersCount();
else // Update objects in folder under root
- aParent = createIndex(folderId(aGroup), 0, -1);
+ aParent = createIndex(folderId(aGroup), 0, (void*)Q_NULLPTR);
} else {
// Update a sub-document
if (aGroup == myXMLReader->subType()) {
// Update sub-document root
- aParent = findDocumentRootIndex(aDoc.get());
+ aParent = findDocumentRootIndex(aDoc.get(), 0);
aStartId = foldersCount(aDoc.get());
} else
// update folder in sub-document
} else if (theMessage->eventID() == Events_Loop::loop()->eventByName(EVENT_DOCUMENT_CHANGED)) {
DocumentPtr aDoc = ModelAPI_Session::get()->activeDocument();
if (aDoc != aRootDoc) {
- QModelIndex aDocRoot = findDocumentRootIndex(aDoc.get());
+ QModelIndex aDocRoot = findDocumentRootIndex(aDoc.get(), 0);
if (aDocRoot.isValid())
emit dataChanged(aDocRoot, aDocRoot);
else
//******************************************************
void XGUI_DataModel::clear()
{
-
+ beginResetModel();
+ endResetModel();
}
//******************************************************
//******************************************************
ObjectPtr XGUI_DataModel::object(const QModelIndex& theIndex) const
{
- if (theIndex.internalId() < 0) // this is a folder
+ if (theIndex.internalId() == 0) // this is a folder
+ return ObjectPtr();
+ ModelAPI_Object* aObj =
+ dynamic_cast<ModelAPI_Object*>((ModelAPI_Entity*)theIndex.internalPointer());
+ if (!aObj)
return ObjectPtr();
- ModelAPI_Object* aObj = (ModelAPI_Object*)theIndex.internalPointer();
if (getSubDocument(aObj)) // the selected index is a folder of sub-document
return ObjectPtr();
}
//******************************************************
-QModelIndex XGUI_DataModel::objectIndex(const ObjectPtr theObject) const
+QModelIndex XGUI_DataModel::objectIndex(const ObjectPtr theObject, int theColumn) const
{
std::string aType = theObject->groupName();
DocumentPtr aDoc = theObject->document();
if (aResult.get()) {
ResultCompSolidPtr aCompRes = ModelAPI_Tools::compSolidOwner(aResult);
if (aCompRes.get()) {
- for (int i = 0; i < aCompRes->numberOfSubs(true); i++) {
- if (aCompRes->subResult(i, true) == theObject) {
- aRow = i;
- break;
- }
- }
+ aRow = ModelAPI_Tools::compSolidIndex(aResult);
}
}
}
if (aRow == -1)
return QModelIndex();
else
- return createIndex(aRow, 0, theObject.get());
+ return createIndex(aRow, theColumn, theObject.get());
}
SessionPtr aSession = ModelAPI_Session::get();
DocumentPtr aRootDoc = aSession->moduleDocument();
// The object from sub document
aRow += foldersCount(aDoc.get());
}
- return createIndex(aRow, 0, theObject.get());
+ return createIndex(aRow, theColumn, theObject.get());
}
//******************************************************
int aNbFolders = foldersCount();
int theIndexRow = theIndex.row();
- if ((theRole == Qt::DecorationRole) && (theIndex == lastHistoryIndex()))
- return QIcon(":pictures/arrow.png");
+ if (theRole == Qt::DecorationRole) {
+ if (theIndex == lastHistoryIndex())
+ return QIcon(":pictures/arrow.png");
+ else if (theIndex.column() == 0) {
+ VisibilityState aState = getVisibilityState(theIndex);
+ switch (aState) {
+ case NoneState:
+ return QIcon();
+ case Visible:
+ return QIcon(":pictures/eyeopen.png");
+ case SemiVisible:
+ return QIcon(":pictures/eyemiclosed.png");
+ case Hidden:
+ return QIcon(":pictures/eyeclosed.png");
+ }
+ }
+ }
- if (theIndex.column() == 1)
+ //if (theIndex.column() == 1)
+ if (theIndex.column() != 1)
return QVariant();
- int aParentId = theIndex.internalId();
- if (aParentId == -1) { // root folders
+ quintptr aParentId = theIndex.internalId();
+ if (aParentId == 0) { // root folders
switch (theRole) {
case Qt::DisplayRole:
return QString(myXMLReader->rootFolderName(theIndexRow).c_str()) +
int aRow = theIndexRow;
while (aMissedIdx.contains(aRow))
aRow++;
-
- switch (theRole) {
- case Qt::DisplayRole:
- return QString(myXMLReader->subFolderName(aRow).c_str()) +
- QString(" (%1)").arg(rowCount(theIndex));
- case Qt::DecorationRole:
- return QIcon(myXMLReader->subFolderIcon(aRow).c_str());
+ if (aRow < myXMLReader->subFoldersNumber()) {
+ switch (theRole) {
+ case Qt::DisplayRole:
+ return QString(myXMLReader->subFolderName(aRow).c_str()) +
+ QString(" (%1)").arg(rowCount(theIndex));
+ case Qt::DecorationRole:
+ return QIcon(myXMLReader->subFolderIcon(aRow).c_str());
+ }
}
} else {
- ModelAPI_Object* aObj = (ModelAPI_Object*)theIndex.internalPointer();
- switch (theRole) {
- case Qt::DisplayRole:
- {
- if (aObj->groupName() == ModelAPI_ResultParameter::group()) {
- ModelAPI_ResultParameter* aParam = dynamic_cast<ModelAPI_ResultParameter*>(aObj);
- AttributeDoublePtr aValueAttribute =
- aParam->data()->real(ModelAPI_ResultParameter::VALUE());
- QString aVal = QString::number(aValueAttribute->value());
- QString aTitle = QString(aObj->data()->name().c_str());
- return aTitle + " = " + aVal;
+ ModelAPI_Object* aObj =
+ dynamic_cast<ModelAPI_Object*>((ModelAPI_Entity*)theIndex.internalPointer());
+ if (aObj) {
+ switch (theRole) {
+ case Qt::DisplayRole:
+ {
+ if (aObj->groupName() == ModelAPI_ResultParameter::group()) {
+ ModelAPI_ResultParameter* aParam = dynamic_cast<ModelAPI_ResultParameter*>(aObj);
+ AttributeDoublePtr aValueAttribute =
+ aParam->data()->real(ModelAPI_ResultParameter::VALUE());
+ QString aVal = QString::number(aValueAttribute->value());
+ QString aTitle = QString(aObj->data()->name().c_str());
+ return aTitle + " = " + aVal;
+ }
+ QString aSuffix;
+ if (aObj->groupName() == myXMLReader->subType()) {
+ ResultPartPtr aPartRes = getPartResult(aObj);
+ if (aPartRes.get()) {
+ if (aPartRes->partDoc().get() == NULL)
+ aSuffix = " (Not loaded)";
+ }
+ }
+ return aObj->data()->name().c_str() + aSuffix;
}
- QString aSuffix;
- if (aObj->groupName() == myXMLReader->subType()) {
- ResultPartPtr aPartRes = getPartResult(aObj);
- if (aPartRes.get()) {
- if (aPartRes->partDoc().get() == NULL)
- aSuffix = " (Not loaded)";
+ case Qt::DecorationRole:
+ return ModuleBase_IconFactory::get()->getIcon(object(theIndex));
+ }
+ } else {
+ switch (theRole) {
+ case Qt::DisplayRole:
+ {
+ ModelAPI_ResultField::ModelAPI_FieldStep* aStep =
+ dynamic_cast<ModelAPI_ResultField::ModelAPI_FieldStep*>
+ ((ModelAPI_Entity*)theIndex.internalPointer());
+ if (aStep) {
+ return "Step " + QString::number(aStep->id() + 1) + " " +
+ aStep->field()->textLine(aStep->id()).c_str();
}
}
- return aObj->data()->name().c_str() + aSuffix;
+ break;
}
- case Qt::DecorationRole:
- return ModuleBase_IconFactory::get()->getIcon(object(theIndex));
}
}
}
return aNbFolders + aNbItems;
}
- int aId = theParent.internalId();
- if (aId == -1) {
+ quintptr aId = theParent.internalId();
+ if (aId == 0) {
// this is a folder under root
int aParentPos = theParent.row();
std::string aType = myXMLReader->rootFolderType(aParentPos);
int aRow = theParent.row();
while (aMissedIdx.contains(aRow))
aRow++;
- std::string aType = myXMLReader->subFolderType(aRow);
- return aDoc->size(aType);
+ if (aRow < myXMLReader->subFoldersNumber()) {
+ std::string aType = myXMLReader->subFolderType(aRow);
+ return aDoc->size(aType);
+ }
} else {
- ModelAPI_Object* aObj = (ModelAPI_Object*)theParent.internalPointer();
+ ModelAPI_Object* aObj =
+ dynamic_cast<ModelAPI_Object*>((ModelAPI_Entity*)theParent.internalPointer());
// Check for Part feature
ResultPartPtr aPartRes = getPartResult(aObj);
if (aPartRes.get()) {
ModelAPI_ResultCompSolid* aCompRes = dynamic_cast<ModelAPI_ResultCompSolid*>(aObj);
if (aCompRes)
return aCompRes->numberOfSubs(true);
+ ModelAPI_ResultField* aFieldRes = dynamic_cast<ModelAPI_ResultField*>(aObj);
+ if (aFieldRes)
+ return aFieldRes->stepsSize();
}
}
}
//******************************************************
int XGUI_DataModel::columnCount(const QModelIndex& theParent) const
{
- return 2;
+ return 3;
}
//******************************************************
if (!theParent.isValid()) {
if (theRow < aNbFolders) // Return first level folder index
- return createIndex(theRow, theColumn, -1);
+ return createIndex(theRow, theColumn, (void*)Q_NULLPTR);
else { // return object under root index
std::string aType = myXMLReader->rootType();
int aObjId = theRow - aNbFolders;
if (aObjId < aRootDoc->size(aType)) {
ObjectPtr aObj = aRootDoc->object(aType, aObjId);
- aIndex = objectIndex(aObj);
+ aIndex = objectIndex(aObj, theColumn);
}
}
} else {
- int aId = theParent.internalId();
+ quintptr aId = theParent.internalId();
int aParentPos = theParent.row();
- if (aId == -1) { // return object index inside of first level of folders
+ if (aId == 0) { // return object index inside of first level of folders
std::string aType = myXMLReader->rootFolderType(aParentPos);
if (theRow < aRootDoc->size(aType)) {
ObjectPtr aObj = aRootDoc->object(aType, theRow);
- aIndex = objectIndex(aObj);
+ aIndex = objectIndex(aObj, theColumn);
}
} else {
// It is an object which could have children
QIntList aMissedIdx = missedFolderIndexes(aDoc);
while (aMissedIdx.contains(aParentRow))
aParentRow++;
- std::string aType = myXMLReader->subFolderType(aParentRow);
- if (theRow < aDoc->size(aType)) {
- ObjectPtr aObj = aDoc->object(aType, theRow);
- aIndex = objectIndex(aObj);
+ if (aParentRow < myXMLReader->subFoldersNumber()) {
+ std::string aType = myXMLReader->subFolderType(aParentRow);
+ if (theRow < aDoc->size(aType)) {
+ ObjectPtr aObj = aDoc->object(aType, theRow);
+ aIndex = objectIndex(aObj, theColumn);
+ }
}
} else {
- ModelAPI_Object* aParentObj = (ModelAPI_Object*)theParent.internalPointer();
+ ModelAPI_Object* aParentObj =
+ dynamic_cast<ModelAPI_Object*>((ModelAPI_Entity*)theParent.internalPointer());
// Check for Part feature
ResultPartPtr aPartRes = getPartResult(aParentObj);
// this is an object under sub document root
std::string aType = myXMLReader->subType();
ObjectPtr aObj = aSubDoc->object(aType, theRow - aNbSubFolders);
- aIndex = objectIndex(aObj);
+ aIndex = objectIndex(aObj, theColumn);
}
} else {
// Check for composite object
ModelAPI_CompositeFeature* aCompFeature =
dynamic_cast<ModelAPI_CompositeFeature*>(aParentObj);
if (aCompFeature) {
- aIndex = objectIndex(aCompFeature->subFeature(theRow));
+ aIndex = objectIndex(aCompFeature->subFeature(theRow), theColumn);
} else {
ModelAPI_ResultCompSolid* aCompRes =
dynamic_cast<ModelAPI_ResultCompSolid*>(aParentObj);
if (aCompRes)
- aIndex = objectIndex(aCompRes->subResult(theRow));
+ aIndex = objectIndex(aCompRes->subResult(theRow), theColumn);
+ else {
+ ModelAPI_ResultField* aFieldRes =
+ dynamic_cast<ModelAPI_ResultField*>(aParentObj);
+ if (aFieldRes) {
+ aIndex = createIndex(theRow, theColumn, aFieldRes->step(theRow));
+ }
+ }
}
}
}
}
}
- if (theColumn != 0)
- return createIndex(aIndex.row(), theColumn, aIndex.internalPointer());
return aIndex;
}
if (theIndex == MYLastDeleted)
return QModelIndex();
- int aId = theIndex.internalId();
- if (aId != -1) { // The object is not a root folder
+ SessionPtr aSession = ModelAPI_Session::get();
+ quintptr aId = theIndex.internalId();
+ if (aId != 0) { // The object is not a root folder
ModelAPI_Document* aDoc = getSubDocument(theIndex.internalPointer());
if (aDoc) {
// It is a folder of sub-document
}
ObjectPtr aObj = object(theIndex);
if (!aObj.get()) {
+ // It can b e a step of a field
+ ModelAPI_ResultField::ModelAPI_FieldStep* aStep =
+ dynamic_cast<ModelAPI_ResultField::ModelAPI_FieldStep*>
+ ((ModelAPI_Entity*)theIndex.internalPointer());
+ if (aStep) {
+ ModelAPI_ResultField* aField = aStep->field();
+ DocumentPtr aDoc = aSession->activeDocument();
+ ObjectPtr aFld;
+ for(int i = 0; i < aDoc->size(ModelAPI_ResultField::group()); i++) {
+ aFld = aDoc->object(ModelAPI_ResultField::group(), i);
+ if (aFld.get() == aField)
+ return objectIndex(aFld);
+ }
+ }
// To avoid additional request about index which was already deleted
// If deleted it causes a crash on delete object from Part
MYLastDeleted = theIndex;
}
// Use as ordinary object
std::string aType = aObj->groupName();
- SessionPtr aSession = ModelAPI_Session::get();
DocumentPtr aRootDoc = aSession->moduleDocument();
DocumentPtr aSubDoc = aObj->document();
if (aSubDoc == aRootDoc) {
// return first level of folder index
int aFolderId = myXMLReader->rootFolderId(aType);
// Items in a one row must have the same parent
- return createIndex(aFolderId, 0, -1);
+ return createIndex(aFolderId, 1, (void*)Q_NULLPTR);
}
} else {
if (aType == myXMLReader->subType())
// return first level of folder index
int aFolderId = folderId(aType, aSubDoc.get());
// Items in a one row must have the same parent
- return createIndex(aFolderId, 0, aSubDoc.get());
+ return createIndex(aFolderId, 1, aSubDoc.get());
}
}
}
//******************************************************
Qt::ItemFlags XGUI_DataModel::flags(const QModelIndex& theIndex) const
{
- qint64 aIt = theIndex.internalId();
+ quintptr aIt = theIndex.internalId();
ModelAPI_Object* aObj = 0;
ModelAPI_Document* aDoc = 0;
SessionPtr aSession = ModelAPI_Session::get();
Qt::ItemFlags aEditingFlag = Qt::ItemIsSelectable | Qt::ItemIsEnabled | Qt::ItemIsEditable;
- if (aIt == -1) {
+ if (aIt == 0) {
// Folders under root
DocumentPtr aRootDoc = aSession->moduleDocument();
if (aRootDoc != aActiveDoc)
} else {
aDoc = getSubDocument(theIndex.internalPointer());
if (!aDoc)
- aObj = (ModelAPI_Object*) theIndex.internalPointer();
+ aObj = dynamic_cast<ModelAPI_Object*>((ModelAPI_Entity*)theIndex.internalPointer());
}
if (aObj) {
// An object
if (aObj->isDisabled())
- return theIndex.column() == 1? Qt::ItemIsSelectable : aNullFlag;
+ return theIndex.column() == 2? Qt::ItemIsSelectable : aNullFlag;
if (aSession->moduleDocument() != aObj->document())
if (aActiveDoc != aObj->document())
- return theIndex.column() == 1? Qt::ItemIsSelectable : aNullFlag;
+ return theIndex.column() == 2? Qt::ItemIsSelectable : aNullFlag;
bool isCompositeSub = false;
- // An object which is sub-object of a composite object can not be accessible in column 1
- if (theIndex.column() == 1) {
+ // An object which is sub-object of a composite object can not be accessible in column 2
+ if (theIndex.column() == 2) {
ObjectPtr aObjPtr = aObj->data()->owner();
FeaturePtr aFeature = std::dynamic_pointer_cast<ModelAPI_Feature>(aObjPtr);
if (aFeature.get()) {
}
//******************************************************
-QModelIndex XGUI_DataModel::findDocumentRootIndex(const ModelAPI_Document* theDoc) const
+QModelIndex
+ XGUI_DataModel::findDocumentRootIndex(const ModelAPI_Document* theDoc, int aColumn) const
{
SessionPtr aSession = ModelAPI_Session::get();
DocumentPtr aRootDoc = aSession->moduleDocument();
if (myXMLReader->rootType() == ModelAPI_Feature::group()) {
aRow += foldersCount();
}
- return createIndex(aRow, 0, aObj.get());
+ return createIndex(aRow, aColumn, aObj.get());
}
}
} else { // If document is attached to feature
int aRow = i;
if (myXMLReader->rootType() == ModelAPI_Feature::group())
aRow += foldersCount();
- return createIndex(aRow, 0, aObj.get());
+ return createIndex(aRow, aColumn, aObj.get());
}
}
}
}
//******************************************************
-QModelIndex XGUI_DataModel::documentRootIndex(DocumentPtr theDoc) const
+QModelIndex XGUI_DataModel::documentRootIndex(DocumentPtr theDoc, int theColumn) const
{
SessionPtr aSession = ModelAPI_Session::get();
DocumentPtr aRootDoc = aSession->moduleDocument();
if (theDoc == aRootDoc)
return QModelIndex();
else
- return findDocumentRootIndex(theDoc.get());
+ return findDocumentRootIndex(theDoc.get(), theColumn);
}
//******************************************************
FeaturePtr aFeature = aCurDoc->currentFeature(true);
if (aFeature.get()) {
QModelIndex aInd = objectIndex(aFeature);
- return createIndex(aInd.row(), 1, aInd.internalPointer());
+ return createIndex(aInd.row(), 2, aInd.internalPointer());
} else {
if (aCurDoc == aSession->moduleDocument())
- return createIndex(foldersCount() - 1, 1, -1);
+ return createIndex(foldersCount() - 1, 2, -1);
else
- return createIndex(foldersCount(aCurDoc.get()) - 1, 1, aCurDoc.get());
+ return createIndex(foldersCount(aCurDoc.get()) - 1, 2, aCurDoc.get());
}
}
insertRows(theRow, theCount, theParent);
}
}
+
+//******************************************************
+//bool XGUI_DataModel::blockEventsProcessing(const bool theState)
+//{
+// bool aPreviousState = myIsEventsProcessingBlocked;
+// myIsEventsProcessingBlocked = theState;
+// return aPreviousState;
+//}
+
+//******************************************************
+XGUI_DataModel::VisibilityState
+ XGUI_DataModel::getVisibilityState(const QModelIndex& theIndex) const
+{
+ Qt::ItemFlags aFlags = theIndex.flags();
+ if (aFlags == Qt::ItemFlags())
+ return NoneState;
+
+ ObjectPtr aObj = object(theIndex);
+ if (aObj.get()) {
+ ResultPtr aResObj = std::dynamic_pointer_cast<ModelAPI_Result>(aObj);
+ if (aResObj.get()) {
+ XGUI_Displayer* aDisplayer = myWorkshop->displayer();
+ ResultCompSolidPtr aCompRes = std::dynamic_pointer_cast<ModelAPI_ResultCompSolid>(aResObj);
+ if (aCompRes.get()) {
+ VisibilityState aState = aCompRes->numberOfSubs(true) == 0 ?
+ (aDisplayer->isVisible(aCompRes)? Visible : Hidden) : NoneState;
+ for (int i = 0; i < aCompRes->numberOfSubs(true); i++) {
+ ResultPtr aSubRes = aCompRes->subResult(i, true);
+ VisibilityState aS = aDisplayer->isVisible(aSubRes)? Visible : Hidden;
+ if (aState == NoneState)
+ aState = aS;
+ else if (aState != aS) {
+ aState = SemiVisible;
+ break;
+ }
+ }
+ return aState;
+ } else {
+ if (aDisplayer->isVisible(aResObj))
+ return Visible;
+ else
+ return Hidden;
+ }
+ }
+ }
+ return NoneState;
+}
