X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModuleBase%2FModuleBase_IconFactory.cpp;h=a3be0328f94a86fbd2837fc7114432ecab5614a2;hb=b22f8bc2d6f96b466583d21445d5c5c719f4c724;hp=ed2719816e245dba947607a30edce4ed24e98c57;hpb=cbde248859fb0072f6012907391ea90cfc254574;p=modules%2Fshaper.git

diff --git a/src/ModuleBase/ModuleBase_IconFactory.cpp b/src/ModuleBase/ModuleBase_IconFactory.cpp
index ed2719816..a3be0328f 100644
--- a/src/ModuleBase/ModuleBase_IconFactory.cpp
+++ b/src/ModuleBase/ModuleBase_IconFactory.cpp
@@ -1,11 +1,27 @@
-// Copyright (C) 2014-20xx CEA/DEN, EDF R&D
+// Copyright (C) 2014-2019  CEA/DEN, EDF R&D
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
-// File:        ModuleBase_IconFactory.cpp
-// Created:     28 Jul 2015
-// Author:      Vitaly SMETANNIKOV
+#include "ModuleBase_IconFactory.h"
 
+#include "Config_XMLReader.h"
 
-#include "ModuleBase_IconFactory.h"
+#include <QDir>
 
 ModuleBase_IconFactory* MYIconFactory = 0;
 
@@ -34,3 +50,32 @@ QIcon ModuleBase_IconFactory::getIcon(ObjectPtr theIcon)
 {
   return QIcon();
 }
+
+QIcon ModuleBase_IconFactory::loadIcon(const QString& theValue)
+{
+  return QIcon(loadPixmap(theValue));
+}
+
+QPixmap ModuleBase_IconFactory::loadPixmap(const QString& theValue)
+{
+  QPixmap aPixmap(theValue);
+
+  if (aPixmap.isNull()) {
+    std::string aPath = Config_XMLReader::findConfigFile(theValue.toStdString());
+    if (!aPath.empty())
+      aPixmap = QPixmap(QString::fromStdString(aPath));
+  }
+  return aPixmap;
+}
+
+QImage ModuleBase_IconFactory::loadImage(const QString& theValue)
+{
+  QImage anImage(theValue);
+
+  if (anImage.isNull()) {
+    std::string aPath = Config_XMLReader::findConfigFile(theValue.toStdString());
+    if (!aPath.empty())
+      anImage = QImage(QString::fromStdString(aPath));
+  }
+  return anImage;
+}