FCL/sf/mw/hgwidgets: comparison hgcacheproxymodel/src/hgdataprovidermodel.cpp

equal deleted inserted replaced

-:463f1934e292
+:c348b9772569
 *
 * Contributors:
 *
 * Description:
 *
-*  Version     : %version: 6 %
+*  Version     : %version: 15 %
 */
 #include <e32debug.h>
 #include <QVariant>
-#include <HbIcon.h>
+#include <HbIcon>
 #include <qpixmapdata_p.h>
 #include <hgwidgets/hgdataprovidermodel.h>
 #include <hgwidgets/hgcacheproxymodel.h>
 #include "hglogger.h"
 HgDataProviderModel::HgDataProviderModel(QObject *parent) :
 QAbstractItemModel(parent),
 mCache(new QList<QMap<int, QVariant>*>()),
 mCacheSize(0),
 mUnallocatedPixmaps(0),
-mObserver(0)
+mObserver(0),
+mIconMode(HgDataProviderIconHbIcon)
 {
 TX_ENTRY
 TX_EXIT
 }
 QVariant HgDataProviderModel::data(int idx, int role) const
 {
 QVariant res;
 if ( containsRole(idx, role)){
 res = mCache->at(idx)->value(role);
-} else if (role == Qt::DecorationRole ){
+} else if (isIndexValid(idx)){
-res = defaultIcon();
+if (role == Qt::DecorationRole ){
+res = defaultIcon();
+} else {
+res = getData(idx,role);
+}
 }
 return res;
 }
 QMap<int, QVariant> HgDataProviderModel::itemData(const QModelIndex &index) const
 return res;
 }
 void HgDataProviderModel::clearCache()
 {
+for ( int i=0; i<count(); i++){
+releasePixmap(i);
+}
 qDeleteAll( mCache->begin(), mCache->end() );
 mCache->clear();
 }
 int HgDataProviderModel::count() const
 }
 bool HgDataProviderModel::update(int pos, QList< QPair< QVariant, int > >* list, bool silent)
 {
 bool change(false);
-if (list && list->count() && pos >=0 && pos<count() && mCache->at(pos)) {
+if (list && list->count() && isIndexValid(pos)) {
-while(list->count()){
+while(list->count()>0){
 QPair< QVariant, int > pair = list->takeFirst();
 change = update(pos, pair.first, pair.second, true)|change;
 }
 if ( !silent && change ){
 emitDataChanged(pos, pos, false);
 bool HgDataProviderModel::update(int pos, QVariant obj, int role, bool silent)
 {
 bool change(false);
 if ( isIndexValid(pos)){
+mDataLock.lock();
 mCache->at(pos)->insert(role, obj); //this will remove old one if needed
+mDataLock.unlock();
 change = true;
 }
 if ( !silent && change ){
 emitDataChanged(pos, pos, false);
 bool HgDataProviderModel::updateIcon(int pos, QVariant obj, bool silent)
 {
 bool change(false);
 if ( obj.isValid() && !obj.isNull() && isIndexValid(pos) ){
+mDataLock.lock();
 mCache->at(pos)->insert(Qt::DecorationRole, obj); //will remove old if needed
+mDataLock.unlock();
 change = true;
 if (!silent){
 TX_LOG_ARGS(QString("pos:%1").arg( pos ) );
 if ( mObserver){
 mObserver->dataUpdated(pos,pos);
 QList< QPair< QVariant, int > > list;
 list.append(item);
 doInsertItem(pos, &list, silent);
 }
+void HgDataProviderModel::clearItem(int pos, bool silent)
+{
+bool change = false;
+if ( isIndexValid(pos)){
+mDataLock.lock();
+mCache->at(pos)->clear();
+mDataLock.unlock();
+change = true;
+}
+if ( change && !silent){
+emit dataChanged( index(pos, 0), index(pos, 0) );
+}
+}
 void HgDataProviderModel::doInsertItem(int pos, QList< QPair< QVariant, int > >* list, bool silent)
 {
-if (pos >mCache->count()){
+if (pos >mCache->count() || pos <0){
-pos = mCache->count();
+return;
-} else if (pos <0){
-pos = 0;
 }
 if ( !silent){
 beginInsertRows(QModelIndex(), pos, pos);
 }
+mDataLock.lock();
 mCache->insert(pos, new QMap<int, QVariant>());
+mDataLock.unlock();
 if (list && list->count()){
 update(pos, list, true);
 }
 if ( !silent){
 endInsertRows();
 }
 }
-void HgDataProviderModel::removeItem(int pos)
+void HgDataProviderModel::removeItem(int pos, bool silent)
 {
-removeItems(pos, 1);
+removeItems(pos, 1, silent);
 }
-void HgDataProviderModel::removeItems(int pos, int size)
+void HgDataProviderModel::removeItems(int pos, int size, bool silent)
 {
-if (pos >mCache->count())
+if (pos >=mCache->count()){
 return;
-else if (pos <0){
+} else if (pos <0){
 size = size + pos; //pos <0
 pos = 0;
 }
 if (size >mCache->count()){
 size = mCache->count();
-} else if (size <0){
+}
+if (size <=0){
 return;
 }
+if (!silent){
 beginRemoveRows(QModelIndex(),pos, pos+size-1);
+} else {
+qWarning("Removing items without notifying might be danger.");
+}
+mDataLock.lock();
 for (int i=0; i<size && pos<mCache->count(); i++){
 mCache->removeAt(pos);
 }
-endRemoveRows();
+mDataLock.unlock();
-}
+if (!silent)
+endRemoveRows();
+}
 void HgDataProviderModel::resetModel()
 {
 beginResetModel();
 doResetModel();
 endResetModel();
+}
+void HgDataProviderModel::setIconMode(HgDataProviderModel::HgDataProviderIconMode mode)
+{
+mIconMode = mode;
+}
+HgDataProviderModel::HgDataProviderIconMode HgDataProviderModel::iconMode()
+{
+return mIconMode;
 }
 void HgDataProviderModel::emitDataChanged(int from, int to, bool silent)
 {
 if ( !silent ){
 }
 }
 void HgDataProviderModel::resizeQPixmapPool(int newSize)
 {
-//    mQPixmapsLock.lock();
+mQPixmapsLock.lock();
 int currentSize = mFreePixmaps.count() + mUsedPixmaps.count();
 int diff = currentSize - newSize - KQPixmapCacheEmergencyBuffer;
 mUnallocatedPixmaps = 0;
 while (diff != 0){
 if (diff < 0){
 mFreePixmaps.removeLast();
 } //else will be deleted with releasePixmap;
 diff--;
 }
 }
-//    mQPixmapsLock.unlock();
+mQPixmapsLock.unlock();
 mCacheSize = newSize;
 }
 void HgDataProviderModel::releasePixmap(int idx)
 {
-//    mQPixmapsLock.lock();
+mQPixmapsLock.lock();
 if (mUsedPixmaps.contains(idx)) {
 QPixmap* pix = mUsedPixmaps.take(idx);
-if ( ( mFreePixmaps.count() + mUsedPixmaps.count() + mUnallocatedPixmaps ) > ( mCacheSize + KQPixmapCacheEmergencyBuffer ) ) {
+if ( ( mFreePixmaps.count() + mUsedPixmaps.count() + mUnallocatedPixmaps ) >= ( mCacheSize + KQPixmapCacheEmergencyBuffer ) ) {
 delete pix; //we have too many pixmaps
 } else {
 mFreePixmaps.append(pix);
 }
 } else {
 //        TX_LOG_ARGS( QString("can't release pixmap for idx=%0").arg(idx));
 }
-//    mQPixmapsLock.unlock();
+mQPixmapsLock.unlock();
 }
 QVariant HgDataProviderModel::createIcon(int index, QPixmap aPixmap)
 {
 TX_ENTRY
+QVariant res;
 	QPixmap* pix = getPixmap(index);
 	if (pix){
 		if ( pix->pixmapData() ) {
 			pix->pixmapData()->fromImage(aPixmap.toImage(), Qt::AutoColor );
 		} else {
 			*pix = aPixmap;
 		}
-//		mQPixmapsLock.lock();
+		mQPixmapsLock.lock();
 		mUsedPixmaps.insert(index, pix);
-//		mQPixmapsLock.unlock();
+		mQPixmapsLock.unlock();
-		return HbIcon(QIcon(*pix));
+		switch (mIconMode){
+case HgDataProviderIconHbIcon :
+res = HbIcon(QIcon(*pix));
+break;
+		    case HgDataProviderIconQIcon :
+res = QIcon(*pix);
+break;
+		    case HgDataProviderIconQImage :
+res = pix->toImage();
+break;
+		    case HgDataProviderIconQPixmap:
+		        res = *pix;
+		        break;
+default:
+break;
+		}
 	}
-	TX_EXIT_ARGS( QString("No pixmap avilable"));
-	return QVariant();
+	if (res.isNull()){
+	    TX_EXIT_ARGS( QString("No pixmap avilable"));
+	}
+	return res;
 }
 QPixmap* HgDataProviderModel::getPixmap(int idx)
 {
 //    TX_ENTRY
 QPixmap* res = NULL;
-//    mQPixmapsLock.lock();
+mQPixmapsLock.lock();
 if ( mUsedPixmaps.contains(idx)){
 res = mUsedPixmaps.take(idx);//let's just replace pixmapdata for that pixmap
 } else {
 if (!mFreePixmaps.isEmpty()){
 res = mFreePixmaps.takeFirst();
 res = new QPixmap();
 } else {
 TX_LOG_ARGS(QString("no free pixmaps"));
 }
 }
-//    mQPixmapsLock.unlock();
+mQPixmapsLock.unlock();
 //    TX_EXIT
 return res;
 }
 //eof

branch	GCC_SURGE
changeset 10	c348b9772569
parent 8	15f034b8a3b5
child 17	a10844a9914d