Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mapsme/omim.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/map/information_display.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'map/information_display.cpp')
-rw-r--r--map/information_display.cpp270
1 files changed, 139 insertions, 131 deletions
diff --git a/map/information_display.cpp b/map/information_display.cpp
index 33290a17b8..bebee28b39 100644
--- a/map/information_display.cpp
+++ b/map/information_display.cpp
@@ -5,26 +5,13 @@
#include "map/ruler.hpp"
#include "map/alfa_animation_task.hpp"
-#include "render/drawer.hpp"
-
#include "anim/task.hpp"
#include "anim/controller.hpp"
-#include "gui/controller.hpp"
-#include "gui/button.hpp"
-#include "gui/cached_text_view.hpp"
-
-#include "graphics/defines.hpp"
-#include "graphics/depth_constants.hpp"
-#include "graphics/display_list.hpp"
-
#include "platform/platform.hpp"
#include "geometry/transformations.hpp"
-
-using namespace graphics;
-
namespace
{
static int const RULLER_X_OFFSET = 6;
@@ -43,7 +30,8 @@ namespace
InformationDisplay::InformationDisplay(Framework * fw)
: m_framework(fw)
{
- m_fontDesc.m_color = Color(0x4D, 0x4D, 0x4D, 0xCC);
+ ///@TODO UVR
+ //m_fontDesc.m_color = Color(0x4D, 0x4D, 0x4D, 0xCC);
InitRuler(fw);
InitCountryStatusDisplay(fw);
@@ -61,143 +49,151 @@ InformationDisplay::InformationDisplay(Framework * fw)
void InformationDisplay::InitRuler(Framework * fw)
{
- Ruler::Params p;
+ ///@TODO UVR
+// Ruler::Params p;
- p.m_depth = rulerDepth;
- p.m_position = EPosAboveLeft;
- p.m_framework = fw;
+// p.m_depth = rulerDepth;
+// p.m_position = EPosAboveLeft;
+// p.m_framework = fw;
- m_ruler.reset(new Ruler(p));
- m_ruler->setIsVisible(false);
+// m_ruler.reset(new Ruler(p));
+// m_ruler->setIsVisible(false);
}
void InformationDisplay::InitCountryStatusDisplay(Framework * fw)
{
- CountryStatusDisplay::Params p(fw->GetCountryTree().GetActiveMapLayout());
+ ///@TODO UVR
+// CountryStatusDisplay::Params p(fw->GetCountryTree().GetActiveMapLayout());
- p.m_pivot = m2::PointD(0, 0);
- p.m_position = EPosCenter;
- p.m_depth = countryStatusDepth;
+// p.m_pivot = m2::PointD(0, 0);
+// p.m_position = EPosCenter;
+// p.m_depth = countryStatusDepth;
- m_countryStatusDisplay.reset(new CountryStatusDisplay(p));
+// m_countryStatusDisplay.reset(new CountryStatusDisplay(p));
}
void InformationDisplay::InitCopyright(Framework * fw)
{
- gui::CachedTextView::Params p;
+ ///@TODO UVR
+// gui::CachedTextView::Params p;
- p.m_depth = rulerDepth;
- p.m_position = EPosAboveLeft;
- p.m_pivot = m2::PointD(0, 0);
- p.m_text = "Map data © OpenStreetMap";
+// p.m_depth = rulerDepth;
+// p.m_position = EPosAboveLeft;
+// p.m_pivot = m2::PointD(0, 0);
+// p.m_text = "Map data © OpenStreetMap";
- m_copyrightLabel.reset(new gui::CachedTextView(p));
+// m_copyrightLabel.reset(new gui::CachedTextView(p));
}
void InformationDisplay::InitCompassArrow(Framework * fw)
{
- CompassArrow::Params p;
+ ///@TODO UVR
+// CompassArrow::Params p;
- p.m_position = EPosCenter;
- p.m_depth = compassDepth;
- p.m_pivot = m2::PointD(0, 0);
- p.m_framework = fw;
+// p.m_position = EPosCenter;
+// p.m_depth = compassDepth;
+// p.m_pivot = m2::PointD(0, 0);
+// p.m_framework = fw;
- m_compassArrow.reset(new CompassArrow(p));
- m_compassArrow->setIsVisible(false);
+// m_compassArrow.reset(new CompassArrow(p));
+// m_compassArrow->setIsVisible(false);
}
void InformationDisplay::InitLocationState(Framework * fw)
{
- location::State::Params p;
+ ///@TODO UVR
+// location::State::Params p;
- p.m_position = EPosCenter;
- p.m_depth = locationDepth;
- p.m_pivot = m2::PointD(0, 0);
- p.m_locationAreaColor = Color(30, 150, 240, 20);
- p.m_framework = fw;
+// p.m_position = EPosCenter;
+// p.m_depth = locationDepth;
+// p.m_pivot = m2::PointD(0, 0);
+// p.m_locationAreaColor = Color(0x51, 0xA3, 0xDC, 0x46);
+// p.m_framework = fw;
- m_locationState.reset(new location::State(p));
+// m_locationState.reset(new location::State(p));
}
void InformationDisplay::InitDebugLabel()
{
- gui::CachedTextView::Params p;
+ ///@TODO UVR
+// gui::CachedTextView::Params p;
- p.m_depth = debugDepth;
- p.m_position = EPosAboveRight;
- p.m_pivot = m2::PointD(0, 0);
+// p.m_depth = debugDepth;
+// p.m_position = EPosAboveRight;
+// p.m_pivot = m2::PointD(0, 0);
- m_debugLabel.reset(new gui::CachedTextView(p));
+// m_debugLabel.reset(new gui::CachedTextView(p));
}
-void InformationDisplay::setController(gui::Controller * controller)
-{
- m_controller = controller;
- m_controller->AddElement(m_countryStatusDisplay);
- m_controller->AddElement(m_compassArrow);
- m_controller->AddElement(m_locationState);
- m_controller->AddElement(m_ruler);
- m_controller->AddElement(m_debugLabel);
-
- m_controller->AddElement(m_copyrightLabel);
- shared_ptr<anim::Task> task(new AlfaAnimationTask(1.0, 0.0, 0.15, 3.0, m_framework));
- task->AddCallback(anim::Task::EEnded, [this] ()
- {
- m_controller->RemoveElement(m_copyrightLabel);
- m_copyrightLabel.reset();
- });
-
- m_copyrightLabel->setAnimated([task] ()
- {
- AlfaAnimationTask * t = static_cast<AlfaAnimationTask *>(task.get());
- return t->GetCurrentAlfa();
- });
-
- m_framework->GetAnimController()->AddTask(task);
-}
+ ///@TODO UVR
+//void InformationDisplay::setController(gui::Controller * controller)
+//{
+// m_controller = controller;
+// m_controller->AddElement(m_countryStatusDisplay);
+// m_controller->AddElement(m_compassArrow);
+// m_controller->AddElement(m_locationState);
+// m_controller->AddElement(m_ruler);
+// m_controller->AddElement(m_debugLabel);
+
+// m_controller->AddElement(m_copyrightLabel);
+// shared_ptr<anim::Task> task(new AlfaAnimationTask(1.0, 0.0, 0.15, 3.0, m_framework));
+// task->AddCallback(anim::Task::EEnded, [this] ()
+// {
+// m_controller->RemoveElement(m_copyrightLabel);
+// m_copyrightLabel.reset();
+// });
+
+// m_copyrightLabel->setAnimated([task] ()
+// {
+// AlfaAnimationTask * t = static_cast<AlfaAnimationTask *>(task.get());
+// return t->GetCurrentAlfa();
+// });
+
+// m_framework->GetAnimController()->AddTask(task);
+//}
void InformationDisplay::SetWidgetPivotsByDefault(int screenWidth, int screenHeight)
{
- double rulerOffsX = RULLER_X_OFFSET;
- double rulerOffsY = RULLER_Y_OFFSET;
- double compassOffsX = COMPASS_X_OFFSET;
- double compassOffsY = COMPASS_Y_OFFSET;
- m2::RectI const rect = m2::RectI(0, 0, screenWidth, screenHeight);
-
-#ifdef OMIM_OS_ANDROID
- if (GetPlatform().IsTablet())
- {
- rulerOffsX = RULLER_X_OFFSET_L;
- rulerOffsY = RULLER_Y_OFFSET_L;
- compassOffsX = COMPASS_X_OFFSET_L;
- compassOffsY = COMPASS_Y_OFFSET_L;
- }
-#endif
-
- double const vs = m_framework->GetVisualScale();
- m_countryStatusDisplay->setPivot(m2::PointD(rect.Center()));
-
- m2::PointD const size = m_compassArrow->GetPixelSize();
- m_compassArrow->setPivot(m2::PointD(compassOffsX * vs + size.x / 2.0,
- rect.maxY() - compassOffsY * vs - size.y / 2.0));
-
- m_ruler->setPivot(m2::PointD(rect.maxX() - rulerOffsX * vs,
- rect.maxY() - rulerOffsY * vs));
-
- if (m_copyrightLabel)
- {
- m_copyrightLabel->setPivot(m2::PointD(rect.maxX() - rulerOffsX * vs,
- rect.maxY() - rulerOffsY * vs));
- }
- m_debugLabel->setPivot(m2::PointD(rect.minX() + 10,
- rect.minY() + 50 + 5 * vs));
+ ///@TODO UVR
+// double rulerOffsX = RULLER_X_OFFSET;
+// double rulerOffsY = RULLER_Y_OFFSET;
+// double compassOffsX = COMPASS_X_OFFSET;
+// double compassOffsY = COMPASS_Y_OFFSET;
+//#ifdef OMIM_OS_ANDROID
+// if (GetPlatform().IsTablet())
+// {
+// rulerOffsX = RULLER_X_OFFSET_L;
+// rulerOffsY = RULLER_Y_OFFSET_L;
+// compassOffsX = COMPASS_X_OFFSET_L;
+// compassOffsY = COMPASS_Y_OFFSET_L;
+// }
+//#endif
+
+// double const vs = m_framework->GetVisualScale();
+// m_countryStatusDisplay->setPivot(m2::PointD(rect.Center()));
+
+// m2::PointD const size = m_compassArrow->GetPixelSize();
+// m_compassArrow->setPivot(m2::PointD(compassOffsX * vs + size.x / 2.0,
+// rect.maxY() - compassOffsY * vs - size.y / 2.0));
+
+// m_ruler->setPivot(m2::PointD(rect.maxX() - rulerOffsX * vs,
+// rect.maxY() - rulerOffsY * vs));
+
+// if (m_copyrightLabel)
+// {
+// m_copyrightLabel->setPivot(m2::PointD(rect.maxX() - rulerOffsX * vs,
+// rect.maxY() - rulerOffsY * vs));
+// }
+
+// m_debugLabel->setPivot(m2::PointD(rect.minX() + 10,
+// rect.minY() + 50 + 5 * vs));
}
bool InformationDisplay::isCopyrightActive() const
{
- return m_copyrightLabel != nullptr;
+ ///@TODO UVR
+ return false;//m_copyrightLabel != nullptr;
}
void InformationDisplay::enableCopyright(bool doEnable)
@@ -208,30 +204,34 @@ void InformationDisplay::enableCopyright(bool doEnable)
void InformationDisplay::enableRuler(bool doEnable)
{
- if (doEnable)
- m_ruler->AnimateShow();
- else
- m_ruler->AnimateHide();
+ ///@TODO UVR
+// if (doEnable)
+// m_ruler->AnimateShow();
+// else
+// m_ruler->AnimateHide();
}
bool InformationDisplay::isRulerEnabled() const
{
- return m_ruler->isVisible();
+ ///@TODO UVR
+ return false;//m_ruler->isVisible();
}
void InformationDisplay::setVisualScale(double visualScale)
{
- m_fontDesc.m_size = static_cast<uint32_t>(FONT_SIZE * visualScale);
+ ///@TODO UVR
+// m_fontDesc.m_size = static_cast<uint32_t>(FONT_SIZE * visualScale);
- m_ruler->setFont(gui::Element::EActive, m_fontDesc);
- m_debugLabel->setFont(gui::Element::EActive, m_fontDesc);
- if (m_copyrightLabel)
- m_copyrightLabel->setFont(gui::Element::EActive, m_fontDesc);
+// m_ruler->setFont(gui::Element::EActive, m_fontDesc);
+// m_debugLabel->setFont(gui::Element::EActive, m_fontDesc);
+// if (m_copyrightLabel)
+// m_copyrightLabel->setFont(gui::Element::EActive, m_fontDesc);
}
void InformationDisplay::enableDebugInfo(bool doEnable)
{
- m_debugLabel->setIsVisible(doEnable);
+ ///@TODO UVR
+ //m_debugLabel->setIsVisible(doEnable);
}
void InformationDisplay::setDebugInfo(double frameDuration, int currentScale)
@@ -239,45 +239,53 @@ void InformationDisplay::setDebugInfo(double frameDuration, int currentScale)
ostringstream out;
out << "Scale : " << currentScale;
- m_debugLabel->setText(out.str());
+ ///@TODO UVR
+ //m_debugLabel->setText(out.str());
}
void InformationDisplay::enableCompassArrow(bool doEnable)
{
- if (doEnable)
- m_compassArrow->AnimateShow();
- else
- m_compassArrow->AnimateHide();
+ ///@TODO UVR
+// if (doEnable)
+// m_compassArrow->AnimateShow();
+// else
+// m_compassArrow->AnimateHide();
}
bool InformationDisplay::isCompassArrowEnabled() const
{
- return m_compassArrow->isVisible();
+ ///@TODO UVR
+ return false;//m_compassArrow->isVisible();
}
void InformationDisplay::setCompassArrowAngle(double angle)
{
- m_compassArrow->SetAngle(angle);
+ ///@TODO UVR
+ //m_compassArrow->SetAngle(angle);
}
void InformationDisplay::setEmptyCountryIndex(storage::TIndex const & idx)
{
- m_countryStatusDisplay->SetCountryIndex(idx);
+ ///@TODO UVR
+ //m_countryStatusDisplay->SetCountryIndex(idx);
}
shared_ptr<CountryStatusDisplay> const & InformationDisplay::countryStatusDisplay() const
{
- return m_countryStatusDisplay;
+ ///@TODO UVR
+ return nullptr;//m_countryStatusDisplay;
}
shared_ptr<location::State> const & InformationDisplay::locationState() const
{
- return m_locationState;
+ ///@TODO UVR
+ return nullptr; //m_locationState;
}
void InformationDisplay::measurementSystemChanged()
{
- m_ruler->setIsDirtyLayout(true);
+ ///@TODO UVR
+ //m_ruler->setIsDirtyLayout(true);
}
void InformationDisplay::ResetRouteMatchingInfo()
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-11 01:07:05 +0300