From: abn <adrien.bruneton@cea.fr>
Date: Mon, 8 Aug 2016 14:21:26 +0000 (+0200)
Subject: [MEDCalc] Support for ELNO field + minor GUI bug fix.
X-Git-Tag: V8_1_0b1~1
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=51ed503edb7d4390ce4078ba445128995d70ed9c;p=modules%2Fmed.git

[MEDCalc] Support for ELNO field + minor GUI bug fix.
---

diff --git a/src/MEDCalc/cmp/MEDPresentation.cxx b/src/MEDCalc/cmp/MEDPresentation.cxx
index e76ad7693..a0beac542 100644
--- a/src/MEDCalc/cmp/MEDPresentation.cxx
+++ b/src/MEDCalc/cmp/MEDPresentation.cxx
@@ -240,6 +240,8 @@ MEDPresentation::getPVFieldTypeString(MEDCoupling::TypeOfField fieldType) const
       return "POINTS";
     case MEDCoupling::ON_GAUSS_PT:
       return "POINTS"; // because internally after application of the ELGA filter, the field will appear as a POINT field
+    case MEDCoupling::ON_GAUSS_NE:
+      return "POINTS"; // because internally after application of the ELNO mesh filter, the field will appear as a POINT field
     default:
       STDLOG("MEDPresentation::getPVFieldTypeString() -- Not implemented ! ELNO field?");
       return "";
@@ -265,6 +267,7 @@ MEDPresentation::createSource()
     case MEDCoupling::ON_CELLS: typ = "P0"; break;
     case MEDCoupling::ON_NODES: typ = "P1"; break;
     case MEDCoupling::ON_GAUSS_PT: typ = "GAUSS"; break;
+    case MEDCoupling::ON_GAUSS_NE: typ = "GSSNE"; break;
     default:
       const char * msg ="MEDPresentation::createSource(): field type not impl. yet!";
       STDLOG(msg);
@@ -294,18 +297,12 @@ MEDPresentation::createSource()
     }
   if(_mcFieldType == MEDCoupling::ON_GAUSS_NE)
     {
-      const char * msg ="MEDPresentation::createSource(): ELNO field never tested!";
-      STDLOG(msg);
-      throw KERNEL::createSalomeException(msg);
-
       std::ostringstream oss, oss2;
       oss2 << "__srcObj" << GeneratePythonId();
       oss << oss2.str() << " = pvs.ELNOMesh(Input=" << _srcObjVar << ");";
       pushAndExecPyLine(oss.str()); oss.str("");
       // Now the source becomes the result of the CellDatatoPointData:
       _srcObjVar = oss2.str();
-//      oss << _srcObjVar << ".SelectSourceArray = ['CELLS', 'ELNO@0'];";
-//      pushAndExecPyLine(oss.str()); oss.str("");
     }
 }
 
diff --git a/src/MEDCalc/gui/dialogs/WidgetPresentationParameters.cxx b/src/MEDCalc/gui/dialogs/WidgetPresentationParameters.cxx
index 601e46d44..3114be35e 100644
--- a/src/MEDCalc/gui/dialogs/WidgetPresentationParameters.cxx
+++ b/src/MEDCalc/gui/dialogs/WidgetPresentationParameters.cxx
@@ -90,10 +90,9 @@ WidgetPresentationParameters::toggleCommonFieldWidget(bool show)
 void
 WidgetPresentationParameters::toggleWidget(bool show)
 {
+  toggleCommonFieldWidget(true);
   if (!show)
     {
-      toggleCommonFieldWidget(true);
-
       _blockSig = true;
       _ui.widgetDynamic->hide();
       setPresName(tr("LAB_DEFAULT_DYN_TITLE").toStdString());