Fix for issue [CEA]: FIELDS: Wrong behaviour of "Displayed component" gui control

diff --git a/src/MEDCalc/cmp/MEDPresentation.cxx b/src/MEDCalc/cmp/MEDPresentation.cxx
index ff63e90a1de0cd11d030ad52e5fd30de5a40991b..a234c6b833ef47c3dae142df33d028edcfad6a3b 100644 (file)
--- a/src/MEDCalc/cmp/MEDPresentation.cxx
+++ b/src/MEDCalc/cmp/MEDPresentation.cxx
@@ -653,6 +653,8 @@ MEDPresentation::fillAvailableFieldComponents()
   if (!(nbCompo > 1 && nbCompo <= 3))
     _selectedComponentIndex = 0;
 
+  std::map<std::string, long> aCompoMap;
+  std::vector <std::string> aCompos;
   for (long i = 0; i<nbCompo; i++)
     {
       std::ostringstream oss2;
@@ -667,10 +669,41 @@ MEDPresentation::fillAvailableFieldComponents()
           STDLOG("Unexpected Python error");
           throw KERNEL::createSalomeException("Unexpected Python error");
         }
-      std::ostringstream oss_p;
-      oss_p << MEDPresentation::PROP_COMPONENT << i;
-      setStringProperty(oss_p.str(), compo);
+      if (aCompoMap.find(compo) == aCompoMap.end()) {
+        aCompoMap.insert(std::pair<std::string, int>(compo, 1));
+        aCompos.push_back(compo);
+      }
+      else {
+        if (aCompoMap[compo] == 1) {
+          for (std::vector<std::string>::size_type ii = 0; ii != aCompos.size(); ii++) {
+            // Modify the previous occurrence
+            if (aCompos[ii] == compo) {
+              std::ostringstream oss_m;
+              oss_m << compo << "(" << 1 << ")";
+              aCompos[ii] = oss_m.str();
+              break;
+            }
+          }
+          std::ostringstream oss_n;
+          oss_n << compo << "(" << 2 << ")";
+          aCompos.push_back(oss_n.str());
+        }
+        else if (aCompoMap[compo] > 1) {
+          auto val = aCompoMap[compo];
+          val++;
+          std::ostringstream oss_n;
+          oss_n << compo << "(" << val << ")";
+          aCompos.push_back(oss_n.str());
+        }
+        aCompoMap[compo] = aCompoMap[compo]++;
+      }
     }
+  for (std::vector<std::string>::size_type i = 0; i != aCompos.size(); i++) {
+    std::ostringstream oss_p;
+    oss_p << MEDPresentation::PROP_COMPONENT << i;
+    setStringProperty(oss_p.str(), aCompos[i]);
+  }
+
 }
 
 /**

diff --git a/src/MEDCalc/gui/dialogs/WidgetPresentationParameters.cxx b/src/MEDCalc/gui/dialogs/WidgetPresentationParameters.cxx
index e8963edea5c25405ed5d28be9f81e09e33345e77..503684e3a1de974d7f818cff2d7be2670c356189 100644 (file)
--- a/src/MEDCalc/gui/dialogs/WidgetPresentationParameters.cxx
+++ b/src/MEDCalc/gui/dialogs/WidgetPresentationParameters.cxx
@@ -129,7 +129,7 @@ WidgetPresentationParameters::isShown() const
 string
 WidgetPresentationParameters::getComponent() const
 {
-  if (_ui.comboBoxCompo->count() > 1 && _ui.comboBoxCompo->count() <= 3)
+  if (_ui.comboBoxCompo->count() > 1 && _ui.comboBoxCompo->count() <= 4)
     if (_ui.comboBoxCompo->currentIndex() == 0) // Euclidean norm
       return "";