Compare commits
3 Commits
631ade1954
...
4307fb96a6
Author | SHA1 | Date | |
---|---|---|---|
4307fb96a6 | |||
c35390b6d6 | |||
fff6bd2b49 |
104
main.cpp
104
main.cpp
@ -39,93 +39,6 @@
|
||||
#define SERIAL_PORT "ttyUSB0"
|
||||
#endif
|
||||
|
||||
#if 0
|
||||
static QGraphicsProxyWidget *createItem(const QSizeF &minimum = QSizeF(100.0, 100.0),
|
||||
const QSizeF &preferred = QSize(150.0, 100.0),
|
||||
const QSizeF &maximum = QSizeF(200.0, 100.0),
|
||||
const QString &name = "0")
|
||||
{
|
||||
QGraphicsProxyWidget *w = new QGraphicsProxyWidget;
|
||||
w->setWidget(new QPushButton(name));
|
||||
w->setData(0, name);
|
||||
w->setMinimumSize(minimum);
|
||||
w->setPreferredSize(preferred);
|
||||
w->setMaximumSize(maximum);
|
||||
|
||||
w->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred);
|
||||
return w;
|
||||
}
|
||||
|
||||
int main(int argc, char **argv)
|
||||
{
|
||||
QApplication app(argc, argv);
|
||||
|
||||
QGraphicsScene scene;
|
||||
scene.setSceneRect(0, 0, 800, 480);
|
||||
|
||||
QSizeF minSize(30, 100);
|
||||
QSizeF prefSize(210, 100);
|
||||
QSizeF maxSize(300, 100);
|
||||
|
||||
QGraphicsProxyWidget *a = createItem(minSize, prefSize, maxSize, "A");
|
||||
QGraphicsProxyWidget *b = createItem(minSize, prefSize, maxSize, "B");
|
||||
QGraphicsProxyWidget *c = createItem(minSize, prefSize, maxSize, "C");
|
||||
QGraphicsProxyWidget *d = createItem(minSize, prefSize, maxSize, "D");
|
||||
QGraphicsProxyWidget *e = createItem(minSize, prefSize, maxSize, "E");
|
||||
QGraphicsProxyWidget *f = createItem(QSizeF(30, 50), QSizeF(150, 50), maxSize, "F (overflow)");
|
||||
QGraphicsProxyWidget *g = createItem(QSizeF(30, 50), QSizeF(30, 100), maxSize, "G (overflow)");
|
||||
|
||||
QGraphicsAnchorLayout *l = new QGraphicsAnchorLayout;
|
||||
l->setSpacing(0);
|
||||
|
||||
QGraphicsWidget *w = new QGraphicsWidget(0, Qt::Window);
|
||||
w->setPos(20, 20);
|
||||
w->setLayout(l);
|
||||
|
||||
// vertical
|
||||
l->addAnchor(a, Qt::AnchorTop, l, Qt::AnchorTop);
|
||||
l->addAnchor(b, Qt::AnchorTop, l, Qt::AnchorTop);
|
||||
|
||||
l->addAnchor(c, Qt::AnchorTop, a, Qt::AnchorBottom);
|
||||
l->addAnchor(c, Qt::AnchorTop, b, Qt::AnchorBottom);
|
||||
l->addAnchor(c, Qt::AnchorBottom, d, Qt::AnchorTop);
|
||||
l->addAnchor(c, Qt::AnchorBottom, e, Qt::AnchorTop);
|
||||
|
||||
l->addAnchor(d, Qt::AnchorBottom, l, Qt::AnchorBottom);
|
||||
l->addAnchor(e, Qt::AnchorBottom, l, Qt::AnchorBottom);
|
||||
|
||||
l->addAnchor(c, Qt::AnchorTop, f, Qt::AnchorTop);
|
||||
l->addAnchor(c, Qt::AnchorVerticalCenter, f, Qt::AnchorBottom);
|
||||
l->addAnchor(f, Qt::AnchorBottom, g, Qt::AnchorTop);
|
||||
l->addAnchor(c, Qt::AnchorBottom, g, Qt::AnchorBottom);
|
||||
|
||||
// horizontal
|
||||
l->addAnchor(l, Qt::AnchorLeft, a, Qt::AnchorLeft);
|
||||
l->addAnchor(l, Qt::AnchorLeft, d, Qt::AnchorLeft);
|
||||
l->addAnchor(a, Qt::AnchorRight, b, Qt::AnchorLeft);
|
||||
|
||||
l->addAnchor(a, Qt::AnchorRight, c, Qt::AnchorLeft);
|
||||
l->addAnchor(c, Qt::AnchorRight, e, Qt::AnchorLeft);
|
||||
|
||||
l->addAnchor(b, Qt::AnchorRight, l, Qt::AnchorRight);
|
||||
l->addAnchor(e, Qt::AnchorRight, l, Qt::AnchorRight);
|
||||
l->addAnchor(d, Qt::AnchorRight, e, Qt::AnchorLeft);
|
||||
|
||||
l->addAnchor(l, Qt::AnchorLeft, f, Qt::AnchorLeft);
|
||||
l->addAnchor(l, Qt::AnchorLeft, g, Qt::AnchorLeft);
|
||||
l->addAnchor(f, Qt::AnchorRight, g, Qt::AnchorRight);
|
||||
|
||||
|
||||
scene.addItem(w);
|
||||
scene.setBackgroundBrush(Qt::darkGreen);
|
||||
QGraphicsView view(&scene);
|
||||
|
||||
view.show();
|
||||
|
||||
return app.exec();
|
||||
}
|
||||
#endif
|
||||
|
||||
// argv[1]: file to send to dc
|
||||
int main(int argc, char *argv[]) {
|
||||
QByteArray const value = qgetenv("LC_ALL");
|
||||
@ -140,22 +53,6 @@ int main(int argc, char *argv[]) {
|
||||
QApplication::setApplicationName("ATBUpdateTool");
|
||||
QApplication::setApplicationVersion(APP_VERSION);
|
||||
|
||||
#if 0
|
||||
// vorbereitend
|
||||
QGraphicsScene scene;
|
||||
scene.setSceneRect(0, 0, 800, 480);
|
||||
|
||||
QGraphicsAnchorLayout *l = new QGraphicsAnchorLayout;
|
||||
l->setSpacing(0);
|
||||
|
||||
QGraphicsWidget *w = new QGraphicsWidget(0, Qt::Window);
|
||||
w->setPos(20, 20);
|
||||
w->setLayout(l);
|
||||
|
||||
QGraphicsView view(&scene);
|
||||
// view.show();
|
||||
#endif
|
||||
|
||||
if (!messageHandlerInstalled()) { // change internal qt-QDebug-handling
|
||||
atbInstallMessageHandler(atbDebugOutput);
|
||||
setDebugLevel(LOG_NOTICE);
|
||||
@ -230,6 +127,7 @@ int main(int argc, char *argv[]) {
|
||||
QThread::currentThread()->setObjectName("main thread");
|
||||
qInfo() << "Main thread" << QThread::currentThreadId();
|
||||
|
||||
|
||||
Worker worker(hw,
|
||||
customerNr,
|
||||
machineNr,
|
||||
|
@ -16,6 +16,16 @@ MainWindow::MainWindow(Worker *worker, QWidget *parent)
|
||||
, m_width(70)
|
||||
, m_progressRunning(false)
|
||||
, m_progressValue(0) {
|
||||
|
||||
|
||||
this->setStatusBar(new QStatusBar(this));
|
||||
QFont f;
|
||||
f.setStyleHint(QFont::Monospace);
|
||||
f.setWeight(QFont::Bold);
|
||||
f.setFamily("Misc Fixed");
|
||||
f.setPixelSize(12);
|
||||
this->statusBar()->setFont(f);
|
||||
|
||||
ui->setupUi(this);
|
||||
|
||||
ui->updateProgress->setRange(0, 100);
|
||||
@ -214,30 +224,6 @@ void MainWindow::onReplaceLast(QString text, QString suffix) {
|
||||
}
|
||||
|
||||
void MainWindow::onShowErrorMessage(QString title, QString text) {
|
||||
text = text.leftJustified(50, ' ');
|
||||
QMessageBox msgBox(QMessageBox::NoIcon, title,
|
||||
text, QMessageBox::Ok,
|
||||
this, Qt::FramelessWindowHint);
|
||||
msgBox.resize(100, 50);
|
||||
|
||||
// msg.setStyleSheet("background-color: rgb(0, 0, 0);")
|
||||
// msg.setStyleSheet("text-color: rgb(255, 255, 255);")
|
||||
|
||||
msgBox.setStyleSheet("QMessageBox{border: 1px solid black; background-color:white}");
|
||||
msgBox.setDefaultButton(QMessageBox::Ok);
|
||||
msgBox.defaultButton()->setVisible(false);
|
||||
|
||||
QTimer *t = new QTimer(this);
|
||||
connect(t, SIGNAL(timeout()), msgBox.defaultButton(), SLOT(click()));
|
||||
t->setSingleShot(true);
|
||||
t->start(5 * 1000);
|
||||
|
||||
msgBox.show();
|
||||
msgBox.move(0, 0);
|
||||
|
||||
if(msgBox.exec() == QMessageBox::Ok) {
|
||||
// do something
|
||||
} else {
|
||||
// do something else
|
||||
}
|
||||
this->statusBar()->showMessage( // timeout: 5000
|
||||
QString(title + ": " + text).leftJustified(80, ' '), 20000);
|
||||
}
|
||||
|
@ -3,6 +3,7 @@
|
||||
|
||||
#include <QMainWindow>
|
||||
#include <QTimer>
|
||||
#include <QStatusBar>
|
||||
|
||||
QT_BEGIN_NAMESPACE
|
||||
namespace Ui { class MainWindow; }
|
||||
|
@ -25,7 +25,7 @@
|
||||
<x>10</x>
|
||||
<y>10</y>
|
||||
<width>781</width>
|
||||
<height>461</height>
|
||||
<height>441</height>
|
||||
</rect>
|
||||
</property>
|
||||
<layout class="QGridLayout" name="gridLayout">
|
||||
|
Loading…
x
Reference in New Issue
Block a user