Salome HOME
projects
/
modules
/
hydro.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Initial merge of branch 'BR_HYDRO_IMPS_2016' into BR_PORTING_OCCT_7
[modules/hydro.git]
/
src
/
HYDROGUI
/
HYDROGUI_ListModel.cxx
diff --git
a/src/HYDROGUI/HYDROGUI_ListModel.cxx
b/src/HYDROGUI/HYDROGUI_ListModel.cxx
index 254cb7c3f06fcf8ffd786e76451a5ab4e0e02226..a452d2b3ba7145356f386adaf93f09285c28c6ca 100644
(file)
--- a/
src/HYDROGUI/HYDROGUI_ListModel.cxx
+++ b/
src/HYDROGUI/HYDROGUI_ListModel.cxx
@@
-51,9
+51,6
@@
HYDROGUI_ListModel::HYDROGUI_ListModel( QObject* theParent )
myEye = QPixmap( 16, 16 );
myEye.fill( Qt::black );
}
myEye = QPixmap( 16, 16 );
myEye.fill( Qt::black );
}
-
- // Set the supported drag actions for the items in the model
- setSupportedDragActions( Qt::MoveAction | Qt::CopyAction );
}
/**
}
/**
@@
-156,9
+153,9
@@
int HYDROGUI_ListModel::rowCount( const QModelIndex &theParent ) const
*/
void HYDROGUI_ListModel::setObjects( const Object2VisibleList& theObjects )
{
*/
void HYDROGUI_ListModel::setObjects( const Object2VisibleList& theObjects )
{
+ beginResetModel();
myObjects = theObjects;
myObjects = theObjects;
-
- reset();
+ endResetModel();
}
/**
}
/**
@@
-182,9
+179,9
@@
HYDROGUI_ListModel::ObjectList HYDROGUI_ListModel::getObjects() const
*/
void HYDROGUI_ListModel::addObject( const Object2Visible& theObject )
{
*/
void HYDROGUI_ListModel::addObject( const Object2Visible& theObject )
{
+ beginResetModel();
myObjects << theObject;
myObjects << theObject;
-
- reset();
+ endResetModel();
}
/**
}
/**
@@
-200,9
+197,9
@@
void HYDROGUI_ListModel::removeObjectByName( const QString& theObjectName )
}
}
}
}
+ beginResetModel();
myObjects.removeAll(anItem);
myObjects.removeAll(anItem);
-
- reset();
+ endResetModel();
}
}
@@
-315,6
+312,14
@@
Qt::DropActions HYDROGUI_ListModel::supportedDropActions() const
return Qt::MoveAction | Qt::CopyAction;
}
return Qt::MoveAction | Qt::CopyAction;
}
+/**
+*/
+Qt::DropActions HYDROGUI_ListModel::supportedDragActions() const
+{
+ // Set the supported drag actions for the items in the model
+ return Qt::MoveAction | Qt::CopyAction;
+}
+
/**
Get list of ids by the list model indexes.
@param theIsToSort defines if the list of ids should be sorted in ascending order
/**
Get list of ids by the list model indexes.
@param theIsToSort defines if the list of ids should be sorted in ascending order
@@
-520,6
+525,7
@@
void HYDROGUI_ListModel::setDecorationEnabled( const bool theIsToEnable )
void HYDROGUI_ListModel::undoLastMove()
{
void HYDROGUI_ListModel::undoLastMove()
{
+ beginResetModel();
myObjects = myPrevObjects;
myObjects = myPrevObjects;
-
reset
();
+
endResetModel
();
}
}