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

Move debug time message out of the way, Allow for more room for grabbing the graph title easier when reordering

Browse Source
This commit is contained in:
Mark Watkins 2011-12-04 21:04:01 +10:00
parent e4bd02bd6c
commit 674c82e263
4 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Graphs/gGraphView.cpp
View File

@ -2046,6 +2046,8 @@ void gGraphView::paintGL()
if (width()<=0) return;
if (height()<=0) return;
QTime time;
time.start();
glClearColor(255,255,255,255);
//glClearDepth(1);
@ -2115,8 +2117,6 @@ void gGraphView::paintGL()
}
//int thr=m_idealthreads;
QTime time;
time.start();
#ifdef ENABLED_THREADED_DRAWING
for (int i=0;i<m_idealthreads;i++) {
masterlock->acquire(1);
@ -2160,8 +2160,14 @@ void gGraphView::paintGL()
m_tooltip->paint();
if (m_showsplitter && PROFILE["ShowDebug"].toBool()) {
QString ss;
ss="PreDraw took "+QString::number(elapsed)+"ms";
AddTextQue(ss,width()-140,10,0,col,defaultfont);
int ela=time.elapsed();
ss="Debug Mode "+QString::number(ela)+"ms ("+QString::number(1000.0/float(ela),'f',1)+"fps)";
int w,h;
GetTextExtent(ss,w,h);
QColor col=Qt::white;
quads->add(width()-m_graphs[0]->marginRight(),0,width()-m_graphs[0]->marginRight(),w,width(),w,width(),0,col);
quads->draw();
AddTextQue(ss,width()+3,w/2,90,col,defaultfont);
DrawTextQue();
}
//glDisable(GL_TEXTURE_2D);
@ -2267,7 +2273,7 @@ void gGraphView::mouseMoveEvent(QMouseEvent * event)
if (m_button_down || ((py + h + graphSpacer) >= 0)) {
if (m_button_down || ((y >= py) && (y < py + h))) {
if (m_button_down || (x >= titleWidth)) {
if (m_button_down || (x >= titleWidth+(20))) {
this->setCursor(Qt::ArrowCursor);
m_horiz_travel+=qAbs(x-m_lastxpos)+qAbs(y-m_lastypos);
m_lastxpos=x;
@ -2277,6 +2283,7 @@ void gGraphView::mouseMoveEvent(QMouseEvent * event)
m_graphs[i]->mouseMoveEvent(&e);
} else {
//qDebug() << "Hovering over" << m_graphs[i]->title();
this->setCursor(Qt::OpenHandCursor);
}
} else if ((y >= py + h) && (y <= py + h + graphSpacer + 1)) {
@ -2309,7 +2316,7 @@ void gGraphView::mousePressEvent(QMouseEvent * event)
if ((py + h + graphSpacer) >= 0) {
if ((y >= py) && (y < py + h)) {
//qDebug() << "Clicked" << i;
if (x < titleWidth) { // clicked on title to drag graph..
if (x < titleWidth+20) { // clicked on title to drag graph..
m_graph_dragging=true;
m_graph_index=i;
m_sizer_point.setX(x);

4
Graphs/gGraphView.h
View File

@ -341,6 +341,10 @@ public:
m_marginleft=left; m_marginright=right;
m_margintop=top; m_marginbottom=bottom;
}
inline short marginLeft() { return m_marginleft; }
inline short marginRight() { return m_marginright; }
inline short marginTop() { return m_margintop; }
inline short marginBottom() { return m_marginbottom; }
GLShortBuffer * lines();
GLShortBuffer * backlines();

1
docs/channels.xml
View File

@ -90,6 +90,7 @@ One id code per item
<channel id="0x0803" class="data" scope="!day" name="Weight" details="Weight" label="Weight" unit="Kg" color="black"/>
<channel id="0x0804" class="data" scope="!day" name="Height" details="Height" label="Height" unit="cm" color="blue"/>
<channel id="0x0805" class="data" name="Bookmark" details="Session Bookmark" label="Bookmark" unit="duration" color="orange"/>
<channel id="0x0806" class="data" name="BMI" details="Body Mass Index" label="BMI" unit="kg/m2" color="orange"/>
<channel id="0xd000" class="data" scope="!day" unique="true" name="Journal" details="Journal Notes" label="Journal" type="richtext"/>
</group>
<group name="PRS1">

2
overview.cpp
View File

@ -118,7 +118,7 @@ Overview::Overview(QWidget *parent,gGraphView * shared) :
weight->addSlice("Weight",QColor("black"),ST_SETAVG);
WEIGHT->AddLayer(weight);
bmi=new SummaryChart("B.M.I.",GT_LINE);
bmi=new SummaryChart("BMI",GT_LINE);
bmi->setMachineType(MT_JOURNAL);
bmi->addSlice("BMI",QColor("dark blue"),ST_SETAVG);
BMI->AddLayer(bmi);