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

Main Window page select button fixes

Browse Source
This commit is contained in:
Mark Watkins 2011-09-07 19:15:33 +10:00
parent a23d9a447b
commit cc5dab6050
4 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Graphs/gGraphView.cpp
View File

@ -1215,7 +1215,7 @@ gGraphView::gGraphView(QWidget *parent, gGraphView * shared) :
backlines=new GLBuffer(QColor(0,0,0,0),10000,GL_LINES); // big fat shared line list backlines=new GLBuffer(QColor(0,0,0,0),10000,GL_LINES); // big fat shared line list
quads=new GLBuffer(QColor(0,0,0,0),1024,GL_QUADS); // big fat shared line list quads=new GLBuffer(QColor(0,0,0,0),1024,GL_QUADS); // big fat shared line list
quads->forceAntiAlias(true); quads->forceAntiAlias(true);
//setFocusPolicy(Qt::StrongFocus); setFocusPolicy(Qt::StrongFocus);
} }
gGraphView::~gGraphView() gGraphView::~gGraphView()
{ {
@ -1839,6 +1839,7 @@ void gGraphView::wheelEvent(QWheelEvent * event)
void gGraphView::keyPressEvent(QKeyEvent * event) void gGraphView::keyPressEvent(QKeyEvent * event)
{ {
return;
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) {

10
mainwindow.cpp
View File

@ -178,8 +178,7 @@ void MainWindow::Startup()
overview=new Overview(ui->tabWidget,daily->SharedWidget()); overview=new Overview(ui->tabWidget,daily->SharedWidget());
ui->tabWidget->insertTab(2,overview,tr("Overview")); ui->tabWidget->insertTab(2,overview,tr("Overview"));
//oximetry=NULL;
//overview=NULL;
oximetry=new Oximetry(ui->tabWidget,daily->SharedWidget()); oximetry=new Oximetry(ui->tabWidget,daily->SharedWidget());
ui->tabWidget->insertTab(3,oximetry,tr("Oximetry")); ui->tabWidget->insertTab(3,oximetry,tr("Oximetry"));
@ -296,7 +295,7 @@ void MainWindow::on_dailyButton_clicked()
void MainWindow::on_overviewButton_clicked() void MainWindow::on_overviewButton_clicked()
{ {
//ui->tabWidget->setCurrentWidget(overview); ui->tabWidget->setCurrentWidget(overview);
} }
void MainWindow::on_webView_loadFinished(bool arg1) void MainWindow::on_webView_loadFinished(bool arg1)
@ -445,3 +444,8 @@ void MainWindow::DelayedScreenshot()
a+="/screenshot-"+QDateTime::currentDateTime().toString(Qt::ISODate)+".png"; a+="/screenshot-"+QDateTime::currentDateTime().toString(Qt::ISODate)+".png";
pixmap.save(a); pixmap.save(a);
} }
void MainWindow::on_actionView_O_ximetry_triggered()
{
on_oximetryButton_clicked();
}

2
mainwindow.h
View File

@ -89,6 +89,8 @@ private slots:
void on_action_Screenshot_triggered(); void on_action_Screenshot_triggered();
void DelayedScreenshot(); void DelayedScreenshot();
void on_actionView_O_ximetry_triggered();
private: private:
Ui::MainWindow *ui; Ui::MainWindow *ui;
Daily * daily; Daily * daily;

11
mainwindow.ui
View File

@ -588,9 +588,10 @@
<property name="title"> <property name="title">
<string>&amp;View</string> <string>&amp;View</string>
</property> </property>
<addaction name="actionView_Welcome"/>
<addaction name="actionView_Daily"/> <addaction name="actionView_Daily"/>
<addaction name="actionView_Overview"/> <addaction name="actionView_Overview"/>
<addaction name="actionView_Welcome"/> <addaction name="actionView_O_ximetry"/>
<addaction name="separator"/> <addaction name="separator"/>
<addaction name="actionUse_AntiAliasing"/> <addaction name="actionUse_AntiAliasing"/>
<addaction name="actionOverlay_Bars"/> <addaction name="actionOverlay_Bars"/>
@ -762,6 +763,14 @@
<string>F12</string> <string>F12</string>
</property> </property>
</action> </action>
<action name="actionView_O_ximetry">
<property name="text">
<string>View O&amp;ximetry</string>
</property>
<property name="shortcut">
<string>F7</string>
</property>
</action>
</widget> </widget>
<customwidgets> <customwidgets>
<customwidget> <customwidget>