[MEDCalc] icons and preferences

diff --git a/src/MEDCalc/gui/MEDModule.cxx b/src/MEDCalc/gui/MEDModule.cxx
index 7b9fccbb34815558a3f2d9e279462369cbe4028c..7d5770b6de890c25a4b72dcd82d6401e42c8e732 100644 (file)
--- a/src/MEDCalc/gui/MEDModule.cxx
+++ b/src/MEDCalc/gui/MEDModule.cxx
@@ -25,6 +25,7 @@
 #include "SALOME_LifeCycleCORBA.hxx"
 #include "QtxPopupMgr.h"
 
+#include <LightApp_Preferences.h>
 #include <SUIT_Desktop.h>
 #include <SUIT_ResourceMgr.h>
 #include <SUIT_Session.h>
@@ -122,6 +123,24 @@ MEDModule::viewManagers( QStringList& list ) const
 #endif
 }
 
+void
+MEDModule::createPreferences()
+{
+  int genTab = addPreference(tr("PREF_TAB_GENERAL"));
+
+  int themeGroup = addPreference(tr("PREF_THEME_GROUP"), genTab);
+  setPreferenceProperty(themeGroup, "columns", 2);
+  int icons = addPreference(tr("PREF_ICONS"), themeGroup, LightApp_Preferences::Selector, "MEDCalc", "icons" );
+  QStringList iconsThemes;
+  iconsThemes.append(tr("PREF_ICON_THEME_MODERN"));
+  iconsThemes.append(tr("PREF_ICON_THEME_CLASSIC"));
+  QList<QVariant> indices;
+  indices.append(0);
+  indices.append(1);
+  setPreferenceProperty(icons, "strings", iconsThemes);
+  setPreferenceProperty(icons, "indexes", indices);
+}
+
 bool
 MEDModule::activateModule( SUIT_Study* theStudy )
 {

diff --git a/src/MEDCalc/gui/MEDModule.hxx b/src/MEDCalc/gui/MEDModule.hxx
index 508253dcde064dfa6b2b84a76b3937b0afe90b4e..b0853c61d33c0114ca49194595911f94b8d10955 100644 (file)
--- a/src/MEDCalc/gui/MEDModule.hxx
+++ b/src/MEDCalc/gui/MEDModule.hxx
@@ -63,6 +63,8 @@ public:
   virtual void windows(QMap<int, int>& theMap) const;
   virtual void viewManagers(QStringList& theList) const;
 
+  virtual void createPreferences();
+
   int createStandardAction(const QString& label,
                            QObject* slotobject,
                            const char* slotmember,

diff --git a/src/MEDCalc/gui/MED_images.ts b/src/MEDCalc/gui/MED_images.ts
index 3f7fcf1e0ea8390e038bea692741d199a72776ac..bcc3b14e51f948a07aff328d42cc61bf1beb107f 100644 (file)
--- a/src/MEDCalc/gui/MED_images.ts
+++ b/src/MEDCalc/gui/MED_images.ts
@@ -63,53 +63,155 @@
       <source>ICO_WORKSPACE_SAVE</source>
       <translation>workspace_save.png</translation>
     </message>
+    <!-- Presentation toolbar icons (default theme)-->
     <message>
-      <source>ICO_PRESENTATION_SCALAR_MAP</source>
+      <source>ICO_PRESENTATION_SCALAR_MAP_DEFAULT</source>
       <translation>scalarmap24.png</translation>
     </message>
     <message>
-      <source>ICO_PRESENTATION_CONTOUR</source>
+      <source>ICO_PRESENTATION_CONTOUR_DEFAULT</source>
       <translation>pqIsosurface24.png</translation>
     </message>
     <message>
-      <source>ICO_PRESENTATION_VECTOR_FIELD</source>
+      <source>ICO_PRESENTATION_VECTOR_FIELD_DEFAULT</source>
       <translation>pqGlyph24.png</translation>
     </message>
     <message>
-      <source>ICO_PRESENTATION_SLICES</source>
+      <source>ICO_PRESENTATION_SLICES_DEFAULT</source>
       <translation>pqSlice24.png</translation>
     </message>
     <message>
-      <source>ICO_PRESENTATION_DEFLECTION_SHAPE</source>
+      <source>ICO_PRESENTATION_DEFLECTION_SHAPE_DEFAULT</source>
       <translation>pqWarp24.png</translation>
     </message>
     <message>
-      <source>ICO_PRESENTATION_POINT_SPRITE</source>
+      <source>ICO_PRESENTATION_POINT_SPRITE_DEFAULT</source>
       <translation>pqNodeMapData24.png</translation>
     </message>
+    <!-- Presentation tree icons (default theme)-->
     <message>
-      <source>ICO_MEDPresentationScalarMap</source>
+      <source>ICO_MEDPresentationScalarMap_DEFAULT</source>
       <translation>scalarmap16.png</translation>
     </message>
     <message>
-      <source>ICO_MEDPresentationContour</source>
+      <source>ICO_MEDPresentationContour_DEFAULT</source>
       <translation>pqIsosurface16.png</translation>
     </message>
     <message>
-      <source>ICO_MEDPresentationVectorField</source>
+      <source>ICO_MEDPresentationVectorField_DEFAULT</source>
       <translation>pqGlyph16.png</translation>
     </message>
     <message>
-      <source>ICO_MEDPresentationSlices</source>
+      <source>ICO_MEDPresentationSlices_DEFAULT</source>
       <translation>pqSlice16.png</translation>
     </message>
     <message>
-      <source>ICO_MEDPresentationDeflectionShape</source>
+      <source>ICO_MEDPresentationDeflectionShape_DEFAULT</source>
       <translation>pqWarp16.png</translation>
     </message>
     <message>
-      <source>ICO_MEDPresentationPointSprite</source>
+      <source>ICO_MEDPresentationPointSprite_DEFAULT</source>
       <translation>pqNodeMapData16.png</translation>
     </message>
+    <!-- Presentation toolbar icons (modern theme)-->
+    <message>
+      <source>ICO_PRESENTATION_SCALAR_MAP_MODERN</source>
+      <translation>scalarmap24.png</translation>
+    </message>
+    <message>
+      <source>ICO_PRESENTATION_CONTOUR_MODERN</source>
+      <translation>pqIsosurface24.png</translation>
+    </message>
+    <message>
+      <source>ICO_PRESENTATION_VECTOR_FIELD_MODERN</source>
+      <translation>pqGlyph24.png</translation>
+    </message>
+    <message>
+      <source>ICO_PRESENTATION_SLICES_MODERN</source>
+      <translation>pqSlice24.png</translation>
+    </message>
+    <message>
+      <source>ICO_PRESENTATION_DEFLECTION_SHAPE_MODERN</source>
+      <translation>pqWarp24.png</translation>
+    </message>
+    <message>
+      <source>ICO_PRESENTATION_POINT_SPRITE_MODERN</source>
+      <translation>pqNodeMapData24.png</translation>
+    </message>
+    <!-- Presentation tree icons (modern theme)-->
+    <message>
+      <source>ICO_MEDPresentationScalarMap_MODERN</source>
+      <translation>scalarmap16.png</translation>
+    </message>
+    <message>
+      <source>ICO_MEDPresentationContour_MODERN</source>
+      <translation>pqIsosurface16.png</translation>
+    </message>
+    <message>
+      <source>ICO_MEDPresentationVectorField_MODERN</source>
+      <translation>pqGlyph16.png</translation>
+    </message>
+    <message>
+      <source>ICO_MEDPresentationSlices_MODERN</source>
+      <translation>pqSlice16.png</translation>
+    </message>
+    <message>
+      <source>ICO_MEDPresentationDeflectionShape_MODERN</source>
+      <translation>pqWarp16.png</translation>
+    </message>
+    <message>
+      <source>ICO_MEDPresentationPointSprite_MODERN</source>
+      <translation>pqNodeMapData16.png</translation>
+    </message>
+    <!-- Presentation toolbar icons (classic theme)-->
+    <message>
+      <source>ICO_PRESENTATION_SCALAR_MAP_CLASSIC</source>
+      <translation>visu_scalars24.png</translation>
+    </message>
+    <message>
+      <source>ICO_PRESENTATION_CONTOUR_CLASSIC</source>
+      <translation>visu_isosurfaces24.png</translation>
+    </message>
+    <message>
+      <source>ICO_PRESENTATION_VECTOR_FIELD_CLASSIC</source>
+      <translation>visu_vectors24.png</translation>
+    </message>
+    <message>
+      <source>ICO_PRESENTATION_SLICES_CLASSIC</source>
+      <translation>visu_cutplanes24.png</translation>
+    </message>
+    <message>
+      <source>ICO_PRESENTATION_DEFLECTION_SHAPE_CLASSIC</source>
+      <translation>visu_deformed24.png</translation>
+    </message>
+    <message>
+      <source>ICO_PRESENTATION_POINT_SPRITE_CLASSIC</source>
+      <translation>visu_points24.png</translation>
+    </message>
+    <!-- Presentation tree icons (classic theme)-->
+    <message>
+      <source>ICO_MEDPresentationScalarMap_CLASSIC</source>
+      <translation>visu_scalars16.png</translation>
+    </message>
+    <message>
+      <source>ICO_MEDPresentationContour_CLASSIC</source>
+      <translation>visu_isosurfaces16.png</translation>
+    </message>
+    <message>
+      <source>ICO_MEDPresentationVectorField_CLASSIC</source>
+      <translation>visu_vectors16.png</translation>
+    </message>
+    <message>
+      <source>ICO_MEDPresentationSlices_CLASSIC</source>
+      <translation>visu_cutplanes16.png</translation>
+    </message>
+    <message>
+      <source>ICO_MEDPresentationDeflectionShape_CLASSIC</source>
+      <translation>visu_deformed16.png</translation>
+    </message>
+    <message>
+      <source>ICO_MEDPresentationPointSprite_CLASSIC</source>
+      <translation>visu_points16.png</translation>
+    </message>
   </context>
 </TS>

diff --git a/src/MEDCalc/gui/MED_msg_en.ts b/src/MEDCalc/gui/MED_msg_en.ts
index 8a6d8934ed9cb6c4d67d60bcb1d9c7e23dc28d42..092e8caa5f36b11d75273257882a1a3ad63f0b9a 100644 (file)
--- a/src/MEDCalc/gui/MED_msg_en.ts
+++ b/src/MEDCalc/gui/MED_msg_en.ts
@@ -357,6 +357,26 @@
       <source>MEN_FILE</source>
       <translation>&amp;File</translation>
     </message>
+    <message>
+      <source>PREF_TAB_GENERAL</source>
+      <translation>General</translation>
+    </message>
+    <message>
+      <source>PREF_THEME_GROUP</source>
+      <translation>Theme</translation>
+    </message>
+    <message>
+      <source>PREF_ICONS</source>
+      <translation>Icons</translation>
+    </message>
+    <message>
+      <source>PREF_ICON_THEME_MODERN</source>
+      <translation>Modern</translation>
+    </message>
+    <message>
+      <source>PREF_ICON_THEME_CLASSIC</source>
+      <translation>Classic</translation>
+    </message>
   </context>
   <context>
     <name>WorkspaceController</name>

diff --git a/src/MEDCalc/gui/MED_msg_fr.ts b/src/MEDCalc/gui/MED_msg_fr.ts
index 290fe00fb294b30afb2cfd5593f1f19177408a03..c892ca55d958a4ceb38f9e7cf911bc521fbf231f 100644 (file)
--- a/src/MEDCalc/gui/MED_msg_fr.ts
+++ b/src/MEDCalc/gui/MED_msg_fr.ts
@@ -361,6 +361,26 @@
       <source>MEN_FILE</source>
       <translation>&amp;Fichier</translation>
     </message>
+    <message>
+      <source>PREF_TAB_GENERAL</source>
+      <translation>Général</translation>
+    </message>
+    <message>
+      <source>PREF_THEME_GROUP</source>
+      <translation>Thème</translation>
+    </message>
+    <message>
+      <source>PREF_ICONS</source>
+      <translation>Icones</translation>
+    </message>
+    <message>
+      <source>PREF_ICON_THEME_MODERN</source>
+      <translation>Moderne</translation>
+    </message>
+    <message>
+      <source>PREF_ICON_THEME_CLASSIC</source>
+      <translation>Classique</translation>
+    </message>
   </context>
   <context>
     <name>WorkspaceController</name>

diff --git a/src/MEDCalc/gui/PresentationController.cxx b/src/MEDCalc/gui/PresentationController.cxx
index ea2aa57521de4aa9050cbecae37f1b45c3a813d1..bb432b56ba0c3ddfd0f1b27f6b2f82c44355cb0c 100644 (file)
--- a/src/MEDCalc/gui/PresentationController.cxx
+++ b/src/MEDCalc/gui/PresentationController.cxx
@@ -32,6 +32,8 @@
 #include <SALOMEDS_Study.hxx>
 
 #include <SUIT_Desktop.h>
+#include <SUIT_Session.h>
+#include <SUIT_ResourceMgr.h>
 #include <QMessageBox>
 
 static const int OPTIONS_VIEW_MODE_ID = 943;
@@ -52,6 +54,23 @@ PresentationController::~PresentationController()
   STDLOG("Deleting the PresentationController");
 }
 
+std::string
+PresentationController::_getIconName(const std::string& name)
+{
+  SUIT_ResourceMgr* mgr = SUIT_Session::session()->resourceMgr();
+  if (!mgr)
+    return name;
+
+  // Read value from preferences and suffix name to select icon theme
+  int theme = mgr->integerValue("MEDCalc", "icons");
+  if (theme == 0) {
+    return name + "_MODERN";
+  } else if (theme == 1) {
+    return name + "_CLASSIC";
+  }
+  return name + "_DEFAULT";
+}
+
 void
 PresentationController::createActions()
 {
@@ -95,7 +114,7 @@ PresentationController::createActions()
   // Presentations
   label   = tr("LAB_PRESENTATION_SCALAR_MAP");
   tooltip = tr("TIP_PRESENTATION_SCALAR_MAP");
-  QString icon = tr("ICO_PRESENTATION_SCALAR_MAP");
+  QString icon = tr(_getIconName("ICO_PRESENTATION_SCALAR_MAP").c_str());
   int actionId;
   actionId = _salomeModule->createStandardAction(label,this, SLOT(OnVisualizeScalarMap()),icon,tooltip);
   _salomeModule->createTool(actionId, toolbarId);
@@ -104,7 +123,7 @@ PresentationController::createActions()
 
   label   = tr("LAB_PRESENTATION_CONTOUR");
   tooltip = tr("TIP_PRESENTATION_CONTOUR");
-  icon    = tr("ICO_PRESENTATION_CONTOUR");
+  icon    = tr(_getIconName("ICO_PRESENTATION_CONTOUR").c_str());
   actionId = _salomeModule->createStandardAction(label,this, SLOT(OnVisualizeContour()),icon,tooltip);
   _salomeModule->createTool(actionId, toolbarId);
   _salomeModule->action(actionId)->setIconVisibleInMenu(true);
@@ -112,7 +131,7 @@ PresentationController::createActions()
 
   label   = tr("LAB_PRESENTATION_VECTOR_FIELD");
   tooltip = tr("TIP_PRESENTATION_VECTOR_FIELD");
-  icon    = tr("ICO_PRESENTATION_VECTOR_FIELD");
+  icon    = tr(_getIconName("ICO_PRESENTATION_VECTOR_FIELD").c_str());
   actionId = _salomeModule->createStandardAction(label,this, SLOT(OnVisualizeVectorField()),icon,tooltip);
   _salomeModule->createTool(actionId, toolbarId);
   _salomeModule->action(actionId)->setIconVisibleInMenu(true);
@@ -120,7 +139,7 @@ PresentationController::createActions()
 
   label   = tr("LAB_PRESENTATION_SLICES");
   tooltip = tr("TIP_PRESENTATION_SLICES");
-  icon    = tr("ICO_PRESENTATION_SLICES");
+  icon    = tr(_getIconName("ICO_PRESENTATION_SLICES").c_str());
   actionId = _salomeModule->createStandardAction(label,this, SLOT(OnVisualizeSlices()),icon,tooltip);
   _salomeModule->createTool(actionId, toolbarId);
   _salomeModule->action(actionId)->setIconVisibleInMenu(true);
@@ -128,7 +147,7 @@ PresentationController::createActions()
 
   label   = tr("LAB_PRESENTATION_DEFLECTION_SHAPE");
   tooltip = tr("TIP_PRESENTATION_DEFLECTION_SHAPE");
-  icon    = tr("ICO_PRESENTATION_DEFLECTION_SHAPE");
+  icon    = tr(_getIconName("ICO_PRESENTATION_DEFLECTION_SHAPE").c_str());
   actionId = _salomeModule->createStandardAction(label,this, SLOT(OnVisualizeDeflectionShape()),icon,tooltip);
   _salomeModule->createTool(actionId, toolbarId);
   _salomeModule->action(actionId)->setIconVisibleInMenu(true);
@@ -136,7 +155,7 @@ PresentationController::createActions()
 
   label   = tr("LAB_PRESENTATION_POINT_SPRITE");
   tooltip = tr("TIP_PRESENTATION_POINT_SPRITE");
-  icon    = tr("ICO_PRESENTATION_POINT_SPRITE");
+  icon    = tr(_getIconName("ICO_PRESENTATION_POINT_SPRITE").c_str());
   actionId = _salomeModule->createStandardAction(label,this, SLOT(OnVisualizePointSprite()),icon,tooltip);
   _salomeModule->createTool(actionId, toolbarId);
   _salomeModule->action(actionId)->setIconVisibleInMenu(true);
@@ -243,6 +262,7 @@ PresentationController::updateTreeViewWithNewPresentation(long fieldId, long pre
 
   std::string name = MEDFactoryClient::getPresentationManager()->getPresentationProperty(presentationId, "name");
   std::string icon = std::string("ICO_") + name;
+  icon = _getIconName(icon);
   name = tr(name.c_str()).toStdString();
   std::string label = tr(icon.c_str()).toStdString();
 

diff --git a/src/MEDCalc/gui/PresentationController.hxx b/src/MEDCalc/gui/PresentationController.hxx
index f48f8e77b5d5cda0d96a3ee4e5a1aa4082ad89e2..d58b926d8cd2638f3d6f9df903c34cf15935d14c 100644 (file)
--- a/src/MEDCalc/gui/PresentationController.hxx
+++ b/src/MEDCalc/gui/PresentationController.hxx
@@ -59,7 +59,7 @@ public:
   MEDCALC::MEDPresentationViewMode getSelectedViewMode();
 
 signals:
-  void presentationSignal(const PresentationEvent* event);
+  void presentationSignal(const PresentationEvent*);
 
 protected slots:
   void OnVisualizeScalarMap();
@@ -68,11 +68,12 @@ protected slots:
   void OnVisualizeSlices();
   void OnVisualizeDeflectionShape();
   void OnVisualizePointSprite();
-  void processWorkspaceEvent(const MEDCALC::MedEvent* event);
+  void processWorkspaceEvent(const MEDCALC::MedEvent*);
 
 private:
   void visualize(PresentationEvent::EventType);
-  void updateTreeViewWithNewPresentation(long fieldId, long presentationId);
+  void updateTreeViewWithNewPresentation(long, long);
+  std::string _getIconName(const std::string&);
 
 private:
   MEDModule* _salomeModule;

diff --git a/src/MEDCalc/res/CMakeLists.txt b/src/MEDCalc/res/CMakeLists.txt
index c46ae2bbbbaa1281f9a22b873b301e35ea7b2018..a69b6db66e6e08679d70a415663f7045440d35cb 100644 (file)
--- a/src/MEDCalc/res/CMakeLists.txt
+++ b/src/MEDCalc/res/CMakeLists.txt
@@ -20,23 +20,6 @@
 ADD_SUBDIRECTORY(testfiles)
 ADD_SUBDIRECTORY(presentations)
 
-SET(MED_RESOURCES_FILES
-  datasource_add.png
-  datasource_changeUnderlyingMesh.png
-  datasource_interpolateField.png
-  datasource_expandfield.png
-  datasource_field.png
-  datasource_mesh.png
-  datasource.png
-  datasource_use.png
-  datasource_view.png
-  fileimport-32.png
-  folder.png
-  image_add.png
-  MEDCalc.png
-  MEDCalc_small.png
-  workspace_clean.png
-  workspace_save.png
-  pqAppIcon16.png
-  )
+FILE(GLOB MED_RESOURCES_FILES RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}/*.png")
+
 INSTALL(FILES ${MED_RESOURCES_FILES} DESTINATION ${SALOME_MED_INSTALL_RES_DATA})

diff --git a/src/MEDCalc/res/presentations/CMakeLists.txt b/src/MEDCalc/res/presentations/CMakeLists.txt
index b5ca4088130c63faa9e4940286cc8c48bc5c137d..c7289b0c21530b0892340547ff6b599ddf13fbab 100644 (file)
--- a/src/MEDCalc/res/presentations/CMakeLists.txt
+++ b/src/MEDCalc/res/presentations/CMakeLists.txt
@@ -17,18 +17,5 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
-SET(MED_RESOURCES_FILES
-  pqGlyph16.png
-  pqGlyph24.png
-  pqIsosurface16.png
-  pqIsosurface24.png
-  pqNodeMapData16.png
-  pqNodeMapData24.png
-  pqSlice16.png
-  pqSlice24.png
-  pqWarp16.png
-  pqWarp24.png
-  scalarmap16.png
-  scalarmap24.png
-  )
-INSTALL(FILES ${MED_RESOURCES_FILES} DESTINATION ${SALOME_MED_INSTALL_RES_DATA})
+ADD_SUBDIRECTORY(modern)
+ADD_SUBDIRECTORY(classic)

diff --git a/src/MEDCalc/res/presentations/classic/CMakeLists.txt b/src/MEDCalc/res/presentations/classic/CMakeLists.txt
new file mode 100644 (file)
index 0000000..d574ae3
--- /dev/null
+++ b/src/MEDCalc/res/presentations/classic/CMakeLists.txt
@@ -0,0 +1,22 @@
+# Copyright (C) 2016  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(GLOB MED_RESOURCES_FILES RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}/*.png")
+
+INSTALL(FILES ${MED_RESOURCES_FILES} DESTINATION ${SALOME_MED_INSTALL_RES_DATA})

diff --git a/src/MEDCalc/res/presentations/classic/visu_cutplanes16.png b/src/MEDCalc/res/presentations/classic/visu_cutplanes16.png
new file mode 100644 (file)
index 0000000..cb88f3d
Binary files /dev/null and b/src/MEDCalc/res/presentations/classic/visu_cutplanes16.png differ

diff --git a/src/MEDCalc/res/presentations/classic/visu_cutplanes24.png b/src/MEDCalc/res/presentations/classic/visu_cutplanes24.png
new file mode 100644 (file)
index 0000000..3858050
Binary files /dev/null and b/src/MEDCalc/res/presentations/classic/visu_cutplanes24.png differ

diff --git a/src/MEDCalc/res/presentations/classic/visu_deformed16.png b/src/MEDCalc/res/presentations/classic/visu_deformed16.png
new file mode 100644 (file)
index 0000000..f12b8f2
Binary files /dev/null and b/src/MEDCalc/res/presentations/classic/visu_deformed16.png differ

diff --git a/src/MEDCalc/res/presentations/classic/visu_deformed24.png b/src/MEDCalc/res/presentations/classic/visu_deformed24.png
new file mode 100644 (file)
index 0000000..d763d43
Binary files /dev/null and b/src/MEDCalc/res/presentations/classic/visu_deformed24.png differ

diff --git a/src/MEDCalc/res/presentations/classic/visu_isosurfaces16.png b/src/MEDCalc/res/presentations/classic/visu_isosurfaces16.png
new file mode 100644 (file)
index 0000000..0229c7a
Binary files /dev/null and b/src/MEDCalc/res/presentations/classic/visu_isosurfaces16.png differ

diff --git a/src/MEDCalc/res/presentations/classic/visu_isosurfaces24.png b/src/MEDCalc/res/presentations/classic/visu_isosurfaces24.png
new file mode 100644 (file)
index 0000000..e5e7794
Binary files /dev/null and b/src/MEDCalc/res/presentations/classic/visu_isosurfaces24.png differ

diff --git a/src/MEDCalc/res/presentations/classic/visu_points16.png b/src/MEDCalc/res/presentations/classic/visu_points16.png
new file mode 100644 (file)
index 0000000..bf40656
Binary files /dev/null and b/src/MEDCalc/res/presentations/classic/visu_points16.png differ

diff --git a/src/MEDCalc/res/presentations/classic/visu_points24.png b/src/MEDCalc/res/presentations/classic/visu_points24.png
new file mode 100644 (file)
index 0000000..c3287b4
Binary files /dev/null and b/src/MEDCalc/res/presentations/classic/visu_points24.png differ

diff --git a/src/MEDCalc/res/presentations/classic/visu_scalars16.png b/src/MEDCalc/res/presentations/classic/visu_scalars16.png
new file mode 100644 (file)
index 0000000..f675c3d
Binary files /dev/null and b/src/MEDCalc/res/presentations/classic/visu_scalars16.png differ

diff --git a/src/MEDCalc/res/presentations/classic/visu_scalars24.png b/src/MEDCalc/res/presentations/classic/visu_scalars24.png
new file mode 100644 (file)
index 0000000..2182a7f
Binary files /dev/null and b/src/MEDCalc/res/presentations/classic/visu_scalars24.png differ

diff --git a/src/MEDCalc/res/presentations/classic/visu_vectors16.png b/src/MEDCalc/res/presentations/classic/visu_vectors16.png
new file mode 100644 (file)
index 0000000..ebb1bc6
Binary files /dev/null and b/src/MEDCalc/res/presentations/classic/visu_vectors16.png differ

diff --git a/src/MEDCalc/res/presentations/classic/visu_vectors24.png b/src/MEDCalc/res/presentations/classic/visu_vectors24.png
new file mode 100644 (file)
index 0000000..d3fa2c4
Binary files /dev/null and b/src/MEDCalc/res/presentations/classic/visu_vectors24.png differ

diff --git a/src/MEDCalc/res/presentations/modern/CMakeLists.txt b/src/MEDCalc/res/presentations/modern/CMakeLists.txt
new file mode 100644 (file)
index 0000000..d574ae3
--- /dev/null
+++ b/src/MEDCalc/res/presentations/modern/CMakeLists.txt
@@ -0,0 +1,22 @@
+# Copyright (C) 2016  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(GLOB MED_RESOURCES_FILES RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}/*.png")
+
+INSTALL(FILES ${MED_RESOURCES_FILES} DESTINATION ${SALOME_MED_INSTALL_RES_DATA})

diff --git a/src/MEDCalc/res/presentations/modern/pqGlyph16.png b/src/MEDCalc/res/presentations/modern/pqGlyph16.png
new file mode 100644 (file)
index 0000000..ff441b0
Binary files /dev/null and b/src/MEDCalc/res/presentations/modern/pqGlyph16.png differ

diff --git a/src/MEDCalc/res/presentations/modern/pqGlyph24.png b/src/MEDCalc/res/presentations/modern/pqGlyph24.png
new file mode 100644 (file)
index 0000000..68e6766
Binary files /dev/null and b/src/MEDCalc/res/presentations/modern/pqGlyph24.png differ

diff --git a/src/MEDCalc/res/presentations/modern/pqIsosurface16.png b/src/MEDCalc/res/presentations/modern/pqIsosurface16.png
new file mode 100644 (file)
index 0000000..40b7908
Binary files /dev/null and b/src/MEDCalc/res/presentations/modern/pqIsosurface16.png differ

diff --git a/src/MEDCalc/res/presentations/modern/pqIsosurface24.png b/src/MEDCalc/res/presentations/modern/pqIsosurface24.png
new file mode 100644 (file)
index 0000000..825222c
Binary files /dev/null and b/src/MEDCalc/res/presentations/modern/pqIsosurface24.png differ

diff --git a/src/MEDCalc/res/presentations/modern/pqNodeMapData16.png b/src/MEDCalc/res/presentations/modern/pqNodeMapData16.png
new file mode 100644 (file)
index 0000000..4cb32e4
Binary files /dev/null and b/src/MEDCalc/res/presentations/modern/pqNodeMapData16.png differ

diff --git a/src/MEDCalc/res/presentations/modern/pqNodeMapData24.png b/src/MEDCalc/res/presentations/modern/pqNodeMapData24.png
new file mode 100644 (file)
index 0000000..3b79783
Binary files /dev/null and b/src/MEDCalc/res/presentations/modern/pqNodeMapData24.png differ

diff --git a/src/MEDCalc/res/presentations/modern/pqSlice16.png b/src/MEDCalc/res/presentations/modern/pqSlice16.png
new file mode 100644 (file)
index 0000000..5b1f1cc
Binary files /dev/null and b/src/MEDCalc/res/presentations/modern/pqSlice16.png differ

diff --git a/src/MEDCalc/res/presentations/modern/pqSlice24.png b/src/MEDCalc/res/presentations/modern/pqSlice24.png
new file mode 100644 (file)
index 0000000..070ce3b
Binary files /dev/null and b/src/MEDCalc/res/presentations/modern/pqSlice24.png differ

diff --git a/src/MEDCalc/res/presentations/modern/pqWarp16.png b/src/MEDCalc/res/presentations/modern/pqWarp16.png
new file mode 100644 (file)
index 0000000..b27599a
Binary files /dev/null and b/src/MEDCalc/res/presentations/modern/pqWarp16.png differ

diff --git a/src/MEDCalc/res/presentations/modern/pqWarp24.png b/src/MEDCalc/res/presentations/modern/pqWarp24.png
new file mode 100644 (file)
index 0000000..b7227d4
Binary files /dev/null and b/src/MEDCalc/res/presentations/modern/pqWarp24.png differ

diff --git a/src/MEDCalc/res/presentations/modern/scalarmap16.png b/src/MEDCalc/res/presentations/modern/scalarmap16.png
new file mode 100644 (file)
index 0000000..97fbeb8
Binary files /dev/null and b/src/MEDCalc/res/presentations/modern/scalarmap16.png differ

diff --git a/src/MEDCalc/res/presentations/modern/scalarmap24.png b/src/MEDCalc/res/presentations/modern/scalarmap24.png
new file mode 100644 (file)
index 0000000..08cedf9
Binary files /dev/null and b/src/MEDCalc/res/presentations/modern/scalarmap24.png differ

diff --git a/src/MEDCalc/res/presentations/pqGlyph16.png b/src/MEDCalc/res/presentations/pqGlyph16.png
deleted file mode 100644 (file)
index ff441b0..0000000
Binary files a/src/MEDCalc/res/presentations/pqGlyph16.png and /dev/null differ

diff --git a/src/MEDCalc/res/presentations/pqGlyph24.png b/src/MEDCalc/res/presentations/pqGlyph24.png
deleted file mode 100644 (file)
index 68e6766..0000000
Binary files a/src/MEDCalc/res/presentations/pqGlyph24.png and /dev/null differ

diff --git a/src/MEDCalc/res/presentations/pqIsosurface16.png b/src/MEDCalc/res/presentations/pqIsosurface16.png
deleted file mode 100644 (file)
index 40b7908..0000000
Binary files a/src/MEDCalc/res/presentations/pqIsosurface16.png and /dev/null differ

diff --git a/src/MEDCalc/res/presentations/pqIsosurface24.png b/src/MEDCalc/res/presentations/pqIsosurface24.png
deleted file mode 100644 (file)
index 825222c..0000000
Binary files a/src/MEDCalc/res/presentations/pqIsosurface24.png and /dev/null differ

diff --git a/src/MEDCalc/res/presentations/pqNodeMapData16.png b/src/MEDCalc/res/presentations/pqNodeMapData16.png
deleted file mode 100644 (file)
index 4cb32e4..0000000
Binary files a/src/MEDCalc/res/presentations/pqNodeMapData16.png and /dev/null differ

diff --git a/src/MEDCalc/res/presentations/pqNodeMapData24.png b/src/MEDCalc/res/presentations/pqNodeMapData24.png
deleted file mode 100644 (file)
index 3b79783..0000000
Binary files a/src/MEDCalc/res/presentations/pqNodeMapData24.png and /dev/null differ

diff --git a/src/MEDCalc/res/presentations/pqSlice16.png b/src/MEDCalc/res/presentations/pqSlice16.png
deleted file mode 100644 (file)
index 5b1f1cc..0000000
Binary files a/src/MEDCalc/res/presentations/pqSlice16.png and /dev/null differ

diff --git a/src/MEDCalc/res/presentations/pqSlice24.png b/src/MEDCalc/res/presentations/pqSlice24.png
deleted file mode 100644 (file)
index 070ce3b..0000000
Binary files a/src/MEDCalc/res/presentations/pqSlice24.png and /dev/null differ

diff --git a/src/MEDCalc/res/presentations/pqWarp16.png b/src/MEDCalc/res/presentations/pqWarp16.png
deleted file mode 100644 (file)
index b27599a..0000000
Binary files a/src/MEDCalc/res/presentations/pqWarp16.png and /dev/null differ

diff --git a/src/MEDCalc/res/presentations/pqWarp24.png b/src/MEDCalc/res/presentations/pqWarp24.png
deleted file mode 100644 (file)
index b7227d4..0000000
Binary files a/src/MEDCalc/res/presentations/pqWarp24.png and /dev/null differ

diff --git a/src/MEDCalc/res/presentations/scalarmap16.png b/src/MEDCalc/res/presentations/scalarmap16.png
deleted file mode 100644 (file)
index aa7d554..0000000
Binary files a/src/MEDCalc/res/presentations/scalarmap16.png and /dev/null differ

diff --git a/src/MEDCalc/res/presentations/scalarmap24.png b/src/MEDCalc/res/presentations/scalarmap24.png
deleted file mode 100644 (file)
index 7132ece..0000000
Binary files a/src/MEDCalc/res/presentations/scalarmap24.png and /dev/null differ