MRUITestEngine.h does not #include "MRPch/MRFmt.h" (#5274)

Author: Fedr

source/MRViewer/MRUIQualityControl.cpp

@@ -1,6 +1,6 @@
 #include "MRUIQualityControl.h"
-
 #include "MRViewer/MRUIStyle.h"
+#include "MRPch/MRFmt.h"
 
 namespace MR::QualityControl
 {

source/MRViewer/MRUIStyle.ipp

@@ -106,8 +106,14 @@ namespace detail
                     ImGui::PushItemWidth( x - prevX );
                     MR_FINALLY{ ImGui::PopItemWidth(); };
                     prevX = x;
+                    std::string s;
+                    if ( i + 1 != VectorTraits<T>::size )
+                        s = "###";
+                    s += label;
+                    s += "##";
+                    s += std::to_string( i );
                     bool elemChanged = func(
-                        fmt::format( "{}{}##{}", i == VectorTraits<T>::size - 1 ? "" : "###", label, i ).c_str(),
+                        s.c_str(),
                         VectorTraits<T>::getElem( i, value ),
                         i
                     );
@@ -160,11 +166,11 @@ namespace detail
         std::string maxString = valueToString<E>( max, unitParams );
 
         if ( haveMin && haveMax )
-            return fmt::format( "Range: {} .. {}", minString, maxString );
+            return "Range: " + minString + " .. " + maxString;
         if ( haveMin )
-            return fmt::format( "Range: at least {}", minString );
+            return "Range: at least " + minString;
         if ( haveMax )
-            return fmt::format( "Range: at most {}", maxString );
+            return "Range: at most " + maxString;
         return "";
     }
 
@@ -464,20 +470,20 @@ bool plusMinusGeneric( const char* label, T& plus, T& minus, UnitToStringParams<
     auto getStateKeyIsAsym = [&, ret = std::string{}]() mutable -> const std::string&
     {
         if ( ret.empty() )
-            ret = fmt::format( "MR::plusMinus:{}", label );
+            ret = std::string( "MR::plusMinus:" ) + label;
         return ret;
     };
 
     auto getPlusName = [&, ret = std::string{}]() mutable -> const std::string&
     {
         if ( ret.empty() )
-            ret = fmt::format( "###plus:{}", label );
+            ret = std::string( "###plus:" ) + label;
         return ret;
     };
     auto getMinusName = [&, ret = std::string{}]() mutable -> const std::string&
     {
         if ( ret.empty() )
-            ret = fmt::format( "###minus:{}", label );
+            ret = std::string( "###minus:" ) + label;
         return ret;
     };
 
@@ -510,7 +516,7 @@ bool plusMinusGeneric( const char* label, T& plus, T& minus, UnitToStringParams<
 
     // The symmetry toggle.
     ImGui::SetCursorPosX( ImGui::GetCursorPosX() + fullWidth - toggleSymButtonWidth );
-    if ( ( buttonEx )( fmt::format( "{}###toggleSymmetry:{}", isAsym ? "\xC2\xB1"/*U+00B1 PLUS-MINUS SIGN*/ : "+/-", label ).c_str(), ImVec2( toggleSymButtonWidth, ImGui::GetFrameHeight() ), { .customTexture = UI::getTexture( UI::TextureType::GradientBtnGray ).get() } ) )
+    if ( ( buttonEx )( ( ( isAsym ? "\xC2\xB1"/*U+00B1 PLUS-MINUS SIGN*/ : "+/-" ) + std::string( "###toggleSymmetry:" ) + label ).c_str(), ImVec2( toggleSymButtonWidth, ImGui::GetFrameHeight() ), { .customTexture = UI::getTexture( UI::TextureType::GradientBtnGray ).get() } ) )
     {
         isAsym = !isAsym;
 
@@ -587,7 +593,7 @@ bool plusMinusGeneric( const char* label, T& plus, T& minus, UnitToStringParams<
         }
 
         // This name can't match the plus/minus names, because we check if those are active above.
-        if ( func( fmt::format( "###sym:{}", label ).c_str(), plus, std::move( unitToStringParams ) ) ) // Move the params on the last usage, in case the lambda decides to take them by value for some reason.
+        if ( func( ( std::string( "###sym:" ) + label ).c_str(), plus, std::move( unitToStringParams ) ) ) // Move the params on the last usage, in case the lambda decides to take them by value for some reason.
         {
             minus = -plus;
             ret = true;

source/MRViewer/MRUITestEngine.cpp

@@ -1,6 +1,6 @@
 #include "MRUITestEngine.h"
-#include "MRPch/MRSpdlog.h"
 #include "MRImGui.h"
+#include "MRPch/MRFmt.h"
 
 #ifndef MR_ENABLE_UI_TEST_ENGINE
 // Set to 0 to disable the UI test engine. All functions will act as if no UI elements are registered.
@@ -220,4 +220,12 @@ const GroupEntry& getRootEntry()
     return state.root;
 }
 
+[[nodiscard]] MRVIEWER_API Unexpected<std::string> Entry::unexpected_( std::string_view selfName, std::string_view tKindName )
+{
+    if ( selfName.empty() )
+        return unexpected( fmt::format( "Expected UI entity to be a `{}` but got a `{}`.", tKindName, getKindName() ) );
+    else
+        return unexpected( fmt::format( "Expected UI entity `{}` to be a `{}` but got a `{}`.", selfName, tKindName, getKindName() ) );
 }
+
+} // namespace MR::UI::TestEngine

source/MRViewer/MRUITestEngine.h

@@ -1,7 +1,6 @@
 #pragma once
 
 #include "MRMesh/MRExpected.h"
-#include "MRPch/MRFmt.h"
 #include "MRViewer/exports.h"
 
 #include <cstdint>
@@ -175,19 +174,17 @@ struct Entry
     {
         Expected<T *> ret = std::get_if<T>( &value );
         if ( !*ret )
-        {
-            if ( selfName.empty() )
-                ret = unexpected( fmt::format( "Expected UI entity to be a `{}` but got a `{}`.", T::kindName, getKindName() ) );
-            else
-                ret = unexpected( fmt::format( "Expected UI entity `{}` to be a `{}` but got a `{}`.", selfName, T::kindName, getKindName() ) );
-        }
+            ret = unexpected_( selfName, T::kindName );
         return ret;
     }
     template <typename T>
     [[nodiscard]] Expected<const T *> getAs( std::string_view selfName = {} ) const
     {
         return const_cast<Entry *>( this )->template getAs<T>( selfName );
     }
+
+private:
+    [[nodiscard]] MRVIEWER_API Unexpected<std::string> unexpected_( std::string_view selfName, std::string_view tKindName );
 };
 
 // Returns the current entry tree.