X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModuleBase%2FModuleBase_ModelWidget.h;h=73de512dd1b9feaaf86068878c3a655f5a36b7d8;hb=cd3e66b2f07a49646c344406b7236819d53f5ae9;hp=3d667f6f19c19f72f2a9c0e9224d94b906908434;hpb=322bc04c30609d50bd763a8dbe014284d0f0e8d6;p=modules%2Fshaper.git

diff --git a/src/ModuleBase/ModuleBase_ModelWidget.h b/src/ModuleBase/ModuleBase_ModelWidget.h
index 3d667f6f1..73de512dd 100644
--- a/src/ModuleBase/ModuleBase_ModelWidget.h
+++ b/src/ModuleBase/ModuleBase_ModelWidget.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2014-2019  CEA/DEN, EDF R&D
+// Copyright (C) 2014-2020  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
@@ -34,6 +34,10 @@
 
 #include <memory>
 
+#ifdef _MSC_VER
+#pragma warning(disable: 4100)
+#endif
+
 class Config_WidgetAPI;
 class Events_InfoMessage;
 class ModuleBase_IPropertyPanel;
@@ -241,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;
   }
@@ -255,8 +266,8 @@ Q_OBJECT
   /// \param theFeature a feature object
   /// \param theToStoreValue a value about necessity to store the widget value to the feature
   /// \param isUpdateFlushed a flag if update should be flushed on store value
-  void setFeature(const FeaturePtr& theFeature, const bool theToStoreValue = false,
-                  const bool isUpdateFlushed = true);
+  virtual void setFeature(const FeaturePtr& theFeature, const bool theToStoreValue = false,
+                          const bool isUpdateFlushed = true);
 
   /// Editing mode depends on mode of current operation. This value is defined by it.
   virtual void setEditingMode(bool isEditing) { myIsEditing = isEditing; }
@@ -310,6 +321,16 @@ Q_OBJECT
   /// for current feature. By default does nothing
   virtual void showInformativePage() {}
 
+  /// Returns True if data of its attribute was modified
+  virtual bool isModified() const { return false; }
+
+  virtual void setReadOnly(bool isReadOnly) { setEnabled(!isReadOnly); }
+
+  virtual bool isReadOnly() const { return !isEnabled(); }
+
+  /// Returns true if the widget should have access to external parts
+  bool canUseExternalParts() const { return myUseExternalParts; }
+
 signals:
   /// The signal about widget values are to be changed
   void beforeValuesChanged();
@@ -452,6 +473,11 @@ private:
   bool myIsValueStateBlocked;
   /// do not flush updated signal
   bool myFlushUpdateBlocked;
+
+  bool myUpdateVisualAttributes;
+
+  /// A flag which indicates that current widget should have access to external parts
+  bool myUseExternalParts;
 };
 
 #endif