Merge pull request #1501 from csoler/v0.6-ImprovedGUI

created a cache for default icons to avoid allocating them everytime …

.travis.yml

@@ -10,7 +10,7 @@ matrix:
       sudo: required
       compiler: gcc
     - os: osx
-      osx_image: xcode9.3
+      osx_image: xcode10.1
       compiler: clang
       sudo: false
 
@@ -48,7 +48,7 @@ addons:
 
 before_script:
   - if [ $TRAVIS_OS_NAME == linux ]; then qmake QMAKE_CC=$CC QMAKE_CXX=$CXX; fi
-  - if [ $TRAVIS_OS_NAME == osx ]; then qmake QMAKE_CC=$CC QMAKE_CXX=$CXX CONFIG+=rs_macos10.13 CONFIG+=no_retroshare_plugins INCLUDEPATH+=/usr/local/opt/openssl/include/ INCLUDEPATH+=/usr/local/Cellar/sqlcipher/4.0.1/include INCLUDEPATH+=/usr/local/Cellar/libmicrohttpd/0.9.62_1/include QMAKE_LIBDIR+=/usr/local/opt/openssl/lib/ QMAKE_LIBDIR+=/usr/local/Cellar/libmicrohttpd/0.9.62_1/lib QMAKE_LIBDIR+=/usr/local/Cellar/sqlcipher/4.0.1/lib; fi
+  - if [ $TRAVIS_OS_NAME == osx ]; then qmake QMAKE_CC=$CC QMAKE_CXX=$CXX CONFIG+=rs_macos10.14 CONFIG+=no_retroshare_plugins INCLUDEPATH+=/usr/local/opt/openssl/include/ INCLUDEPATH+=/usr/local/Cellar/sqlcipher/4.0.1/include INCLUDEPATH+=/usr/local/Cellar/libmicrohttpd/0.9.62_1/include QMAKE_LIBDIR+=/usr/local/opt/openssl/lib/ QMAKE_LIBDIR+=/usr/local/Cellar/libmicrohttpd/0.9.62_1/lib QMAKE_LIBDIR+=/usr/local/Cellar/sqlcipher/4.0.1/lib; fi
 
 script:
   - if [ $TRAVIS_OS_NAME == osx ] && [ "${COVERITY_SCAN_BRANCH}" != 1 ]; then make -j4; fi

retroshare-gui/src/gui/gxs/GxsIdDetails.cpp

@@ -64,6 +64,12 @@
 //const int kRecognTagType_Dev_Patcher     	= 4;
 //const int kRecognTagType_Dev_Developer	 	= 5;
 
+uint32_t GxsIdDetails::mImagesAllocated = 0;
+time_t GxsIdDetails::mLastIconCacheCleaning = time(NULL);
+std::map<RsGxsId,std::pair<time_t,QImage> > GxsIdDetails::mDefaultIconCache ;
+
+#define ICON_CACHE_STORAGE_TIME 		  600
+#define DELAY_BETWEEN_ICON_CACHE_CLEANING 300
 
 void ReputationItemDelegate::paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const
 {
@@ -451,9 +457,50 @@ static bool findTagIcon(int tag_class, int /*tag_type*/, QIcon &icon)
  * Bring the source code from this adaptation:
  * http://francisshanahan.com/identicon5/test.html
  */
-QImage GxsIdDetails::makeDefaultIcon(const RsGxsId& id)
+const QImage& GxsIdDetails::makeDefaultIcon(const RsGxsId& id)
 {
-    return  drawIdentIcon(QString::fromStdString(id.toStdString()),64*3, true);
+    // We use a cache for images. QImage has its own smart pointer system, but it does not prevent
+    // the same image to be allocated many times. We do this using a cache. The cache is also cleaned-up
+    // on a regular time basis so as to get rid of unused images.
+
+    time_t now = time(NULL);
+
+    // cleanup the cache every 10 mins
+
+    if(mLastIconCacheCleaning + DELAY_BETWEEN_ICON_CACHE_CLEANING < now)
+    {
+        std::cerr << "(II) Cleaning the icons cache." << std::endl;
+        int nb_deleted = 0;
+
+        for(auto it(mDefaultIconCache.begin());it!=mDefaultIconCache.end();)
+            if(it->second.first + ICON_CACHE_STORAGE_TIME < now && it->second.second.isDetached())
+            {
+				it = mDefaultIconCache.erase(it);
+                ++nb_deleted;
+            }
+			else
+				++it;
+
+        mLastIconCacheCleaning = now;
+        std::cerr << "(II) Removed " << nb_deleted << " unused icons. Cache contains " << mDefaultIconCache.size() << " icons"<< std::endl;
+    }
+
+    // now look for the icon
+
+    auto it = mDefaultIconCache.find(id);
+
+    if(it != mDefaultIconCache.end())
+    {
+        it->second.first = now;
+        return it->second.second;
+    }
+
+    QImage image = drawIdentIcon(QString::fromStdString(id.toStdString()),64*3, true);
+
+    mDefaultIconCache[id] = std::make_pair(now,image);
+    it = mDefaultIconCache.find(id);
+
+    return it->second.second;
 }
 
 /**

retroshare-gui/src/gui/gxs/GxsIdDetails.h

@@ -103,7 +103,7 @@ public:
 	static void GenerateCombinedPixmap(QPixmap &pixmap, const QList<QIcon> &icons, int iconSize);
 
 	//static QImage makeDefaultIcon(const RsGxsId& id);
-    static QImage makeDefaultIcon(const RsGxsId& id);
+    static const QImage& makeDefaultIcon(const RsGxsId& id);
 
 	/* Processing */
 	static void enableProcess(bool enable);
@@ -157,6 +157,11 @@ protected:
 	/* Pending data */
 	QMap<QObject*,CallbackData> mPendingData;
 	QMap<QObject*,CallbackData>::iterator mPendingDataIterator;
+
+    static uint32_t mImagesAllocated;
+    static std::map<RsGxsId,std::pair<time_t,QImage> > mDefaultIconCache;
+    static time_t mLastIconCacheCleaning;
+
     int mCheckTimerId;
 	int mProcessDisableCount;
 

retroshare.pri

@@ -155,6 +155,7 @@ rs_macos10.9:CONFIG -= rs_macos10.11
 rs_macos10.10:CONFIG -= rs_macos10.11
 rs_macos10.12:CONFIG -= rs_macos10.11
 rs_macos10.13:CONFIG -= rs_macos10.11
+rs_macos10.14:CONFIG -= rs_macos10.11
 
 # To enable JSON API append the following assignation to qmake command line
 # "CONFIG+=rs_jsonapi"
@@ -645,6 +646,14 @@ macx-* {
 		QMAKE_CXXFLAGS += -Wno-nullability-completeness
 		QMAKE_CFLAGS += -Wno-nullability-completeness
 	}
+	rs_macos10.14 {
+		message(***retroshare.pri: Set Target and SDK to MacOS 10.14 )
+		QMAKE_MACOSX_DEPLOYMENT_TARGET=10.14
+		QMAKE_MAC_SDK = macosx10.14
+		QMAKE_CXXFLAGS += -Wno-nullability-completeness
+		QMAKE_CFLAGS += -Wno-nullability-completeness
+	}
+
 
 
 	message(***retroshare.pri:MacOSX)
@@ -657,10 +666,10 @@ macx-* {
 	BIN_DIR += "/Applications/Xcode.app/Contents/Developer/usr/bin"
 	INC_DIR += "/usr/local/Cellar/miniupnpc/2.1/include"
 	INC_DIR += "/usr/local/Cellar/libmicrohttpd/0.9.62_1/include"
-	INC_DIR += "/usr/local/Cellar/sqlcipher/4.0.1/include"
+	INC_DIR += "/usr/local/Cellar/sqlcipher/4.1.0/include"
 	LIB_DIR += "/usr/local/opt/openssl/lib/"
 	LIB_DIR += "/usr/local/Cellar/libmicrohttpd/0.9.62_1/lib"
-	LIB_DIR += "/usr/local/Cellar/sqlcipher/4.0.1/lib"
+	LIB_DIR += "/usr/local/Cellar/sqlcipher/4.1.0/lib"
 	LIB_DIR += "/usr/local/Cellar/miniupnpc/2.1/lib"
 	CONFIG += c++11
 	INCLUDEPATH += "/usr/local/include"