TableView3D: Added a new TableView3D to replace the old QTableWidget …

…based one
fredcooke · Jul 31, 2014 · 68043e7 · 68043e7
1 parent e5a1279
commit 68043e7
Show file tree

Hide file tree

Showing 4 changed files with 285 additions and 3 deletions.
diff --git a/core/core.pro b/core/core.pro
@@ -119,7 +119,8 @@ SOURCES += src/main.cpp\
     src/comboparam.cpp \
     src/ramdiffwindow.cpp \
     src/pluginmanager.cpp \
-    src/qcustomplot.cpp
+    src/qcustomplot.cpp \
+    src/tableviewnew3d.cpp
 
 
 HEADERS  += src/mainwindow.h \
@@ -172,7 +173,8 @@ HEADERS  += src/mainwindow.h \
     src/comboparam.h \
     src/ramdiffwindow.h \
     src/pluginmanager.h \
-    src/qcustomplot.h
+    src/qcustomplot.h \
+    src/tableviewnew3d.h
 
 FORMS    += src/mainwindow.ui \
     src/comsettings.ui \

diff --git a/core/src/mainwindow.cpp b/core/src/mainwindow.cpp
@@ -30,12 +30,15 @@
 #include "logloader.h"
 #include "QsLog.h"
 #include "wizardview.h"
-
+#include "tableviewnew3d.h"
 #define define2string_p(x) #x
 #define define2string(x) define2string_p(x)
 
 MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent)
 {
+    TableViewNew3D *table = new TableViewNew3D();
+    table->setGeometry(100,100,800,600);
+    table->show();
 	m_interrogationInProgress = false;
 	m_offlineMode = false;
 	m_checkEmsDataInUse = false;

diff --git a/core/src/tableviewnew3d.cpp b/core/src/tableviewnew3d.cpp
@@ -0,0 +1,245 @@
+#include "tableviewnew3d.h"
+#include <QPainter>
+#include <QMouseEvent>
+#define ITEM_WIDTH 60
+#define ITEM_HEIGHT 30
+#define ROWS 19
+#define COLUMNS 21
+TableViewNew3D::TableViewNew3D(QWidget *parent) : QWidget(parent)
+{
+	multiSelect = false;
+	for (int y=0;y<ROWS;y++)
+	{
+		yaxis.append(10 * y);
+		QList<double> row;
+		QList<int> highlightrow;
+		highlightrow.append(0); //For the Y column
+		for (int x=0;x<COLUMNS;x++)
+		{
+			xaxis.append(10 * x);
+			row.append((COLUMNS * 10) - (10 * x));
+			highlightrow.append(0);
+		}
+		m_highlightList.append(highlightrow);
+
+		if (y == 0)
+		{
+			m_highlightList.append(highlightrow); //Double add it for the last row
+		}
+		highlightrow.clear();
+		values.append(row);
+
+	}
+
+}
+void TableViewNew3D::paintEvent (QPaintEvent *evt)
+{
+	Q_UNUSED(evt)
+	QPainter painter(this);
+	painter.setPen(QColor::fromRgb(0,0,0));
+	painter.drawRect(0,0,width()-1,height()-1);
+	//item width = 40
+	//item height = 20
+	for (int y=0;y<ROWS;y++)
+	{
+		if (currentCell.x() == 0 && currentCell.y() == y)
+		{
+			painter.setPen(QColor::fromRgb(0,0,255));
+		}
+		painter.drawRect(0,y*ITEM_HEIGHT,ITEM_WIDTH-1,ITEM_HEIGHT-1);
+		QString numval = QString::number(yaxis.at(y));
+		int width = painter.fontMetrics().width(numval);
+		painter.drawText((ITEM_WIDTH/2.0) - (width / 2.0),(y)*ITEM_HEIGHT + ((ITEM_HEIGHT/2.0)-2) + (painter.fontMetrics().height()/2.0),numval);
+		painter.setPen(QColor::fromRgb(0,0,0));
+	}
+	for (int x=0;x<COLUMNS;x++)
+	{
+		if (currentCell.y() == ROWS && currentCell.x() == x+1)
+		{
+			painter.setPen(QColor::fromRgb(0,0,255));
+		}
+		painter.drawRect((x+1)*ITEM_WIDTH,ITEM_HEIGHT*ROWS,ITEM_WIDTH-1,ITEM_HEIGHT-1);
+		QString numval = QString::number(xaxis.at(x));
+		int width = painter.fontMetrics().width(numval);
+		painter.drawText(((x+1)*ITEM_WIDTH) + ((ITEM_WIDTH/2.0) - (width / 2.0)),ITEM_HEIGHT*ROWS + ((ITEM_HEIGHT/2.0)-2) + (painter.fontMetrics().height()/2.0),numval);
+		painter.setPen(QColor::fromRgb(0,0,0));
+	}
+
+	for (int y=0;y<ROWS;y++)
+	{
+		for (int x=0;x<COLUMNS;x++)
+		{
+			if (currentCell.y() == y && currentCell.x() == x+1)
+			{
+				painter.setPen(QColor::fromRgb(0,0,255));
+			}
+			painter.drawRect(ITEM_WIDTH*(x+1),ITEM_HEIGHT*y,ITEM_WIDTH-1,ITEM_HEIGHT-1);
+
+			double val = values.at(y).at(x);
+			double max = 255;
+			if (val < max/4.0)
+			{
+				QColor bgcolor = QColor::fromRgb(0,(255*((val)/(max/4.0))),255);
+				painter.fillRect(ITEM_WIDTH*(x+1),ITEM_HEIGHT*y,ITEM_WIDTH-1,ITEM_HEIGHT-1,bgcolor);
+			}
+			else if (val < ((max/4.0)*2))
+			{
+				QColor bgcolor = QColor::fromRgb(0,255,255-(255*((val-((max/4.0)))/(max/4.0))));
+				painter.fillRect(ITEM_WIDTH*(x+1),ITEM_HEIGHT*y,ITEM_WIDTH-1,ITEM_HEIGHT-1,bgcolor);
+			}
+			else if (val < ((max/4.0)*3))
+			{
+				QColor bgcolor = QColor::fromRgb((255*((val-((max/4.0)*2))/(max/4.0))),255,0);
+				painter.fillRect(ITEM_WIDTH*(x+1),ITEM_HEIGHT*y,ITEM_WIDTH-1,ITEM_HEIGHT-1,bgcolor);
+			}
+			else
+			{
+				QColor bgcolor = QColor::fromRgb(255,255-(255*((val-((max/4.0)*3))/(max/4.0))),0);
+				painter.fillRect(ITEM_WIDTH*(x+1),ITEM_HEIGHT*y,ITEM_WIDTH-1,ITEM_HEIGHT-1,bgcolor);
+			}
+
+			QString numval = QString::number(values.at(y).at(x));
+			int width = painter.fontMetrics().width(numval);
+			painter.drawText((ITEM_WIDTH*(x+1)) + ((ITEM_WIDTH / 2.0) - (width / 2.0)),((ITEM_HEIGHT*y) + ((ITEM_HEIGHT/2.0)-2)) + (painter.fontMetrics().height()/2.0),numval);
+			painter.setPen(QColor::fromRgb(0,0,0));
+		}
+	}
+}
+void TableViewNew3D::mouseMoveEvent(QMouseEvent *evt)
+{
+	m_x = evt->x() / ITEM_WIDTH;
+	m_y = evt->y() / ITEM_HEIGHT;
+	update();
+}
+void TableViewNew3D::mousePressEvent(QMouseEvent *evt)
+{
+	m_x = evt->x() / ITEM_WIDTH;
+	m_y = evt->y() / ITEM_HEIGHT;
+	currentCell.setX(m_x);
+	currentCell.setY(m_y);
+	/*if (m_highlightList.size() > m_y)
+	{
+		if (m_highlightList.at(m_y).size() > m_x)
+		{
+			m_highlightList[m_y][m_x] = 1;
+		}
+	}*/
+
+	update();
+}
+
+void TableViewNew3D::mouseReleaseEvent(QMouseEvent *evt)
+{
+	Q_UNUSED(evt)
+}
+void TableViewNew3D::keyPressEvent(QKeyEvent *evt)
+{
+	if (evt->key() == Qt::Key_Up)
+	{
+		if (currentCell.y() > 0)
+		{
+			/*if (evt->modifiers() & Qt::ShiftModifier)
+			{
+				if (!multiSelect)
+				{
+					//No selection yet.
+					startSelectCell = currentCell;
+					multiSelect = true;
+				}
+				for (int i=)
+				//Selecting a rectangle
+				//selection will be
+				for (int i=0;i<m_highlightList.size();i++)
+				{
+					//Each row here, test if the first is highlighted. If so,
+				}
+			}
+			else if (evt->modifiers()  & Qt::ControlModifier)
+			{
+				//Moving selection without clearing
+			}
+			else
+			{
+				//Deselect everything, and move cursor to new point
+				for (int i=0;i<m_highlightList.size();i++)
+				{
+					for (int j=0;j<m_highlightList[i].size();j++)
+					{
+						m_highlightList[i][j] = 0;
+					}
+
+				}
+			}*/
+			currentCell.setY(currentCell.y()-1);
+			update();
+			return;
+		}
+	}
+	if (evt->key() == Qt::Key_Down)
+	{
+		if (currentCell.y() < ROWS)
+		{
+			currentCell.setY(currentCell.y()+1);
+			update();
+			return;
+		}
+	}
+	if (evt->key() == Qt::Key_Left)
+	{
+		if (currentCell.x() > 0)
+		{
+			currentCell.setX(currentCell.x()-1);
+			update();
+			return;
+		}
+	}
+	if (evt->key() == Qt::Key_Right)
+	{
+		if (currentCell.x() < COLUMNS)
+		{
+			currentCell.setX(currentCell.x()+1);
+			update();
+			return;
+		}
+	}
+	if (evt->key() == Qt::Key_Equal)
+	{
+		if (currentCell.x() == 0 && currentCell.y() != 0)
+		{
+			//Y Axis
+			yaxis[currentCell.y()]++;
+			update();
+			return;
+		}
+		else if (currentCell.y() == ROWS)
+		{
+			xaxis[currentCell.x()-1]++;
+			update();
+			return;
+			//X Axis
+		}
+		values[currentCell.y()][currentCell.x()-1]++;
+		update();
+		return;
+	}
+	if (evt->key() == Qt::Key_Minus)
+	{
+		if (currentCell.x() == 0 && currentCell.y() != 0)
+		{
+			//Y axis
+			yaxis[currentCell.y()]--;
+			update();
+			return;
+		}
+		else if (currentCell.y() == ROWS)
+		{
+			//X Axis
+			xaxis[currentCell.x()-1]--;
+			update();
+			return;
+		}
+		values[currentCell.y()][currentCell.x()-1]--;
+		update();
+		return;
+	}
+}
diff --git a/core/src/tableviewnew3d.h b/core/src/tableviewnew3d.h
@@ -0,0 +1,32 @@
+#ifndef TABLEVIEWNEW3D_H
+#define TABLEVIEWNEW3D_H
+
+#include <QWidget>
+
+class TableViewNew3D : public QWidget
+{
+	Q_OBJECT
+public:
+	explicit TableViewNew3D(QWidget *parent = 0);
+private:
+	void paintEvent (QPaintEvent *evt);
+	QList<double> xaxis;
+	QList<double> yaxis;
+	QList<QList<double> > values;
+	void mouseMoveEvent(QMouseEvent *evt);
+	void mousePressEvent(QMouseEvent *evt);
+	void mouseReleaseEvent(QMouseEvent *evt);
+	int m_x;
+	int m_y;
+	QList<QList<int> > m_highlightList;
+	void keyPressEvent(QKeyEvent *evt);
+	QPoint currentCell;
+	QPoint startSelectCell;
+	bool multiSelect;
+signals:
+
+public slots:
+
+};
+
+#endif // TABLEVIEWNEW3D_H