Further improvements in the speed when opening symbol properties dial…

…og (symbology-ng) git-svn-id: http://svn.osgeo.org/qgis/trunk@14499 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Nov 3, 2010 · 34e9fc5 · 34e9fc5
1 parent 1e7da44
commit 34e9fc5
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 10 deletions.
diff --git a/src/gui/symbology-ng/qgssymbollayerv2widget.cpp b/src/gui/symbology-ng/qgssymbollayerv2widget.cpp
@@ -438,6 +438,7 @@ QgsSvgMarkerSymbolLayerV2Widget::QgsSvgMarkerSymbolLayerV2Widget( QWidget* paren
 
 #include <QTime>
 #include <QAbstractListModel>
+#include <QPixmapCache>
 
 class QgsSvgListModel : public QAbstractListModel
 {
@@ -458,16 +459,22 @@ class QgsSvgListModel : public QAbstractListModel
 
       if ( role == Qt::DecorationRole ) // icon
       {
-        QSvgRenderer renderer;
+
-        QPainter painter;
+        QPixmap pixmap;
-
+        if ( !QPixmapCache::find( entry, pixmap ) )
-        // render SVG file
+        {
-        renderer.load( entry );
+          // render SVG file
-        QPixmap pixmap( QSize( 24, 24 ) );
+          QSvgRenderer renderer;
-        pixmap.fill();
+          QPainter painter;
-        painter.begin( &pixmap );
+          renderer.load( entry );
-        renderer.render( &painter );
+          pixmap = QPixmap( QSize( 24, 24 ) );
-        painter.end();
+          pixmap.fill();
+          painter.begin( &pixmap );
+          renderer.render( &painter );
+          painter.end();
+
+          QPixmapCache::insert( entry, pixmap );
+        }
 
         return pixmap;
       }

diff --git a/src/ui/symbollayer/widget_svgfill.ui b/src/ui/symbollayer/widget_svgfill.ui
@@ -55,9 +55,15 @@
      <property name="flow">
       <enum>QListView::LeftToRight</enum>
      </property>
+     <property name="layoutMode">
+      <enum>QListView::Batched</enum>
+     </property>
      <property name="viewMode">
       <enum>QListView::IconMode</enum>
      </property>
+     <property name="uniformItemSizes">
+      <bool>true</bool>
+     </property>
     </widget>
    </item>
    <item row="3" column="0">

diff --git a/src/ui/symbollayer/widget_svgmarker.ui b/src/ui/symbollayer/widget_svgmarker.ui
@@ -141,6 +141,9 @@
      <property name="movement">
       <enum>QListView::Static</enum>
      </property>
+     <property name="layoutMode">
+      <enum>QListView::Batched</enum>
+     </property>
      <property name="spacing">
       <number>2</number>
      </property>
@@ -153,6 +156,9 @@
      <property name="viewMode">
       <enum>QListView::IconMode</enum>
      </property>
+     <property name="uniformItemSizes">
+      <bool>true</bool>
+     </property>
      <property name="wordWrap">
       <bool>true</bool>
      </property>