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

Graphs Reorder ability.. Click and drag on title

Browse Source
This commit is contained in:
Mark Watkins 2011-07-16 02:11:19 +10:00
parent 6d00f59ec2
commit a37587a4e9
6 changed files with 72 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Graphs/graphwindow.cpp
View File

@ -5,6 +5,7 @@
*********************************************************************/
#include <math.h>
#include <QDebug>
#include <QMouseEvent>
#include "SleepLib/profiles.h"
#include "graphwindow.h"
@ -234,6 +235,7 @@ void gGraphWindow::ZoomX(double mult,int origin_px)
}
SetXBounds(min,max);
}
gGraphWindow *LastGraphLDown=NULL;
gGraphWindow *LastGraphRDown=NULL;
gGraphWindow *currentWidget=NULL;
@ -245,6 +247,21 @@ void gGraphWindow::mouseMoveEvent(QMouseEvent * event)
if (m_dragGraph) {
if (LastGraphLDown!=this)
currentWidget=this;
if (splitter) {
if (event->y()>m_scrY) {
//qDebug() << "Swap Down";
int i=splitter->indexOf(this);
splitter->insertWidget(i+1,this);
} else if (event->y()<0) {
//qDebug() << "Swap up";
int i=splitter->indexOf(this);
if (i>0) {
splitter->insertWidget(i-1,this);
}
}
}
return;
}
if (m_mouseLDown && LastGraphLDown && (LastGraphLDown!=this)) {

52
Graphs/graphwindow.h
View File

@ -51,29 +51,29 @@ public:
virtual void OnMouseRightDown(QMouseEvent * event);
virtual void OnMouseRightRelease(QMouseEvent * event);
int GetScrX(void) const { return m_scrX; };
int GetScrY(void) const { return m_scrY; };
int GetScrX(void) const { return m_scrX; }
int GetScrY(void) const { return m_scrY; }
// For mouse to screen use only.. work in OpenGL points where possible
const QString & Title(void ) { return m_title; };
const QString & Title(void ) { return m_title; }
void SetMargins(float top, float right, float bottom, float left); // OpenGL width of each corners margin
float GetTopMargin(void) const { return m_marginTop; };
float GetBottomMargin(void) const { return m_marginBottom; };
float GetLeftMargin(void) const { return m_marginLeft; };
float GetRightMargin(void) const { return m_marginRight; };
float GetTopMargin(void) const { return m_marginTop; }
float GetBottomMargin(void) const { return m_marginBottom; }
float GetLeftMargin(void) const { return m_marginLeft; }
float GetRightMargin(void) const { return m_marginRight; }
void SetTopMargin(float i) { m_marginTop=i; };
void SetBottomMargin(float i) { m_marginBottom=i; };
void SetLeftMargin(float i) { m_marginLeft=i; };
void SetRightMargin(float i) { m_marginRight=i; };
void SetTopMargin(float i) { m_marginTop=i; }
void SetBottomMargin(float i) { m_marginBottom=i; }
void SetLeftMargin(float i) { m_marginLeft=i; }
void SetRightMargin(float i) { m_marginRight=i; }
inline float Width() { return m_scrX-m_marginLeft-m_marginRight; }; // Width of OpenGL main drawing area
inline int Height() { return m_scrY-m_marginTop-m_marginBottom; }; // Height of ""...
inline float Width() { return m_scrX-m_marginLeft-m_marginRight; } // Width of OpenGL main drawing area
inline int Height() { return m_scrY-m_marginTop-m_marginBottom; } // Height of ""...
void LinkZoom(gGraphWindow *g) { link_zoom.push_back(g); }; // Linking graphs changes zoom behaviour..
//void LinkMove(gGraphWindow *g) { link_move.push_back(g); }; // Linking graphs changes zoom behaviour..
void LinkZoom(gGraphWindow *g) { link_zoom.push_back(g); } // Linking graphs changes zoom behaviour..
//void LinkMove(gGraphWindow *g) { link_move.push_back(g); } // Linking graphs changes zoom behaviour..
virtual double MinX();
virtual double MaxX();
@ -105,24 +105,24 @@ public:
double wid=Width();
double w=((wid/xx)*(x-min_x));
return w+GetLeftMargin();
};
}
inline double p2x(float px) {
double xx=max_x-min_x;
double wx=px-GetLeftMargin();
double ww=wx/Width();
return min_x+(xx*ww);
};
}
inline int y2p(double y) {
double yy=max_y-min_y;
double h=(Height()/yy)*(y-min_y);
return h+GetBottomMargin();
};
}
inline double p2y(float py) {
double yy=max_y-min_y;
double hy=py-GetBottomMargin();
double hh=hy/Height();
return min_y+(yy*hh);
};
}
void Render(float scrx,float scry);
@ -135,16 +135,16 @@ public:
double max_x,min_x,max_y,min_y;
double rmax_x,rmin_x,rmax_y,rmin_y;
void SetBlockZoom(bool b) { m_block_zoom=b; };
//void SetBlockMove(bool b) { m_block_move=b; };
bool BlockZoom() { return m_block_zoom; };
void SetBlockZoom(bool b) { m_block_zoom=b; }
//void SetBlockMove(bool b) { m_block_move=b; }
bool BlockZoom() { return m_block_zoom; }
QGLContext *gl_context;
//FTFont *texfont;
void SetGradientBackground(bool b) { m_gradient_background=b; };
bool GradientBackground() { return m_gradient_background; };
void SetGradientBackground(bool b) { m_gradient_background=b; }
bool GradientBackground() { return m_gradient_background; }
void SetSplitter(QSplitter *s) { splitter=s; };
bool isDraggingGraph() { return m_dragGraph; };
void SetSplitter(QSplitter *s) { splitter=s; }
bool isDraggingGraph() { return m_dragGraph; }
protected:
void initializeGL();
QSplitter *splitter;

4
daily.cpp
View File

@ -77,7 +77,7 @@ Daily::Daily(QWidget *parent,QGLContext *context) :
bool extras=false; //true;
fg->AddLayer(new gFlagsLine(flags[0],QColor("light green"),"CSR",0,sfc));
fg->AddLayer(new gFlagsLine(flags[1],QColor("purple"),"CA",1,sfc));
fg->AddLayer(new gFlagsLine(flags[2],QColor("aqua"),"OA",2,sfc));
fg->AddLayer(new gFlagsLine(flags[2],QColor("#40c0ff"),"OA",2,sfc));
fg->AddLayer(new gFlagsLine(flags[3],QColor("blue"),"H",3,sfc));
fg->AddLayer(new gFlagsLine(flags[4],QColor("black"),"FL",4,sfc));
fg->AddLayer(new gFlagsLine(flags[6],QColor("gold"),"RE",6,sfc));
@ -147,7 +147,7 @@ Daily::Daily(QWidget *parent,QGLContext *context) :
//FRW->AddLayer(new gLineOverlayBar(flags[9],QColor("dark green"),"U0E"));
FRW->AddLayer(new gLineOverlayBar(flags[5],QColor("red"),"VS"));
FRW->AddLayer(new gLineOverlayBar(flags[4],QColor("black"),"FL"));
FRW->AddLayer(new gLineOverlayBar(flags[2],QColor("aqua"),"OA"));
FRW->AddLayer(new gLineOverlayBar(flags[2],QColor("#40c0ff"),"OA"));
FRW->AddLayer(new gLineOverlayBar(flags[1],QColor("purple"),"CA"));
FRW->setMinimumHeight(190);

6
daily.h
View File

@ -30,7 +30,7 @@ class Daily : public QWidget
public:
explicit Daily(QWidget *parent,QGLContext *context);
~Daily();
void SetGLContext(QGLContext *context) { shared_context=context; };
void SetGLContext(QGLContext *context) { shared_context=context; }
void ReloadGraphs();
void RedrawGraphs();
@ -68,8 +68,8 @@ private:
list<gGraphWindow *> Graphs;
void AddCPAPData(gPointData *d) { CPAPData.push_back(d); };
void AddOXIData(gPointData *d) { OXIData.push_back(d); };
void AddCPAPData(gPointData *d) { CPAPData.push_back(d); }
void AddOXIData(gPointData *d) { OXIData.push_back(d); }
void AddGraph(gGraphWindow *w);
void UpdateCPAPGraphs(Day *day);
void UpdateOXIGraphs(Day *day);

37
overview.cpp
View File

@ -98,34 +98,19 @@ Overview::Overview(QWidget *parent,QGLContext *context) :
//SESSTIMES->AddLayer(new gXAxis());
SESSTIMES->setMinimumHeight(270);
AHI->LinkZoom(PRESSURE);
AHI->LinkZoom(LEAK);
AHI->LinkZoom(USAGE);
AHI->LinkZoom(SESSTIMES);
PRESSURE->LinkZoom(AHI);
PRESSURE->LinkZoom(LEAK);
PRESSURE->LinkZoom(USAGE);
PRESSURE->LinkZoom(SESSTIMES);
LEAK->LinkZoom(AHI);
LEAK->LinkZoom(PRESSURE);
LEAK->LinkZoom(USAGE);
LEAK->LinkZoom(SESSTIMES);
USAGE->LinkZoom(AHI);
USAGE->LinkZoom(PRESSURE);
USAGE->LinkZoom(LEAK);
USAGE->LinkZoom(SESSTIMES);
SESSTIMES->LinkZoom(AHI);
SESSTIMES->LinkZoom(PRESSURE);
SESSTIMES->LinkZoom(LEAK);
SESSTIMES->LinkZoom(USAGE);
gGraphWindow * graphs[]={AHI,PRESSURE,LEAK,USAGE,SESSTIMES};
int ss=sizeof(graphs)/sizeof(gGraphWindow *);
gSplitter->addWidget(SESSTIMES);
gSplitter->addWidget(AHI);
gSplitter->addWidget(PRESSURE);
gSplitter->addWidget(LEAK);
gSplitter->addWidget(USAGE);
for (int i=0;i<ss;i++) {
AddGraph(graphs[i]);
for (int j=0;j<ss;j++) {
if (graphs[i]!=graphs[j])
graphs[i]->LinkZoom(graphs[j]);
}
gSplitter->addWidget(graphs[i]);
graphs[i]->SetSplitter(gSplitter);
}
dummyday=new Day(NULL);

16
oximetry.cpp
View File

@ -60,9 +60,19 @@ Oximetry::Oximetry(QWidget *parent) :
portname="";
gSplitter->addWidget(PLETHY);
gSplitter->addWidget(PULSE);
gSplitter->addWidget(SPO2);
gGraphWindow * graphs[]={PLETHY,PULSE,SPO2};
int ss=sizeof(graphs)/sizeof(gGraphWindow *);
for (int i=0;i<ss;i++) {
AddGraph(graphs[i]);
for (int j=0;j<ss;j++) {
if (graphs[i]!=graphs[j])
graphs[i]->LinkZoom(graphs[j]);
}
gSplitter->addWidget(graphs[i]);
graphs[i]->SetSplitter(gSplitter);
}
on_RefreshPortsButton_clicked();
}