Merge branch 'csgroup_IS2'

[modules/shaper.git] / src / PartSet / PartSet_Module.h

diff --git a/src/PartSet/PartSet_Module.h b/src/PartSet/PartSet_Module.h
index 7567f40a2912468cf2f5af1b023a5b2e8a539d87..e47fabe9df15cb788ec4132df554431d32b3e77c 100644 (file)
--- a/src/PartSet/PartSet_Module.h
+++ b/src/PartSet/PartSet_Module.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2014-2019  CEA/DEN, EDF R&D
+// Copyright (C) 2014-2021  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
@@ -399,6 +399,9 @@ public:
   /// Reads description of features from XML file
   virtual void createFeatures();
 
+  /// add texture
+  static void setTexture(const std::string &theTextureFile, const AISObjectPtr& thePrs);
+
 public slots:
   /// Slolt called on object display
   /// \param theObject a data object
@@ -414,6 +417,8 @@ public slots:
   /// \param theTrsfType type of tranformation
   virtual void onViewTransformed(int theTrsfType = 2);
 
+  void onConflictingConstraints();
+
 protected slots:
   /// Called when previous operation is finished
   virtual void onSelectionChanged();