From: vsr <vsr@opencascade.com>
Date: Fri, 21 Feb 2020 12:22:23 +0000 (+0300)
Subject: Merge branch 'occ/shaper2smesh'
X-Git-Tag: V9_5_0a1~17
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=645e2cb70c0e40290725f28fdc5fec8a93338d28;p=modules%2Fshaper.git

Merge branch 'occ/shaper2smesh'
---

645e2cb70c0e40290725f28fdc5fec8a93338d28
diff --cc salomeRun_deb.bat
index 17e988d55,be74b9812..5534c345c
--- a/salomeRun_deb.bat
+++ b/salomeRun_deb.bat
@@@ -8,11 -8,8 +8,11 @@@ pushd %PARENT_DIR
  popd
  
  @SET OCC_LIB_PREFIX=d
- call env_Salome.bat d
+ call env_Salome.bat d run
  
 +rem Variable which is necessary for launching SALOME
 +SET SALOME_PLEASE_SETUP_ENVIRONMENT_AS_BEFORE=1
 +
  @SET SHAPER_ROOT_DIR=%ROOT_DIR%\install
  @SET SalomeAppConfig=%SHAPER_ROOT_DIR%\share\salome\resources\shaper;%GUI_ROOT_DIR%\share\salome\resources\gui
  
diff --cc src/ExchangePlugin/ExchangePlugin_Dump.cpp
index 097042a28,9ca46901b..e955db654
--- a/src/ExchangePlugin/ExchangePlugin_Dump.cpp
+++ b/src/ExchangePlugin/ExchangePlugin_Dump.cpp
@@@ -65,10 -47,13 +65,13 @@@ void ExchangePlugin_Dump::initAttribute
    data()->addAttribute(GEOMETRIC_DUMP_ID(), ModelAPI_AttributeBoolean::typeId());
    data()->addAttribute(WEAK_NAMING_DUMP_ID(), ModelAPI_AttributeBoolean::typeId());
  
+   data()->addAttribute(EXPORT_VARIABLES_ID(), ModelAPI_AttributeBoolean::typeId());
+ 
    // default values
 -  boolean(TOPOLOGICAL_NAMING_DUMP_ID())->setValue(true);
 -  boolean(GEOMETRIC_DUMP_ID())->setValue(true);
 -  boolean(WEAK_NAMING_DUMP_ID())->setValue(false);
 +  boolean(TOPOLOGICAL_NAMING_DUMP_ID())->setValue(THE_DUMP_NAMING);
 +  boolean(GEOMETRIC_DUMP_ID())->setValue(THE_DUMP_GEO);
 +  boolean(WEAK_NAMING_DUMP_ID())->setValue(THE_DUMP_WEAK);
+   boolean(EXPORT_VARIABLES_ID())->setValue(false);
  }
  
  void ExchangePlugin_Dump::execute()
diff --cc src/ExchangePlugin/ExchangePlugin_ExportFeature.cpp
index 81a78f0d8,02a12e88f..93500cc5e
--- a/src/ExchangePlugin/ExchangePlugin_ExportFeature.cpp
+++ b/src/ExchangePlugin/ExchangePlugin_ExportFeature.cpp
@@@ -592,9 -575,9 +592,9 @@@ bool ExchangePlugin_ExportFeature::isMa
      }
    }
  
-   if (aFormat == "XAO") { // on export to GEOm the selection attribute is filled - this is
+   if (aFormat == "XAO") { // on export to GEOM the selection attribute is filled - this is
                            // an exceptional case where export to XAO feature must be kept
 -    AttributeSelectionListPtr aList = aThis->selectionList(SELECTION_LIST_ID());
 +    AttributeSelectionListPtr aList = aThis->selectionList(XAO_SELECTION_LIST_ID());
      return !aList->isInitialized() || aList->size() == 0;
    }
    return true;