From 4615d5de0c7b09ee07b140724f527fa63473ef6f Mon Sep 17 00:00:00 2001 From: Mark Watkins Date: Tue, 3 Jan 2012 10:45:39 +1000 Subject: [PATCH] Remove HiRes Printing option (as it's all HighRes now), and re-enabled AntiAliasing for mac --- Graphs/gSummaryChart.cpp | 6 +++--- SleepLib/profiles.cpp | 1 - SleepLib/profiles.h | 6 ------ mainwindow.cpp | 18 +----------------- preferencesdialog.cpp | 18 ------------------ preferencesdialog.ui | 11 ++--------- 6 files changed, 6 insertions(+), 54 deletions(-) diff --git a/Graphs/gSummaryChart.cpp b/Graphs/gSummaryChart.cpp index dd3bcb82..f78be8b2 100644 --- a/Graphs/gSummaryChart.cpp +++ b/Graphs/gSummaryChart.cpp @@ -18,9 +18,9 @@ SummaryChart::SummaryChart(QString label,GraphType type) addVertexBuffer(quads=new gVertexBuffer(20000,GL_QUADS)); addVertexBuffer(lines=new gVertexBuffer(20000,GL_LINES)); quads->forceAntiAlias(true); - lines->setSize(2); - lines->setBlendFunc(GL_SRC_COLOR, GL_ZERO); - lines->forceAntiAlias(false); + lines->setSize(1.5); + //lines->setBlendFunc(GL_SRC_COLOR, GL_ZERO); + //lines->forceAntiAlias(false); m_empty=true; hl_day=-1; diff --git a/SleepLib/profiles.cpp b/SleepLib/profiles.cpp index b50e43ff..bf83f0fa 100644 --- a/SleepLib/profiles.cpp +++ b/SleepLib/profiles.cpp @@ -565,7 +565,6 @@ const char * IS_STR_ShowSerialNumbers="ShowSerialNumbers"; // AppearanceSettings Strings const char * AS_STR_GraphHeight="GraphHeight"; const char * AS_STR_AntiAliasing="UseAntiAliasing"; -const char * AS_STR_HighResPrinting="HighResPrinting"; const char * AS_STR_GraphSnapshots="EnableGraphSnapshots"; const char * AS_STR_Animations="AnimationsAndTransitions"; const char * AS_STR_SquareWave="SquareWavePlots"; diff --git a/SleepLib/profiles.h b/SleepLib/profiles.h index 6910d8e6..0524eeb9 100644 --- a/SleepLib/profiles.h +++ b/SleepLib/profiles.h @@ -452,7 +452,6 @@ public: extern const char * AS_STR_GraphHeight; extern const char * AS_STR_AntiAliasing; -extern const char * AS_STR_HighResPrinting; extern const char * AS_STR_GraphSnapshots; extern const char * AS_STR_Animations; extern const char * AS_STR_SquareWave; @@ -469,7 +468,6 @@ public: { if (!m_profile->contains(AS_STR_GraphHeight)) (*m_profile)[AS_STR_GraphHeight]=180.0; if (!m_profile->contains(AS_STR_AntiAliasing)) (*m_profile)[AS_STR_AntiAliasing]=false; // i think it's ugly - if (!m_profile->contains(AS_STR_HighResPrinting)) (*m_profile)[AS_STR_HighResPrinting]=true; if (!m_profile->contains(AS_STR_GraphSnapshots)) (*m_profile)[AS_STR_GraphSnapshots]=true; if (!m_profile->contains(AS_STR_Animations)) (*m_profile)[AS_STR_Animations]=true; if (!m_profile->contains(AS_STR_SquareWave)) (*m_profile)[AS_STR_SquareWave]=false; @@ -483,8 +481,6 @@ public: int graphHeight() { return (*m_profile)[AS_STR_GraphHeight].toInt(); } //! \brief Returns true if AntiAliasing (the graphical smoothing method) is enabled bool antiAliasing() { return (*m_profile)[AS_STR_AntiAliasing].toBool(); } - //! \brief Returns true if QPrinter object should use higher-quality High Resolution print mode - bool highResPrinting() { return (*m_profile)[AS_STR_HighResPrinting].toBool(); } //! \brief Returns true if renderPixmap function is in use, which takes snapshots of graphs bool graphSnapshots() { return (*m_profile)[AS_STR_GraphSnapshots].toBool(); } //! \brief Returns true if Graphical animations & Transitions will be drawn @@ -498,8 +494,6 @@ public: void setGraphHeight(int height) { (*m_profile)[AS_STR_GraphHeight]=height; } //! \brief Set to true to turn on AntiAliasing (the graphical smoothing method) void setAntiAliasing(bool aa) { (*m_profile)[AS_STR_AntiAliasing]=aa; } - //! \brief Set to true if QPrinter object should use higher-quality High Resolution print mode - void setHighResPrinting(bool hires) { (*m_profile)[AS_STR_HighResPrinting]=hires; } //! \brief Set to true if renderPixmap functions are in use, which takes snapshots of graphs. void setGraphSnapshots(bool gs) { (*m_profile)[AS_STR_GraphSnapshots]=gs; } //! \brief Set to true if Graphical animations & Transitions will be drawn diff --git a/mainwindow.cpp b/mainwindow.cpp index 2f6f7bb6..97a3a560 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -1462,23 +1462,11 @@ void MainWindow::PrintReport(gGraphView *gv,QString name, QDate date) QPrinter * printer; - //bool highres; bool aa_setting=PROFILE.appearance->antiAliasing(); -#ifdef Q_WS_MAC - PROFILE.appearance->setHighResPrinting(true); // forced on -// bool force_antialiasing=true; -//#else -#endif bool force_antialiasing=aa_setting; - if (PROFILE.appearance->highResPrinting()) { - printer=new QPrinter(QPrinter::HighResolution); - //highres=true; - } else { - printer=new QPrinter(QPrinter::ScreenResolution); - //highres=false; - } + printer=new QPrinter(QPrinter::HighResolution); #ifdef Q_WS_X11 printer->setPrinterName("Print to File (PDF)"); @@ -1507,11 +1495,7 @@ void MainWindow::PrintReport(gGraphView *gv,QString name, QDate date) painter.begin(printer); GLint gw; -//#ifdef Q_WS_WIN32 gw=2048; // Rough guess.. No GL_MAX_RENDERBUFFER_SIZE in mingw.. :( -//#else -// glGetIntegerv(GL_MAX_RENDERBUFFER_SIZE,&gw); -//#endif //QSizeF pxres=printer->paperSize(QPrinter::DevicePixel); QRect prect=printer->pageRect(); diff --git a/preferencesdialog.cpp b/preferencesdialog.cpp index 5f9bf982..511fb6cb 100644 --- a/preferencesdialog.cpp +++ b/preferencesdialog.cpp @@ -156,12 +156,7 @@ PreferencesDialog::PreferencesDialog(QWidget *parent,Profile * _profile) : ui->maskDescription->setText(profile->cpap->maskDescription()); -#ifdef Q_WS_MAC - ui->useAntiAliasing->setChecked(false); - ui->useAntiAliasing->setDisabled(true); -#else ui->useAntiAliasing->setChecked(profile->appearance->antiAliasing()); -#endif ui->useSquareWavePlots->setChecked(profile->appearance->squareWavePlots()); ui->enableGraphSnapshots->setChecked(profile->appearance->graphSnapshots()); ui->skipLoginScreen->setChecked(PREF["SkipLoginScreen"].toBool()); @@ -173,14 +168,6 @@ PreferencesDialog::PreferencesDialog(QWidget *parent,Profile * _profile) : ui->complianceGroupbox->setChecked(profile->cpap->showComplianceInfo()); ui->complianceHours->setValue(profile->cpap->complianceHours()); -#ifdef Q_WS_MAC - profile->appearance->setHighResPrinting(true); - ui->highResolutionPrinting->setChecked(true); - ui->highResolutionPrinting->setEnabled(false); -#else - ui->highResolutionPrinting->setChecked(profile->appearance->highResPrinting()); -#endif - ui->graphHeight->setValue(profile->appearance->graphHeight()); if (!PREF.contains(STR_GEN_UpdatesAutoCheck)) PREF[STR_GEN_UpdatesAutoCheck]=true; @@ -280,11 +267,7 @@ void PreferencesDialog::Save() { bool needs_restart=false; -#ifdef Q_WS_MAC - profile->appearance->setAntiAliasing(false); -#else profile->appearance->setAntiAliasing(ui->useAntiAliasing->isChecked()); -#endif if (ui->useSquareWavePlots->isChecked()!=profile->appearance->squareWavePlots()) { profile->appearance->setSquareWavePlots(ui->useSquareWavePlots->isChecked()); needs_restart=true; @@ -294,7 +277,6 @@ void PreferencesDialog::Save() profile->session->setMultithreading(ui->enableMultithreading->isChecked()); profile->session->setCacheSessions(ui->cacheSessionData->isChecked()); profile->cpap->setMaskDescription(ui->maskDescription->text()); - profile->appearance->setHighResPrinting(ui->highResolutionPrinting->isChecked()); profile->appearance->setAnimations(ui->animationsAndTransitionsCheckbox->isChecked()); profile->cpap->setShowComplianceInfo(ui->complianceGroupbox->isChecked()); diff --git a/preferencesdialog.ui b/preferencesdialog.ui index 7e2fa9de..c6cb2fc6 100644 --- a/preferencesdialog.ui +++ b/preferencesdialog.ui @@ -1228,18 +1228,11 @@ Unfortunately some older computers/versions of Qt can cause this application to be unstable with this feature enabled. - Enable Graph Snapshots + Enable event breakdown pie chart - - - High Resolution Printing (Slow) - - - - Use RDI instead of AHI (PRS1 only) @@ -1630,7 +1623,7 @@ this application to be unstable with this feature enabled. - Animations && Transitions + Animations && Fancy Stuff