X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FXGUI%2FXGUI_ObjectsBrowser.cpp;h=eda25f837032b3830713a6fb4b4ef37f9c6a4657;hb=4c763543675ec80cad142d3a2f8b4766ca64ac0f;hp=7eb50de3409ce79f2c8a48199da60345c0a26c93;hpb=34afe547352180006fee9600173c4dc93dc1f6c3;p=modules%2Fshaper.git diff --git a/src/XGUI/XGUI_ObjectsBrowser.cpp b/src/XGUI/XGUI_ObjectsBrowser.cpp index 7eb50de34..eda25f837 100644 --- a/src/XGUI/XGUI_ObjectsBrowser.cpp +++ b/src/XGUI/XGUI_ObjectsBrowser.cpp @@ -1,4 +1,22 @@ -// Copyright (C) 2014-20xx CEA/DEN, EDF R&D --> +// 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 +// #include "XGUI_ObjectsBrowser.h" #include "XGUI_Tools.h" @@ -8,7 +26,6 @@ #include #include #include -#include #include @@ -21,14 +38,12 @@ #include #include -#ifdef WIN32 -#ifdef HAVE_SALOME -#include +#ifdef DEBUG_INDXES +#include #endif -#endif - /// Width of second column (minimum acceptable = 27) +#define FIRST_COL_WIDTH 20 #define SECOND_COL_WIDTH 30 @@ -41,7 +56,8 @@ class XGUI_TreeViewItemDelegate: public QStyledItemDelegate public: /// Constructor /// \param theParent a parent of the delegate - XGUI_TreeViewItemDelegate(XGUI_DataTree* theParent):QStyledItemDelegate(theParent), myTreedView(theParent) {} + XGUI_TreeViewItemDelegate(XGUI_DataTree* theParent):QStyledItemDelegate(theParent), + myTreedView(theParent) {} /// Set data for item editor (name of the item) /// \param editor a widget of editor @@ -68,23 +84,15 @@ private: XGUI_DataTree::XGUI_DataTree(QWidget* theParent) : QTreeView(theParent) { -#ifdef WIN32 -#ifdef HAVE_SALOME - setStyle(new QWindowsStyle()); -#else - myStyle = new XGUI_TreeViewStyle(); - setStyle(myStyle); -#endif -#endif - setHeaderHidden(true); + setTreePosition(1); setEditTriggers(QAbstractItemView::NoEditTriggers); setSelectionBehavior(QAbstractItemView::SelectRows); setSelectionMode(QAbstractItemView::ExtendedSelection); - setItemDelegateForColumn(0, new XGUI_TreeViewItemDelegate(this)); + setItemDelegateForColumn(1, new XGUI_TreeViewItemDelegate(this)); - connect(this, SIGNAL(doubleClicked(const QModelIndex&)), + connect(this, SIGNAL(doubleClicked(const QModelIndex&)), SLOT(onDoubleClick(const QModelIndex&))); } @@ -106,8 +114,8 @@ void XGUI_DataTree::commitData(QWidget* theEditor) { static int aEntrance = 0; if (aEntrance == 0) { - // We have to check number of enter and exit of this function because it can be called recursively by Qt - // in order to avoid double modifying of a data + // We have to check number of enter and exit of this function because it can be called + // recursively by Qt in order to avoid double modifying of a data aEntrance = 1; QLineEdit* aEditor = dynamic_cast(theEditor); if (aEditor) { @@ -127,7 +135,7 @@ void XGUI_DataTree::commitData(QWidget* theEditor) aEntrance = 0; } -void XGUI_DataTree::clear() +void XGUI_DataTree::clear() { dataModel()->clear(); reset(); @@ -135,18 +143,49 @@ void XGUI_DataTree::clear() void XGUI_DataTree::resizeEvent(QResizeEvent* theEvent) { + QTreeView::resizeEvent(theEvent); QSize aSize = theEvent->size(); if (aSize.isValid()) { - setColumnWidth(0, aSize.width() - SECOND_COL_WIDTH); - setColumnWidth(1, SECOND_COL_WIDTH); + setColumnWidth(0, FIRST_COL_WIDTH); + setColumnWidth(1, aSize.width() - SECOND_COL_WIDTH - FIRST_COL_WIDTH - 10); + setColumnWidth(2, SECOND_COL_WIDTH); } - QTreeView::resizeEvent(theEvent); } -void XGUI_DataTree::onDoubleClick(const QModelIndex& theIndex) +#ifdef DEBUG_INDXES +void XGUI_DataTree::mousePressEvent(QMouseEvent* theEvent) { - if (theIndex.column() != 1) + QTreeView::mousePressEvent(theEvent); + if (theEvent->button() != Qt::MidButton) return; + QModelIndex aInd = indexAt(theEvent->pos()); + QString aTxt = + QString("r=%1 c=%2 p=%3").arg(aInd.row()).arg(aInd.column()).arg((long)aInd.internalPointer()); + + QModelIndex aPar = aInd.parent(); + QString aTxt1 = + QString("r=%1 c=%2 p=%3").arg(aPar.row()).arg(aPar.column()).arg((long)aPar.internalPointer()); + QToolTip::showText(theEvent->globalPos(), aTxt + '\n' + aTxt1); +} +#endif + +void XGUI_DataTree::mouseReleaseEvent(QMouseEvent* theEvent) +{ + QTreeView::mouseReleaseEvent(theEvent); +#ifdef DEBUG_INDXES + if (theEvent->button() != Qt::MidButton) + return; + QToolTip::hideText(); +#endif + if (theEvent->button() == Qt::LeftButton) { + QModelIndex aInd = indexAt(theEvent->pos()); + if (aInd.column() == 0) + processEyeClick(aInd); + } +} + +void XGUI_DataTree::processHistoryChange(const QModelIndex& theIndex) +{ SessionPtr aMgr = ModelAPI_Session::get(); // When operation is opened then we can not change history if (aMgr->isOperation()) @@ -157,7 +196,7 @@ void XGUI_DataTree::onDoubleClick(const QModelIndex& theIndex) ObjectPtr aObj = aModel->object(theIndex); DocumentPtr aDoc = aMgr->activeDocument(); - + std::string aOpName = tr("History change").toStdString(); if (aObj.get()) { if (aObj->document() != aDoc) @@ -167,10 +206,10 @@ void XGUI_DataTree::onDoubleClick(const QModelIndex& theIndex) aMgr->finishOperation(); } else { // Ignore clicks on folders outside current document - if ((theIndex.internalId() == -1) && (aDoc != aMgr->moduleDocument())) + if ((theIndex.internalId() == 0) && (aDoc != aMgr->moduleDocument())) // Clicked folder under root but active document is another return; - if ((theIndex.internalId() != -1) && (aDoc.get() != theIndex.internalPointer())) + if ((theIndex.internalId() != 0) && (aDoc.get() != theIndex.internalPointer())) // Cliced not on active document folder return; @@ -184,49 +223,47 @@ void XGUI_DataTree::onDoubleClick(const QModelIndex& theIndex) for (int i = 0; i < aSize; i++) { update(aModel->index(i, 0, aParent)); update(aModel->index(i, 1, aParent)); + update(aModel->index(i, 2, aParent)); } } -#if (!defined HAVE_SALOME) && (defined WIN32) -void XGUI_DataTree::drawRow(QPainter* thePainter, - const QStyleOptionViewItem& theOptions, - const QModelIndex& theIndex) const +void XGUI_DataTree::processEyeClick(const QModelIndex& theIndex) { - QStyleOptionViewItemV4 aOptions = theOptions; - myStyle->setIndex(theIndex); - QTreeView::drawRow(thePainter, aOptions, theIndex); + XGUI_DataModel* aModel = dataModel(); + ObjectPtr aObj = aModel->object(theIndex); + if (aObj.get()) { + ResultPtr aResObj = std::dynamic_pointer_cast(aObj); + if (aResObj.get()) { + aResObj->setDisplayed(!aResObj->isDisplayed()); + Events_Loop::loop()->flush(Events_Loop::eventByName(EVENT_OBJECT_TO_REDISPLAY)); + update(theIndex); + } + // Update list of selected objects because this event happens after + // selection event in object browser + XGUI_ObjectsBrowser* aObjBrowser = qobject_cast(parent()); + if (aObjBrowser) { + aObjBrowser->onSelectionChanged(); + } + } } -//******************************************************************** -//******************************************************************** -//******************************************************************** -void XGUI_TreeViewStyle::drawPrimitive(PrimitiveElement theElement, - const QStyleOption* theOption, - QPainter* thePainter, const QWidget* theWidget) const -{ - if ((theElement == QStyle::PE_PanelItemViewRow) || (theElement == QStyle::PE_PanelItemViewItem)) { - const QStyleOptionViewItemV4* aOptions = qstyleoption_cast(theOption); - if (myIndex.isValid() && ((myIndex.flags() & Qt::ItemIsSelectable) == 0)) { - QStyle::State aState = aOptions->state; - if ((aState & QStyle::State_MouseOver) != 0) - aState &= ~QStyle::State_MouseOver; - QStyleOptionViewItemV4* aOpt = (QStyleOptionViewItemV4*) aOptions; - aOpt->state = aState; - QWindowsVistaStyle::drawPrimitive(theElement, aOpt, thePainter, theWidget); - } +void XGUI_DataTree::onDoubleClick(const QModelIndex& theIndex) +{ + switch (theIndex.column()) { + case 2: + processHistoryChange(theIndex); + break; } - QWindowsVistaStyle::drawPrimitive(theElement, theOption, thePainter, theWidget); } -#endif //******************************************************************** //******************************************************************** //******************************************************************** XGUI_ActiveDocLbl::XGUI_ActiveDocLbl(const QString& theText, QWidget* theParent ) - : QLabel(theText, theParent), - myPreSelectionStyle(""), - myNeutralStyle(""), + : QLabel(theText, theParent), + myPreSelectionStyle(""), + myNeutralStyle(""), mySelectionStyle(""), myIsSelected(false) { @@ -242,8 +279,10 @@ void XGUI_ActiveDocLbl::setTreeView(QTreeView* theView) QColor aHighlightText = aPalet.highlightedText().color(); myPreSelectionStyle = "QLabel {background-color: "; - myPreSelectionStyle += "qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 white, stop:1 " + aHighlight.lighter(170).name() + ");"; - myPreSelectionStyle += "border: 1px solid lightblue; border-radius: 2px }"; + myPreSelectionStyle += aHighlight.lighter(170).name() + "}"; + //myPreSelectionStyle += "qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 white, stop:1 " + + // aHighlight.lighter(170).name() + ");"; + //myPreSelectionStyle += "border: 1px solid lightblue; border-radius: 2px }"; QString aName = aPalet.color(QPalette::Base).name(); myNeutralStyle = "QLabel { border: 1px solid " + aName + " }"; @@ -251,9 +290,11 @@ void XGUI_ActiveDocLbl::setTreeView(QTreeView* theView) #if (!defined HAVE_SALOME) && (defined WIN32) mySelectionStyle = "QLabel {background-color: "; - mySelectionStyle += "qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 rgb(236, 245, 255)"; - mySelectionStyle += ", stop:1 rgb(208, 229, 255));"; - mySelectionStyle += "border: 1px solid rgb(132, 172, 221); border-radius: 2px }"; + mySelectionStyle += "rgb(205, 232, 255); "; + //mySelectionStyle += "qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 rgb(236, 245, 255)"; + //mySelectionStyle += ", stop:1 rgb(208, 229, 255));"; + //mySelectionStyle += "border: 1px solid rgb(132, 172, 221); border-radius: 2px }"; + mySelectionStyle += "border: 1px solid rgb(153, 209, 255) }"; #else mySelectionStyle = "QLabel {background-color: " + aHighlight.name(); mySelectionStyle += "; color : " + aHighlightText.name() + "}"; @@ -295,7 +336,7 @@ void XGUI_ActiveDocLbl::mouseReleaseEvent( QMouseEvent* e) MYClearing = true; myIsSelected = true; setStyleSheet(mySelectionStyle); - // We can not block signals because on + // We can not block signals because on // clear selection the View state will not be updated myTreeView->clearSelection(); QLabel::mouseReleaseEvent(e); @@ -314,8 +355,8 @@ void XGUI_ActiveDocLbl::unselect() //******************************************************************** //******************************************************************** //******************************************************************** -XGUI_ObjectsBrowser::XGUI_ObjectsBrowser(QWidget* theParent) - : QWidget(theParent), myDocModel(0) +XGUI_ObjectsBrowser::XGUI_ObjectsBrowser(QWidget* theParent, XGUI_Workshop* theWorkshop) + : QWidget(theParent), myDocModel(0), myWorkshop(theWorkshop) { QVBoxLayout* aLayout = new QVBoxLayout(this); ModuleBase_Tools::zeroMargins(aLayout); @@ -333,7 +374,7 @@ XGUI_ObjectsBrowser::XGUI_ObjectsBrowser(QWidget* theParent) aLbl->setPixmap(QPixmap(":pictures/assembly.png")); aLbl->setMargin(2); // Do not paint background of the label (in order to show icon) - aLbl->setAutoFillBackground(false); + aLbl->setAutoFillBackground(false); aLabelLay->addWidget(aLbl); @@ -361,14 +402,8 @@ XGUI_ObjectsBrowser::XGUI_ObjectsBrowser(QWidget* theParent) aLabelWgt->setPalette(aPalet); myDocModel = new XGUI_DataModel(this); - myTreeView->setModel(myDocModel); - - // It has to be done after setting of model - myActiveDocLbl->setTreeView(myTreeView); - - QItemSelectionModel* aSelMod = myTreeView->selectionModel(); - connect(aSelMod, SIGNAL(selectionChanged(const QItemSelection&, const QItemSelection&)), - this, SLOT(onSelectionChanged(const QItemSelection&, const QItemSelection&))); + connect(myDocModel, SIGNAL(modelAboutToBeReset()), SLOT(onBeforeReset())); + connect(myDocModel, SIGNAL(treeRebuilt()), SLOT(onAfterModelReset())); connect(myTreeView, SIGNAL(contextMenuRequested(QContextMenuEvent*)), this, SLOT(onContextMenuRequested(QContextMenuEvent*))); @@ -379,6 +414,18 @@ XGUI_ObjectsBrowser::~XGUI_ObjectsBrowser() { } +void XGUI_ObjectsBrowser::setXMLReader(Config_DataModelReader* theReader) +{ + myDocModel->setXMLReader(theReader); + myTreeView->setModel(myDocModel); + + // It has to be done after setting of model + myActiveDocLbl->setTreeView(myTreeView); + + QItemSelectionModel* aSelMod = myTreeView->selectionModel(); + connect(aSelMod, SIGNAL(selectionChanged(const QItemSelection&, const QItemSelection&)), + this, SLOT(onSelectionChanged(const QItemSelection&, const QItemSelection&))); +} //*************************************************** void XGUI_ObjectsBrowser::onContextMenuRequested(QContextMenuEvent* theEvent) @@ -418,19 +465,19 @@ void XGUI_ObjectsBrowser::onEditItem() { QObjectPtrList aSelectedData = selectedObjects(); if (aSelectedData.size() > 0) { - ObjectPtr aFeature = aSelectedData.first(); - if (aFeature) { // Selection happens in TreeView - QObjectPtrList aList; - aList.append(aFeature); - // check whether the object can be deleted. There should not be parts which are not loaded - if (!XGUI_Tools::canRemoveOrRename((QWidget*)parent(), aList)) + ObjectPtr anObject = aSelectedData.first(); + if (anObject.get()) { // Selection happens in TreeView + // check whether the object can be renamed. There should not be parts which are not loaded + std::set aFeatures; + aFeatures.insert(ModelAPI_Feature::feature(anObject)); + if (!XGUI_Tools::canRemoveOrRename((QWidget*)parent(), aFeatures)) return; // Find index which corresponds the feature QModelIndex aIndex; foreach(QModelIndex aIdx, selectedIndexes()) { ObjectPtr aFea = dataModel()->object(aIdx); - if (dataModel()->object(aIdx)->isSame(aFeature)) { + if (dataModel()->object(aIdx)->isSame(anObject)) { aIndex = aIdx; break; } @@ -449,7 +496,7 @@ QModelIndexList XGUI_ObjectsBrowser::expandedItems(const QModelIndex& theParent) { QModelIndexList aIndexes; QModelIndex aIndex; - for (int i = 0; i < myDocModel->rowCount(); i++) { + for (int i = 0; i < myDocModel->rowCount(theParent); i++) { aIndex = myDocModel->index(i, 0, theParent); if (myDocModel->hasChildren(aIndex)) { if (myTreeView->isExpanded(aIndex)) { @@ -466,11 +513,7 @@ QModelIndexList XGUI_ObjectsBrowser::expandedItems(const QModelIndex& theParent) //*************************************************** void XGUI_ObjectsBrowser::rebuildDataTree() { - QModelIndexList aIndexList = expandedItems(); myDocModel->rebuildDataTree(); - foreach(QModelIndex aIndex, aIndexList) { - myTreeView->setExpanded(aIndex, true); - } update(); } @@ -491,17 +534,25 @@ void XGUI_ObjectsBrowser::setObjectsSelected(const QObjectPtrList& theObjects) } //*************************************************** -void XGUI_ObjectsBrowser::clearContent() -{ - myTreeView->clear(); +void XGUI_ObjectsBrowser::clearContent() +{ + myTreeView->clear(); } +//*************************************************** void XGUI_ObjectsBrowser::onSelectionChanged(const QItemSelection& theSelected, const QItemSelection& theDeselected) +{ + onSelectionChanged(); +} + +//*************************************************** +void XGUI_ObjectsBrowser::onSelectionChanged() { emit selectionChanged(); } +//*************************************************** QObjectPtrList XGUI_ObjectsBrowser::selectedObjects(QModelIndexList* theIndexes) const { QObjectPtrList aList; @@ -509,7 +560,7 @@ QObjectPtrList XGUI_ObjectsBrowser::selectedObjects(QModelIndexList* theIndexes) XGUI_DataModel* aModel = dataModel(); QModelIndexList::const_iterator aIt; for (aIt = aIndexes.constBegin(); aIt != aIndexes.constEnd(); ++aIt) { - if ((*aIt).column() == 0) { + if ((*aIt).column() == 1) { ObjectPtr aObject = aModel->object(*aIt); if (aObject) { aList.append(aObject); @@ -519,4 +570,47 @@ QObjectPtrList XGUI_ObjectsBrowser::selectedObjects(QModelIndexList* theIndexes) } } return aList; -} \ No newline at end of file +} + +void XGUI_ObjectsBrowser::onBeforeReset() +{ + myExpandedItems = expandedItems(); +} + +void XGUI_ObjectsBrowser::onAfterModelReset() +{ + foreach(QModelIndex aIndex, myExpandedItems) { + myTreeView->setExpanded(aIndex, true); + } +} + +std::list XGUI_ObjectsBrowser::getStateForDoc(DocumentPtr theDoc) const +{ + std::list aStates; + XGUI_DataModel* aModel = dataModel(); + QModelIndex aRootIdx = aModel->documentRootIndex(theDoc); + int aNbChild = aModel->rowCount(aRootIdx); + for (int i = 0; i < aNbChild; i++) { + QModelIndex aIdx = aModel->index(i, 1, aRootIdx); + aStates.push_back(myTreeView->isExpanded(aIdx)); + } + return aStates; +} + +void XGUI_ObjectsBrowser::setStateForDoc(DocumentPtr theDoc, const std::list& theStates) +{ + if (theStates.size() == 0) + return; + XGUI_DataModel* aModel = dataModel(); + QModelIndex aRootIdx = aModel->documentRootIndex(theDoc); + int aNbChild = aModel->rowCount(aRootIdx); + + std::list::const_iterator aIt; + int i = 0; + for (aIt = theStates.cbegin(); aIt != theStates.cend(); aIt++, i++) { + if (i >= aNbChild ) + break; + QModelIndex aIdx = aModel->index(i, 0, aRootIdx); + myTreeView->setExpanded(aIdx, (*aIt)); + } +}