Introduce more signals in history store (#5658)

Grantim · web-flow · commit 52db12dbc496 · 2026-01-30T15:18:16.000+03:00
diff --git a/source/MRViewer/MRAncillaryLabels.cpp b/source/MRViewer/MRAncillaryLabels.cpp
@@ -5,6 +5,7 @@
 #include "MRViewer.h"
 #include "MRViewport.h"
 #include "ImGuiMenu.h"
+#include "MRImGuiMultiViewport.h"
 #include "imgui.h"
 
 namespace MR
@@ -141,9 +142,9 @@ void AncillaryImGuiLabel::preDraw_()
         Vector3f coord = vp.projectToViewportSpace( labelData_.position );
         auto viewerCoord = getViewerInstance().viewportToScreen( coord, vp.id );
 
-        params.list->PushClipRect( minRect, maxRect );
+        params.list->PushClipRect( ImGuiMV::Window2ScreenSpaceImVec2( minRect ), ImGuiMV::Window2ScreenSpaceImVec2( maxRect ) );
         ImGuiMeasurementIndicators::text( ImGuiMeasurementIndicators::Element::both, params,
-            ImVec2( viewerCoord.x, viewerCoord.y ), sWithI, {}, {}, pivot_ );
+            ImGuiMV::Window2ScreenSpaceImVec2( ImVec2( viewerCoord.x, viewerCoord.y ) ), sWithI, {}, {}, pivot_ );
         params.list->PopClipRect();
     }
 }
diff --git a/source/MRViewer/MRHistoryStore.cpp b/source/MRViewer/MRHistoryStore.cpp
@@ -25,9 +25,11 @@ void HistoryStore::appendAction( std::shared_ptr<HistoryAction> action )
         return;
     if ( !action )
         return;
+    changedSignal( *this, ChangeType::PreAppendAction, action );
     if ( scopedBlock_ )
     {
         scopedBlock_->push_back( std::move( action ) );
+        changedSignal( *this, ChangeType::PostAppendAction, scopedBlock_->back() );
         return;
     }
     spdlog::info( "History action append: \"{}\"", action->name() );
@@ -37,7 +39,7 @@ void HistoryStore::appendAction( std::shared_ptr<HistoryAction> action )
     stack_[firstRedoIndex_] = std::move( action );
     ++firstRedoIndex_;
 
-    changedSignal( *this, ChangeType::AppendAction );
+    changedSignal( *this, ChangeType::PostAppendAction, stack_.back() );
 
     filterByMemoryLimit_();
 }
@@ -52,7 +54,7 @@ void HistoryStore::clear()
     spdlog::info( "History store clear" );
     stack_.clear();
     firstRedoIndex_ = 0;
-    changedSignal( *this, ChangeType::Clear );
+    changedSignal( *this, ChangeType::Clear, {} );
 }
 
 void HistoryStore::filterStack( HistoryStackFilter filteringCondition, bool deepFiltering /*= true*/ )
@@ -63,7 +65,7 @@ void HistoryStore::filterStack( HistoryStackFilter filteringCondition, bool deep
     const auto [needSignal, redoDecrease] = filterHistoryActionsVector( stack_, filteringCondition, firstRedoIndex_, deepFiltering );
     firstRedoIndex_ -= redoDecrease;
     if ( needSignal )
-        changedSignal( *this, ChangeType::Filter );
+        changedSignal( *this, ChangeType::Filter, {} );
 }
 
 bool HistoryStore::undo()
@@ -80,11 +82,11 @@ bool HistoryStore::undo()
     if ( stack_[firstRedoIndex_ - 1] )
     {
         spdlog::info( "History action undo: \"{}\"", stack_[firstRedoIndex_ - 1]->name() );
-        changedSignal( *this, ChangeType::PreUndo );
+        changedSignal( *this, ChangeType::PreUndo, stack_[firstRedoIndex_ - 1] );
         stack_[firstRedoIndex_ - 1]->action( HistoryAction::Type::Undo );
     }
     --firstRedoIndex_;
-    changedSignal( *this, ChangeType::PostUndo );
+    changedSignal( *this, ChangeType::PostUndo, stack_[firstRedoIndex_] );
     return true;
 }
 
@@ -101,11 +103,11 @@ bool HistoryStore::redo()
     if ( stack_[firstRedoIndex_] )
     {
         spdlog::info( "History action redo: \"{}\"", stack_[firstRedoIndex_]->name() );
-        changedSignal( *this, ChangeType::PreRedo );
+        changedSignal( *this, ChangeType::PreRedo, stack_[firstRedoIndex_] );
         stack_[firstRedoIndex_]->action( HistoryAction::Type::Redo );
     }
     ++firstRedoIndex_;
-    changedSignal( *this, ChangeType::PostRedo );
+    changedSignal( *this, ChangeType::PostRedo, stack_[firstRedoIndex_ - 1] );
     return true;
 }
 
@@ -167,7 +169,7 @@ void HistoryStore::filterByMemoryLimit_()
         stack_.erase( stack_.begin() );
         --firstRedoIndex_;
         --savedSceneIndex_;
-        changedSignal( *this, ChangeType::PopAction );
+        changedSignal( *this, ChangeType::PopAction, nullptr );
     }
 }
 
diff --git a/source/MRViewer/MRHistoryStore.h b/source/MRViewer/MRHistoryStore.h
@@ -81,16 +81,17 @@ class MRVIEWER_CLASS HistoryStore
     /// Signal is called after this store changed
     enum class ChangeType
     {
-        AppendAction, ///< additions in scoped block does not provide signal
-        PreUndo,
-        PostUndo,
-        PreRedo,
-        PostRedo,
-        Clear,
-        PopAction, ///< called after removing action that exceeds memory limit
-        Filter
+        PreAppendAction, ///< called before action is appended (allows to decorate raw actions with scopes): action - that is about to be added
+        PostAppendAction, ///< called after action is appended either to store or to current scope: action - one that was just added
+        PreUndo, ///< called right before action is undone: action - the that will be undone
+        PostUndo, ///< called right after action is undone: action - the that have been undone
+        PreRedo, ///< called right before action is redone: action - the that will be redone
+        PostRedo, ///< called right after action is redone: action - the that have been redone
+        Clear, ///< called when this store is cleaned: action - nullptr
+        PopAction, ///< called after removing action that exceeds memory limit: action - nullptr
+        Filter ///< called after this store is filtered: action - nullptr
     };
-    using HistoryStoreChangedSignal = boost::signals2::signal<void( const HistoryStore& store, ChangeType )>;
+    using HistoryStoreChangedSignal = boost::signals2::signal<void( const HistoryStore& store, ChangeType, std::shared_ptr<HistoryAction> action )>;
     HistoryStoreChangedSignal changedSignal;
 
 private:
diff --git a/source/MRViewer/MRSceneControlMenuItems.cpp b/source/MRViewer/MRSceneControlMenuItems.cpp
@@ -44,7 +44,7 @@ UndoMenuItem::UndoMenuItem() :
         if ( !historyStoreConnection_.connected() )
         {
             historyStoreConnection_ = history->changedSignal.connect( MAKE_SLOT( &UndoMenuItem::updateUndoListCache_ ) );
-            updateUndoListCache_( *history, HistoryStore::ChangeType::AppendAction ); // can by any type
+            updateUndoListCache_( *history, HistoryStore::ChangeType::PostUndo, {} );
         }
     } );
 }
@@ -73,8 +73,16 @@ std::string UndoMenuItem::getDynamicTooltip() const
     return res;
 }
 
-void UndoMenuItem::updateUndoListCache_( const HistoryStore& store, HistoryStore::ChangeType )
+void UndoMenuItem::updateUndoListCache_( const HistoryStore& store, HistoryStore::ChangeType type, std::shared_ptr<HistoryAction> )
 {
+    if ( type == HistoryStore::ChangeType::PreRedo || 
+        type == HistoryStore::ChangeType::PreUndo || 
+        type == HistoryStore::ChangeType::PreAppendAction )
+        return; // no need to update cache in this case
+
+    if ( type == HistoryStore::ChangeType::PostAppendAction && bool( store.getScopeBlockPtr() ) )
+        return; // no need to update cache for actions in scope
+
     auto lastUndos = store.getNActions( cMaxNumActionsInList, HistoryAction::Type::Undo );
     if ( lastUndos.empty() )
     {
@@ -109,7 +117,7 @@ RedoMenuItem::RedoMenuItem() :
         if ( !historyStoreConnection_.connected() )
         {
             historyStoreConnection_ = history->changedSignal.connect( MAKE_SLOT( &RedoMenuItem::updateRedoListCache_ ) );
-            updateRedoListCache_( *history, HistoryStore::ChangeType::AppendAction ); // can by any type
+            updateRedoListCache_( *history, HistoryStore::ChangeType::PostRedo, {} );
         }
     } );
 }
@@ -137,8 +145,16 @@ std::string RedoMenuItem::getDynamicTooltip() const
     return res;
 }
 
-void RedoMenuItem::updateRedoListCache_( const HistoryStore& store, HistoryStore::ChangeType )
+void RedoMenuItem::updateRedoListCache_( const HistoryStore& store, HistoryStore::ChangeType type, std::shared_ptr<HistoryAction> )
 {
+    if ( type == HistoryStore::ChangeType::PreRedo ||
+        type == HistoryStore::ChangeType::PreUndo ||
+        type == HistoryStore::ChangeType::PreAppendAction )
+        return; // no need to update cache in this case
+
+    if ( type == HistoryStore::ChangeType::PostAppendAction && bool( store.getScopeBlockPtr() ) )
+        return; // no need to update cache for actions in scope
+
     auto lastRedos = store.getNActions( cMaxNumActionsInList, HistoryAction::Type::Redo );
     if ( lastRedos.empty() )
     {
diff --git a/source/MRViewer/MRSceneControlMenuItems.h b/source/MRViewer/MRSceneControlMenuItems.h
@@ -14,7 +14,7 @@ class UndoMenuItem : public RibbonMenuItem
     virtual std::string getDynamicTooltip() const override;
     
 private:
-    void updateUndoListCache_( const HistoryStore& store, HistoryStore::ChangeType type );
+    void updateUndoListCache_( const HistoryStore& store, HistoryStore::ChangeType, std::shared_ptr<HistoryAction> );
 
     boost::signals2::scoped_connection historyStoreConnection_;
 };
@@ -28,7 +28,7 @@ class RedoMenuItem : public RibbonMenuItem
     virtual std::string getDynamicTooltip() const override;
 
 private:
-    void updateRedoListCache_( const HistoryStore& store, HistoryStore::ChangeType type );
+    void updateRedoListCache_( const HistoryStore& store, HistoryStore::ChangeType, std::shared_ptr<HistoryAction> );
 
     boost::signals2::scoped_connection historyStoreConnection_;
 };
diff --git a/source/MRViewer/MRViewer.cpp b/source/MRViewer/MRViewer.cpp
@@ -2813,11 +2813,11 @@ void Viewer::enableGlobalHistory( bool on )
     if ( on )
     {
         globalHistoryStore_ = std::make_unique<HistoryStore>();
-        globalHistoryStore_->changedSignal.connect( [this]( const HistoryStore&, HistoryStore::ChangeType type )
+        globalHistoryStore_->changedSignal.connect( [this] ( const HistoryStore& st, HistoryStore::ChangeType type, std::shared_ptr<HistoryAction> )
         {
             if ( type == HistoryStore::ChangeType::PostUndo ||
                  type == HistoryStore::ChangeType::PostRedo ||
-                 type == HistoryStore::ChangeType::AppendAction )
+                 ( type == HistoryStore::ChangeType::PostAppendAction && !st.getScopeBlockPtr() ) )
                 makeTitleFromSceneRootPath();
         } );
     }

Original file line number	Diff line number	Diff line change
`@@ -25,9 +25,11 @@ void HistoryStore::appendAction( std::shared_ptr<HistoryAction> action )`
`25`	`25`	`return;`
`26`	`26`	`if ( !action )`
`27`	`27`	`return;`
	`28`	`+ changedSignal( *this, ChangeType::PreAppendAction, action );`
`28`	`29`	`if ( scopedBlock_ )`
`29`	`30`	`{`
`30`	`31`	`scopedBlock_->push_back( std::move( action ) );`
	`32`	`+ changedSignal( *this, ChangeType::PostAppendAction, scopedBlock_->back() );`
`31`	`33`	`return;`
`32`	`34`	`}`
`33`	`35`	`spdlog::info( "History action append: \"{}\"", action->name() );`
`@@ -37,7 +39,7 @@ void HistoryStore::appendAction( std::shared_ptr<HistoryAction> action )`
`37`	`39`	`stack_[firstRedoIndex_] = std::move( action );`
`38`	`40`	`++firstRedoIndex_;`
`39`	`41`
`40`		`- changedSignal( *this, ChangeType::AppendAction );`
	`42`	`+ changedSignal( *this, ChangeType::PostAppendAction, stack_.back() );`
`41`	`43`
`42`	`44`	`filterByMemoryLimit_();`
`43`	`45`	`}`
`@@ -52,7 +54,7 @@ void HistoryStore::clear()`
`52`	`54`	`spdlog::info( "History store clear" );`
`53`	`55`	`stack_.clear();`
`54`	`56`	`firstRedoIndex_ = 0;`
`55`		`- changedSignal( *this, ChangeType::Clear );`
	`57`	`+ changedSignal( *this, ChangeType::Clear, {} );`
`56`	`58`	`}`
`57`	`59`
`58`	`60`	`void HistoryStore::filterStack( HistoryStackFilter filteringCondition, bool deepFiltering /= true/ )`
`@@ -63,7 +65,7 @@ void HistoryStore::filterStack( HistoryStackFilter filteringCondition, bool deep`
`63`	`65`	`const auto [needSignal, redoDecrease] = filterHistoryActionsVector( stack_, filteringCondition, firstRedoIndex_, deepFiltering );`
`64`	`66`	`firstRedoIndex_ -= redoDecrease;`
`65`	`67`	`if ( needSignal )`
`66`		`- changedSignal( *this, ChangeType::Filter );`
	`68`	`+ changedSignal( *this, ChangeType::Filter, {} );`
`67`	`69`	`}`
`68`	`70`
`69`	`71`	`bool HistoryStore::undo()`
`@@ -80,11 +82,11 @@ bool HistoryStore::undo()`
`80`	`82`	`if ( stack_[firstRedoIndex_ - 1] )`
`81`	`83`	`{`
`82`	`84`	`spdlog::info( "History action undo: \"{}\"", stack_[firstRedoIndex_ - 1]->name() );`
`83`		`- changedSignal( *this, ChangeType::PreUndo );`
	`85`	`+ changedSignal( *this, ChangeType::PreUndo, stack_[firstRedoIndex_ - 1] );`
`84`	`86`	`stack_[firstRedoIndex_ - 1]->action( HistoryAction::Type::Undo );`
`85`	`87`	`}`
`86`	`88`	`--firstRedoIndex_;`
`87`		`- changedSignal( *this, ChangeType::PostUndo );`
	`89`	`+ changedSignal( *this, ChangeType::PostUndo, stack_[firstRedoIndex_] );`
`88`	`90`	`return true;`
`89`	`91`	`}`
`90`	`92`
`@@ -101,11 +103,11 @@ bool HistoryStore::redo()`
`101`	`103`	`if ( stack_[firstRedoIndex_] )`
`102`	`104`	`{`
`103`	`105`	`spdlog::info( "History action redo: \"{}\"", stack_[firstRedoIndex_]->name() );`
`104`		`- changedSignal( *this, ChangeType::PreRedo );`
	`106`	`+ changedSignal( *this, ChangeType::PreRedo, stack_[firstRedoIndex_] );`
`105`	`107`	`stack_[firstRedoIndex_]->action( HistoryAction::Type::Redo );`
`106`	`108`	`}`
`107`	`109`	`++firstRedoIndex_;`
`108`		`- changedSignal( *this, ChangeType::PostRedo );`
	`110`	`+ changedSignal( *this, ChangeType::PostRedo, stack_[firstRedoIndex_ - 1] );`
`109`	`111`	`return true;`
`110`	`112`	`}`
`111`	`113`
`@@ -167,7 +169,7 @@ void HistoryStore::filterByMemoryLimit_()`
`167`	`169`	`stack_.erase( stack_.begin() );`
`168`	`170`	`--firstRedoIndex_;`
`169`	`171`	`--savedSceneIndex_;`
`170`		`- changedSignal( *this, ChangeType::PopAction );`
	`172`	`+ changedSignal( *this, ChangeType::PopAction, nullptr );`
`171`	`173`	`}`
`172`	`174`	`}`
`173`	`175`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ UndoMenuItem::UndoMenuItem() :`
`44`	`44`	`if ( !historyStoreConnection_.connected() )`
`45`	`45`	`{`
`46`	`46`	`historyStoreConnection_ = history->changedSignal.connect( MAKE_SLOT( &UndoMenuItem::updateUndoListCache_ ) );`
`47`		`- updateUndoListCache_( *history, HistoryStore::ChangeType::AppendAction ); // can by any type`
	`47`	`+ updateUndoListCache_( *history, HistoryStore::ChangeType::PostUndo, {} );`
`48`	`48`	`}`
`49`	`49`	`} );`
`50`	`50`	`}`
`@@ -73,8 +73,16 @@ std::string UndoMenuItem::getDynamicTooltip() const`
`73`	`73`	`return res;`
`74`	`74`	`}`
`75`	`75`
`76`		`-void UndoMenuItem::updateUndoListCache_( const HistoryStore& store, HistoryStore::ChangeType )`
	`76`	`+void UndoMenuItem::updateUndoListCache_( const HistoryStore& store, HistoryStore::ChangeType type, std::shared_ptr<HistoryAction> )`
`77`	`77`	`{`
	`78`	`+ if ( type == HistoryStore::ChangeType::PreRedo \|\|`
	`79`	`+ type == HistoryStore::ChangeType::PreUndo \|\|`
	`80`	`+ type == HistoryStore::ChangeType::PreAppendAction )`
	`81`	`+ return; // no need to update cache in this case`
	`82`	`+`
	`83`	`+ if ( type == HistoryStore::ChangeType::PostAppendAction && bool( store.getScopeBlockPtr() ) )`
	`84`	`+ return; // no need to update cache for actions in scope`
	`85`	`+`
`78`	`86`	`auto lastUndos = store.getNActions( cMaxNumActionsInList, HistoryAction::Type::Undo );`
`79`	`87`	`if ( lastUndos.empty() )`
`80`	`88`	`{`
`@@ -109,7 +117,7 @@ RedoMenuItem::RedoMenuItem() :`
`109`	`117`	`if ( !historyStoreConnection_.connected() )`
`110`	`118`	`{`
`111`	`119`	`historyStoreConnection_ = history->changedSignal.connect( MAKE_SLOT( &RedoMenuItem::updateRedoListCache_ ) );`
`112`		`- updateRedoListCache_( *history, HistoryStore::ChangeType::AppendAction ); // can by any type`
	`120`	`+ updateRedoListCache_( *history, HistoryStore::ChangeType::PostRedo, {} );`
`113`	`121`	`}`
`114`	`122`	`} );`
`115`	`123`	`}`
`@@ -137,8 +145,16 @@ std::string RedoMenuItem::getDynamicTooltip() const`
`137`	`145`	`return res;`
`138`	`146`	`}`
`139`	`147`
`140`		`-void RedoMenuItem::updateRedoListCache_( const HistoryStore& store, HistoryStore::ChangeType )`
	`148`	`+void RedoMenuItem::updateRedoListCache_( const HistoryStore& store, HistoryStore::ChangeType type, std::shared_ptr<HistoryAction> )`
`141`	`149`	`{`
	`150`	`+ if ( type == HistoryStore::ChangeType::PreRedo \|\|`
	`151`	`+ type == HistoryStore::ChangeType::PreUndo \|\|`
	`152`	`+ type == HistoryStore::ChangeType::PreAppendAction )`
	`153`	`+ return; // no need to update cache in this case`
	`154`	`+`
	`155`	`+ if ( type == HistoryStore::ChangeType::PostAppendAction && bool( store.getScopeBlockPtr() ) )`
	`156`	`+ return; // no need to update cache for actions in scope`
	`157`	`+`
`142`	`158`	`auto lastRedos = store.getNActions( cMaxNumActionsInList, HistoryAction::Type::Redo );`
`143`	`159`	`if ( lastRedos.empty() )`
`144`	`160`	`{`
Original file line number	Diff line number	Diff line change
`@@ -2813,11 +2813,11 @@ void Viewer::enableGlobalHistory( bool on )`
`2813`	`2813`	`if ( on )`
`2814`	`2814`	`{`
`2815`	`2815`	`globalHistoryStore_ = std::make_unique<HistoryStore>();`
`2816`		`- globalHistoryStore_->changedSignal.connect( [this]( const HistoryStore&, HistoryStore::ChangeType type )`
	`2816`	`+ globalHistoryStore_->changedSignal.connect( [this] ( const HistoryStore& st, HistoryStore::ChangeType type, std::shared_ptr<HistoryAction> )`
`2817`	`2817`	`{`
`2818`	`2818`	`if ( type == HistoryStore::ChangeType::PostUndo \|\|`
`2819`	`2819`	`type == HistoryStore::ChangeType::PostRedo \|\|`
`2820`		`- type == HistoryStore::ChangeType::AppendAction )`
	`2820`	`+ ( type == HistoryStore::ChangeType::PostAppendAction && !st.getScopeBlockPtr() ) )`
`2821`	`2821`	`makeTitleFromSceneRootPath();`
`2822`	`2822`	`} );`
`2823`	`2823`	`}`