From 52c385003f12a4aabe848b5b135d845193e0a826 Mon Sep 17 00:00:00 2001
From: wmayer <wmayer@users.sourceforge.net>
Date: Fri, 30 May 2014 12:56:26 +0200
Subject: [PATCH] + optimization for icon retrieval in InputField

---
 src/Gui/InputField.cpp | 25 +++++++++++++++++++++----
 src/Gui/InputField.h   |  3 +++
 2 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/src/Gui/InputField.cpp b/src/Gui/InputField.cpp
index d47d68f88..de87f0a98 100644
--- a/src/Gui/InputField.cpp
+++ b/src/Gui/InputField.cpp
@@ -25,6 +25,7 @@
 #ifndef _PreComp_
 # include <QContextMenuEvent>
 # include <QMenu>
+# include <QPixmapCache>
 #endif
 
 #include <Base/Console.h>
@@ -68,7 +69,7 @@ InputField::InputField ( QWidget * parent )
     setValidator(new InputValidator(this));
     iconLabel = new QLabel(this);
     iconLabel->setCursor(Qt::ArrowCursor);
-    QPixmap pixmap = BitmapFactory().pixmapFromSvg(":/icons/button_valid.svg", QSize(sizeHint().height(),sizeHint().height()));
+    QPixmap pixmap = getValidationIcon(":/icons/button_valid.svg", QSize(sizeHint().height(),sizeHint().height()));
     iconLabel->setPixmap(pixmap);
     iconLabel->setStyleSheet(QString::fromAscii("QLabel { border: none; padding: 0px; }"));
     iconLabel->hide();
@@ -89,6 +90,22 @@ InputField::~InputField()
 {
 }
 
+QPixmap InputField::getValidationIcon(const char* name, const QSize& size) const
+{
+    QString key = QString::fromAscii("%1_%2x%3")
+        .arg(QString::fromAscii(name))
+        .arg(size.width())
+        .arg(size.height());
+    QPixmap icon;
+    if (QPixmapCache::find(key, icon))
+        return icon;
+
+    icon = BitmapFactory().pixmapFromSvg(name, size);
+    if (!icon.isNull())
+        QPixmapCache::insert(key, icon);
+    return icon;
+}
+
 void InputField::resizeEvent(QResizeEvent *)
 {
     QSize sz = iconLabel->sizeHint();
@@ -157,7 +174,7 @@ void InputField::newInput(const QString & text)
     }catch(Base::Exception &e){
         ErrorText = e.what();
         this->setToolTip(QString::fromAscii(ErrorText.c_str()));
-        QPixmap pixmap = BitmapFactory().pixmapFromSvg(":/icons/button_invalid.svg", QSize(sizeHint().height(),sizeHint().height()));
+        QPixmap pixmap = getValidationIcon(":/icons/button_invalid.svg", QSize(sizeHint().height(),sizeHint().height()));
         iconLabel->setPixmap(pixmap);
         parseError(QString::fromAscii(ErrorText.c_str()));
         validInput = false;
@@ -167,7 +184,7 @@ void InputField::newInput(const QString & text)
     // check if unit fits!
     if(!actUnit.isEmpty() && !res.getUnit().isEmpty() && actUnit != res.getUnit()){
         this->setToolTip(QString::fromAscii("Wrong unit"));
-        QPixmap pixmap = BitmapFactory().pixmapFromSvg(":/icons/button_invalid.svg", QSize(sizeHint().height(),sizeHint().height()));
+        QPixmap pixmap = getValidationIcon(":/icons/button_invalid.svg", QSize(sizeHint().height(),sizeHint().height()));
         iconLabel->setPixmap(pixmap);
         parseError(QString::fromAscii("Wrong unit"));
         validInput = false;
@@ -175,7 +192,7 @@ void InputField::newInput(const QString & text)
     }
 
 
-    QPixmap pixmap = BitmapFactory().pixmapFromSvg(":/icons/button_valid.svg", QSize(sizeHint().height(),sizeHint().height()));
+    QPixmap pixmap = getValidationIcon(":/icons/button_valid.svg", QSize(sizeHint().height(),sizeHint().height()));
     iconLabel->setPixmap(pixmap);
     ErrorText = "";
     validInput = true;
diff --git a/src/Gui/InputField.h b/src/Gui/InputField.h
index 7bd3b917b..b7edb6ec8 100644
--- a/src/Gui/InputField.h
+++ b/src/Gui/InputField.h
@@ -161,6 +161,9 @@ protected:
     virtual void contextMenuEvent(QContextMenuEvent * event);
     virtual void resizeEvent(QResizeEvent*);
 
+private:
+    QPixmap getValidationIcon(const char* name, const QSize& size) const;
+
 private:
     QLabel* iconLabel;
     QByteArray m_sPrefGrp;