Issue #19094: Non-translation of filters on groups in SHAPER

diff --git a/src/FiltersPlugin/CMakeLists.txt b/src/FiltersPlugin/CMakeLists.txt
index 7c294c82f200a96d2d9d2941fbbc905798daa15d..bcec89ff8596a27feb4078ea33c1a290976dea7c 100644 (file)
--- a/src/FiltersPlugin/CMakeLists.txt
+++ b/src/FiltersPlugin/CMakeLists.txt
@@ -78,10 +78,16 @@ SET(XML_RESOURCES
   filter-TopoConnectedFaces.xml
 )
 
+SET(TEXT_RESOURCES
+    FiltersPlugin_msg_en.ts
+    FiltersPlugin_msg_fr.ts
+)
+
 SOURCE_GROUP ("XML Files" FILES ${XML_RESOURCES})
+SOURCE_GROUP ("Resource Files" FILES ${TEXT_RESOURCES})
 
 ADD_DEFINITIONS(-DFILTERS_EXPORTS ${OpenCASCADE_DEFINITIONS})
-ADD_LIBRARY(FiltersPlugin SHARED ${PROJECT_SOURCES} ${PROJECT_HEADERS} ${XML_RESOURCES})
+ADD_LIBRARY(FiltersPlugin SHARED ${PROJECT_SOURCES} ${PROJECT_HEADERS} ${XML_RESOURCES} ${TEXT_RESOURCES})
 TARGET_LINK_LIBRARIES(FiltersPlugin ${PROJECT_LIBRARIES})
 
 INCLUDE_DIRECTORIES(
@@ -99,6 +105,7 @@ INCLUDE_DIRECTORIES(
 INSTALL(TARGETS FiltersPlugin DESTINATION ${SHAPER_INSTALL_PLUGIN_FILES})
 INSTALL(FILES ${XML_RESOURCES} DESTINATION ${SHAPER_INSTALL_XML_RESOURCES})
 INSTALL(FILES ${PROJECT_PYFILES} DESTINATION ${SHAPER_INSTALL_ADDONS})
+INSTALL(FILES ${TEXT_RESOURCES} DESTINATION ${SHAPER_INSTALL_XML_RESOURCES})
 
 
 ADD_UNIT_TESTS(

diff --git a/src/FiltersPlugin/FiltersPlugin_msg_en.ts b/src/FiltersPlugin/FiltersPlugin_msg_en.ts
new file mode 100644 (file)
index 0000000..e20f87a
--- /dev/null
+++ b/src/FiltersPlugin/FiltersPlugin_msg_en.ts
@@ -0,0 +1,310 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.0" language="en_US">
+
+  <!-- workshop -->
+  <context>
+    <name>workshop</name>
+    <message>
+      <source>Selection filters</source>
+      <translation>Selection filters</translation>
+    </message>
+  </context>
+
+  <!-- FiltersSelection -->
+  <context>
+    <name>FiltersSelection</name>
+    <message>
+      <source></source>
+      <translation></translation>
+    </message>
+    <message>
+      <source>Selection filters</source>
+      <translation>Selection filters</translation>
+    </message>
+    <message>
+      <source>Filters</source>
+      <translation>Filters</translation>
+    </message>
+    <message>
+      <source>Add new filter...</source>
+      <translation>Add new filter...</translation>
+    </message>
+    <message>
+      <source>Delete the filter</source>
+      <translation>Delete the filter</translation>
+    </message>
+    <message>
+      <source>Reverse the filter</source>
+      <translation>Reverse the filter</translation>
+    </message>
+    <message>
+      <source>Selection by filters</source>
+      <translation>Selection by filters</translation>
+    </message>
+    <message>
+      <source>Number of selected objects:</source>
+      <translation>Number of selected objects:</translation>
+    </message>
+    <message>
+      <source>Select</source>
+      <translation>Select</translation>
+    </message>
+    <message>
+      <source>Selection is empty</source>
+      <translation>Selection is empty</translation>
+    </message>
+    <message>
+      <source>Show only</source>
+      <translation>Show only</translation>
+    </message>
+    <message>
+      <source>Belongs to</source>
+      <translation>Belongs to</translation>
+    </message>
+    <message>
+      <source>External faces</source>
+      <translation>External faces</translation>
+    </message>
+    <message>
+      <source>Horizontal faces</source>
+      <translation>Horizontal faces</translation>
+    </message>
+    <message>
+      <source>On geometry</source>
+      <translation>On geometry</translation>
+    </message>
+    <message>
+      <source>On line</source>
+      <translation>On line</translation>
+    </message>
+    <message>
+      <source>On plane</source>
+      <translation>On plane</translation>
+    </message>
+    <message>
+      <source>On plane side</source>
+      <translation>On plane side</translation>
+    </message>
+    <message>
+      <source>On/In/Out a solid</source>
+      <translation>On/In/Out a solid</translation>
+    </message>
+    <message>
+      <source>Opposite to an edge</source>
+      <translation>Opposite to an edge</translation>
+    </message>
+    <message>
+      <source>Topologically connected faces</source>
+      <translation>Topologically connected faces</translation>
+    </message>
+    <message>
+      <source>Vertical faces</source>
+      <translation>Vertical faces</translation>
+    </message>
+    <message>
+      <source>Attribute "%1" is not initialized.</source>
+      <translation>Select a shape.</translation>
+    </message>
+  </context>
+  <context>
+    <name>FiltersSelection:FiltersPlugin_ShapeType</name>
+    <message>
+      <source>Unknown error.</source>
+      <translation>Unknown error.</translation>
+    </message>
+  </context>
+  <context>
+    <name>FiltersSelection:GeomValidators_ShapeType</name>
+    <message>
+      <source>It does not contain element with acceptable shape type. The type should be one of the next: %1</source>
+      <translation>It does not contain element with acceptable shape type. The type should be one of the next: %1</translation>
+    </message>
+    <message>
+      <source>The object is empty</source>
+      <translation>The object is empty</translation>
+    </message>
+  </context>
+
+  <!-- BelongsTo -->
+  <context>
+    <name>BelongsTo</name>
+    <message>
+      <source>Objects:</source>
+      <translation>Objects:</translation>
+    </message>
+    <message>
+      <source>Select objects to limit selection.</source>
+      <translation>Select objects to limit selection.</translation>
+    </message>
+  </context>
+
+  <!-- OnGeometry -->
+  <context>
+    <name>OnGeometry</name>
+    <message>
+      <source>Select objects to limit selection.</source>
+      <translation>Select objects to limit selection.</translation>
+    </message>
+    <message>
+      <source>Shapes:</source>
+      <translation>Shapes:</translation>
+    </message>
+  </context>
+  <context>
+    <name>OnGeometry:FiltersPlugin_ShapeType</name>
+    <message>
+      <source>Unknown error.</source>
+      <translation>Unknown error.</translation>
+    </message>
+  </context>
+
+  <!-- OnLine -->
+  <context>
+    <name>OnLine</name>
+    <message>
+      <source>Lines:</source>
+      <translation>Lines:</translation>
+    </message>
+    <message>
+      <source>Select vertices or segments.</source>
+      <translation>Select vertices or segments.</translation>
+    </message>
+  </context>
+  <context>
+    <name>OnLine:GeomValidators_ShapeType</name>
+    <message>
+      <source>It does not contain element with acceptable shape type. The type should be one of the next: %1</source>
+      <translation>It does not contain element with acceptable shape type. The type should be one of the next: %1</translation>
+    </message>
+  </context>
+
+  <!-- OnPlane -->
+  <context>
+    <name>OnPlane</name>
+    <message>
+      <source>Planes:</source>
+      <translation>Planes:</translation>
+    </message>
+    <message>
+      <source>Select planes or planar faces.</source>
+      <translation>Select planes or planar faces.</translation>
+    </message>
+  </context>
+  <context>
+    <name>OnPlane:GeomValidators_ShapeType</name>
+    <message>
+      <source>It does not contain element with acceptable shape type. The type should be one of the next: %1</source>
+      <translation>It does not contain element with acceptable shape type. The type should be one of the next: %1</translation>
+    </message>
+  </context>
+
+  <!-- OnPlaneSide -->
+  <context>
+    <name>OnPlaneSide</name>
+    <message>
+      <source>Plane:</source>
+      <translation>Plane:</translation>
+    </message>
+    <message>
+      <source>Select plane or planar face.</source>
+      <translation>Select plane or planar face.</translation>
+    </message>
+  </context>
+  <context>
+    <name>OnPlaneSide:GeomValidators_ShapeType</name>
+    <message>
+      <source>The object is empty</source>
+      <translation>The object is empty</translation>
+    </message>
+  </context>
+
+  <!-- OppositeToEdge -->
+  <context>
+    <name>OppositeToEdge</name>
+    <message>
+      <source>Edge:</source>
+      <translation>Edge:</translation>
+    </message>
+    <message>
+      <source>Select edge.</source>
+      <translation>Select edge.</translation>
+    </message>
+  </context>
+  <context>
+    <name>OppositeToEdge:GeomValidators_ShapeType</name>
+    <message>
+      <source>The object is empty</source>
+      <translation>The object is empty</translation>
+    </message>
+  </context>
+
+  <!-- RelativeToSolid -->
+  <context>
+    <name>RelativeToSolid</name>
+    <message>
+      <source>In</source>
+      <translation>In</translation>
+    </message>
+    <message>
+      <source>In &amp; On</source>
+      <translation>In &amp; On</translation>
+    </message>
+    <message>
+      <source>Not On</source>
+      <translation>Not On</translation>
+    </message>
+    <message>
+      <source>On</source>
+      <translation>On</translation>
+    </message>
+    <message>
+      <source>On &amp; Out</source>
+      <translation>On &amp; Out</translation>
+    </message>
+    <message>
+      <source>Out</source>
+      <translation>Out</translation>
+    </message>
+    <message>
+      <source>Select a solid.</source>
+      <translation>Select a solid.</translation>
+    </message>
+    <message>
+      <source>Solid:</source>
+      <translation>Solid:</translation>
+    </message>
+  </context>
+  <context>
+    <name>RelativeToSolid:GeomValidators_ShapeType</name>
+    <message>
+      <source>The object is empty</source>
+      <translation>The object is empty</translation>
+    </message>
+  </context>
+
+  <!-- TopoConnectedFaces -->
+  <context>
+    <name>TopoConnectedFaces</name>
+    <message>
+      <source>Propagation</source>
+      <translation>Propagation</translation>
+    </message>
+    <message>
+      <source>Select vertex, edge or face.</source>
+      <translation>Select vertex, edge or face.</translation>
+    </message>
+    <message>
+      <source>Shape:</source>
+      <translation>Shape:</translation>
+    </message>
+  </context>
+  <context>
+    <name>TopoConnectedFaces:GeomValidators_ShapeType</name>
+    <message>
+      <source>The object is empty</source>
+      <translation>The object is empty</translation>
+    </message>
+  </context>
+
+</TS>

diff --git a/src/FiltersPlugin/FiltersPlugin_msg_fr.ts b/src/FiltersPlugin/FiltersPlugin_msg_fr.ts
new file mode 100644 (file)
index 0000000..16b2458
--- /dev/null
+++ b/src/FiltersPlugin/FiltersPlugin_msg_fr.ts
@@ -0,0 +1,311 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.0" language="fr_FR">
+
+
+  <!-- workshop -->
+  <context>
+    <name>workshop</name>
+    <message>
+      <source>Selection filters</source>
+      <translation>Filtres de sélection</translation>
+    </message>
+  </context>
+
+  <!-- FiltersSelection -->
+  <context>
+    <name>FiltersSelection</name>
+    <message>
+      <source></source>
+      <translation></translation>
+    </message>
+    <message>
+      <source>Selection filters</source>
+      <translation>Filtres de sélection</translation>
+    </message>
+    <message>
+      <source>Filters</source>
+      <translation>Filtres</translation>
+    </message>
+    <message>
+      <source>Add new filter...</source>
+      <translation>Ajouter un nouveau filtre ...</translation>
+    </message>
+    <message>
+      <source>Delete the filter</source>
+      <translation>Supprimer le filtre</translation>
+    </message>
+    <message>
+      <source>Reverse the filter</source>
+      <translation>Inversez le filtre</translation>
+    </message>
+    <message>
+      <source>Selection by filters</source>
+      <translation>Sélection par filtres</translation>
+    </message>
+    <message>
+      <source>Number of selected objects:</source>
+      <translation>Nombre d'objets sélectionnés:</translation>
+    </message>
+    <message>
+      <source>Select</source>
+      <translation>Sélectionner</translation>
+    </message>
+    <message>
+      <source>Selection is empty</source>
+      <translation>La sélection est vide</translation>
+    </message>
+    <message>
+      <source>Show only</source>
+      <translation>Montrer seulement</translation>
+    </message>
+    <message>
+      <source>Belongs to</source>
+      <translation>Appartient à</translation>
+    </message>
+    <message>
+      <source>External faces</source>
+      <translation>Externe faces</translation>
+    </message>
+    <message>
+      <source>Horizontal faces</source>
+      <translation>Faces horizontales</translation>
+    </message>
+    <message>
+      <source>On geometry</source>
+      <translation>Sur la géométrie</translation>
+    </message>
+    <message>
+      <source>On line</source>
+      <translation>En ligne</translation>
+    </message>
+    <message>
+      <source>On plane</source>
+      <translation>En plan</translation>
+    </message>
+    <message>
+      <source>On plane side</source>
+      <translation>En côté plan</translation>
+    </message>
+    <message>
+      <source>On/In/Out a solid</source>
+      <translation>Sur/Dans/Dehors un solide</translation>
+    </message>
+    <message>
+      <source>Opposite to an edge</source>
+      <translation>En face d&apos;un bord</translation>
+    </message>
+    <message>
+      <source>Topologically connected faces</source>
+      <translation>Faces topologiquement connectés</translation>
+    </message>
+    <message>
+      <source>Vertical faces</source>
+      <translation>Faces verticales</translation>
+    </message>
+    <message>
+      <source>Attribute "%1" is not initialized.</source>
+      <translation>Sélectionnez un objet.</translation>
+    </message>
+  </context>
+  <context>
+    <name>FiltersSelection:FiltersPlugin_ShapeType</name>
+    <message>
+      <source>Unknown error.</source>
+      <translation>Erreur inconnue.</translation>
+    </message>
+  </context>
+  <context>
+    <name>FiltersSelection:GeomValidators_ShapeType</name>
+    <message>
+      <source>It does not contain element with acceptable shape type. The type should be one of the next: %1</source>
+      <translation>Il ne contient pas d&apos;élément avec un type de forme acceptable. Le type doit être l&apos;un des prochains: %1</translation>
+    </message>
+    <message>
+      <source>The object is empty</source>
+      <translation>L'objet est vide.</translation>
+    </message>
+  </context>
+
+  <!-- BelongsTo -->
+  <context>
+    <name>BelongsTo</name>
+    <message>
+      <source>Objects:</source>
+      <translation>Objets:</translation>
+    </message>
+    <message>
+      <source>Select objects to limit selection.</source>
+      <translation>Sélectionner des objets pour limiter la sélection</translation>
+    </message>
+  </context>
+
+  <!-- OnGeometry -->
+  <context>
+    <name>OnGeometry</name>
+    <message>
+      <source>Select objects to limit selection.</source>
+      <translation>Sélectionner des objets pour limiter la sélection</translation>
+    </message>
+    <message>
+      <source>Shapes:</source>
+      <translation>Objets:</translation>
+    </message>
+  </context>
+  <context>
+    <name>OnGeometry:FiltersPlugin_ShapeType</name>
+    <message>
+      <source>Unknown error.</source>
+      <translation>Erreur inconnue.</translation>
+    </message>
+  </context>
+
+  <!-- OnLine -->
+  <context>
+    <name>OnLine</name>
+    <message>
+      <source>Lines:</source>
+      <translation>Lignes:</translation>
+    </message>
+    <message>
+      <source>Select vertices or segments.</source>
+      <translation>AZV Select vertices or segments.</translation>
+    </message>
+  </context>
+  <context>
+    <name>OnLine:GeomValidators_ShapeType</name>
+    <message>
+      <source>It does not contain element with acceptable shape type. The type should be one of the next: %1</source>
+      <translation>Il ne contient pas d&apos;élément avec un type de forme acceptable. Le type doit être l&apos;un des prochains: %1</translation>
+    </message>
+  </context>
+
+  <!-- OnPlane -->
+  <context>
+    <name>OnPlane</name>
+    <message>
+      <source>Planes:</source>
+      <translation>Plans:</translation>
+    </message>
+    <message>
+      <source>Select planes or planar faces.</source>
+      <translation>Sélectionnez des plans ou des faces planes.</translation>
+    </message>
+  </context>
+  <context>
+    <name>OnPlane:GeomValidators_ShapeType</name>
+    <message>
+      <source>It does not contain element with acceptable shape type. The type should be one of the next: %1</source>
+      <translation>Il ne contient pas d&apos;élément avec un type de forme acceptable. Le type doit être l&apos;un des prochains: %1</translation>
+    </message>
+  </context>
+
+  <!-- OnPlaneSide -->
+  <context>
+    <name>OnPlaneSide</name>
+    <message>
+      <source>Plane:</source>
+      <translation>Plan:</translation>
+    </message>
+    <message>
+      <source>Select plane or planar face.</source>
+      <translation>Sélectionnez un plan ou une face plane.</translation>
+    </message>
+  </context>
+  <context>
+    <name>OnPlaneSide:GeomValidators_ShapeType</name>
+    <message>
+      <source>The object is empty</source>
+      <translation>L'objet est vide.</translation>
+    </message>
+  </context>
+
+  <!-- OppositeToEdge -->
+  <context>
+    <name>OppositeToEdge</name>
+    <message>
+      <source>Edge:</source>
+      <translation>Arête:</translation>
+    </message>
+    <message>
+      <source>Select edge.</source>
+      <translation>Sélectionnez le arête.</translation>
+    </message>
+  </context>
+  <context>
+    <name>OppositeToEdge:GeomValidators_ShapeType</name>
+    <message>
+      <source>The object is empty</source>
+      <translation>L'objet est vide.</translation>
+    </message>
+  </context>
+
+  <!-- RelativeToSolid -->
+  <context>
+    <name>RelativeToSolid</name>
+    <message>
+      <source>In</source>
+      <translation>Dans</translation>
+    </message>
+    <message>
+      <source>In &amp; On</source>
+      <translation>Dans et Sur</translation>
+    </message>
+    <message>
+      <source>Not On</source>
+      <translation>Pas Sur</translation>
+    </message>
+    <message>
+      <source>On</source>
+      <translation>Sur</translation>
+    </message>
+    <message>
+      <source>On &amp; Out</source>
+      <translation>Sur et Dehors</translation>
+    </message>
+    <message>
+      <source>Out</source>
+      <translation>Dehors</translation>
+    </message>
+    <message>
+      <source>Select a solid.</source>
+      <translation>Sélectionnez un solide.</translation>
+    </message>
+    <message>
+      <source>Solid:</source>
+      <translation>Solide:</translation>
+    </message>
+  </context>
+  <context>
+    <name>RelativeToSolid:GeomValidators_ShapeType</name>
+    <message>
+      <source>The object is empty</source>
+      <translation>L'objet est vide.</translation>
+    </message>
+  </context>
+
+  <!-- TopoConnectedFaces -->
+  <context>
+    <name>TopoConnectedFaces</name>
+    <message>
+      <source>Propagation</source>
+      <translation>Propagation</translation>
+    </message>
+    <message>
+      <source>Select vertex, edge or face.</source>
+      <translation>Sélectionnez le sommet, l'arête ou la face.</translation>
+    </message>
+    <message>
+      <source>Shape:</source>
+      <translation>Objet:</translation>
+    </message>
+  </context>
+  <context>
+    <name>TopoConnectedFaces:GeomValidators_ShapeType</name>
+    <message>
+      <source>The object is empty</source>
+      <translation>L'objet est vide.</translation>
+    </message>
+  </context>
+
+</TS>

diff --git a/src/Model/Model_FeatureValidator.cpp b/src/Model/Model_FeatureValidator.cpp
index 794fc048f48dfcce5e9cec02cfd904ab3d414dfe..1241f3ce6508fd9cc9e8dd57d0b859174f23291a 100644 (file)
--- a/src/Model/Model_FeatureValidator.cpp
+++ b/src/Model/Model_FeatureValidator.cpp
@@ -25,6 +25,7 @@
 #include <ModelAPI_Attribute.h>
 #include <ModelAPI_Data.h>
 #include <ModelAPI_Feature.h>
+#include <ModelAPI_FiltersFeature.h>
 #include <ModelAPI_Object.h>
 #include <ModelAPI_Session.h>
 
@@ -59,7 +60,11 @@ bool Model_FeatureValidator::isValid(const std::shared_ptr<ModelAPI_Feature>& th
           aFeatureFind->second.find(*it) == aFeatureFind->second.end()) {
         theError = "Attribute \"%1\" is not initialized.";
         theError.addParameter(anAttr->id());
-        theError.setContext(theFeature->getKind() + ":" + anAttr->id());
+        // workaround for the filters selection feature: do not append the attribute id
+        if (std::dynamic_pointer_cast<ModelAPI_FiltersFeature>(theFeature))
+          theError.setContext(theFeature->getKind());
+        else
+          theError.setContext(theFeature->getKind() + ":" + anAttr->id());
         return false;
       }
     }

diff --git a/src/ModuleBase/ModuleBase_ModelWidget.cpp b/src/ModuleBase/ModuleBase_ModelWidget.cpp
index b3bc3a10023057c429026ab5aa3e9f286a403564..e232d1d89614d7d7288dc413ced7e09cd379af70 100644 (file)
--- a/src/ModuleBase/ModuleBase_ModelWidget.cpp
+++ b/src/ModuleBase/ModuleBase_ModelWidget.cpp
@@ -191,7 +191,6 @@ QString ModuleBase_ModelWidget::getError(const bool theValueStateChecked) const
   if (!feature().get())
     return anError;
 
-  std::string aFeatureID = feature()->getKind();
   std::string anAttributeID = attributeID();
   AttributePtr anAttribute = feature()->attribute(anAttributeID);
   if (!anAttribute.get())
@@ -206,7 +205,7 @@ QString ModuleBase_ModelWidget::getError(const bool theValueStateChecked) const
       anErrorMsg = "Unknown error.";
 
     if (anErrorMsg.context().empty()) {
-      anErrorMsg.setContext(aFeatureID + ":" + anAttributeID + ":" + aValidatorID);
+      anErrorMsg.setContext(context() + ":" + aValidatorID);
     }
   }
 

diff --git a/src/ModuleBase/ModuleBase_ModelWidget.h b/src/ModuleBase/ModuleBase_ModelWidget.h
index cea25f232f7ed20766ead6b7964606c01e14919b..73de512dd1b9feaaf86068878c3a655f5a36b7d8 100644 (file)
--- a/src/ModuleBase/ModuleBase_ModelWidget.h
+++ b/src/ModuleBase/ModuleBase_ModelWidget.h
@@ -245,12 +245,19 @@ Q_OBJECT
 
   /// \return Context for translation
   virtual std::string context() const {
-
+    bool isAppendAttr = true;
     std::string aContext = myFeatureId;
     if(!aContext.empty() && !myAttributeID.empty()) {
-      aContext += ":";
+      // workaround for ModelAPI_Filter's attributes:
+      // do not keep attribute name, because it may be changed
+      // if the same filter is selected twice or more.
+      if (myAttributeID.find(aContext + "__") != std::string::npos)
+        isAppendAttr = false;
+      else
+        aContext += ":";
     }
-    aContext += myAttributeID;
+    if (isAppendAttr)
+      aContext += myAttributeID;
 
     return aContext;
   }

diff --git a/src/ModuleBase/ModuleBase_WidgetSelectionFilter.cpp b/src/ModuleBase/ModuleBase_WidgetSelectionFilter.cpp
index 94f2f54c46c49eaa78c1f4b1b19c51c60800d5a1..3e3d407d3a1f903f381fa8a7f6e530513ca0478e 100644 (file)
--- a/src/ModuleBase/ModuleBase_WidgetSelectionFilter.cpp
+++ b/src/ModuleBase/ModuleBase_WidgetSelectionFilter.cpp
@@ -93,7 +93,8 @@ ModuleBase_FilterStarter::ModuleBase_FilterStarter(const std::string& theFeature
   ModuleBase_Tools::adjustMargins(aMainLayout);
 
   aMainLayout->addStretch(1);
-  QPushButton* aLaunchBtn = new QPushButton(tr("Selection by filters"), this);
+  QPushButton* aLaunchBtn = new QPushButton(
+      ModuleBase_Tools::translate("FiltersSelection", "Selection by filters"), this);
   connect(aLaunchBtn, SIGNAL(clicked()), SLOT(onFiltersLaunch()));
   aMainLayout->addWidget(aLaunchBtn);
 }
@@ -184,6 +185,7 @@ ModuleBase_FilterItem::ModuleBase_FilterItem(
 
 void ModuleBase_FilterItem::addItemRow(QWidget* theParent)
 {
+  std::string aContext = mySelection->getKind();
   QHBoxLayout* aLayout = new QHBoxLayout(theParent);
   ModuleBase_Tools::zeroMargins(aLayout);
 
@@ -197,17 +199,17 @@ void ModuleBase_FilterItem::addItemRow(QWidget* theParent)
     myRevBtn->setIcon(QIcon(":pictures/reverce.png"));
   else
     myRevBtn->setIcon(QIcon(":pictures/add.png"));
-  myRevBtn->setToolTip(tr("Reverse the filter"));
+  myRevBtn->setToolTip(ModuleBase_Tools::translate(aContext, "Reverse the filter"));
   connect(myRevBtn, SIGNAL(toggled(bool)), SLOT(onReverse(bool)));
   aLayout->addWidget(myRevBtn);
 
   const std::string& aFilterName = ModelAPI_Session::get()->filters()->filter(myFilterID)->name();
-  aLayout->addWidget(new QLabel(aFilterName.c_str(), theParent), 1);
+  aLayout->addWidget(new QLabel(ModuleBase_Tools::translate(aContext, aFilterName), theParent), 1);
 
   QToolButton* aDelBtn = new QToolButton(theParent);
   aDelBtn->setIcon(QIcon(":pictures/delete.png"));
   aDelBtn->setAutoRaise(true);
-  aDelBtn->setToolTip(tr("Delete the filter"));
+  aDelBtn->setToolTip(ModuleBase_Tools::translate(aContext, "Delete the filter"));
   connect(aDelBtn, SIGNAL(clicked(bool)), SLOT(onDelete()));
   aLayout->addWidget(aDelBtn);
 }
@@ -249,7 +251,7 @@ ModuleBase_WidgetSelectionFilter::ModuleBase_WidgetSelectionFilter(QWidget* theP
   QVBoxLayout* aMainLayout = new QVBoxLayout(this);
   ModuleBase_Tools::adjustMargins(aMainLayout);
 
-  QGroupBox* aFiltersGroup = new QGroupBox(tr("Filters"), this);
+  QGroupBox* aFiltersGroup = new QGroupBox(translate("Filters"), this);
   QVBoxLayout* aGroupLayout = new QVBoxLayout(aFiltersGroup);
   aGroupLayout->setContentsMargins(0, 0, 0, 0);
   aGroupLayout->setSpacing(0);
@@ -260,14 +262,15 @@ ModuleBase_WidgetSelectionFilter::ModuleBase_WidgetSelectionFilter(QWidget* theP
   aGroupLayout->addWidget(myFiltersWgt);
 
   myFiltersCombo = new QComboBox(aFiltersGroup);
-  myFiltersCombo->addItem(tr("Add new filter..."));
+  myFiltersCombo->addItem(translate("Add new filter..."));
   SessionPtr aSession = ModelAPI_Session::get();
   std::list<FilterPtr> allFilters =
     aSession->filters()->filters((GeomAPI_Shape::ShapeType) mySelectionType);
+  storeFilters(allFilters);
   QStringList aItems;
   std::list<FilterPtr>::const_iterator aIt;
   for (aIt = allFilters.cbegin(); aIt != allFilters.cend(); aIt++) {
-    aItems.push_back((*aIt)->name().c_str());
+    aItems.push_back(translate((*aIt)->name().c_str()));
   }
   myFiltersCombo->addItems(aItems);
   connect(myFiltersCombo, SIGNAL(currentIndexChanged(int)), SLOT(onAddFilter(int)));
@@ -282,7 +285,7 @@ ModuleBase_WidgetSelectionFilter::ModuleBase_WidgetSelectionFilter(QWidget* theP
 
   aBtnLayout->addStretch(1);
 
-  mySelectBtn = new QPushButton(tr("Select"), aBtnWgt);
+  mySelectBtn = new QPushButton(translate("Select"), aBtnWgt);
   connect(mySelectBtn, SIGNAL(clicked()), SLOT(onSelect()));
   aBtnLayout->addWidget(mySelectBtn);
 
@@ -293,13 +296,13 @@ ModuleBase_WidgetSelectionFilter::ModuleBase_WidgetSelectionFilter(QWidget* theP
   QHBoxLayout* aLblLayout = new QHBoxLayout(aLblWgt);
   ModuleBase_Tools::zeroMargins(aLblLayout);
 
-  aLblLayout->addWidget(new QLabel(tr("Number of selected objects:"), aLblWgt));
+  aLblLayout->addWidget(new QLabel(translate("Number of selected objects:"), aLblWgt));
 
   myNbLbl = new QLabel("0", aLblWgt);
   aLblLayout->addWidget(myNbLbl);
 
   // Show only button
-  myShowBtn = new QCheckBox(tr("Show only"), this);
+  myShowBtn = new QCheckBox(translate("Show only"), this);
   connect(myShowBtn, SIGNAL(toggled(bool)), SLOT(onShowOnly(bool)));
   aLblLayout->addWidget(myShowBtn);
 
@@ -351,7 +354,6 @@ void ModuleBase_WidgetSelectionFilter::onAddFilter(int theIndex)
     return;
 
   ModelAPI_FiltersFactory* aFactory = ModelAPI_Session::get()->filters();
-  std::list<FilterPtr> aFilters = aFactory->filters((GeomAPI_Shape::ShapeType) mySelectionType);
   FiltersFeaturePtr aFiltersFeature =
     std::dynamic_pointer_cast<ModelAPI_FiltersFeature>(myFeature);
 
@@ -360,12 +362,15 @@ void ModuleBase_WidgetSelectionFilter::onAddFilter(int theIndex)
   std::list<FilterPtr>::iterator aIt;
   int i;
   std::string aFilter;
-  for (aIt = aFilters.begin(), i = 0; aIt != aFilters.cend(); i++, aIt++) {
-    if (aText == (*aIt)->name()) {
-      aFilter = aFactory->id(*aIt);
-      break;
-    }
+  std::map<std::string, FilterPtr>::const_iterator aFound = myFilters.find(aText);
+  if (aFound == myFilters.end()) {
+    std::list<FilterPtr> aFilters = aFactory->filters((GeomAPI_Shape::ShapeType) mySelectionType);
+    storeFilters(aFilters);
+    aFound = myFilters.find(aText);
   }
+  if (aFound != myFilters.end())
+    aFilter = aFactory->id(aFound->second);
+
   aFiltersFeature->addFilter(aFilter);
   updateObject(myFeature);
 
@@ -555,9 +560,8 @@ void ModuleBase_WidgetSelectionFilter::updateNumberSelected()
 {
   int aNb = myValues.size();
   myNbLbl->setText(QString::number(aNb));
-  //QString aErr = () ? tr("Selection is empty") : "";
   if (aNb == 0)
-    myFeature->setError(tr("Selection is empty").toStdString(), false, false);
+    myFeature->setError(translate("Selection is empty").toStdString(), false, false);
   else {
     myFeature->setError("", false, false);
     myFeature->data()->execState(ModelAPI_StateDone);
@@ -701,7 +705,7 @@ QString ModuleBase_WidgetSelectionFilter::getError(const bool theValueStateCheck
   QString aErrorMsg = ModuleBase_ModelWidget::getError(theValueStateChecked);
   if (aErrorMsg.isEmpty()) {
     if (myValues.size() == 0)
-      aErrorMsg = tr("Selection is empty");
+      aErrorMsg = translate("Selection is empty");
   }
   return aErrorMsg;
 }
@@ -728,3 +732,17 @@ void ModuleBase_WidgetSelectionFilter::onObjectUpdated()
   ModelAPI_EventCreator::get()->sendUpdated(myFeature, EVENT_DISP);
   Events_Loop::loop()->flush(EVENT_DISP);
 }
+
+void ModuleBase_WidgetSelectionFilter::storeFilters(const std::list<FilterPtr>& theFilters)
+{
+  for (std::list<FilterPtr>::const_iterator anIt = theFilters.begin();
+       anIt != theFilters.end(); ++anIt) {
+    std::string aName = translate((*anIt)->name()).toStdString();
+    myFilters[aName] = *anIt;
+  }
+}
+
+QString ModuleBase_WidgetSelectionFilter::translate(const std::string& theString) const
+{
+  return ModuleBase_Tools::translate(myFeatureId, theString);
+}

diff --git a/src/ModuleBase/ModuleBase_WidgetSelectionFilter.h b/src/ModuleBase/ModuleBase_WidgetSelectionFilter.h
index 7ecc0e4ed002aabb947fcf544db5edfdc9146a77..1fd4de6b5e5dd9f202fd77b232fd3b9806be0673 100644 (file)
--- a/src/ModuleBase/ModuleBase_WidgetSelectionFilter.h
+++ b/src/ModuleBase/ModuleBase_WidgetSelectionFilter.h
@@ -41,6 +41,8 @@ class QVBoxLayout;
 class QPushButton;
 class QCheckBox;
 
+class ModelAPI_Filter;
+
 class ModuleBase_IWorkshop;
 
 /**
@@ -220,6 +222,12 @@ private:
   /// Return currently created filter items
   QList<ModuleBase_FilterItem*> itemsList() const;
 
+  /// Translate a string
+  QString translate(const std::string& theString) const;
+
+  /// Store translated names of filters and their instances
+  void storeFilters(const std::list<std::shared_ptr<ModelAPI_Filter> >& theFilters);
+
 private:
   ModuleBase_IWorkshop* myWorkshop;
 
@@ -248,6 +256,9 @@ private:
 
   /// Attribute name which will get result of filtering
   std::string mySelectorAttribute;
+
+  /// Translated name and the corresponding filter
+  std::map<std::string, std::shared_ptr<ModelAPI_Filter> > myFilters;
 };