games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-23 22:37:55 +02:00
Code Issues Releases Activity

Merge branch 'master' into 'develop'

Browse Source
This commit is contained in:
Ivan Savenko
2025-02-27 21:15:42 +00:00
parent 319d90cbb4 dfda6d2626
commit 8f074490a7
52 changed files with 864 additions and 386 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
client/mainmenu/CStatisticScreen.cpp
View File

@@ -437,7 +437,7 @@ int computeGridStep(int maxAmount, int linesLimit)
}
LineChart::LineChart(Rect position, std::string title, TData data, TIcons icons, float maxY)
: CIntObject(), maxVal(0), maxDay(0)
: CIntObject(), maxVal(0), maxDay(0), data(data)
{
OBJECT_CONSTRUCTION;
@@ -473,21 +473,17 @@ LineChart::LineChart(Rect position, std::string title, TData data, TIcons icons,
niceMaxVal = gridStep * std::ceil(maxVal / gridStep);
niceMaxVal = std::max(1, niceMaxVal); // avoid zero size Y axis (if all values are 0)
// calculate points in chart
auto getPoint = [this](int i, std::vector<float> data){
float x = (static_cast<float>(chartArea.w) / static_cast<float>(maxDay - 1)) * static_cast<float>(i);
float y = static_cast<float>(chartArea.h) - (static_cast<float>(chartArea.h) / niceMaxVal) * data[i];
return Point(x, y);
};
// draw grid (vertical lines)
int dayGridInterval = maxDay < 700 ? 7 : 28;
for(const auto & line : data)
if(maxDay > 1)
{
for(int i = 0; i < line.second.size(); i += dayGridInterval)
for(const auto & line : data)
{
Point p = getPoint(i, line.second) + chartArea.topLeft();
canvas->addLine(Point(p.x, chartArea.topLeft().y), Point(p.x, chartArea.topLeft().y + chartArea.h), ColorRGBA(70, 70, 70));
for(int i = 0; i < line.second.size(); i += dayGridInterval)
{
Point p = getPoint(i, line.second) + chartArea.topLeft();
canvas->addLine(Point(p.x, chartArea.topLeft().y), Point(p.x, chartArea.topLeft().y + chartArea.h), ColorRGBA(70, 70, 70));
}
}
}
@@ -517,7 +513,9 @@ LineChart::LineChart(Rect position, std::string title, TData data, TIcons icons,
for(auto & icon : icons)
if(std::get<0>(icon) == line.first && std::get<1>(icon) == i + 1) // color && day
{
pictures.emplace_back(std::make_shared<CPicture>(std::get<2>(icon), Point(p.x - (std::get<2>(icon)->width() / 2), p.y - (std::get<2>(icon)->height() / 2))));
auto img = std::get<2>(icon);
Point imgPos(p.x - (img->contentRect().w / 2) - img->contentRect().x, p.y - (img->contentRect().h / 2) - img->contentRect().y);
pictures.emplace_back(std::make_shared<CPicture>(img, imgPos));
pictures.back()->addRClickCallback([icon](){ CRClickPopup::createAndPush(std::get<3>(icon)); });
}
@@ -535,18 +533,51 @@ LineChart::LineChart(Rect position, std::string title, TData data, TIcons icons,
layout.emplace_back(std::make_shared<CLabel>(p.x, p.y, FONT_MEDIUM, ETextAlignment::CENTER, Colors::WHITE, LIBRARY->generaltexth->translate("core.genrltxt.64")));
}
Point LineChart::getPoint(int i, std::vector<float> data)
{
float x = (static_cast<float>(chartArea.w) / static_cast<float>(maxDay - 1)) * static_cast<float>(i);
float y = static_cast<float>(chartArea.h) - (static_cast<float>(chartArea.h) / niceMaxVal) * data[i];
return Point(x, y);
};
void LineChart::updateStatusBar(const Point & cursorPosition)
{
statusBar->moveTo(cursorPosition + Point(-statusBar->pos.w / 2, 20));
statusBar->fitToRect(pos, 10);
OBJECT_CONSTRUCTION;
Rect r(pos.x + chartArea.x, pos.y + chartArea.y, chartArea.w, chartArea.h);
statusBar->setEnabled(r.isInside(cursorPosition));
if(r.isInside(cursorPosition))
Point curPos = cursorPosition;
if(r.isInside(curPos))
{
float x = (static_cast<float>(maxDay - 1) / static_cast<float>(chartArea.w)) * (static_cast<float>(cursorPosition.x) - static_cast<float>(r.x)) + 1.0f;
float y = niceMaxVal - (niceMaxVal / static_cast<float>(chartArea.h)) * (static_cast<float>(cursorPosition.y) - static_cast<float>(r.y));
std::vector<std::pair<int, Point>> points;
for(const auto & line : data)
{
for(int i = 0; i < line.second.size(); i++)
{
Point p = getPoint(i, line.second) + chartArea.topLeft();
int len = Point(curPos.x - p.x - pos.x, curPos.y - p.y - pos.y).length();
points.push_back(std::make_pair(len, p));
}
}
std::sort(points.begin(), points.end(), [](const auto &a, const auto &b) { return a.first < b.first; });
if(points.size() && points[0].first < 15)
{
// Snap in with marker for nearest point
hoverMarker = std::make_shared<TransparentFilledRectangle>(Rect(points[0].second - Point(3, 3), Point(6, 6)), Colors::ORANGE);
curPos = points[0].second + pos;
}
else
hoverMarker.reset();
float x = (static_cast<float>(maxDay - 1) / static_cast<float>(chartArea.w)) * (static_cast<float>(curPos.x) - static_cast<float>(r.x)) + 1.0f;
float y = niceMaxVal - (niceMaxVal / static_cast<float>(chartArea.h)) * (static_cast<float>(curPos.y) - static_cast<float>(r.y));
statusBar->write(LIBRARY->generaltexth->translate("core.genrltxt.64") + ": " + CStatisticScreen::getDay(x) + " " + LIBRARY->generaltexth->translate("vcmi.statisticWindow.value") + ": " + (static_cast<int>(y) > 0 ? std::to_string(static_cast<int>(y)) : std::to_string(y)));
}
statusBar->setEnabled(r.resize(1).isInside(curPos));
statusBar->moveTo(curPos + Point(-statusBar->pos.w / 2, 20));
statusBar->fitToRect(pos, 10);
setRedrawParent(true);
redraw();
}