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

Fixed empty graph at top mucking up keyboard zooming

Browse Source
This commit is contained in:
Mark Watkins 2011-11-28 09:10:16 +10:00
parent f8b410077c
commit 4d0cccfce9
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Graphs/gGraphView.cpp
View File

@ -1867,9 +1867,11 @@ void gGraphView::ResetBounds(bool refresh) //short group)
{ {
Q_UNUSED(refresh) Q_UNUSED(refresh)
qint64 m1=0,m2=0; qint64 m1=0,m2=0;
gGraph *g;
for (int i=0;i<m_graphs.size();i++) { for (int i=0;i<m_graphs.size();i++) {
m_graphs[i]->ResetBounds(); m_graphs[i]->ResetBounds();
if (!m_graphs[i]->min_x) continue; if (!m_graphs[i]->min_x) continue;
g=m_graphs[i];
if (!m1 || m_graphs[i]->min_x<m1) m1=m_graphs[i]->min_x; if (!m1 || m_graphs[i]->min_x<m1) m1=m_graphs[i]->min_x;
if (!m2 || m_graphs[i]->max_x>m2) m2=m_graphs[i]->max_x; if (!m2 || m_graphs[i]->max_x>m2) m2=m_graphs[i]->max_x;
} }
@ -1880,7 +1882,9 @@ void gGraphView::ResetBounds(bool refresh) //short group)
m_graphs[i]->SetMaxX(m2); m_graphs[i]->SetMaxX(m2);
} }
} }
qint64 xx=m_graphs[0]->max_x - m_graphs[0]->min_x; if (!g) g=m_graphs[0];
qint64 xx=g->max_x - g->min_x;
double d=xx/86400000L; double d=xx/86400000L;
int h=xx/3600000L; int h=xx/3600000L;
int m=(xx/60000) % 60; int m=(xx/60000) % 60;
@ -1999,7 +2003,6 @@ void gGraphView::paintGL()
if (width()<=0) return; if (width()<=0) return;
if (height()<=0) return; if (height()<=0) return;
glClearColor(255,255,255,255); glClearColor(255,255,255,255);
//glClearDepth(1); //glClearDepth(1);
glClear(GL_COLOR_BUFFER_BIT);// | GL_DEPTH_BUFFER_BIT); glClear(GL_COLOR_BUFFER_BIT);// | GL_DEPTH_BUFFER_BIT);
@ -2410,8 +2413,10 @@ void gGraphView::keyPressEvent(QKeyEvent * event)
gGraph *g; gGraph *g;
for (int i=0;i<m_graphs.size();i++) { for (int i=0;i<m_graphs.size();i++) {
if (m_graphs[i]->group()==0) { if (m_graphs[i]->group()==0) {
g=m_graphs[i]; if (!m_graphs[i]->isEmpty()) {
break; g=m_graphs[i];
break;
}
} }
} }
if (!g) return; if (!g) return;