Change names of some ExchangePlugin feature attributes

diff --git a/src/ExchangePlugin/ExchangePlugin_ExportFeature.cpp b/src/ExchangePlugin/ExchangePlugin_ExportFeature.cpp
index 6d3fc8a847a50c2fc54abd63f20eab758b615d2d..97fb5266c7fb365288bf91597a58acae268a03c9 100644 (file)
--- a/src/ExchangePlugin/ExchangePlugin_ExportFeature.cpp
+++ b/src/ExchangePlugin/ExchangePlugin_ExportFeature.cpp
@@ -64,8 +64,8 @@ const std::string& ExchangePlugin_ExportFeature::getKind()
  */
 void ExchangePlugin_ExportFeature::initAttributes()
 {
-  data()->addAttribute(ExchangePlugin_ExportFeature::FILE_FORMAT_ID(), ModelAPI_AttributeString::typeId());
   data()->addAttribute(ExchangePlugin_ExportFeature::FILE_PATH_ID(), ModelAPI_AttributeString::typeId());
+  data()->addAttribute(ExchangePlugin_ExportFeature::FILE_FORMAT_ID(), ModelAPI_AttributeString::typeId());
   data()->addAttribute(ExchangePlugin_ExportFeature::SELECTION_LIST_ID(), ModelAPI_AttributeSelectionList::typeId());
 }
 

diff --git a/src/ExchangePlugin/ExchangePlugin_ExportFeature.h b/src/ExchangePlugin/ExchangePlugin_ExportFeature.h
index 774cbadd9c8a3618a004e91d1f1e3b5f773a2f13..88809020eada4460787e0e70635002db665fa7c0 100644 (file)
--- a/src/ExchangePlugin/ExchangePlugin_ExportFeature.h
+++ b/src/ExchangePlugin/ExchangePlugin_ExportFeature.h
@@ -23,18 +23,18 @@ public:
     static const std::string MY_EXPORT_ID("Export");
     return MY_EXPORT_ID;
   }
-  /// attribute name of file format
-  inline static const std::string& FILE_FORMAT_ID()
-  {
-    static const std::string MY_FILE_FORMAT_ID("export_file_format");
-    return MY_FILE_FORMAT_ID;
-  }
   /// attribute name of file path
   inline static const std::string& FILE_PATH_ID()
   {
-    static const std::string MY_FILE_PATH_ID("export_file_selector");
+    static const std::string MY_FILE_PATH_ID("file_path");
     return MY_FILE_PATH_ID;
   }
+  /// attribute name of file format
+  inline static const std::string& FILE_FORMAT_ID()
+  {
+    static const std::string MY_FILE_FORMAT_ID("file_format");
+    return MY_FILE_FORMAT_ID;
+  }
   /// attribute name of selection list
   inline static const std::string& SELECTION_LIST_ID()
   {

diff --git a/src/ExchangePlugin/ExchangePlugin_ImportFeature.h b/src/ExchangePlugin/ExchangePlugin_ImportFeature.h
index edc37478f531ed72542fa2c2d8ca3b9b9cdb9d39..2c606ce86505c751a7538e2ab9758dfa74941bc5 100644 (file)
--- a/src/ExchangePlugin/ExchangePlugin_ImportFeature.h
+++ b/src/ExchangePlugin/ExchangePlugin_ImportFeature.h
@@ -27,7 +27,7 @@ class ExchangePlugin_ImportFeature : public ModelAPI_Feature
   /// attribute name of referenced face
   inline static const std::string& FILE_PATH_ID()
   {
-    static const std::string MY_FILE_PATH_ID("import_file_selector");
+    static const std::string MY_FILE_PATH_ID("file_path");
     return MY_FILE_PATH_ID;
   }
   /// default constructor

diff --git a/src/ExchangePlugin/plugin-Exchange.xml b/src/ExchangePlugin/plugin-Exchange.xml
index b335af3bda668d386e7b436557d1d349da23de06..061e231800be0469db064462791aaed05835a07b 100644 (file)
--- a/src/ExchangePlugin/plugin-Exchange.xml
+++ b/src/ExchangePlugin/plugin-Exchange.xml
@@ -4,15 +4,15 @@
   <workbench id="Features" document="Part">
     <group id="Exchange">
       <feature id="Import" title="Import" tooltip="Import a file" icon=":icons/import.png">
-        <file_selector id="import_file_selector" title="Import file" path="">
+        <file_selector id="file_path" title="Import file" path="">
           <validator id="ExchangePlugin_ImportFormat" parameters="BREP|BRP:BREP,STEP|STP:STEP,IGES|IGS:IGES" />
         </file_selector>
       </feature>
       <feature id="Export" title="Export" tooltip="Export to file" icon=":icons/export.png">
-        <export_file_selector id="export_file_selector" type="save" title="Export file" path="">
+        <export_file_selector id="file_path" type="save" title="Export file" path="">
           <validator id="ExchangePlugin_ExportFormat" parameters="BREP|BRP:BREP,STEP|STP:STEP,IGES|IGS:IGES-5.1,IGES|IGS:IGES-5.3" />
           <attributes>
-            <attribute id="export_file_format" role="format" />
+            <attribute id="file_format" role="format" />
           </attributes>
         </export_file_selector>
         <multi_selector id="selection_list" tooltip="Select a set of objects" type_choice="Vertices Edges Faces Solids" />