From 77b1761d9aac3817c1a9fbfb1f077813a63a3ff6 Mon Sep 17 00:00:00 2001 From: "joogab.yun" Date: Tue, 12 Sep 2023 16:20:41 +0900 Subject: [PATCH] Fixed typos in log and add change log level Change-Id: If5ac06756ffa44f6066cff51a324d18792c74293 --- .../internal/event/events/hover-event-processor.cpp | 14 +++++++------- .../tap-gesture/tap-gesture-detector-impl.cpp | 2 +- .../events/tap-gesture/tap-gesture-recognizer.cpp | 4 ++-- .../internal/event/events/touch-event-processor.cpp | 21 +++++++++++++-------- 4 files changed, 23 insertions(+), 18 deletions(-) diff --git a/dali/internal/event/events/hover-event-processor.cpp b/dali/internal/event/events/hover-event-processor.cpp index 9188fd7..73d95ef 100644 --- a/dali/internal/event/events/hover-event-processor.cpp +++ b/dali/internal/event/events/hover-event-processor.cpp @@ -44,6 +44,7 @@ namespace DALI_INIT_TRACE_FILTER(gTraceFilter, DALI_TRACE_PERFORMANCE_MARKER, false); #if defined(DEBUG_ENABLED) Debug::Filter* gLogFilter = Debug::Filter::New(Debug::NoLogging, false, "LOG_HOVER_PROCESSOR"); +#endif // defined(DEBUG_ENABLED) const char* TOUCH_POINT_STATE[PointState::INTERRUPTED + 1] = { @@ -55,7 +56,6 @@ const char* TOUCH_POINT_STATE[PointState::INTERRUPTED + 1] = "INTERRUPTED", }; -#endif // defined(DEBUG_ENABLED) /** * Recursively deliver events to the actor and its parents, until the event is consumed or the stage is reached. @@ -296,8 +296,8 @@ void HoverEventProcessor::ProcessHoverEvent(const Integration::HoverEvent& event if(hoverEvent->GetPoint(0).GetState() != PointState::MOTION) { - DALI_LOG_DEBUG_INFO("PrimaryHitActor:(%p), id(%d), name(%s), state(%d)\n", primaryHitActor ? reinterpret_cast(&primaryHitActor.GetBaseObject()) : NULL, primaryHitActor ? primaryHitActor.GetProperty(Dali::Actor::Property::ID) : -1, primaryHitActor ? primaryHitActor.GetProperty(Dali::Actor::Property::NAME).c_str() : "", hoverEvent->GetPoint(0).GetState()); - DALI_LOG_DEBUG_INFO("ConsumedActor: (%p), id(%d), name(%s), state(%d)\n", consumedActor ? reinterpret_cast(&consumedActor.GetBaseObject()) : NULL, consumedActor ? consumedActor.GetProperty(Dali::Actor::Property::ID) : -1, consumedActor ? consumedActor.GetProperty(Dali::Actor::Property::NAME).c_str() : "", hoverEvent->GetPoint(0).GetState()); + DALI_LOG_RELEASE_INFO("PrimaryHitActor:(%p), id(%d), name(%s), state(%s)\n", primaryHitActor ? reinterpret_cast(&primaryHitActor.GetBaseObject()) : NULL, primaryHitActor ? primaryHitActor.GetProperty(Dali::Actor::Property::ID) : -1, primaryHitActor ? primaryHitActor.GetProperty(Dali::Actor::Property::NAME).c_str() : "", TOUCH_POINT_STATE[hoverEvent->GetPoint(0).GetState()]); + DALI_LOG_RELEASE_INFO("ConsumedActor: (%p), id(%d), name(%s), state(%s)\n", consumedActor ? reinterpret_cast(&consumedActor.GetBaseObject()) : NULL, consumedActor ? consumedActor.GetProperty(Dali::Actor::Property::ID) : -1, consumedActor ? consumedActor.GetProperty(Dali::Actor::Property::NAME).c_str() : "", TOUCH_POINT_STATE[hoverEvent->GetPoint(0).GetState()]); } } @@ -328,7 +328,7 @@ void HoverEventProcessor::ProcessHoverEvent(const Integration::HoverEvent& event { if(lastPrimaryHitActor->GetLeaveRequired()) { - DALI_LOG_DEBUG_INFO("LeaveActor(Hit): (%p) %s\n", reinterpret_cast(lastPrimaryHitActor), lastPrimaryHitActor->GetName().data()); + DALI_LOG_RELEASE_INFO("LeaveActor(Hit): (%p) %d %s\n", reinterpret_cast(lastPrimaryHitActor), lastPrimaryHitActor->GetId(), lastPrimaryHitActor->GetName().data()); leaveEventConsumer = EmitHoverSignals(mLastPrimaryHitActor.GetActor(), lastRenderTaskImpl, hoverEvent, PointState::LEAVE); } } @@ -336,7 +336,7 @@ void HoverEventProcessor::ProcessHoverEvent(const Integration::HoverEvent& event { // At this point mLastPrimaryHitActor was touchable and sensitive in the previous touch event process but is not in the current one. // An interrupted event is send to allow some actors to go back to their original state (i.e. Button controls) - DALI_LOG_DEBUG_INFO("InterruptedActor(Hit): (%p) %s\n", reinterpret_cast(lastPrimaryHitActor), lastPrimaryHitActor->GetName().data()); + DALI_LOG_RELEASE_INFO("InterruptedActor(Hit): (%p) %d %s\n", reinterpret_cast(lastPrimaryHitActor), lastPrimaryHitActor->GetId(), lastPrimaryHitActor->GetName().data()); leaveEventConsumer = EmitHoverSignals(mLastPrimaryHitActor.GetActor(), lastRenderTaskImpl, hoverEvent, PointState::INTERRUPTED); } } @@ -354,7 +354,7 @@ void HoverEventProcessor::ProcessHoverEvent(const Integration::HoverEvent& event { if(lastConsumedActor->GetLeaveRequired()) { - DALI_LOG_DEBUG_INFO("LeaveActor(Consume): (%p) %s\n", reinterpret_cast(lastConsumedActor), lastConsumedActor->GetName().data()); + DALI_LOG_RELEASE_INFO("LeaveActor(Consume): (%p) %d %s\n", reinterpret_cast(lastConsumedActor), lastConsumedActor->GetId(), lastConsumedActor->GetName().data()); EmitHoverSignals(lastConsumedActor, lastRenderTaskImpl, hoverEvent, PointState::LEAVE); } } @@ -362,7 +362,7 @@ void HoverEventProcessor::ProcessHoverEvent(const Integration::HoverEvent& event { // At this point mLastConsumedActor was touchable and sensitive in the previous touch event process but is not in the current one. // An interrupted event is send to allow some actors to go back to their original state (i.e. Button controls) - DALI_LOG_DEBUG_INFO("InterruptedActor(Consume): (%p) %s\n", reinterpret_cast(lastConsumedActor), lastConsumedActor->GetName().data()); + DALI_LOG_RELEASE_INFO("InterruptedActor(Consume): (%p) %d %s\n", reinterpret_cast(lastConsumedActor), lastConsumedActor->GetId(), lastConsumedActor->GetName().data()); EmitHoverSignals(mLastConsumedActor.GetActor(), lastRenderTaskImpl, hoverEvent, PointState::INTERRUPTED); } } diff --git a/dali/internal/event/events/tap-gesture/tap-gesture-detector-impl.cpp b/dali/internal/event/events/tap-gesture/tap-gesture-detector-impl.cpp index e78a0e3..902f4d3 100644 --- a/dali/internal/event/events/tap-gesture/tap-gesture-detector-impl.cpp +++ b/dali/internal/event/events/tap-gesture/tap-gesture-detector-impl.cpp @@ -247,7 +247,7 @@ void TapGestureDetector::OnActorAttach(Actor& actor) void TapGestureDetector::OnActorDetach(Actor& actor) { - DALI_LOG_INFO(gLogFilter, Debug::General, "TapGestureDetector detector actor(%d)\n", actor.GetId()); + DALI_LOG_INFO(gLogFilter, Debug::General, "TapGestureDetector detach actor(%d)\n", actor.GetId()); } void TapGestureDetector::OnActorDestroyed(Object& object) diff --git a/dali/internal/event/events/tap-gesture/tap-gesture-recognizer.cpp b/dali/internal/event/events/tap-gesture/tap-gesture-recognizer.cpp index fd8f3ff..cfa5d72 100644 --- a/dali/internal/event/events/tap-gesture/tap-gesture-recognizer.cpp +++ b/dali/internal/event/events/tap-gesture/tap-gesture-recognizer.cpp @@ -87,7 +87,7 @@ void TapGestureRecognizer::SendEvent(const Integration::TouchEvent& event) else // Clear if the time between touch down and touch up is long. { mState = CLEAR; - DALI_LOG_DEBUG_INFO("time between touch down and touch up is long. (%dms > %dms)\n", mDeltaBetweenTouchDownTouchUp, mRecognizerTime); + DALI_LOG_RELEASE_INFO("time between touch down and touch up is long. (%dms > %dms)\n", mDeltaBetweenTouchDownTouchUp, mRecognizerTime); } } else if(pointState == PointState::INTERRUPTED) @@ -109,7 +109,7 @@ void TapGestureRecognizer::SendEvent(const Integration::TouchEvent& event) else // Clear if the time between touch down and touch up is long. { mState = CLEAR; - DALI_LOG_DEBUG_INFO("time between touch down and touch up is long. (%dms > %dms)\n", mDeltaBetweenTouchDownTouchUp, mRecognizerTime); + DALI_LOG_RELEASE_INFO("time between touch down and touch up is long. (%dms > %dms)\n", mDeltaBetweenTouchDownTouchUp, mRecognizerTime); } } else if(pointState == PointState::DOWN) diff --git a/dali/internal/event/events/touch-event-processor.cpp b/dali/internal/event/events/touch-event-processor.cpp index e91e7c0..4ae559d 100644 --- a/dali/internal/event/events/touch-event-processor.cpp +++ b/dali/internal/event/events/touch-event-processor.cpp @@ -46,6 +46,7 @@ namespace DALI_INIT_TRACE_FILTER(gTraceFilter, DALI_TRACE_PERFORMANCE_MARKER, false); #if defined(DEBUG_ENABLED) Debug::Filter* gLogFilter = Debug::Filter::New(Debug::NoLogging, false, "LOG_TOUCH_PROCESSOR"); +#endif // defined(DEBUG_ENABLED) const char* TOUCH_POINT_STATE[6] = { @@ -57,7 +58,6 @@ const char* TOUCH_POINT_STATE[6] = "INTERRUPTED", }; -#endif // defined(DEBUG_ENABLED) Dali::Actor EmitInterceptTouchSignals(Dali::Actor actor, const Dali::TouchEvent& touchEvent) { @@ -397,10 +397,15 @@ bool TouchEventProcessor::ProcessTouchEvent(const Integration::TouchEvent& event } consumed = consumedActor ? true : false; - if(primaryPointState != PointState::MOTION) + if(primaryPointState == PointState::MOTION) + { + DALI_LOG_INFO(gLogFilter, Debug::Concise, "PrimaryHitActor: (%p) id(%d), name(%s), state(%s), screenPosition(%f, %f)\n", primaryHitActor ? reinterpret_cast(&primaryHitActor.GetBaseObject()) : NULL, primaryHitActor ? primaryHitActor.GetProperty(Dali::Actor::Property::ID) : -1, primaryHitActor ? primaryHitActor.GetProperty(Dali::Actor::Property::NAME).c_str() : "", TOUCH_POINT_STATE[primaryPointState], primaryPoint.GetScreenPosition().x, primaryPoint.GetScreenPosition().y); + DALI_LOG_INFO(gLogFilter, Debug::Concise, "ConsumedActor: (%p) id(%d), name(%s), state(%s)\n", consumedActor ? reinterpret_cast(&consumedActor.GetBaseObject()) : NULL, consumedActor ? consumedActor.GetProperty(Dali::Actor::Property::ID) : -1, consumedActor ? consumedActor.GetProperty(Dali::Actor::Property::NAME).c_str() : "", TOUCH_POINT_STATE[primaryPointState]); + } + else { - DALI_LOG_DEBUG_INFO("PrimaryHitActor:(%p), id(%d), name(%s), state(%d)\n", primaryHitActor ? reinterpret_cast(&primaryHitActor.GetBaseObject()) : NULL, primaryHitActor ? primaryHitActor.GetProperty(Dali::Actor::Property::ID) : -1, primaryHitActor ? primaryHitActor.GetProperty(Dali::Actor::Property::NAME).c_str() : "", primaryPointState); - DALI_LOG_DEBUG_INFO("ConsumedActor: (%p), id(%d), name(%s), state(%d)\n", consumedActor ? reinterpret_cast(&consumedActor.GetBaseObject()) : NULL, consumedActor ? consumedActor.GetProperty(Dali::Actor::Property::ID) : -1, consumedActor ? consumedActor.GetProperty(Dali::Actor::Property::NAME).c_str() : "", primaryPointState); + DALI_LOG_RELEASE_INFO("PrimaryHitActor:(%p), id(%d), name(%s), state(%s)\n", primaryHitActor ? reinterpret_cast(&primaryHitActor.GetBaseObject()) : NULL, primaryHitActor ? primaryHitActor.GetProperty(Dali::Actor::Property::ID) : -1, primaryHitActor ? primaryHitActor.GetProperty(Dali::Actor::Property::NAME).c_str() : "", TOUCH_POINT_STATE[primaryPointState]); + DALI_LOG_RELEASE_INFO("ConsumedActor: (%p), id(%d), name(%s), state(%s)\n", consumedActor ? reinterpret_cast(&consumedActor.GetBaseObject()) : NULL, consumedActor ? consumedActor.GetProperty(Dali::Actor::Property::ID) : -1, consumedActor ? consumedActor.GetProperty(Dali::Actor::Property::NAME).c_str() : "", TOUCH_POINT_STATE[primaryPointState]); } } @@ -438,7 +443,7 @@ bool TouchEventProcessor::ProcessTouchEvent(const Integration::TouchEvent& event { if(lastPrimaryHitActor->GetLeaveRequired()) { - DALI_LOG_DEBUG_INFO("LeaveActor(Hit): (%p) %s\n", reinterpret_cast(lastPrimaryHitActor), lastPrimaryHitActor->GetName().data()); + DALI_LOG_RELEASE_INFO("LeaveActor(Hit): (%p) %d %s\n", reinterpret_cast(lastPrimaryHitActor), lastPrimaryHitActor->GetId(), lastPrimaryHitActor->GetName().data()); leaveEventConsumer = EmitTouchSignals(lastPrimaryHitActor, lastRenderTaskImpl, touchEventImpl, PointState::LEAVE); } } @@ -446,7 +451,7 @@ bool TouchEventProcessor::ProcessTouchEvent(const Integration::TouchEvent& event { // At this point mLastPrimaryHitActor was touchable and sensitive in the previous touch event process but is not in the current one. // An interrupted event is send to allow some actors to go back to their original state (i.e. Button controls) - DALI_LOG_DEBUG_INFO("InterruptedActor(Hit): (%p) %s\n", reinterpret_cast(lastPrimaryHitActor), lastPrimaryHitActor->GetName().data()); + DALI_LOG_RELEASE_INFO("InterruptedActor(Hit): (%p) %d %s\n", reinterpret_cast(lastPrimaryHitActor), lastPrimaryHitActor->GetId(), lastPrimaryHitActor->GetName().data()); leaveEventConsumer = EmitTouchSignals(lastPrimaryHitActor, lastRenderTaskImpl, touchEventImpl, PointState::INTERRUPTED); } } @@ -466,7 +471,7 @@ bool TouchEventProcessor::ProcessTouchEvent(const Integration::TouchEvent& event { if(lastConsumedActor->GetLeaveRequired()) { - DALI_LOG_DEBUG_INFO("LeaveActor(Consume): (%p) %s\n", reinterpret_cast(lastConsumedActor), lastConsumedActor->GetName().data()); + DALI_LOG_RELEASE_INFO("LeaveActor(Consume): (%p) %d %s\n", reinterpret_cast(lastConsumedActor), lastConsumedActor->GetId(), lastConsumedActor->GetName().data()); EmitTouchSignals(lastConsumedActor, lastRenderTaskImpl, touchEventImpl, PointState::LEAVE); } } @@ -474,7 +479,7 @@ bool TouchEventProcessor::ProcessTouchEvent(const Integration::TouchEvent& event { // At this point mLastConsumedActor was touchable and sensitive in the previous touch event process but is not in the current one. // An interrupted event is send to allow some actors to go back to their original state (i.e. Button controls) - DALI_LOG_DEBUG_INFO("InterruptedActor(Consume): (%p) %s\n", reinterpret_cast(lastConsumedActor), lastConsumedActor->GetName().data()); + DALI_LOG_RELEASE_INFO("InterruptedActor(Consume): (%p) %d %s\n", reinterpret_cast(lastConsumedActor), lastConsumedActor->GetId(), lastConsumedActor->GetName().data()); EmitTouchSignals(mLastConsumedActor.GetActor(), lastRenderTaskImpl, touchEventImpl, PointState::INTERRUPTED); } } -- 2.7.4