X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FExchangePlugin%2FExchangePlugin_ExportFeature.cpp;h=0c78b27e19d564ea586603b39054585ecea74786;hb=8405b4339e5881493a81c6f4b0c410fdb5cfa0ec;hp=95b47c8699e313513191cda0c552e0669dc217ce;hpb=185923a92c76805bc1b410b0f655e214394a8573;p=modules%2Fshaper.git

diff --git a/src/ExchangePlugin/ExchangePlugin_ExportFeature.cpp b/src/ExchangePlugin/ExchangePlugin_ExportFeature.cpp
index 95b47c869..0c78b27e1 100644
--- a/src/ExchangePlugin/ExchangePlugin_ExportFeature.cpp
+++ b/src/ExchangePlugin/ExchangePlugin_ExportFeature.cpp
@@ -1,8 +1,22 @@
-// Copyright (C) 2014-20xx CEA/DEN, EDF R&D
-
-// File:    ExchangePlugin_ExportFeature.cpp
-// Created: May 14, 2015
-// Author:  Sergey POKHODENKO
+// Copyright (C) 2014-2017  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<mailto:webmaster.salome@opencascade.com>
+//
 
 #include <ExchangePlugin_ExportFeature.h>
 
@@ -43,6 +57,7 @@
 #include <XAO_Group.hxx>
 #include <XAO_Field.hxx>
 #include <XAO_Xao.hxx>
+#include <XAO_Geometry.hxx>
 
 #include <ExchangePlugin_Tools.h>
 
@@ -175,6 +190,27 @@ void ExchangePlugin_ExportFeature::exportFile(const std::string& theFileName,
   }
 }
 
+/// Returns XAO string by the value from the table
+static std::string valToString(const ModelAPI_AttributeTables::Value& theVal,
+  const ModelAPI_AttributeTables::ValueType& theType) {
+  std::ostringstream aStr; // the resulting string value
+  switch(theType) {
+  case ModelAPI_AttributeTables::BOOLEAN:
+    aStr<<(theVal.myBool ? "true" : "false");
+    break;
+  case ModelAPI_AttributeTables::INTEGER:
+    aStr<<theVal.myInt;
+    break;
+  case ModelAPI_AttributeTables::DOUBLE:
+    aStr<<theVal.myDouble;
+    break;
+  case ModelAPI_AttributeTables::STRING:
+    aStr<<theVal.myStr;
+    break;
+  }
+  return aStr.str();
+}
+
 void ExchangePlugin_ExportFeature::exportXAO(const std::string& theFileName)
 {
   try {
@@ -289,6 +325,7 @@ void ExchangePlugin_ExportFeature::exportXAO(const std::string& theFileName)
       aStep->setStamp(aStampIndex);
       int aNumElements = isWholePart ? aXaoField->countElements() : aTables->rows();
       int aNumComps = aTables->columns();
+      std::set<int> aFilledIDs; // to fill the rest by defaults
       // omit default values first row
       for(int aRow = isWholePart ? 0 : 1; aRow < aNumElements; aRow++) {
         for(int aCol = 0; aCol < aNumComps; aCol++) {
@@ -300,37 +337,33 @@ void ExchangePlugin_ExportFeature::exportXAO(const std::string& theFileName)
             // complex conversion of reference id to element index
             int aReferenceID = aSelection->Id();
             std::string aReferenceString = XAO::XaoUtils::intToString(aReferenceID);
-            int anElementID =
+            anElementID =
               aXao.getGeometry()->getElementIndexByReference(aFieldDimension, aReferenceString);
           }
 
           ModelAPI_AttributeTables::Value aVal = aTables->value(
             isWholePart ? 0 : aRow, aCol, aStepIndex);
-          std::ostringstream aStr; // string value
-          switch(aTables->type()) {
-          case ModelAPI_AttributeTables::BOOLEAN:
-            aStr<<(aVal.myBool ? "True" : "False");
-            break;
-          case ModelAPI_AttributeTables::INTEGER:
-            aStr<<aVal.myInt;
-            break;
-          case ModelAPI_AttributeTables::DOUBLE:
-            aStr<<aVal.myDouble;
-            break;
-          case ModelAPI_AttributeTables::STRING:
-            aStr<<aVal.myStr;
-            break;
-          }
-          std::string aStrVal = aStr.str();
+          std::string aStrVal = valToString(aVal, aTables->type());
           aStep->setStringValue(isWholePart ? aRow : anElementID, aCol, aStrVal);
+          aFilledIDs.insert(anElementID);
+        }
+      }
+      if (!isWholePart) { // fill the rest values by default ones
+        XAO::GeometricElementList::iterator allElem = aXao.getGeometry()->begin(aFieldDimension);
+        for(; allElem != aXao.getGeometry()->end(aFieldDimension); allElem++) {
+          if (aFilledIDs.find(allElem->first) != aFilledIDs.end())
+            continue;
+          for(int aCol = 0; aCol < aNumComps; aCol++) {
+            ModelAPI_AttributeTables::Value aVal = aTables->value(0, aCol, aStepIndex); // default
+            std::string aStrVal = valToString(aVal, aTables->type());
+            aStep->setStringValue(allElem->first, aCol, aStrVal);
+          }
         }
       }
     }
   }
 
-
   // exporting
-
   XAOExport(theFileName, &aXao, anError);
 
   if (!anError.empty()) {