sagi/jce-manager
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

sagi ha manyak

Browse source
This commit is contained in:
Liran BN 2014-10-15 12:26:30 +03:00
parent 85e2ea645f
commit 68030355c8
3 changed files with 61 additions and 63 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

83
src/jceData/Grades/graph/gradegraph.cpp
View file

@ -5,6 +5,8 @@ gradegraph::gradegraph(QWidget *parent) : QDialog(parent), ui(new Ui::gradegraph
ui->setupUi(this);
this->setModal(true); //makes it on top of application
this->gp = NULL;
tableWidget = new QCustomPlot(this);
ui->verticalLayoutTable->addWidget(tableWidget);
}
@ -13,13 +15,14 @@ void gradegraph::showGraph(GradePage *gpPTR)
qDebug() << Q_FUNC_INFO;
this->gp = gpPTR;
if (ui->graphwidget->graphCount() > 0)
if (tableWidget->graphCount() > 0)
clearGraph();
setVisualization();
setGraphsData();
ui->graphwidget->replot();
tableWidget->replot();
this->show();
}
@ -42,8 +45,8 @@ void gradegraph::setGraphsData()
indicatorX[i] = i;
if (i%4==1) //years
{
QCPItemText *textLabel = new QCPItemText(ui->graphwidget);
ui->graphwidget->addItem(textLabel);
QCPItemText *textLabel = new QCPItemText(tableWidget);
tableWidget->addItem(textLabel);
double lastAvg = gp->getAvg(minYearInList+yearCount);
@ -72,8 +75,8 @@ void gradegraph::setGraphsData()
{
if (i+4 < xRangeForYear) //semesters
{
QCPItemText *textLabel = new QCPItemText(ui->graphwidget);
ui->graphwidget->addItem(textLabel);
QCPItemText *textLabel = new QCPItemText(tableWidget);
tableWidget->addItem(textLabel);
//qDebug() << "year: " << minYearInList+yearCount << "sem " << (i-1)%4;
double avg = gp->getAvg(minYearInList+yearCount,(i-1)%4);
@ -105,9 +108,9 @@ void gradegraph::setGraphsData()
}
}
//yearly
ui->graphwidget->graph(0)->setData(indicatorX,yearlyAvg);
tableWidget->graph(0)->setData(indicatorX,yearlyAvg);
//yearly
ui->graphwidget->graph(1)->setData(indicatorX,SemesterialAvg);
tableWidget->graph(1)->setData(indicatorX,SemesterialAvg);
}
/**
@ -115,21 +118,21 @@ void gradegraph::setGraphsData()
*/
void gradegraph::setVisualization()
{
ui->graphwidget->setBackground(QBrush(Qt::white));
ui->graphwidget->axisRect()->setupFullAxesBox(true); //make the graph looks like a box
tableWidget->setBackground(QBrush(Qt::white));
tableWidget->axisRect()->setupFullAxesBox(true); //make the graph looks like a box
ui->graphwidget->addGraph(); //yearly and semesterial graphs
ui->graphwidget->addGraph();
tableWidget->addGraph(); //yearly and semesterial graphs
tableWidget->addGraph();
ui->graphwidget->graph(0)->setName(tr("Yearly Average"));
ui->graphwidget->graph(0)->setPen(QPen(Qt::GlobalColor::blue));
ui->graphwidget->graph(0)->setScatterStyle(QCPScatterStyle(QCPScatterStyle::ssCircle, Qt::blue, Qt::blue, 7));
ui->graphwidget->graph(0)->setLineStyle(QCPGraph::lsImpulse );
tableWidget->graph(0)->setName(tr("Yearly Average"));
tableWidget->graph(0)->setPen(QPen(Qt::GlobalColor::blue));
tableWidget->graph(0)->setScatterStyle(QCPScatterStyle(QCPScatterStyle::ssCircle, Qt::blue, Qt::blue, 7));
tableWidget->graph(0)->setLineStyle(QCPGraph::lsImpulse );
ui->graphwidget->graph(1)->setName(tr("Semesterial Average"));
ui->graphwidget->graph(1)->setLineStyle(QCPGraph::lsStepLeft);
ui->graphwidget->graph(1)->setPen(QPen( QColor(Qt::GlobalColor::red)));
ui->graphwidget->graph(1)->setScatterStyle(QCPScatterStyle(QCPScatterStyle::ssCircle, Qt::red, Qt::red, 7));
tableWidget->graph(1)->setName(tr("Semesterial Average"));
tableWidget->graph(1)->setLineStyle(QCPGraph::lsStepLeft);
tableWidget->graph(1)->setPen(QPen( QColor(Qt::GlobalColor::red)));
tableWidget->graph(1)->setScatterStyle(QCPScatterStyle(QCPScatterStyle::ssCircle, Qt::red, Qt::red, 7));
int minYearInList = gp->getMinYearInList()-1;
int maxYearInList = gp->getMaxYearInList()+1;
@ -163,33 +166,33 @@ void gradegraph::setVisualization()
}
}
ui->graphwidget->yAxis->setLabel(tr("AVG Grade"));
ui->graphwidget->yAxis->setTickLabelFont(QFont(QFont().family(), 8));
ui->graphwidget->yAxis->setRange(MIN_GRADE,MAX_GRADE);
ui->graphwidget->yAxis->setTickStep(2);
ui->graphwidget->yAxis->setAutoSubTicks(false);
ui->graphwidget->yAxis->setAutoTickStep(false);
ui->graphwidget->yAxis->setSubTickCount(5);
tableWidget->yAxis->setLabel(tr("AVG Grade"));
tableWidget->yAxis->setTickLabelFont(QFont(QFont().family(), 8));
tableWidget->yAxis->setRange(MIN_GRADE,MAX_GRADE);
tableWidget->yAxis->setTickStep(2);
tableWidget->yAxis->setAutoSubTicks(false);
tableWidget->yAxis->setAutoTickStep(false);
tableWidget->yAxis->setSubTickCount(5);
ui->graphwidget->xAxis->setLabel(tr("Years"));
ui->graphwidget->xAxis->setAutoTickLabels(false);
ui->graphwidget->xAxis->setTickLabelFont(QFont(QFont().family(), 7));
ui->graphwidget->xAxis->setAutoTickStep(false);
ui->graphwidget->xAxis->setTickStep(1);
ui->graphwidget->xAxis->setAutoSubTicks(false);
ui->graphwidget->xAxis->setSubTickCount(0);
ui->graphwidget->xAxis->setTickVectorLabels(xStrings);
ui->graphwidget->xAxis->setRange(1,xRangeForYear);
tableWidget->xAxis->setLabel(tr("Years"));
tableWidget->xAxis->setAutoTickLabels(false);
tableWidget->xAxis->setTickLabelFont(QFont(QFont().family(), 7));
tableWidget->xAxis->setAutoTickStep(false);
tableWidget->xAxis->setTickStep(1);
tableWidget->xAxis->setAutoSubTicks(false);
tableWidget->xAxis->setSubTickCount(0);
tableWidget->xAxis->setTickVectorLabels(xStrings);
tableWidget->xAxis->setRange(1,xRangeForYear);
ui->graphwidget->legend->setVisible(true); //show graph name on top right
tableWidget->legend->setVisible(true); //show graph name on top right
}
void gradegraph::clearGraph()
{
int itemDeleted,graphs,plots;
itemDeleted = ui->graphwidget->clearItems();
graphs = ui->graphwidget->clearGraphs();
plots = ui->graphwidget->clearPlottables();
itemDeleted = tableWidget->clearItems();
graphs = tableWidget->clearGraphs();
plots = tableWidget->clearPlottables();
qDebug() << Q_FUNC_INFO << "items:" << itemDeleted << "graphs" << graphs << "plots:" << plots;
}
void gradegraph::on_pushButton_clicked()

2
src/jceData/Grades/graph/gradegraph.h
View file

@ -2,6 +2,7 @@
#define GRADEGRAPH_H
#include "../gradePage.h"
#include "qcustomplot.h"
#include <QDialog>
namespace Ui {
@ -27,6 +28,7 @@ private:
GradePage *gp;
QCustomPlot *tableWidget;
void setVisualization();
void setGraphsData();
void clearGraph();

39
src/jceData/Grades/graph/gradegraph.ui
View file

@ -17,8 +17,8 @@
<iconset resource="../../../../resources/connectionstatus.qrc">
<normaloff>:/icons/icon.ico</normaloff>:/icons/icon.ico</iconset>
</property>
<layout class="QVBoxLayout" name="verticalLayout_3">
<item>
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0">
<widget class="QLabel" name="label">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Minimum">
@ -37,29 +37,30 @@
</property>
</widget>
</item>
<item>
<layout class="QVBoxLayout" name="verticalLayout_2">
<item row="1" column="0">
<layout class="QVBoxLayout" name="verticalLayoutMain">
<item>
<widget class="QCustomPlot" name="graphwidget" native="true">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<layout class="QVBoxLayout" name="verticalLayout"/>
</widget>
<layout class="QVBoxLayout" name="verticalLayoutTable"/>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout">
<layout class="QHBoxLayout" name="horizontalLayoutButtomPanel">
<property name="spacing">
<number>0</number>
</property>
<property name="sizeConstraint">
<enum>QLayout::SetMinimumSize</enum>
</property>
<item>
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::MinimumExpanding</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>88</width>
<width>90</width>
<height>20</height>
</size>
</property>
@ -78,14 +79,6 @@
</item>
</layout>
</widget>
<customwidgets>
<customwidget>
<class>QCustomPlot</class>
<extends>QWidget</extends>
<header>qcustomplot.h</header>
<container>1</container>
</customwidget>
</customwidgets>
<resources>
<include location="../../../../resources/connectionstatus.qrc"/>
</resources>