Using mouse double click for history line change

diff --git a/src/ModuleBase/ModuleBase_IModule.h b/src/ModuleBase/ModuleBase_IModule.h
index ef8daaecdaa9368a6bcce0e3e7a7a3da4759a7a5..1b3081dd976012fba8772e83870c09b9500b76f7 100644 (file)
--- a/src/ModuleBase/ModuleBase_IModule.h
+++ b/src/ModuleBase/ModuleBase_IModule.h
@@ -126,7 +126,11 @@ class MODULEBASE_EXPORT ModuleBase_IModule : public QObject
 \r
   /// Returns a list of modes, where the AIS objects should be activated\r
   /// \param theModes a list of modes\r
-  virtual void activeSelectionModes(QIntList& theModes) {};\r
+  virtual void activeSelectionModes(QIntList& theModes) {}\r
+\r
+  /// This method is called on object browser creation for customisation of module specific features\r
+  /// \param theObjectBrowser a pinter on Object Browser widget\r
+  virtual void customizeObjectBrowser(QWidget* theObjectBrowser) {}\r
 \r
 public slots:\r
   /// Called on call of command corresponded to a feature\r

diff --git a/src/PartSet/PartSet_DocumentDataModel.cpp b/src/PartSet/PartSet_DocumentDataModel.cpp
index 3205baedd0ead4727ef876c981eedf0cd1e3dd1a..fcf37a140e9f5c1029dd24afd510b63c8c8e7bf5 100644 (file)
--- a/src/PartSet/PartSet_DocumentDataModel.cpp
+++ b/src/PartSet/PartSet_DocumentDataModel.cpp
@@ -24,6 +24,7 @@
 #include <QIcon>
 #include <QString>
 #include <QBrush>
+#include <QTreeView>
 
 #include <set>
 
@@ -659,33 +660,28 @@ void PartSet_DocumentDataModel::deactivatePart()
 
 Qt::ItemFlags PartSet_DocumentDataModel::flags(const QModelIndex& theIndex) const
 {
-  Qt::ItemFlags aFlags = Qt::ItemIsSelectable | Qt::ItemIsEnabled; //QAbstractItemModel::flags(theIndex); 
-  if (object(theIndex)) {
-    aFlags |= Qt::ItemIsEditable;
+  if ((theIndex.internalId() >= PartsFolder) && (theIndex.internalId() <= PartResult)) {
+    Qt::ItemFlags aFlags = Qt::ItemIsSelectable;
+    if (object(theIndex)) {
+      aFlags |= Qt::ItemIsEditable;
+    }
+    // Disable items which are below of last history row
+    // Do not disable second column
+    if (theIndex.internalId() == HistoryNode) {
+      if (theIndex.row() <= lastHistoryRow() || (theIndex.column() == 1))
+        aFlags |= Qt::ItemIsEnabled;
+    } else
+      aFlags |= Qt::ItemIsEnabled;
+    return aFlags;
+  } else {
+    QModelIndex* aIndex = toSourceModelIndex(theIndex);
+    const QAbstractItemModel* aModel = aIndex->model();
+    return aModel->flags(*aIndex);
   }
-  // Disable items which are below of last history row
-  // Do not disable second column
-  //if (theIndex.row() <= lastHistoryRow() || theIndex.column() == 1) {
-  //  aFlags |= Qt::ItemIsEnabled;
-  //}
-  return aFlags;
 }
 
 QModelIndex PartSet_DocumentDataModel::partIndex(const ResultPartPtr& theObject) const
 {
-  //int aRow = -1;
-  //PartSet_PartModel* aModel = 0;
-  //foreach (PartSet_PartModel* aPartModel, myPartModels)
-  //{
-  //  aRow++;
-  //  if (aPartModel->part() == theObject) {
-  //    aModel = aPartModel;
-  //    break;
-  //  }
-  //}
-  //if (aModel) {
-  //  return createIndex(aRow, 0, (void*) getModelIndex(aModel->index(0, 0, QModelIndex())));
-  //}
   DocumentPtr aRootDoc = ModelAPI_Session::get()->moduleDocument();
   int aNb = aRootDoc->size(ModelAPI_ResultPart::group());
   for (int aId = 0; aId < aNb; aId++) {
@@ -754,9 +750,7 @@ int PartSet_DocumentDataModel::lastHistoryRow() const
 
 void PartSet_DocumentDataModel::setLastHistoryItem(const QModelIndex& theIndex)
 {
-  if (theIndex.internalId() == HistoryNode) {
-    myHistoryBackOffset = rowCount() - 1 - theIndex.row();
-  }
+  myHistoryBackOffset = rowCount() - 1 - theIndex.row();
 }
 
 QModelIndex PartSet_DocumentDataModel::lastHistoryItem() const
@@ -801,3 +795,38 @@ QIcon PartSet_DocumentDataModel::featureIcon(const FeaturePtr& theFeature)
   return anIcon;  
 }
 
+void PartSet_DocumentDataModel::onMouseDoubleClick(const QModelIndex& theIndex)
+{
+  QTreeView* aTreeView = dynamic_cast<QTreeView*>(sender());
+  if ((theIndex.internalId() >= PartsFolder) && (theIndex.internalId() <= PartResult)) {
+    if ((theIndex.column() == 1) && (theIndex.internalId() == HistoryNode)) {
+      int aOldId = lastHistoryRow();
+      setLastHistoryItem(theIndex);
+      int aStartRow = std::min(aOldId, theIndex.row());
+      int aEndRow = std::max(aOldId, theIndex.row());
+      for (int i = aStartRow; i <= aEndRow; i++) {
+        aTreeView->update(createIndex(i, 0, HistoryNode));
+        aTreeView->update(createIndex(i, 1, HistoryNode));
+      }
+    }
+  } else {
+    QModelIndex* aIndex = toSourceModelIndex(theIndex);
+    const QAbstractItemModel* aModel = aIndex->model();
+    if (isPartSubModel(aModel)) {
+      PartSet_PartDataModel* aPartModel = (PartSet_PartDataModel*)aModel;
+      QModelIndex aOldItem = aPartModel->lastHistoryItem();
+      aPartModel->setLastHistoryItem(*aIndex);
+      QModelIndex aOldIndex = createIndex(aOldItem.row(), aOldItem.column(), (void*) getModelIndex(aOldItem));
+      int aStartRow = std::min(aOldItem.row(), aIndex->row());
+      int aEndRow = std::max(aOldItem.row(), aIndex->row());
+      for (int i = aStartRow; i <= aEndRow; i++) {
+        QModelIndex aInd1 = aPartModel->index(i, 0);
+        QModelIndex aInd2 = createIndex(i, 0, (void*) getModelIndex(aInd1));
+        aTreeView->update(aInd2);
+        aInd1 = aPartModel->index(i, 1);
+        aInd2 = createIndex(i, 1, (void*) getModelIndex(aInd1));
+        aTreeView->update(aInd2);
+      }
+    }
+  }
+} 

diff --git a/src/PartSet/PartSet_DocumentDataModel.h b/src/PartSet/PartSet_DocumentDataModel.h
index 3631f79850bbf0f162180cf277e7ffca4b612d89..6ab69bf3c1ae52fa6d9da0c642dbcf257db5e1e9 100644 (file)
--- a/src/PartSet/PartSet_DocumentDataModel.h
+++ b/src/PartSet/PartSet_DocumentDataModel.h
@@ -133,11 +133,15 @@ Q_OBJECT
   //! \param theIndex a last index for history
   void setLastHistoryItem(const QModelIndex& theIndex);
 
+  //! Returns last history item
   QModelIndex lastHistoryItem() const;
 
   //! Returns icon name according to feature
   static QIcon featureIcon(const FeaturePtr& theFeature);
 
+ public slots:
+   void onMouseDoubleClick(const QModelIndex& theIndex);
+
  private:
 
   enum

diff --git a/src/PartSet/PartSet_Module.cpp b/src/PartSet/PartSet_Module.cpp
index 2091e3c26b228db348d83289863a00b86a871566..860ca9e37bef4e2c5864635fd8e7acbd26a0109f 100644 (file)
--- a/src/PartSet/PartSet_Module.cpp
+++ b/src/PartSet/PartSet_Module.cpp
@@ -641,6 +641,20 @@ void PartSet_Module::onViewTransformed(int theTrsfType)
 }
 
 
+void PartSet_Module::customizeObjectBrowser(QWidget* theObjectBrowser)
+{
+  XGUI_ObjectsBrowser* aOB = dynamic_cast<XGUI_ObjectsBrowser*>(theObjectBrowser);
+  if (aOB) {
+    QLineEdit* aLabel = aOB->activeDocLabel();
+    QPalette aPalet = aLabel->palette();
+    aPalet.setColor(QPalette::Text, QColor(0, 72, 140));
+    aLabel->setPalette(aPalet);
+    connect(aOB->treeView(), SIGNAL(doubleClicked(const QModelIndex&)), 
+      myDataModel, SLOT(onMouseDoubleClick(const QModelIndex&)));
+  }
+}
+
+
 void PartSet_Module::addObjectBrowserMenu(QMenu* theMenu) const
 {
   QObjectPtrList aObjects = myWorkshop->selection()->selectedObjects();

diff --git a/src/PartSet/PartSet_Module.h b/src/PartSet/PartSet_Module.h
index 3902138cb1ab6bc94c797def84d6f6b2f342b630..cc5e97ae051b1f43a1ac92e79f39b935e37b7888 100644 (file)
--- a/src/PartSet/PartSet_Module.h
+++ b/src/PartSet/PartSet_Module.h
@@ -128,6 +128,10 @@ public:
   /// \param theMessage an event message
   virtual void processEvent(const std::shared_ptr<Events_Message>& theMessage);
 
+  /// This method is called on object browser creation for customisation of module specific features
+  /// \param theObjectBrowser a pinter on Object Browser widget
+  virtual void customizeObjectBrowser(QWidget* theObjectBrowser);
+
 public slots:
   /// SLOT, that is called by no more widget signal emitted by property panel
   /// Set a specific flag to restart the sketcher operation

diff --git a/src/PartSet/PartSet_PartDataModel.cpp b/src/PartSet/PartSet_PartDataModel.cpp
index 1f30ed2b264a8b84f6a656392abfa4e30ea5bd06..ec4dabffaccfbcc66badffccf4f7229e11279f2f 100644 (file)
--- a/src/PartSet/PartSet_PartDataModel.cpp
+++ b/src/PartSet/PartSet_PartDataModel.cpp
@@ -361,8 +361,11 @@ QVariant PartSet_PartDataModel::data(const QModelIndex& theIndex, int theRole) c
       // return Tooltip
       break;
     case Qt::ForegroundRole:
+      if (theIndex.internalId() == HistoryObject) {
+        if (theIndex.row() > lastHistoryRow())
+          return QBrush(Qt::lightGray);
+      }
       return QBrush(myItemsColor);
-      break;
   }
   return QVariant();
 }
@@ -571,3 +574,29 @@ int PartSet_PartDataModel::lastHistoryRow() const
 {
   return rowCount() - 1 - myHistoryBackOffset;
 }
+
+void PartSet_PartDataModel::setLastHistoryItem(const QModelIndex& theIndex)
+{
+  if (theIndex.internalId() == HistoryObject) {
+    myHistoryBackOffset = rowCount() - 1 - theIndex.row();
+  }
+}
+
+QModelIndex PartSet_PartDataModel::lastHistoryItem() const
+{
+  return index(lastHistoryRow(), 1);
+}
+
+Qt::ItemFlags PartSet_PartDataModel::flags(const QModelIndex& theIndex) const
+{
+  Qt::ItemFlags aFlags = Qt::ItemIsSelectable;
+  if (object(theIndex)) {
+    aFlags |= Qt::ItemIsEditable;
+  }
+  if (theIndex.internalId() == HistoryObject) {
+    if (theIndex.row() <= lastHistoryRow() || (theIndex.column() == 1))
+      aFlags |= Qt::ItemIsEnabled;
+  } else
+    aFlags |= Qt::ItemIsEnabled;
+  return aFlags;
+}

diff --git a/src/PartSet/PartSet_PartDataModel.h b/src/PartSet/PartSet_PartDataModel.h
index 6e6e47a769413847566d55b39d538dc548bedea0..c821b4b5024826c35b5ad94544dc3bd2f9dca8ed 100644 (file)
--- a/src/PartSet/PartSet_PartDataModel.h
+++ b/src/PartSet/PartSet_PartDataModel.h
@@ -127,6 +127,10 @@ Q_OBJECT
   /// \param theParent a parent model index
   virtual int columnCount(const QModelIndex &theParent = QModelIndex()) const;
 
+  /// Returns the item flags for the given index.
+  /// \param theIndex a model index
+  virtual Qt::ItemFlags flags(const QModelIndex& theIndex) const;
+
   /// Returns the index of the item in the model specified by the given row, column and parent index.
   /// \param theRow a row
   /// \param theColumn a column
@@ -163,6 +167,13 @@ Q_OBJECT
   //! Return a Part object
   virtual ResultPartPtr part() const;
 
+  //! Set an Index which will be considered as a last history index
+  //! \param theIndex a last index for history
+  void setLastHistoryItem(const QModelIndex& theIndex);
+
+  //! Returns last history item
+  QModelIndex lastHistoryItem() const;
+
  private:
 
   //! Returns document of the current part

diff --git a/src/XGUI/XGUI_Workshop.cpp b/src/XGUI/XGUI_Workshop.cpp
index 20d21f7918956375d98b5fea10b52997840bd520..d726e86b220ba6a26c634fe7ab7998c000228c46 100644 (file)
--- a/src/XGUI/XGUI_Workshop.cpp
+++ b/src/XGUI/XGUI_Workshop.cpp
@@ -1139,6 +1139,7 @@ QDockWidget* XGUI_Workshop::createObjectBrowser(QWidget* theParent)
       "::title { position: relative; padding-left: 5px; text-align: left center }");
   myObjectBrowser = new XGUI_ObjectsBrowser(aObjDock);
   myObjectBrowser->setDataModel(myModule->dataModel());
+  myModule->customizeObjectBrowser(myObjectBrowser);
   aObjDock->setWidget(myObjectBrowser);
 
   myContextMenuMgr->connectObjectBrowser();