Added reload buttons. Improved pixmap for difference view.

ghorwin · Jul 23, 2021 · 1e5881f · 1e5881f
1 parent 6b7bd63
commit 1e5881f
Show file tree

Hide file tree

Showing 6 changed files with 218 additions and 143 deletions.
diff --git a/JacobianMatrixViewer/projects/Qt/JacobianMatrixViewer.pro b/JacobianMatrixViewer/projects/Qt/JacobianMatrixViewer.pro
@@ -52,8 +52,7 @@ HEADERS += \
 	../../src/MatrixAdapter.h \
 	../../src/MatrixInterfaceBand.h \
 	../../src/MatrixInterfaceSparse.h \
-	../../src/MatrixTableModel.h \
-	../../src/MatrixVisualizer.h
+	../../src/MatrixTableModel.h
 
 SOURCES += \
 	../../src/MainDialog.cpp \

diff --git a/JacobianMatrixViewer/resources/JacobianMatrixViewer.qrc b/JacobianMatrixViewer/resources/JacobianMatrixViewer.qrc
@@ -1,5 +1,6 @@
 <RCC>
     <qresource prefix="/">
         <file>JacobianMatrixViewer_64.png</file>
+        <file>reload.png</file>
     </qresource>
 </RCC>
diff --git a/JacobianMatrixViewer/resources/reload.png b/JacobianMatrixViewer/resources/reload.png
diff --git a/JacobianMatrixViewer/src/MainDialog.cpp b/JacobianMatrixViewer/src/MainDialog.cpp
@@ -71,6 +71,16 @@ void MainDialog::on_pushButtonReadMatrix_clicked() {
 		ui->lineEditMatrixFile->setText(openFile);
 	else
 		ui->lineEditMatrixFile->clear();
+
+	// when there is no other matrix yet (i.e. first matrix is read), adjust the pixel size to fit the matrix to view
+	if (ui->lineEditOtherMatrixFile->text().isEmpty()) {
+		if (m_mainMatrix.dimension() > 0) {
+			int pixelSize = (int)std::floor(600/m_mainMatrix.dimension());
+			pixelSize =  std::min(20, pixelSize);
+			ui->spinBoxPixel->setValue(pixelSize);
+		}
+
+	}
 	updateView();
 }
 
@@ -236,16 +246,14 @@ void MainDialog::on_radioButtonDifference_toggled(bool checked) {
 
 QPixmap MainDialog::generatePixmap() const {
 	// compute size in pixels
-	unsigned int n = m_tableModel->rowCount(QModelIndex());
+	int n = m_tableModel->rowCount(QModelIndex());
 	if (n == 0)
 		return QPixmap();
 
-	unsigned int cellPixelSize = ui->spinBoxPixel->value();
-	unsigned int pixSize = n*cellPixelSize;
-	unsigned int borderLinePixelWidth = 1;
+	int cellPixelSize = ui->spinBoxPixel->value();
+	int pixSize = n*cellPixelSize;
+	int borderLinePixelWidth = 1;
 	QColor backgroundColor(Qt::white);
-	QColor usedCellColor(Qt::black);
-	QColor usedButZeroCellColor(Qt::lightGray);
 
 	// create pixmap with desired sizes but add pixels for boundary
 	QPixmap pixmap(pixSize + 2*borderLinePixelWidth, pixSize + 2*borderLinePixelWidth);
@@ -256,18 +264,34 @@ QPixmap MainDialog::generatePixmap() const {
 	QPainter p(&pixmap);
 
 	// draw pixels
-	for (unsigned int i=0; i<n; ++i) {
-		for (unsigned int j=0; j<n; ++j) {
+	for (int i=0; i<n; ++i) {
+		for (int j=0; j<n; ++j) {
 			// get state of cell
-			AbstractMatrixAdapter::CellState s = m_tableModel->matrixAdapter()->state(i,j);
+			AbstractMatrixAdapter::CellState s = m_tableModel->matrixAdapter()->state((unsigned int)i, (unsigned int)j);
 			if (s == AbstractMatrixAdapter::CS_Unused)
 				continue;
 			QColor cellColor;
-			if (s == AbstractMatrixAdapter::CS_Zero)
-				cellColor = usedButZeroCellColor;
-			else
-				cellColor = usedCellColor;
-
+			switch (s) {
+				case AbstractMatrixAdapter::CS_Used:
+					cellColor = Qt::black;
+				break;
+				case AbstractMatrixAdapter::CS_DifferentByUsage:
+					cellColor = QColor("#E50000");
+				break;
+				case AbstractMatrixAdapter::CS_MayBeDifferentByUsage:
+					cellColor = QColor("#FFE0AD");
+				break;
+				case AbstractMatrixAdapter::CS_DifferentByValue:
+					cellColor = QColor("#65C3FF");
+				break;
+				case AbstractMatrixAdapter::CS_SlightlyDifferentByValue:
+					cellColor = QColor("#E6ECFF");
+				break;
+				case AbstractMatrixAdapter::CS_Zero :
+					cellColor = Qt::lightGray;
+				break;
+				case AbstractMatrixAdapter::CS_Unused: ; // just to make compiler happy
+			}
 //			double val = m_tableModel->matrixAdapter()->value(i,j);
 			p.fillRect(borderLinePixelWidth + j*cellPixelSize, borderLinePixelWidth + i*cellPixelSize,
 					   cellPixelSize, cellPixelSize, cellColor);
@@ -276,12 +300,11 @@ QPixmap MainDialog::generatePixmap() const {
 
 	// draw boundary
 	if (borderLinePixelWidth != 0) {
-		QPen borderPen(usedCellColor);
+		QPen borderPen(Qt::black);
 		borderPen.setWidth(borderLinePixelWidth);
 
 		p.setPen( borderPen );
-		p.drawRect(borderLinePixelWidth/2,borderLinePixelWidth/2,
-				   pixSize+1.5*borderLinePixelWidth, pixSize+1.5*borderLinePixelWidth);
+		p.drawRect(0, 0, pixSize+borderLinePixelWidth, pixSize+borderLinePixelWidth);
 	}
 
 	return pixmap;
@@ -332,3 +355,23 @@ void MainDialog::on_pushButtonExportImage_clicked() {
 		return;
 	}
 }
+
+
+void MainDialog::on_toolButtonReloadFirstMatrix_clicked() {
+	QString openFile = ui->lineEditMatrixFile->text();
+	if (openFile.isEmpty()) return;
+	readMatrix(m_mainMatrix, openFile);
+	if (m_mainMatrix.dimension() == 0)
+		QMessageBox::critical(this, QString(), tr("Cannot read file '%1'").arg(openFile));
+	updateView();
+}
+
+
+void MainDialog::on_toolButtonReloadSecondMatrix_clicked() {
+	QString openFile = ui->lineEditOtherMatrixFile->text();
+	if (openFile.isEmpty()) return;
+	readMatrix(m_mainMatrix, openFile);
+	if (m_mainMatrix.dimension() == 0)
+		QMessageBox::critical(this, QString(), tr("Cannot read file '%1'").arg(openFile));
+	updateView();
+}
diff --git a/JacobianMatrixViewer/src/MainDialog.h b/JacobianMatrixViewer/src/MainDialog.h
@@ -33,6 +33,10 @@ private slots:
 
 	void on_pushButtonExportImage_clicked();
 
+	void on_toolButtonReloadFirstMatrix_clicked();
+
+	void on_toolButtonReloadSecondMatrix_clicked();
+
 private:
 	void readMatrix(SingleMatrixAdapter & storage, const QString & openFile);
 	void updateView();