add wireframe paint option,

write file information on the screen,
bug fixes
This commit is contained in:
Anakin
2017-01-16 14:24:30 +01:00
parent 454ed45fa1
commit 86dfe32145
7 changed files with 45 additions and 7 deletions

View File

@@ -8,6 +8,8 @@
#include <QSignalMapper>
#include <QFile>
#include <QSizePolicy>
#include <QFont>
#include <QResizeEvent>
#include "..\Header\FileInterface.h"
#define WINDOW_NAME "Mesh Viewer"
@@ -16,6 +18,7 @@ MainWindow::MainWindow(QWidget *parent)
: QMainWindow(parent)
, ui(new Ui::MainWindowClass)
, m_curSeverity(0)
, m_output(new QLabel(this))
{
ui->setupUi(this);
@@ -36,6 +39,7 @@ MainWindow::MainWindow(QWidget *parent)
MainWindow::~MainWindow()
{
delete ui;
delete m_output;
}
void MainWindow::openFile()
@@ -89,6 +93,14 @@ void MainWindow::setupWidgets()
ui->mainToolBar->addSeparator();
QAction *wireframe = new QAction(QIcon(":/images/toolbar/wireframe.png"), "Wireframe", this);
wireframe->setCheckable(true);
wireframe->setChecked(false);
connect(wireframe, &QAction::triggered, viewer, &OglViewerWidget::toggleWireframe);
ui->mainToolBar->addAction(wireframe);
ui->mainToolBar->addSeparator();
QAction *fileInfo = new QAction(QIcon(":/images/toolbar/info.png"), "File info", this);
connect(fileInfo, &QAction::triggered, this, &MainWindow::aboutFile);
ui->mainToolBar->addAction(fileInfo);
@@ -97,6 +109,11 @@ void MainWindow::setupWidgets()
connect(help, &QAction::triggered, this, &MainWindow::aboutTool);
ui->mainToolBar->addAction(help);
m_output->setObjectName("output");
m_output->setStyleSheet("QLabel#output{color : white; min-width: 400px; min-height: 50px;}");
m_output->setAlignment(Qt::AlignTop);
m_output->setText("Name: -\nMaterials: -\nVertice: -\nTriangle: -");
m_output->raise();
}
@@ -143,6 +160,11 @@ void MainWindow::takeScreenShot()
viewer->grab().save(destination);
}
void MainWindow::resizeEvent(QResizeEvent * e)
{
m_output->move(40, e->size().height() - 80);
}
void MainWindow::setFileInfo(QString name, QVector<Material>* materials, int vertices, int triangle)
{
m_fileInfo = QByteArray("Filename: ");
@@ -165,6 +187,8 @@ void MainWindow::setFileInfo(QString name, QVector<Material>* materials, int ver
m_fileInfo += it.name;
m_fileInfo += "\n";
}
m_output->setText(m_fileInfo.left(m_fileInfo.indexOf("<detail>")));
}
void MainWindow::printMessage(QString message, int severity)