minor logging message tweaks

2026-07-19 19:09:20 +02:00 · 2018-09-18 20:29:23 +02:00
parent 496a680e44
commit 4c7d254539
5 changed files with 22 additions and 22 deletions
--- a/Event.cpp
+++ b/Event.cpp
@@ -743,7 +743,7 @@ copyvalues_event::init() {
    std::get<scene::basic_node *>( m_input.data_source ) = simulation::Memory.find( std::get<std::string>( m_input.data_source ) );
    if( std::get<scene::basic_node *>( m_input.data_source ) == nullptr ) {
        m_ignored = true; // deaktywacja
-        ErrorLog( "Bad event: copyvalues event \"" + m_name + "\" cannot find memcell \"" + std::get<std::string>( m_input.data_source ) + "\"" );
+        ErrorLog( "Bad event: \"" + m_name + "\" (type: " + type() + ") can't find memory cell \"" + std::get<std::string>( m_input.data_source ) + "\"" );
    }
 }

@@ -1030,7 +1030,7 @@ multi_event::init() {
    for( auto &childevent : m_children ) {
        std::get<basic_event *>( childevent ) = simulation::Events.FindEvent( std::get<std::string>( childevent ) );
        if( std::get<basic_event *>( childevent ) == nullptr ) {
-            ErrorLog( "Bad event: multi-event \"" + m_name + "\" cannot find event \"" + std::get<std::string>( childevent ) + "\"" );
+            ErrorLog( "Bad event: \"" + m_name + "\" (type: " + type() + ") can't find event \"" + std::get<std::string>( childevent ) + "\"" );
        }
    }
 }
@@ -1158,7 +1158,7 @@ sound_event::init() {
        std::get<sound_source *>( target ) = simulation::Sounds.find( std::get<std::string>( target ) );
        if( std::get<sound_source *>( target ) == nullptr ) {
            m_ignored = true; // deaktywacja
-            ErrorLog( "Bad event: sound event \"" + m_name + "\" cannot find static sound \"" + std::get<std::string>( target ) + "\"" );
+            ErrorLog( "Bad event: \"" + m_name + "\" (type: " + type() + ") can't find static sound \"" + std::get<std::string>( target ) + "\"" );
        }
    }
 }
@@ -1279,7 +1279,7 @@ animation_event::init() {
        auto *targetcontainer{ targetmodel->GetContainer( m_animationsubmodel ) };
        if( targetcontainer == nullptr ) {
            m_ignored = true;
-            ErrorLog( "Bad event: animation event \"" + m_name + "\" cannot find submodel " + m_animationsubmodel + " in model instance \"" + targetmodel->name() + "\"" );
+            ErrorLog( "Bad event: \"" + m_name + "\" (type: " + type() + ") can't find submodel " + m_animationsubmodel + " in model instance \"" + targetmodel->name() + "\"" );
            break;
        }
        targetcontainer->WillBeAnimated(); // oflagowanie animacji
@@ -1478,7 +1478,7 @@ lights_event::deserialize_( cParser &Input, scene::scratch_data &Scratchpad ) {
            Input >> m_lights[ lightidx++ ];
        }
        else {
-            ErrorLog( "Bad event: lights event \"" + m_name + "\" with more than " + to_string( lightcountlimit ) + " parameters" );
+            ErrorLog( "Bad event: \"" + m_name + "\" (type: " + type() + ") with more than " + to_string( lightcountlimit ) + " parameters" );
        }
    }
    while( lightidx < lightcountlimit ) {
@@ -1736,7 +1736,7 @@ visible_event::init() {
        }
        if( targetnode == nullptr ) {
            m_ignored = true; // deaktywacja
-            ErrorLog( "Bad event: visibility event \"" + m_name + "\" cannot find item \"" + std::get<std::string>( target ) + "\"" );
+            ErrorLog( "Bad event: \"" + m_name + "\" (type: " + type() + ") can't find item \"" + std::get<std::string>( target ) + "\"" );
        }
    }
 }
@@ -1972,7 +1972,7 @@ event_manager::insert( basic_event *Event ) {
        else {
            // NOTE: somewhat convoluted way to deal with 'replacing' events without leaving dangling pointers
            // can be cleaned up if pointers to events were replaced with handles
-            ErrorLog( "Bad event: encountered duplicated event, \"" + Event->m_name + "\"" );
+            ErrorLog( "Bad scenario: duplicate event name \"" + Event->m_name + "\"" );
            duplicate->append( Event ); // doczepka (taki wirtualny multiple bez warunków)
            duplicate->m_ignored = true; // dezaktywacja pierwotnego - taka proteza na wsteczną zgodność
        }
@@ -2123,7 +2123,7 @@ event_manager::InitLaunchers() {
                // jeśli jest powiązana komórka pamięci
                launcher->MemCell = simulation::Memory.find( launcher->asMemCellName );
                if( launcher->MemCell == nullptr ) {
-                    ErrorLog( "Bad scenario: event launcher \"" + launcher->name() + "\" cannot find memcell \"" + launcher->asMemCellName + "\"" );
+                    ErrorLog( "Bad scenario: event launcher \"" + launcher->name() + "\" can't find memcell \"" + launcher->asMemCellName + "\"" );
                }
            }
            else {
@@ -2134,14 +2134,14 @@ event_manager::InitLaunchers() {
        if( launcher->asEvent1Name != "none" ) {
            launcher->Event1 = simulation::Events.FindEvent( launcher->asEvent1Name );
            if( launcher->Event1 == nullptr ) {
-                ErrorLog( "Bad scenario: event launcher \"" + launcher->name() + "\" cannot find event \"" + launcher->asEvent1Name + "\"" );
+                ErrorLog( "Bad scenario: event launcher \"" + launcher->name() + "\" can't find event \"" + launcher->asEvent1Name + "\"" );
            }
        }

        if( launcher->asEvent2Name != "none" ) {
            launcher->Event2 = simulation::Events.FindEvent( launcher->asEvent2Name );
            if( launcher->Event2 == nullptr ) {
-                ErrorLog( "Bad scenario: event launcher \"" + launcher->name() + "\" cannot find event \"" + launcher->asEvent2Name + "\"" );
+                ErrorLog( "Bad scenario: event launcher \"" + launcher->name() + "\" can't find event \"" + launcher->asEvent2Name + "\"" );
            }
        }
    }
--- a/Event.h
+++ b/Event.h
@@ -634,7 +634,7 @@ basic_event::init_targets( TableType_ &Repository, std::string const &Targettype
        if( std::get<scene::basic_node *>( target ) == nullptr ) {
            m_ignored = true; // deaktywacja
            if( Logerrors )
-                ErrorLog( "Bad event: " + type() + " event \"" + m_name + "\" cannot find " + Targettype +" \"" + std::get<std::string>( target ) + "\"" );
+                ErrorLog( "Bad event: \"" + m_name + "\" (type: " + type() + ") can't find " + Targettype +" \"" + std::get<std::string>( target ) + "\"" );
        }
    }
 }
--- a/Track.cpp
+++ b/Track.cpp
@@ -909,7 +909,7 @@ bool TTrack::AssignEvents() {
                m_events = true;
            }
            else {
-                ErrorLog( "Bad event: event \"" + event.first + "\" assigned to track \"" + m_name + "\" does not exist" );
+                ErrorLog( "Bad track: \"" + m_name + "\" can't find assigned event \"" + event.first + "\"" );
                lookupfail = true;
            }
        }
--- a/scenenode.cpp
+++ b/scenenode.cpp
@@ -606,7 +606,7 @@ lines_node::import( cParser &Input, scene::node_data const &Nodedata ) {
        m_data.vertices.emplace_back( vertex0 );
    }
    if( m_data.vertices.size() % 2 != 0 ) {
-        ErrorLog( "Lines node specified odd number of vertices, encountered in file \"" + Input.Name() + "\" (line " + std::to_string( Input.Line() - 1 ) + ")" );
+        ErrorLog( "Lines node specified odd number of vertices, defined in file \"" + Input.Name() + "\" (line " + std::to_string( Input.Line() - 1 ) + ")" );
        m_data.vertices.pop_back();
    }

--- a/simulationstateserializer.cpp
+++ b/simulationstateserializer.cpp
@@ -106,7 +106,7 @@ state_serializer::deserialize( cParser &Input, scene::scratch_data &Scratchpad )
            lookup->second();
        }
        else {
-            ErrorLog( "Bad scenario: unexpected token \"" + token + "\" encountered in file \"" + Input.Name() + "\" (line " + std::to_string( Input.Line() - 1 ) + ")" );
+            ErrorLog( "Bad scenario: unexpected token \"" + token + "\" defined in file \"" + Input.Name() + "\" (line " + std::to_string( Input.Line() - 1 ) + ")" );
        }

        timenow = std::chrono::steady_clock::now();
@@ -316,7 +316,7 @@ state_serializer::deserialize_node( cParser &Input, scene::scratch_data &Scratch

        if( false == simulation::Vehicles.insert( vehicle ) ) {

-            ErrorLog( "Bad scenario: vehicle with duplicate name \"" + vehicle->name() + "\" encountered in file \"" + Input.Name() + "\" (line " + std::to_string( inputline ) + ")" );
+            ErrorLog( "Bad scenario: duplicate vehicle name \"" + vehicle->name() + "\" defined in file \"" + Input.Name() + "\" (line " + std::to_string( inputline ) + ")" );
        }

        if( ( vehicle->MoverParameters->CategoryFlag == 1 ) // trains only
@@ -330,7 +330,7 @@ state_serializer::deserialize_node( cParser &Input, scene::scratch_data &Scratch
        auto *path { deserialize_path( Input, Scratchpad, nodedata ) };
        // duplicates of named tracks are currently experimentally allowed
        if( false == simulation::Paths.insert( path ) ) {
-            ErrorLog( "Bad scenario: track with duplicate name \"" + path->name() + "\" encountered in file \"" + Input.Name() + "\" (line " + std::to_string( inputline ) + ")" );
+            ErrorLog( "Bad scenario: duplicate track name \"" + path->name() + "\" defined in file \"" + Input.Name() + "\" (line " + std::to_string( inputline ) + ")" );
 /*
            delete path;
            delete pathnode;
@@ -346,7 +346,7 @@ state_serializer::deserialize_node( cParser &Input, scene::scratch_data &Scratch
        if( traction == nullptr ) { return; }

        if( false == simulation::Traction.insert( traction ) ) {
-            ErrorLog( "Bad scenario: traction piece with duplicate name \"" + traction->name() + "\" encountered in file \"" + Input.Name() + "\" (line " + std::to_string( inputline ) + ")" );
+            ErrorLog( "Bad scenario: duplicate traction piece name \"" + traction->name() + "\" defined in file \"" + Input.Name() + "\" (line " + std::to_string( inputline ) + ")" );
        }
        scene::Groups.insert( scene::Groups.handle(), traction );
        simulation::Region->insert_and_register( traction );
@@ -358,7 +358,7 @@ state_serializer::deserialize_node( cParser &Input, scene::scratch_data &Scratch
        if( powersource == nullptr ) { return; }

        if( false == simulation::Powergrid.insert( powersource ) ) {
-            ErrorLog( "Bad scenario: power grid source with duplicate name \"" + powersource->name() + "\" encountered in file \"" + Input.Name() + "\" (line " + std::to_string( inputline ) + ")" );
+            ErrorLog( "Bad scenario: duplicate power grid source name \"" + powersource->name() + "\" defined in file \"" + Input.Name() + "\" (line " + std::to_string( inputline ) + ")" );
        }
 /*
        // TODO: implement this
@@ -407,7 +407,7 @@ state_serializer::deserialize_node( cParser &Input, scene::scratch_data &Scratch
            if( instance == nullptr ) { return; }

            if( false == simulation::Instances.insert( instance ) ) {
-                ErrorLog( "Bad scenario: 3d model instance with duplicate name \"" + instance->name() + "\" encountered in file \"" + Input.Name() + "\" (line " + std::to_string( inputline ) + ")" );
+                ErrorLog( "Bad scenario: duplicate 3d model instance name \"" + instance->name() + "\" defined in file \"" + Input.Name() + "\" (line " + std::to_string( inputline ) + ")" );
            }
            scene::Groups.insert( scene::Groups.handle(), instance );
            simulation::Region->insert( instance );
@@ -450,7 +450,7 @@ state_serializer::deserialize_node( cParser &Input, scene::scratch_data &Scratch

        auto *memorycell { deserialize_memorycell( Input, Scratchpad, nodedata ) };
        if( false == simulation::Memory.insert( memorycell ) ) {
-            ErrorLog( "Bad scenario: memory memorycell with duplicate name \"" + memorycell->name() + "\" encountered in file \"" + Input.Name() + "\" (line " + std::to_string( inputline ) + ")" );
+            ErrorLog( "Bad scenario: duplicate memory cell name \"" + memorycell->name() + "\" defined in file \"" + Input.Name() + "\" (line " + std::to_string( inputline ) + ")" );
        }
        scene::Groups.insert( scene::Groups.handle(), memorycell );
        simulation::Region->insert( memorycell );
@@ -459,7 +459,7 @@ state_serializer::deserialize_node( cParser &Input, scene::scratch_data &Scratch

        auto *eventlauncher { deserialize_eventlauncher( Input, Scratchpad, nodedata ) };
        if( false == simulation::Events.insert( eventlauncher ) ) {
-            ErrorLog( "Bad scenario: event launcher with duplicate name \"" + eventlauncher->name() + "\" encountered in file \"" + Input.Name() + "\" (line " + std::to_string( inputline ) + ")" );
+            ErrorLog( "Bad scenario: duplicate event launcher name \"" + eventlauncher->name() + "\" defined in file \"" + Input.Name() + "\" (line " + std::to_string( inputline ) + ")" );
        }
            // event launchers can be either global, or local with limited range of activation
            // each gets assigned different caretaker
@@ -475,7 +475,7 @@ state_serializer::deserialize_node( cParser &Input, scene::scratch_data &Scratch

        auto *sound { deserialize_sound( Input, Scratchpad, nodedata ) };
        if( false == simulation::Sounds.insert( sound ) ) {
-            ErrorLog( "Bad scenario: sound node with duplicate name \"" + sound->name() + "\" encountered in file \"" + Input.Name() + "\" (line " + std::to_string( inputline ) + ")" );
+            ErrorLog( "Bad scenario: duplicate sound node name \"" + sound->name() + "\" defined in file \"" + Input.Name() + "\" (line " + std::to_string( inputline ) + ")" );
        }
        simulation::Region->insert( sound );
    }