Skip to content

Commit 7a6aaae

Browse files
committed
deprecated
1 parent b4a12b1 commit 7a6aaae

File tree

7 files changed

+73
-4
lines changed

7 files changed

+73
-4
lines changed

include/geode/basic/console_progress_logger_client.hpp

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,19 @@ namespace geode
5555
void failed(
5656
const uuid& progress_logger_id, Logger::LEVEL level ) override;
5757

58+
[[deprecated]] void start( const uuid& progress_logger_id,
59+
const std::string& message,
60+
index_t nb_steps ) override;
61+
62+
[[deprecated]] void update( const uuid& progress_logger_id,
63+
index_t current_step,
64+
index_t nb_steps ) override;
65+
66+
[[deprecated]] void completed(
67+
const uuid& progress_logger_id ) override;
68+
69+
[[deprecated]] void failed( const uuid& progress_logger_id ) override;
70+
5871
private:
5972
IMPLEMENTATION_MEMBER( impl_ );
6073
};

include/geode/basic/progress_logger.hpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,8 @@ namespace geode
3939
class opengeode_basic_api ProgressLogger
4040
{
4141
public:
42-
ProgressLogger( const std::string& message, index_t nb_steps );
42+
[[deprecated]] ProgressLogger(
43+
const std::string& message, index_t nb_steps );
4344
ProgressLogger(
4445
Logger::LEVEL level, const std::string& message, index_t nb_steps );
4546
~ProgressLogger();

include/geode/basic/progress_logger_client.hpp

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,20 @@ namespace geode
5656
virtual void failed(
5757
const uuid& progress_logger_id, Logger::LEVEL level ) = 0;
5858

59+
[[deprecated]] virtual void start( const uuid& progress_logger_id,
60+
const std::string& message,
61+
index_t nb_steps ) = 0;
62+
63+
[[deprecated]] virtual void update( const uuid& progress_logger_id,
64+
index_t current_step,
65+
index_t nb_steps ) = 0;
66+
67+
[[deprecated]] virtual void completed(
68+
const uuid& progress_logger_id ) = 0;
69+
70+
[[deprecated]] virtual void failed(
71+
const uuid& progress_logger_id ) = 0;
72+
5973
protected:
6074
ProgressLoggerClient() = default;
6175
};

include/geode/basic/progress_logger_manager.hpp

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,18 @@ namespace geode
5858
static void failed(
5959
const uuid& progress_logger_id, Logger::LEVEL level );
6060

61+
[[deprecated]] static void start( const uuid& progress_logger_id,
62+
const std::string& message,
63+
index_t nb_steps );
64+
65+
[[deprecated]] static void update( const uuid& progress_logger_id,
66+
index_t current_step,
67+
index_t nb_steps );
68+
69+
[[deprecated]] static void completed( const uuid& progress_logger_id );
70+
71+
[[deprecated]] static void failed( const uuid& progress_logger_id );
72+
6173
private:
6274
ProgressLoggerManager();
6375

src/geode/basic/console_progress_logger_client.cpp

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,4 +118,30 @@ namespace geode
118118
{
119119
impl_->failed( progress_logger_id, level );
120120
}
121+
122+
void ConsoleProgressLoggerClient::start( const uuid& progress_logger_id,
123+
const std::string& message,
124+
index_t nb_steps )
125+
{
126+
impl_->start(
127+
progress_logger_id, Logger::LEVEL::info, message, nb_steps );
128+
}
129+
130+
void ConsoleProgressLoggerClient::update(
131+
const uuid& progress_logger_id, index_t current, index_t nb_steps )
132+
{
133+
impl_->update(
134+
progress_logger_id, Logger::LEVEL::info, current, nb_steps );
135+
}
136+
137+
void ConsoleProgressLoggerClient::completed(
138+
const uuid& progress_logger_id )
139+
{
140+
impl_->completed( progress_logger_id, Logger::LEVEL::info );
141+
}
142+
143+
void ConsoleProgressLoggerClient::failed( const uuid& progress_logger_id )
144+
{
145+
impl_->failed( progress_logger_id, Logger::LEVEL::info );
146+
}
121147
} // namespace geode

src/geode/mesh/helpers/euclidean_distance_transform.cpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -364,7 +364,8 @@ namespace geode
364364
template <>
365365
void EuclideanDistanceTransform< 2 >::compute_squared_distance_map()
366366
{
367-
ProgressLogger logger{ "Compute 2D euclidian distance", 2 };
367+
ProgressLogger logger{ Logger::LEVEL::info,
368+
"Compute 2D euclidian distance", 2 };
368369
propagate_directional_squared_distance( 0 );
369370
logger.increment();
370371
combine_squared_distance_components( 1 );
@@ -373,7 +374,8 @@ namespace geode
373374
template <>
374375
void EuclideanDistanceTransform< 3 >::compute_squared_distance_map()
375376
{
376-
ProgressLogger logger{ "Compute 3D euclidian distance", 3 };
377+
ProgressLogger logger{ Logger::LEVEL::info,
378+
"Compute 3D euclidian distance", 3 };
377379
propagate_directional_squared_distance( 0 );
378380
logger.increment();
379381
combine_squared_distance_components( 1 );

tests/basic/test-progress-logger.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,8 @@
3030
void test()
3131
{
3232
geode::index_t nb{ 30000 };
33-
geode::ProgressLogger logger{ "Cool message", nb };
33+
geode::ProgressLogger logger{ geode::Logger::LEVEL::info, "Cool message",
34+
nb };
3435
for( const auto i : geode::Range{ nb } )
3536
{
3637
auto test = 0;

0 commit comments

Comments
 (0)