Clone Selection: hide and deselect original object (#4280)

Author: Fedr

source/MRMesh/MRChangeObjectFields.h

@@ -70,7 +70,8 @@ class ChangeObjectSelectedAction : public HistoryAction
 {
 public:
     using Obj = Object;
-    /// Constructed from original obj
+
+    /// use this constructor to remember object's isSelected property before making any changes in it
     ChangeObjectSelectedAction( const std::string& name, const std::shared_ptr<Object>& obj ) :
         obj_{ obj },
         name_{ name }
@@ -79,6 +80,18 @@ class ChangeObjectSelectedAction : public HistoryAction
             selected_ = obj_->isSelected();
     }
 
+    /// use this constructor to remember object's isSelected property and immediately set new value
+    ChangeObjectSelectedAction( const std::string& name, const std::shared_ptr<Object>& obj, bool newValue ) :
+        obj_{ obj },
+        name_{ name }
+    {
+        if ( obj )
+        {
+            selected_ = obj_->isSelected();
+            obj_->select( newValue );
+        }
+    }
+
     virtual std::string name() const override
     {
         return name_;
@@ -113,7 +126,8 @@ class ChangeObjectVisibilityAction : public HistoryAction
 {
 public:
     using Obj = Object;
-    /// Constructed from original obj
+
+    /// use this constructor to remember object's visibility mask before making any changes in it
     ChangeObjectVisibilityAction( const std::string& name, const std::shared_ptr<Object>& obj ) :
         obj_{ obj },
         name_{ name }
@@ -122,6 +136,18 @@ class ChangeObjectVisibilityAction : public HistoryAction
             visibilityMask_ = obj_->visibilityMask();
     }
 
+    /// use this constructor to remember object's visibility mask and immediately set new mask
+    ChangeObjectVisibilityAction( const std::string& name, const std::shared_ptr<Object>& obj, ViewportMask newVisibilityMask ) :
+        obj_{ obj },
+        name_{ name }
+    {
+        if ( obj )
+        {
+            visibilityMask_ = obj_->visibilityMask();
+            obj_->setVisibilityMask( newVisibilityMask );
+        }
+    }
+
     virtual std::string name() const override
     {
         return name_;

source/MRViewer/MRRibbonMenu.cpp

@@ -984,10 +984,8 @@ void RibbonMenu::cloneTree( const std::vector<std::shared_ptr<Object>>& selected
         if ( !obj )
             continue;
         auto cloneObj = obj->cloneTree();
-        AppendHistory<ChangeObjectSelectedAction>( "unselect base obj", obj );
-        obj->select( false );
-        AppendHistory<ChangeObjectVisibilityAction>( "make base obj invisible", obj );
-        obj->setVisible( false );
+        AppendHistory<ChangeObjectSelectedAction>( "unselect original", obj, false );
+        AppendHistory<ChangeObjectVisibilityAction>( "hide original", obj, ViewportMask() );
         auto name = obj->name();
         if ( std::regex_match( name, pattern ) )
         {
@@ -1016,6 +1014,7 @@ void RibbonMenu::cloneTree( const std::vector<std::shared_ptr<Object>>& selected
 
 void RibbonMenu::cloneSelectedPart( const std::shared_ptr<Object>& object )
 {
+    SCOPED_HISTORY( "Clone Selection" );
     std::shared_ptr<VisualObject> newObj;
     std::string name;
     if ( auto selectedMesh = std::dynamic_pointer_cast< ObjectMesh >( object ) )
@@ -1033,8 +1032,12 @@ void RibbonMenu::cloneSelectedPart( const std::shared_ptr<Object>& object )
         name = "ObjectPoints";
     }
 
+    AppendHistory<ChangeObjectSelectedAction>( "unselect original", object, false );
+    AppendHistory<ChangeObjectVisibilityAction>( "hide original", object, ViewportMask() );
+
     newObj->setName( object->name() + " Partial" );
     newObj->setXf( object->xf() );
+    newObj->select( true );
     AppendHistory<ChangeSceneAction>( "Selection to New object: add " + name, newObj, ChangeSceneAction::Type::AddObject );
     object->parent()->addChild( newObj );
 }