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

Minor cosmetic fixes, plus Reset Graph Layout

Browse Source
This commit is contained in:
Mark Watkins 2011-09-13 03:47:37 +10:00
parent 73e47cccd6
commit f6abc6dfc7
8 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Graphs/gGraphView.cpp
View File

@ -1957,6 +1957,14 @@ void gGraphView::timedRedraw(int ms)
{
QTimer::singleShot(ms,this,SLOT(TimedRefresh()));
}
void gGraphView::resetLayout()
{
for (int i=0;i<m_graphs.size();i++) {
m_graphs[i]->setHeight(default_height);
}
updateScale();
updateGL();
}
MyScrollBar::MyScrollBar(QWidget * parent)

2
Graphs/gGraphView.h
View File

@ -16,6 +16,7 @@
#define MAX(a,b) (((a)<(b)) ? (b) : (a));
enum FlagType { FT_Bar, FT_Dot, FT_Span };
const int default_height=170;
void InitGraphs();
void DoneGraphs();
@ -359,6 +360,7 @@ public:
void updateScrollBar();
void updateScale(); // update scale & Scrollbar
void resetLayout();
void setEmptyText(QString s) { m_emptytext=s; }
QMutex text_mutex;
QMutex gl_mutex;

4
Graphs/gYAxis.cpp
View File

@ -15,8 +15,8 @@ gYSpacer::gYSpacer(int spacer) :Layer(EmptyChannel)
gXGrid::gXGrid(QColor col)
:Layer(EmptyChannel)
{
m_major_color=QColor(190,190,190,64);
m_minor_color=QColor(220,220,220,64);
m_major_color=QColor(180,180,180,128);
m_minor_color=QColor(220,220,220,128);
m_show_major_lines=true;
m_show_minor_lines=true;
}

2
daily.cpp
View File

@ -29,7 +29,6 @@
#include "Graphs/gStatsLine.h"
const int min_height=150;
const int default_height=150;
Daily::Daily(QWidget *parent,Profile * _profile,gGraphView * shared, MainWindow *mw)
:QWidget(parent),mainwin(mw), ui(new Ui::Daily),profile(_profile)
@ -695,6 +694,7 @@ void Daily::on_calendar_selectionChanged()
}
void Daily::ResetGraphLayout()
{
GraphView->resetLayout();
//splitter->setSizes(splitter_sizes);
}

3
mainwindow.cpp
View File

@ -377,7 +377,8 @@ void MainWindow::on_actionOverlay_Bars_toggled(bool checked)
void MainWindow::on_action_Reset_Graph_Layout_triggered()
{
if (daily) daily->ResetGraphLayout();
if (daily && (ui->tabWidget->currentWidget()==daily)) daily->ResetGraphLayout();
if (overview && (ui->tabWidget->currentWidget()==overview)) overview->ResetGraphLayout();
}
void MainWindow::on_action_Preferences_triggered()

6
overview.cpp
View File

@ -17,8 +17,6 @@
#include "Graphs/gLineChart.h"
#include "Graphs/gYAxis.h"
const int default_height=180;
Overview::Overview(QWidget *parent,Profile * _profile,gGraphView * shared) :
QWidget(parent),
ui(new Ui::Overview),
@ -271,3 +269,7 @@ void Overview::on_htmlButton_clicked()
}
}
void Overview::ResetGraphLayout()
{
GraphView->resetLayout();
}

1
overview.h
View File

@ -31,6 +31,7 @@ public:
void ReloadGraphs();
//void UpdateGraphs();
void ResetGraphLayout();
gGraph *AHI,*UC,*PR,*LK,*NPB;
SummaryChart *bc,*uc,*pr,*lk,*npb;

4
report.cpp
View File

@ -231,7 +231,7 @@ QString Report::GenerateReport(QString templ,QDate start, QDate end)
if ((*profile).Exists("Height") && !(*profile)["Height"].toString().isEmpty()) {
if ((*profile)["UnitSystem"].toString()=="Metric")
locals["DistanceMeasure"]="cm";
else locals["DistanceMeasure"]="inches";
else locals["DistanceMeasure"]=" inches";
}
//QFile file(":/docs/template_overview.sht");
//file.open(QIODevice::ReadOnly);
@ -254,7 +254,7 @@ void Report::Print(QString html)
//printer.setPaperSize(QPrinter::A4);
printer.setResolution(QPrinter::HighResolution);
//printer.setPageSize();
printer.setFullPage(false);
printer.setFullPage(false); // This has nothing to do with scaling
printer.setNumCopies(1);
printer.setPageMargins(10,10,10,10,QPrinter::Millimeter);
QPrintDialog *dialog = new QPrintDialog(&printer);