chris/OSCAR-code
1
0
Fork 0
mirror of https://gitlab.com/pholy/OSCAR-code.git synced 2025-04-06 11:10:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix problem with overview charts all starting at left edge when they should not.

Browse Source
This commit is contained in:
Seeker4 2019-08-22 02:33:18 -07:00
parent 1c304eb13e
commit 92136e7a63
1 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
oscar/Graphs/gSessionTimesChart.cpp
View File

@ -422,6 +422,11 @@ void gSummaryChart::paint(QPainter &painter, gGraph &graph, const QRegion &regio
int idx = idx_start; int idx = idx_start;
int numDaysOffset = 0;
if (firstday > date) {
numDaysOffset = date.daysTo(firstday);
}
auto ite = dayindex.find(enddate); auto ite = dayindex.find(enddate);
idx_end = daylist.size()-1; idx_end = daylist.size()-1;
if (ite != dayindex.end()) { if (ite != dayindex.end()) {
@ -466,6 +471,7 @@ void gSummaryChart::paint(QPainter &painter, gGraph &graph, const QRegion &regio
preCalc(); preCalc();
float lastx1 = rect.left(); float lastx1 = rect.left();
lastx1 += numDaysOffset * barw;
float right_edge = (rect.left()+rect.width()+1); float right_edge = (rect.left()+rect.width()+1);
@ -515,6 +521,7 @@ void gSummaryChart::paint(QPainter &painter, gGraph &graph, const QRegion &regio
float ymult = float(rect.height()) / (maxy-miny); float ymult = float(rect.height()) / (maxy-miny);
lastx1 = rect.left(); lastx1 = rect.left();
lastx1 += numDaysOffset * barw;
///////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////
/// Main drawing loop /// Main drawing loop
@ -822,9 +829,6 @@ void gSessionTimesChart::paint(QPainter &painter, gGraph &graph, const QRegion &
QDateTime splittime; QDateTime splittime;
// float lasty1 = rect.bottom();
float lastx1 = rect.left();
auto it = dayindex.find(date); auto it = dayindex.find(date);
int idx=0; int idx=0;
@ -834,6 +838,15 @@ void gSessionTimesChart::paint(QPainter &painter, gGraph &graph, const QRegion &
idx = it.value(); idx = it.value();
} }
int numDaysOffset = 0;
if (firstday > date) {
numDaysOffset = date.daysTo(firstday);
}
// float lasty1 = rect.bottom();
float lastx1 = rect.left();
lastx1 += numDaysOffset * barw;
auto ite = dayindex.find(enddate); auto ite = dayindex.find(enddate);
int idx_end = daylist.size()-1; int idx_end = daylist.size()-1;
if (ite != dayindex.end()) { if (ite != dayindex.end()) {
@ -953,6 +966,7 @@ void gSessionTimesChart::paint(QPainter &painter, gGraph &graph, const QRegion &
nousedays = 0; nousedays = 0;
lastx1 = rect.left(); lastx1 = rect.left();
lastx1 += numDaysOffset * barw;
///////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////
/// Main Loop scaling /// Main Loop scaling