From 4f53a7312fd6d1b76325822d6bd78875d978d868 Mon Sep 17 00:00:00 2001 From: Mark Watkins Date: Thu, 28 Aug 2014 14:02:22 +1000 Subject: [PATCH] Remove old Graph Tab in Preferences --- sleepyhead/Graphs/gGraph.cpp | 11 ++ sleepyhead/preferencesdialog.cpp | 245 ++++--------------------------- sleepyhead/preferencesdialog.h | 11 -- sleepyhead/preferencesdialog.ui | 86 +---------- 4 files changed, 44 insertions(+), 309 deletions(-) diff --git a/sleepyhead/Graphs/gGraph.cpp b/sleepyhead/Graphs/gGraph.cpp index de19fe9e..eb54b05f 100644 --- a/sleepyhead/Graphs/gGraph.cpp +++ b/sleepyhead/Graphs/gGraph.cpp @@ -333,6 +333,9 @@ void gGraph::paint(QPainter &painter, const QRegion ®ion) QString t = name().section(";", -1); painter.drawText(m_rect, Qt::AlignHCenter | Qt::AlignTop, QObject::tr("Snapshot %1").arg(t)); + if (isPinned()) { + painter.drawPixmap(-5, originY-10, m_graphview->pin_icon); + } return; } @@ -691,6 +694,14 @@ void gGraph::mouseMoveEvent(QMouseEvent *event) bool doredraw = false; + if (isSnapshot() && (x> m_graphview->titleWidth)) { + // this nag might be a little too much.. + ToolTip(tr("Snapshot"),x+15,y, TT_AlignLeft); + timedRedraw(0); + return; + } + + for (int i = 0; i < m_layers.size(); i++) { if (m_layers[i]->m_rect.contains(x, y)) if (m_layers[i]->mouseMoveEvent(event, this)) { diff --git a/sleepyhead/preferencesdialog.cpp b/sleepyhead/preferencesdialog.cpp index 7692cf51..497b9b4c 100644 --- a/sleepyhead/preferencesdialog.cpp +++ b/sleepyhead/preferencesdialog.cpp @@ -272,15 +272,6 @@ PreferencesDialog::PreferencesDialog(QWidget *parent, Profile *_profile) : shortformat.replace("yy","yyyy"); }*/ - graphFilterModel = new MySortFilterProxyModel(this); - graphModel = new QStandardItemModel(this); - graphFilterModel->setSourceModel(graphModel); - graphFilterModel->setFilterCaseSensitivity(Qt::CaseInsensitive); - graphFilterModel->setFilterKeyColumn(0); - ui->graphView->setModel(graphFilterModel); - - resetGraphModel(); - chanFilterModel = new MySortFilterProxyModel(this); chanModel = new QStandardItemModel(this); chanFilterModel->setSourceModel(chanModel); @@ -646,8 +637,6 @@ void PreferencesDialog::InitWaveInfo() PreferencesDialog::~PreferencesDialog() { - disconnect(graphModel, SIGNAL(itemChanged(QStandardItem *)), this, - SLOT(graphModel_changed(QStandardItem *))); delete ui; } @@ -997,12 +986,6 @@ void PreferencesDialog::on_graphView_activated(const QModelIndex &index) qDebug() << "Could do something here with" << a; } -void PreferencesDialog::on_graphFilter_textChanged(const QString &arg1) -{ - graphFilterModel->setFilterFixedString(arg1); -} - - MySortFilterProxyModel::MySortFilterProxyModel(QObject *parent) : QSortFilterProxyModel(parent) { @@ -1021,211 +1004,47 @@ bool MySortFilterProxyModel::filterAcceptsRow(int source_row, return QSortFilterProxyModel::filterAcceptsRow(source_row, source_parent); } -void PreferencesDialog::graphModel_changed(QStandardItem *item) -{ - QModelIndex index = item->index(); - gGraphView *gv = nullptr; - bool ok; +//void PreferencesDialog::on_resetGraphButton_clicked() +//{ +// QString title = tr("Confirmation"); +// QString text = tr("Are you sure you want to reset your graph preferences to the defaults?"); +// StandardButtons buttons = QMessageBox::Yes | QMessageBox::No; +// StandardButton defaultButton = QMessageBox::No; - const QModelIndex &row = index.sibling(index.row(), 0); - bool checked = row.data(Qt::CheckStateRole) != 0; - //QString name=row.data().toString(); +// // Display confirmation dialog. +// StandardButton choice = QMessageBox::question(this, title, text, buttons, defaultButton); - int group = row.data(Qt::UserRole + 1).toInt(); - int id = row.data(Qt::UserRole + 2).toInt(); +// if (choice == QMessageBox::No) { +// return; +// } - switch (group) { - case 0: - gv = mainwin->getDaily()->graphView(); - break; +// gGraphView *views[3] = {0}; +// views[0] = mainwin->getDaily()->graphView(); +// views[1] = mainwin->getOverview()->graphView(); - case 1: - gv = mainwin->getOverview()->graphView(); - break; +// // Iterate over all graph containers. +// for (unsigned j = 0; j < 3; j++) { +// gGraphView *view = views[j]; - default: - ; - } +// if (!view) { +// continue; +// } - if (!gv) { - return; - } +// // Iterate over all contained graphs. +// for (int i = 0; i < view->size(); i++) { +// gGraph *g = (*view)[i]; +// g->setRecMaxY(0); // FIXME: should be g->reset(), but need other patches to land. +// g->setRecMinY(0); +// g->setVisible(true); +// } - gGraph *graph = (*gv)[id]; +// view->updateScale(); +// } - if (!graph) { - return; - } - - if (graph->visible() != checked) { - graph->setVisible(checked); - } - - EventDataType val; - - if (index.column() == 1) { - val = index.data().toDouble(&ok); - - if (!ok) { - graphModel->setData(index, QString::number(graph->rec_miny, 'f', 1)); - ui->graphView->update(); - } else { - //if ((val < graph->rec_maxy) || (val==0)) { - graph->setRecMinY(val); - /*} else { - graphModel->setData(index,QString::number(graph->rec_miny,'f',1)); - ui->graphView->update(); - } */ - } - } else if (index.column() == 2) { - val = index.data().toDouble(&ok); - - if (!ok) { - graphModel->setData(index, QString::number(graph->rec_maxy, 'f', 1)); - ui->graphView->update(); - } else { - //if ((val > graph->rec_miny) || (val==0)) { - graph->setRecMaxY(val); - /*} else { - graphModel->setData(index,QString::number(graph->rec_maxy,'f',1)); - ui->graphView->update(); - }*/ - } - - } - - gv->updateScale(); - // qDebug() << name << checked; -} - -void PreferencesDialog::resetGraphModel() -{ - - graphModel->clear(); - QStandardItem *daily = new QStandardItem(tr("Daily Graphs")); - QStandardItem *overview = new QStandardItem(tr("Overview Graphs")); - daily->setEditable(false); - overview->setEditable(false); - - graphModel->appendRow(daily); - graphModel->appendRow(overview); - - ui->graphView->setAlternatingRowColors(true); - - // ui->graphView->setFirstColumnSpanned(0,daily->index(),true); // Crashes on windows.. Why do I need this again? - graphModel->setColumnCount(3); - QStringList headers; - headers.append(tr("Graph")); - headers.append(STR_TR_Min); - headers.append(STR_TR_Max); - graphModel->setHorizontalHeaderLabels(headers); - ui->graphView->setColumnWidth(0, 250); - ui->graphView->setColumnWidth(1, 50); - ui->graphView->setColumnWidth(2, 50); - - gGraphView *gv = mainwin->getDaily()->graphView(); - - for (int i = 0; i < gv->size(); i++) { - QList items; - QString title = (*gv)[i]->title(); - QStandardItem *it = new QStandardItem(title); - it->setCheckable(true); - it->setCheckState((*gv)[i]->visible() ? Qt::Checked : Qt::Unchecked); - it->setEditable(false); - it->setData(0, Qt::UserRole + 1); - it->setData(i, Qt::UserRole + 2); - items.push_back(it); - - if (title != STR_TR_EventFlags) { - - it = new QStandardItem(QString::number((*gv)[i]->rec_miny, 'f', 1)); - it->setEditable(true); - items.push_back(it); - - it = new QStandardItem(QString::number((*gv)[i]->rec_maxy, 'f', 1)); - it->setEditable(true); - items.push_back(it); - } else { - it = new QStandardItem(tr("N/A")); // not applicable. - it->setEditable(false); - items.push_back(it); - items.push_back(it->clone()); - } - - daily->insertRow(i, items); - } - - gv = mainwin->getOverview()->graphView(); - - for (int i = 0; i < gv->size(); i++) { - QList items; - QStandardItem *it = new QStandardItem((*gv)[i]->title()); - it->setCheckable(true); - it->setCheckState((*gv)[i]->visible() ? Qt::Checked : Qt::Unchecked); - it->setEditable(false); - items.push_back(it); - it->setData(1, Qt::UserRole + 1); - it->setData(i, Qt::UserRole + 2); - - it = new QStandardItem(QString::number((*gv)[i]->rec_miny, 'f', 1)); - it->setEditable(true); - items.push_back(it); - - it = new QStandardItem(QString::number((*gv)[i]->rec_maxy, 'f', 1)); - it->setEditable(true); - items.push_back(it); - - overview->insertRow(i, items); - } - - connect(graphModel, SIGNAL(itemChanged(QStandardItem *)), this, - SLOT(graphModel_changed(QStandardItem *))); - - ui->graphView->expandAll(); - -} - -void PreferencesDialog::on_resetGraphButton_clicked() -{ - QString title = tr("Confirmation"); - QString text = tr("Are you sure you want to reset your graph preferences to the defaults?"); - StandardButtons buttons = QMessageBox::Yes | QMessageBox::No; - StandardButton defaultButton = QMessageBox::No; - - // Display confirmation dialog. - StandardButton choice = QMessageBox::question(this, title, text, buttons, defaultButton); - - if (choice == QMessageBox::No) { - return; - } - - gGraphView *views[3] = {0}; - views[0] = mainwin->getDaily()->graphView(); - views[1] = mainwin->getOverview()->graphView(); - - // Iterate over all graph containers. - for (unsigned j = 0; j < 3; j++) { - gGraphView *view = views[j]; - - if (!view) { - continue; - } - - // Iterate over all contained graphs. - for (int i = 0; i < view->size(); i++) { - gGraph *g = (*view)[i]; - g->setRecMaxY(0); // FIXME: should be g->reset(), but need other patches to land. - g->setRecMinY(0); - g->setVisible(true); - } - - view->updateScale(); - } - - resetGraphModel(); - ui->graphView->update(); -} +// resetGraphModel(); +// ui->graphView->update(); +//} /*void PreferencesDialog::on_genOpWidget_itemActivated(QListWidgetItem *item) { diff --git a/sleepyhead/preferencesdialog.h b/sleepyhead/preferencesdialog.h index 80841558..0d00e424 100644 --- a/sleepyhead/preferencesdialog.h +++ b/sleepyhead/preferencesdialog.h @@ -74,12 +74,6 @@ class PreferencesDialog : public QDialog void on_graphView_activated(const QModelIndex &index); - void on_graphFilter_textChanged(const QString &arg1); - - void graphModel_changed(QStandardItem *item); - - void on_resetGraphButton_clicked(); - //void on_genOpWidget_itemActivated(QListWidgetItem *item); void on_maskTypeCombo_activated(int index); @@ -103,8 +97,6 @@ class PreferencesDialog : public QDialog void on_waveSearch_textChanged(const QString &arg1); private: - //! \brief Populates the Graph Model view with data from the Daily, Overview & Oximetry gGraphView objects - void resetGraphModel(); void InitChanInfo(); void InitWaveInfo(); @@ -118,9 +110,6 @@ private: QStringList importLocations; QStringListModel *importModel; - MySortFilterProxyModel *graphFilterModel; - QStandardItemModel *graphModel; - MySortFilterProxyModel * chanFilterModel; QStandardItemModel *chanModel; diff --git a/sleepyhead/preferencesdialog.ui b/sleepyhead/preferencesdialog.ui index 3c8b9e51..e790bed7 100644 --- a/sleepyhead/preferencesdialog.ui +++ b/sleepyhead/preferencesdialog.ui @@ -51,7 +51,7 @@ - 7 + 2 @@ -1305,90 +1305,6 @@ Try to sync it to your PC's clock (which should be synced to a timeserver) - - - Graphs - - - - 0 - - - 0 - - - 0 - - - 0 - - - 0 - - - - - - - Search - - - - - - - Filters the graph list. Simply start typing the name of the graph your looking for. - - - - - - - - - - - - - 3 - - - 3 - - - 3 - - - 3 - - - - - - 0 - 0 - - - - Reset &Defaults - - - - - - - Double click on the (Y-axis) min/max values to edit them - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - - &Oximetry