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

Fix for gGraph height resize bug

Browse Source
This commit is contained in:
Mark Watkins 2011-08-26 21:54:47 +10:00
parent 44d00f32fc
commit 504f383e89
3 changed files with 25 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
Graphs/gGraphView.cpp
View File

@ -148,7 +148,7 @@ gGraph::gGraph(gGraphView *graphview,QString title,int height,short group) :
m_height(height), m_height(height),
m_visible(true) m_visible(true)
{ {
m_min_height=50; m_min_height=80;
m_layers.clear(); m_layers.clear();
if (graphview) { if (graphview) {
@ -157,7 +157,7 @@ gGraph::gGraph(gGraphView *graphview,QString title,int height,short group) :
qWarning() << "gGraph created without a gGraphView container.. Naughty programmer!! Bad!!!"; qWarning() << "gGraph created without a gGraphView container.. Naughty programmer!! Bad!!!";
} }
m_margintop=10; m_margintop=10;
m_marginbottom=10; m_marginbottom=5;
m_marginleft=5; m_marginleft=5;
m_marginright=10; m_marginright=10;
m_selecting_area=m_blockzoom=false; m_selecting_area=m_blockzoom=false;
@ -316,21 +316,21 @@ void gGraph::mouseMoveEvent(QMouseEvent * event)
int y=event->pos().y(); int y=event->pos().y();
int x=event->pos().x(); int x=event->pos().x();
int x2=m_graphview->pointClicked().x(),y2=m_graphview->pointClicked().y(); int x2=m_graphview->pointClicked().x(),y2=m_graphview->pointClicked().y();
int w=m_width-(m_graphview->titleWidth+right+m_marginright); int w=m_lastbounds.width()-(right+m_marginright);
int h=m_height-(bottom+m_marginbottom); int h=m_lastbounds.height()-(bottom+m_marginbottom);
double xx=max_x-min_x; double xx=max_x-min_x;
double xmult=xx/w; double xmult=xx/w;
m_selecting_area=false; m_selecting_area=false;
if (m_graphview->m_selected_graph==this) { if (m_graphview->m_selected_graph==this) {
if (event->buttons() & Qt::LeftButton) { if (event->buttons() & Qt::LeftButton) {
//qDebug() << m_title << "Moved" << x << y << left << right << top << bottom << m_width << m_height; //qDebug() << m_title << "Moved" << x << y << left << right << top << bottom << m_width << h;
int a1=MIN(x,x2); int a1=MIN(x,x2);
int a2=MAX(x,x2); int a2=MAX(x,x2);
if (a1<m_marginleft+left) a1=m_marginleft+left; if (a1<m_marginleft+left) a1=m_marginleft+left;
if (a2>w) a2=w; if (a2>w) a2=w;
m_selecting_area=true; m_selecting_area=true;
m_selection=QRect(a1-m_marginleft-1,0,a2-a1,m_height); m_selection=QRect(a1-m_marginleft-1,0,a2-a1,m_lastbounds.height());
m_graphview->updateGL(); m_graphview->updateGL();
} else if (event->buttons() & Qt::RightButton) { } else if (event->buttons() & Qt::RightButton) {
m_graphview->setPointClicked(event->pos()); m_graphview->setPointClicked(event->pos());
@ -379,11 +379,10 @@ void gGraph::mouseMoveEvent(QMouseEvent * event)
m_graphview->SetXBounds(min_x,max_x,m_group); m_graphview->SetXBounds(min_x,max_x,m_group);
} }
} }
} }
if (x>left+m_marginleft && x<m_width-(m_graphview->titleWidth+right+m_marginright) && y>top+m_margintop && y<m_height-(bottom+m_marginbottom)) { // main area if (x>left+m_marginleft && x<m_lastbounds.width()-(right+m_marginright) && y>top+m_margintop && y<m_lastbounds.height()-(bottom+m_marginbottom)) { // main area
x-=left+m_marginleft; x-=left+m_marginleft;
y-=top+m_margintop; y-=top+m_margintop;
//qDebug() << m_title << "Moved" << x << y << left << right << top << bottom << m_width << m_height; //qDebug() << m_title << "Moved" << x << y << left << right << top << bottom << m_width << m_height;
@ -393,12 +392,12 @@ void gGraph::mousePressEvent(QMouseEvent * event)
{ {
int y=event->pos().y(); int y=event->pos().y();
int x=event->pos().x(); int x=event->pos().x();
int w=m_width-(m_graphview->titleWidth+right+m_marginright); int w=m_lastbounds.width()-(right+m_marginright);
int h=m_height-(bottom+m_marginbottom); int h=m_lastbounds.height()-(bottom+m_marginbottom);
int x2,y2; int x2,y2;
double xx=max_x-min_x; double xx=max_x-min_x;
double xmult=xx/w; double xmult=xx/w;
if (x>left+m_marginleft && x<m_width-(m_graphview->titleWidth+right+m_marginright) && y>top+m_margintop && y<m_height-(bottom+m_marginbottom)) { // main area if (x>left+m_marginleft && x<m_lastbounds.width()-(right+m_marginright) && y>top+m_margintop && y<m_lastbounds.height()-(bottom+m_marginbottom)) { // main area
x-=left+m_marginleft; x-=left+m_marginleft;
y-=top+m_margintop; y-=top+m_margintop;
} }
@ -410,8 +409,8 @@ void gGraph::mouseReleaseEvent(QMouseEvent * event)
{ {
int y=event->pos().y(); int y=event->pos().y();
int x=event->pos().x(); int x=event->pos().x();
int w=m_width-(m_graphview->titleWidth+m_marginleft+left+right+m_marginright); int w=m_lastbounds.width()-(m_marginleft+left+right+m_marginright);
int h=m_height-(bottom+m_marginbottom); int h=m_lastbounds.height()-(bottom+m_marginbottom);
int x2=m_graphview->pointClicked().x(),y2=m_graphview->pointClicked().y(); int x2=m_graphview->pointClicked().x(),y2=m_graphview->pointClicked().y();
@ -481,8 +480,8 @@ void gGraph::mouseDoubleClickEvent(QMouseEvent * event)
//mouseReleaseEvent(event); //mouseReleaseEvent(event);
int y=event->pos().y(); int y=event->pos().y();
int x=event->pos().x(); int x=event->pos().x();
int w=m_width-(m_graphview->titleWidth+m_marginleft+left+right+m_marginright); int w=m_lastbounds.width()-(m_marginleft+left+right+m_marginright);
int h=m_height-(bottom+m_marginbottom); int h=m_lastbounds.height()-(bottom+m_marginbottom);
int x2=m_graphview->pointClicked().x(),y2=m_graphview->pointClicked().y(); int x2=m_graphview->pointClicked().x(),y2=m_graphview->pointClicked().y();
if ((m_graphview->horizTravel()<4) && (x>left+m_marginleft && x<w+m_marginleft+left && y>top+m_margintop && y<h)) { // normal click in main area if ((m_graphview->horizTravel()<4) && (x>left+m_marginleft && x<w+m_marginleft+left && y>top+m_margintop && y<h)) { // normal click in main area
if (event->button() & Qt::RightButton) { if (event->button() & Qt::RightButton) {
@ -505,7 +504,7 @@ void gGraph::keyPressEvent(QKeyEvent * event)
void gGraph::ZoomX(double mult,int origin_px) void gGraph::ZoomX(double mult,int origin_px)
{ {
int width=m_width-(m_graphview->titleWidth+m_marginleft+left+right+m_marginright); int width=m_lastbounds.width()-(m_marginleft+left+right+m_marginright);
if (origin_px==0) origin_px=(width/2); else origin_px-=m_marginleft+left; if (origin_px==0) origin_px=(width/2); else origin_px-=m_marginleft+left;
if (origin_px<0) origin_px=0; if (origin_px<0) origin_px=0;
@ -555,8 +554,8 @@ void gGraph::DrawTextQue()
// margin recalcs.. // margin recalcs..
void gGraph::resize(int width, int height) void gGraph::resize(int width, int height)
{ {
m_height=height; //m_height=height;
m_width=width; //m_width=width;
} }
qint64 gGraph::MinX() qint64 gGraph::MinX()
@ -677,7 +676,7 @@ gGraphView::gGraphView(QWidget *parent) :
m_sizer_index=m_graph_index=0; m_sizer_index=m_graph_index=0;
m_textque_items=0; m_textque_items=0;
m_button_down=m_graph_dragging=m_sizer_dragging=false; m_button_down=m_graph_dragging=m_sizer_dragging=false;
m_lastxpos=0; m_lastypos=m_lastxpos=0;
m_horiz_travel=0; m_horiz_travel=0;
this->setMouseTracking(true); this->setMouseTracking(true);
InitGraphs(); InitGraphs();
@ -1054,8 +1053,9 @@ void gGraphView::mouseMoveEvent(QMouseEvent * event)
if (m_button_down || ((y >= py) && (y < py + h))) { if (m_button_down || ((y >= py) && (y < py + h))) {
if (m_button_down || (x >= titleWidth)) { if (m_button_down || (x >= titleWidth)) {
this->setCursor(Qt::ArrowCursor); this->setCursor(Qt::ArrowCursor);
m_horiz_travel+=abs(x-m_lastxpos); m_horiz_travel+=abs(x-m_lastxpos)+abs(y-m_lastypos);
m_lastxpos=x; m_lastxpos=x;
m_lastypos=y;
QPoint p(x-titleWidth,y-py); QPoint p(x-titleWidth,y-py);
QMouseEvent e(event->type(),p,event->button(),event->buttons(),event->modifiers()); QMouseEvent e(event->type(),p,event->button(),event->buttons(),event->modifiers());

9
Graphs/gGraphView.h
View File

@ -182,9 +182,8 @@ protected:
QVector<Layer *> m_layers; QVector<Layer *> m_layers;
float m_height,m_width; float m_height,m_width;
int m_marginleft, m_marginright, m_margintop, m_marginbottom; short m_marginleft, m_marginright, m_margintop, m_marginbottom;
short left,right,top,bottom; // dirty magin hacks..
int left,right,top,bottom; // dirty magin hacks..
int m_min_height; int m_min_height;
int m_max_height; int m_max_height;
@ -208,7 +207,7 @@ public:
void setScrollBar(MyScrollBar *sb); void setScrollBar(MyScrollBar *sb);
MyScrollBar * scrollBar() { return m_scrollbar; } MyScrollBar * scrollBar() { return m_scrollbar; }
static const int titleWidth=30; static const int titleWidth=30;
static const int graphSpacer=5; static const int graphSpacer=4;
float findTop(gGraph * graph); float findTop(gGraph * graph);
@ -274,7 +273,7 @@ protected:
TextQue m_textque[textque_max]; TextQue m_textque[textque_max];
int m_textque_items; int m_textque_items;
int m_lastxpos; int m_lastxpos,m_lastypos;
signals: signals:

2
daily.cpp
View File

@ -96,7 +96,7 @@ Daily::Daily(QWidget *parent,QGLWidget * shared, MainWindow *mw)
SF->AddLayer(AddCPAP(fg)); SF->AddLayer(AddCPAP(fg));
SF->AddLayer(new gShadowArea()); SF->AddLayer(new gShadowArea());
SF->AddLayer(new gYSpacer(),LayerLeft,gYAxis::Margin); SF->AddLayer(new gYSpacer(),LayerLeft,gYAxis::Margin);
SF->AddLayer(new gFooBar(),LayerBottom,0,10); SF->AddLayer(new gFooBar(),LayerBottom,0,1);
SF->AddLayer(new gXAxis(Qt::black,false),LayerBottom,0,gXAxis::Margin); SF->AddLayer(new gXAxis(Qt::black,false),LayerBottom,0,gXAxis::Margin);
PRD->AddLayer(new gXGrid()); PRD->AddLayer(new gXGrid());