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

fix display issues for short span events

Browse Source
This commit is contained in:
LoudSnorer 2021-03-21 14:15:47 -04:00
parent be1d3d878b
commit 562cd9cc37
2 changed files with 23 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
oscar/Graphs/gFlagsLine.cpp
View File

@ -366,23 +366,25 @@ void gFlagsLine::paint(QPainter &painter, gGraph &w, const QRegion &region)
x1 = double(X - minx) * xmult + left; x1 = double(X - minx) * xmult + left;
x2 = double(X2 - minx) * xmult + left; x2 = double(X2 - minx) * xmult + left;
int width = x1-x2;
width = qMax(2,width); // Insure Rectangle will be visable. Flag events are 2 pixels wide.
brush = QBrush(color); brush = QBrush(color);
painter.fillRect(x2, bartop, x1-x2, bottom-bartop, brush); painter.fillRect(x2, bartop, width, bottom-bartop, brush);
if (!w.selectingArea() && !hover && QRect(x2, bartop, x1-x2, bottom-bartop).contains(w.graphView()->currentMousePos())) { if (!w.selectingArea() && !hover && QRect(x2, bartop, width , bottom-bartop).contains(w.graphView()->currentMousePos())) {
hover = true; hover = true;
painter.setPen(QPen(Qt::red,1)); painter.setPen(QPen(Qt::red,1));
painter.drawRect(x2, bartop, x1-x2, bottom-bartop); painter.drawRect(x2, bartop, width, bottom-bartop);
int x,y; int x,y;
int s = *dptr; double s = *dptr;
int m = s / 60; double m;
s %= 60; s=60*modf(s/60,&m);
QString lab = QString("%1").arg(schema::channel[m_code].fullname()); QString lab = QString("%1").arg(schema::channel[m_code].fullname());
if (m>0) { if (m>0) {
lab += QObject::tr(" (%2 min, %3 sec)").arg(m).arg(s); lab += QObject::tr(" (%2 min, %3 sec)").arg(m).arg(s);
} else { } else {
lab += QObject::tr(" (%3 sec)").arg(m).arg(s); lab += QObject::tr(" (%3 sec)").arg(s);
} }
GetTextExtent(lab, x, y); GetTextExtent(lab, x, y);
w.ToolTip(lab, x2 - 10, bartop + (3 * w.printScaleY()), TT_AlignRight, tooltipTimeout); w.ToolTip(lab, x2 - 10, bartop + (3 * w.printScaleY()), TT_AlignRight, tooltipTimeout);

19
oscar/Graphs/gLineOverlay.cpp
View File

@ -28,7 +28,6 @@ void gLineOverlayBar::paint(QPainter &painter, gGraph &w, const QRegion &region)
if (!schema::channel[m_code].enabled()) if (!schema::channel[m_code].enabled())
return; return;
int left = region.boundingRect().left(); int left = region.boundingRect().left();
int topp = region.boundingRect().top(); // FIXME: Misspelling intentional. int topp = region.boundingRect().top(); // FIXME: Misspelling intentional.
double width = region.boundingRect().width(); double width = region.boundingRect().width();
@ -42,10 +41,12 @@ void gLineOverlayBar::paint(QPainter &painter, gGraph &w, const QRegion &region)
double xx = w.max_x - w.min_x; double xx = w.max_x - w.min_x;
//double yy = w.max_y - w.min_y; //double yy = w.max_y - w.min_y;
if (xx <= 0) { return; }
double jj = width / xx; double jj = width / xx;
if (xx <= 0) { return; }
double x1, x2; double x1, x2;
@ -138,12 +139,20 @@ void gLineOverlayBar::paint(QPainter &painter, gGraph &w, const QRegion &region)
x1 = jj * double(X - w.min_x); x1 = jj * double(X - w.min_x);
x2 = jj * double(Y - w.min_x); x2 = jj * double(Y - w.min_x);
x2 += (int(x1)==int(x2)) ? 1 : 0;
x2 = qMax(0.0, x2)+left; x2 = qMax(0.0, x2)+left;
x1 = qMin(width, x1)+left; x1 = qMin(width, x1)+left;
painter.fillRect(QRect(x2, start_py, x1-x2, height), brush); // x2 represents the begining of a span in pixels
// x1 represent the end of the span in pixels
// BUG HERE
//x2 += (int(x1)==int(x2)) ? 1 : 0;
// Fixed BY
int duration = x1-x2;
if (duration<2) duration=2; // display minial span with 2 pixels.
x2 =x1-duration;
painter.fillRect(QRect(x2, start_py, duration, height), brush);
} }
}/* else if (m_flt == FT_Dot) { }/* else if (m_flt == FT_Dot) {
//////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////