Salome HOME
projects
/
modules
/
shaper.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update viewer on delete an item
[modules/shaper.git]
/
src
/
XGUI
/
XGUI_DataModel.cpp
diff --git
a/src/XGUI/XGUI_DataModel.cpp
b/src/XGUI/XGUI_DataModel.cpp
index 1675b41832ef71de13aba205eb44f5fe86edb2ad..d624d14ad7d06ceecef304ebe80dc6fb8225ab72 100644
(file)
--- a/
src/XGUI/XGUI_DataModel.cpp
+++ b/
src/XGUI/XGUI_DataModel.cpp
@@
-85,7
+85,6
@@
void XGUI_DataModel::processEvent(const std::shared_ptr<Events_Message>& theMess
QModelIndex aParentIndex1, aParentIndex2;
ObjectPtr aObj;
bool aRebuildAll = false;
QModelIndex aParentIndex1, aParentIndex2;
ObjectPtr aObj;
bool aRebuildAll = false;
- bool isInserted = false;
foreach(ModuleBase_ITreeNode* aNode, aNodes) {
aObj = aNode->object();
foreach(ModuleBase_ITreeNode* aNode, aNodes) {
aObj = aNode->object();
@@
-100,13
+99,10
@@
void XGUI_DataModel::processEvent(const std::shared_ptr<Events_Message>& theMess
aParentIndex2 = getParentIndex(aNode, 2);
insertRows(aRow, 1, aParentIndex1);
dataChanged(aParentIndex1, aParentIndex2);
aParentIndex2 = getParentIndex(aNode, 2);
insertRows(aRow, 1, aParentIndex1);
dataChanged(aParentIndex1, aParentIndex2);
- isInserted = true;
}
}
if (aRebuildAll)
rebuildDataTree();
}
}
if (aRebuildAll)
rebuildDataTree();
- else if (isInserted)
- endInsertRows();
emit treeRebuilt();
}
emit treeRebuilt();
}
@@
-223,8
+219,6
@@
void XGUI_DataModel::processEvent(const std::shared_ptr<Events_Message>& theMess
}
if (aCreated.length() == 0)
return;
}
if (aCreated.length() == 0)
return;
- bool isInsert = false;
- bool isRemove = false;
emit beforeTreeRebuild();
foreach(ObjectPtr aObj, aCreated) {
ModuleBase_ITreeNode* aNode = myRoot->subNode(aObj);
emit beforeTreeRebuild();
foreach(ObjectPtr aObj, aCreated) {
ModuleBase_ITreeNode* aNode = myRoot->subNode(aObj);
@@
-238,22
+232,16
@@
void XGUI_DataModel::processEvent(const std::shared_ptr<Events_Message>& theMess
if (aNewNb > aOldNb) {
insertRows(aOldNb - 1, aNewNb - aOldNb, aFirstIdx);
if (aNewNb > aOldNb) {
insertRows(aOldNb - 1, aNewNb - aOldNb, aFirstIdx);
- isInsert = true;
}
else if (aNewNb < aOldNb) {
if (aNewNb)
removeRows(aNewNb - 1, aOldNb - aNewNb, aFirstIdx);
else if (aOldNb)
removeRows(0, aOldNb, aFirstIdx);
}
else if (aNewNb < aOldNb) {
if (aNewNb)
removeRows(aNewNb - 1, aOldNb - aNewNb, aFirstIdx);
else if (aOldNb)
removeRows(0, aOldNb, aFirstIdx);
- isRemove = aNewNb || aOldNb;
}
dataChanged(aFirstIdx, aLastIdx);
}
}
}
dataChanged(aFirstIdx, aLastIdx);
}
}
- if (isRemove)
- endRemoveRows();
- if (isInsert)
- endInsertRows();
emit treeRebuilt();
}
}
emit treeRebuilt();
}
}
@@
-354,6
+342,7
@@
bool XGUI_DataModel::hasChildren(const QModelIndex& theParent) const
bool XGUI_DataModel::insertRows(int theRow, int theCount, const QModelIndex& theParent)
{
beginInsertRows(theParent, theRow, theRow + theCount - 1);
bool XGUI_DataModel::insertRows(int theRow, int theCount, const QModelIndex& theParent)
{
beginInsertRows(theParent, theRow, theRow + theCount - 1);
+ endInsertRows();
return true;
}
return true;
}
@@
-361,6
+350,7
@@
bool XGUI_DataModel::insertRows(int theRow, int theCount, const QModelIndex& the
bool XGUI_DataModel::removeRows(int theRow, int theCount, const QModelIndex& theParent)
{
beginRemoveRows(theParent, theRow, theRow + theCount - 1);
bool XGUI_DataModel::removeRows(int theRow, int theCount, const QModelIndex& theParent)
{
beginRemoveRows(theParent, theRow, theRow + theCount - 1);
+ endRemoveRows();
return true;
}
return true;
}