From af77707c628add54852a2b6350f45ea954e90c67 Mon Sep 17 00:00:00 2001 From: XRay3D Date: Sat, 27 Feb 2021 12:41:16 +0300 Subject: [PATCH 1/2] Speeding up the creation and execution of the frmMain class --- src/candle/frmmain.cpp | 139 +++++++++++++++++++++-------------------- src/candle/frmmain.h | 30 ++++----- 2 files changed, 87 insertions(+), 82 deletions(-) diff --git a/src/candle/frmmain.cpp b/src/candle/frmmain.cpp index 5d129c30..9298df54 100644 --- a/src/candle/frmmain.cpp +++ b/src/candle/frmmain.cpp @@ -22,74 +22,79 @@ #include "ui_frmsettings.h" #include "widgets/widgetmimedata.h" -frmMain::frmMain(QWidget *parent) : - QMainWindow(parent), - ui(new Ui::frmMain) +frmMain::frmMain(QWidget* parent) + : QMainWindow(parent) + , ui(new Ui::frmMain) + , m_deviceStatuses { + { DeviceUnknown, QStringLiteral("Unknown") }, + { DeviceIdle, QStringLiteral("Idle") }, + { DeviceAlarm, QStringLiteral("Alarm") }, + { DeviceRun, QStringLiteral("Run") }, + { DeviceHome, QStringLiteral("Home") }, + { DeviceHold0, QStringLiteral("Hold:0") }, + { DeviceHold1, QStringLiteral("Hold:1") }, + { DeviceQueue, QStringLiteral("Queue") }, + { DeviceCheck, QStringLiteral("Check") }, + { DeviceDoor0, QStringLiteral("Door:0") }, + { DeviceDoor1, QStringLiteral("Door:1") }, + { DeviceDoor2, QStringLiteral("Door:2") }, + { DeviceDoor3, QStringLiteral("Door:3") }, + { DeviceJog, QStringLiteral("Jog") }, + { DeviceSleep, QStringLiteral("Sleep") }, + } + , m_statusCaptions { + { DeviceUnknown, tr("Unknown") }, + { DeviceIdle, tr("Idle") }, + { DeviceAlarm, tr("Alarm") }, + { DeviceRun, tr("Run") }, + { DeviceHome, tr("Home") }, + { DeviceHold0, tr("Hold") + " (0)" }, + { DeviceHold1, tr("Hold") + " (1)" }, + { DeviceQueue, tr("Queue") }, + { DeviceCheck, tr("Check") }, + { DeviceDoor0, tr("Door") + " (0)" }, + { DeviceDoor1, tr("Door") + " (1)" }, + { DeviceDoor2, tr("Door") + " (2)" }, + { DeviceDoor3, tr("Door") + " (3)" }, + { DeviceJog, tr("Jog") }, + { DeviceSleep, tr("Sleep") }, + } + , m_statusBackColors { + { DeviceUnknown, QStringLiteral("red") }, + { DeviceIdle, QStringLiteral("palette(button)") }, + { DeviceAlarm, QStringLiteral("red") }, + { DeviceRun, QStringLiteral("lime") }, + { DeviceHome, QStringLiteral("lime") }, + { DeviceHold0, QStringLiteral("yellow") }, + { DeviceHold1, QStringLiteral("yellow") }, + { DeviceQueue, QStringLiteral("yellow") }, + { DeviceCheck, QStringLiteral("palette(button)") }, + { DeviceDoor0, QStringLiteral("red") }, + { DeviceDoor1, QStringLiteral("red") }, + { DeviceDoor2, QStringLiteral("red") }, + { DeviceDoor3, QStringLiteral("red") }, + { DeviceJog, QStringLiteral("lime") }, + { DeviceSleep, QStringLiteral("blue") }, + } + , m_statusForeColors { + { DeviceUnknown, QStringLiteral("white") }, + { DeviceIdle, QStringLiteral("palette(text)") }, + { DeviceAlarm, QStringLiteral("white") }, + { DeviceRun, QStringLiteral("black") }, + { DeviceHome, QStringLiteral("black") }, + { DeviceHold0, QStringLiteral("black") }, + { DeviceHold1, QStringLiteral("black") }, + { DeviceQueue, QStringLiteral("black") }, + { DeviceCheck, QStringLiteral("palette(text)") }, + { DeviceDoor0, QStringLiteral("white") }, + { DeviceDoor1, QStringLiteral("white") }, + { DeviceDoor2, QStringLiteral("white") }, + { DeviceDoor3, QStringLiteral("white") }, + { DeviceJog, QStringLiteral("black") }, + { DeviceSleep, QStringLiteral("white") }, + } { // Initializing variables - m_deviceStatuses[DeviceUnknown] = "Unknown"; - m_deviceStatuses[DeviceIdle] = "Idle"; - m_deviceStatuses[DeviceAlarm] = "Alarm"; - m_deviceStatuses[DeviceRun] = "Run"; - m_deviceStatuses[DeviceHome] = "Home"; - m_deviceStatuses[DeviceHold0] = "Hold:0"; - m_deviceStatuses[DeviceHold1] = "Hold:1"; - m_deviceStatuses[DeviceQueue] = "Queue"; - m_deviceStatuses[DeviceCheck] = "Check"; - m_deviceStatuses[DeviceDoor0] = "Door:0"; - m_deviceStatuses[DeviceDoor1] = "Door:1"; - m_deviceStatuses[DeviceDoor2] = "Door:2"; - m_deviceStatuses[DeviceDoor3] = "Door:3"; - m_deviceStatuses[DeviceJog] = "Jog"; - m_deviceStatuses[DeviceSleep] = "Sleep"; - - m_statusCaptions[DeviceUnknown] = tr("Unknown"); - m_statusCaptions[DeviceIdle] = tr("Idle"); - m_statusCaptions[DeviceAlarm] = tr("Alarm"); - m_statusCaptions[DeviceRun] = tr("Run"); - m_statusCaptions[DeviceHome] = tr("Home"); - m_statusCaptions[DeviceHold0] = tr("Hold") + " (0)"; - m_statusCaptions[DeviceHold1] = tr("Hold") + " (1)"; - m_statusCaptions[DeviceQueue] = tr("Queue"); - m_statusCaptions[DeviceCheck] = tr("Check"); - m_statusCaptions[DeviceDoor0] = tr("Door") + " (0)"; - m_statusCaptions[DeviceDoor1] = tr("Door") + " (1)"; - m_statusCaptions[DeviceDoor2] = tr("Door") + " (2)"; - m_statusCaptions[DeviceDoor3] = tr("Door") + " (3)"; - m_statusCaptions[DeviceJog] = tr("Jog"); - m_statusCaptions[DeviceSleep] = tr("Sleep"); - - m_statusBackColors[DeviceUnknown] = "red"; - m_statusBackColors[DeviceIdle] = "palette(button)"; - m_statusBackColors[DeviceAlarm] = "red"; - m_statusBackColors[DeviceRun] = "lime"; - m_statusBackColors[DeviceHome] = "lime"; - m_statusBackColors[DeviceHold0] = "yellow"; - m_statusBackColors[DeviceHold1] = "yellow"; - m_statusBackColors[DeviceQueue] = "yellow"; - m_statusBackColors[DeviceCheck] = "palette(button)"; - m_statusBackColors[DeviceDoor0] = "red"; - m_statusBackColors[DeviceDoor1] = "red"; - m_statusBackColors[DeviceDoor2] = "red"; - m_statusBackColors[DeviceDoor3] = "red"; - m_statusBackColors[DeviceJog] = "lime"; - m_statusBackColors[DeviceSleep] = "blue"; - - m_statusForeColors[DeviceUnknown] = "white"; - m_statusForeColors[DeviceIdle] = "palette(text)"; - m_statusForeColors[DeviceAlarm] = "white"; - m_statusForeColors[DeviceRun] = "black"; - m_statusForeColors[DeviceHome] = "black"; - m_statusForeColors[DeviceHold0] = "black"; - m_statusForeColors[DeviceHold1] = "black"; - m_statusForeColors[DeviceQueue] = "black"; - m_statusForeColors[DeviceCheck] = "palette(text)"; - m_statusForeColors[DeviceDoor0] = "white"; - m_statusForeColors[DeviceDoor1] = "white"; - m_statusForeColors[DeviceDoor2] = "white"; - m_statusForeColors[DeviceDoor3] = "white"; - m_statusForeColors[DeviceJog] = "black"; - m_statusForeColors[DeviceSleep] = "white"; m_fileChanged = false; m_heightMapChanged = false; @@ -4498,4 +4503,4 @@ bool frmMain::actionTextLessThan(const QAction *a1, const QAction *a2) QScriptValue frmMain::importExtension(QScriptContext *context, QScriptEngine *engine) { return engine->importExtension(context->argument(0).toString()); -} \ No newline at end of file +} diff --git a/src/candle/frmmain.h b/src/candle/frmmain.h index 1418462c..896ee347 100644 --- a/src/candle/frmmain.h +++ b/src/candle/frmmain.h @@ -83,7 +83,7 @@ class CancelException : public std::exception { } }; -class frmMain : public QMainWindow +class frmMain final: public QMainWindow { Q_OBJECT @@ -217,19 +217,19 @@ private slots: void placeVisualizerButtons(); protected: - void showEvent(QShowEvent *se); - void hideEvent(QHideEvent *he); - void resizeEvent(QResizeEvent *re); - void timerEvent(QTimerEvent *); - void closeEvent(QCloseEvent *ce); - void dragEnterEvent(QDragEnterEvent *dee); - void dropEvent(QDropEvent *de); - QMenu *createPopupMenu() override; + void showEvent(QShowEvent* se) override; + void hideEvent(QHideEvent* he) override; + void resizeEvent(QResizeEvent* re) override; + void timerEvent(QTimerEvent*) override; + void closeEvent(QCloseEvent* ce) override; + void dragEnterEvent(QDragEnterEvent* dee) override; + void dropEvent(QDropEvent* de) override; + QMenu* createPopupMenu() override; private: static const int BUFFERLENGTH = 127; static const int PROGRESSMINLINES = 10000; - static const int PROGRESSSTEP = 1000; + static const int PROGRESSSTEP = 1000; enum SenderState { SenderUnknown = -1, @@ -256,16 +256,16 @@ private slots: DeviceDoor2 = 11, DeviceDoor3 = 12, DeviceJog = 13, - DeviceSleep =14 + DeviceSleep = 14 }; // Ui Ui::frmMain *ui; - QMap m_deviceStatuses; - QMap m_statusCaptions; - QMap m_statusBackColors; - QMap m_statusForeColors; + const QMap m_deviceStatuses; + const QMap m_statusCaptions; + const QMap m_statusBackColors; + const QMap m_statusForeColors; QMenu *m_tableMenu; QMessageBox* m_senderErrorBox; From cd0d5ba4d69bde4b0889f4df3d8f0cc1d00361c7 Mon Sep 17 00:00:00 2001 From: XRay3D Date: Sat, 27 Feb 2021 17:18:38 +0300 Subject: [PATCH 2/2] Rework of the frmmain.ui form design file for low resolution screens --- src/candle/frmmain.cpp | 36 +- src/candle/frmmain.h | 1 - src/candle/frmmain.ui | 3064 ++++++++++++++++++++-------------------- 3 files changed, 1543 insertions(+), 1558 deletions(-) diff --git a/src/candle/frmmain.cpp b/src/candle/frmmain.cpp index 9298df54..1c692054 100644 --- a/src/candle/frmmain.cpp +++ b/src/candle/frmmain.cpp @@ -156,12 +156,6 @@ frmMain::frmMain(QWidget* parent) ui->cmdYMinus->setBackColor(ui->cmdXMinus->backColor()); ui->cmdYPlus->setBackColor(ui->cmdXMinus->backColor()); - ui->cmdFit->setParent(ui->glwVisualizer); - ui->cmdIsometric->setParent(ui->glwVisualizer); - ui->cmdTop->setParent(ui->glwVisualizer); - ui->cmdFront->setParent(ui->glwVisualizer); - ui->cmdLeft->setParent(ui->glwVisualizer); - ui->cmdHeightMapBorderAuto->setMinimumHeight(ui->chkHeightMapBorderShow->sizeHint().height()); ui->cmdHeightMapCreate->setMinimumHeight(ui->cmdFileOpen->sizeHint().height()); ui->cmdHeightMapLoad->setMinimumHeight(ui->cmdFileOpen->sizeHint().height()); @@ -348,8 +342,6 @@ void frmMain::showEvent(QShowEvent *se) { Q_UNUSED(se) - placeVisualizerButtons(); - #ifdef WINDOWS if (QSysInfo::windowsVersion() >= QSysInfo::WV_WINDOWS7) { if (m_taskBarButton == NULL) { @@ -370,7 +362,6 @@ void frmMain::resizeEvent(QResizeEvent *re) { Q_UNUSED(re) - placeVisualizerButtons(); resizeTableHeightMapSections(); } @@ -2560,15 +2551,6 @@ void frmMain::updateHeightMapInterpolationDrawer(bool reset) m_programHeightmapModel.clear(); } -void frmMain::placeVisualizerButtons() -{ - ui->cmdIsometric->move(ui->glwVisualizer->width() - ui->cmdIsometric->width() - 8, 8); - ui->cmdTop->move(ui->cmdIsometric->geometry().left() - ui->cmdTop->width() - 8, 8); - ui->cmdLeft->move(ui->glwVisualizer->width() - ui->cmdLeft->width() - 8, ui->cmdIsometric->geometry().bottom() + 8); - ui->cmdFront->move(ui->cmdLeft->geometry().left() - ui->cmdFront->width() - 8, ui->cmdIsometric->geometry().bottom() + 8); - ui->cmdFit->move(ui->glwVisualizer->width() - ui->cmdFit->width() - 8, ui->cmdLeft->geometry().bottom() + 8); -} - void frmMain::preloadSettings() { QSettings set(m_settingsFileName, QSettings::IniFormat); @@ -2708,7 +2690,7 @@ void frmMain::loadSettings() emit pluginsLoaded(); // Adjust docks width - int w = qMax(ui->dockDevice->widget()->sizeHint().width(), + int w = qMax(ui->dockDevice->widget()->sizeHint().width(), ui->dockModification->widget()->sizeHint().width()); ui->dockDevice->setMinimumWidth(w); ui->dockDevice->setMaximumWidth(w + ui->scrollArea->verticalScrollBar()->width()); @@ -2717,14 +2699,14 @@ void frmMain::loadSettings() ui->dockUser->setMinimumWidth(w); ui->dockUser->setMaximumWidth(w + ui->scrollArea->verticalScrollBar()->width()); - // Buttons - int b = (w - ui->grpControl->layout()->margin() * 2 - ui->grpControl->layout()->spacing() * 3) / 4 * 0.8; - int c = b * 0.8; - setStyleSheet(styleSheet() + QString("\nStyledToolButton[adjustSize='true'] {\n\ - min-width: %1px;\n\ - min-height: %1px;\n\ - qproperty-iconSize: %2px;\n\ - }").arg(b).arg(c)); + // Buttons + // int b = (w - ui->grpControl->layout()->margin() * 2 - ui->grpControl->layout()->spacing() * 3) / 4 * 0.8; + // int c = b * 0.8; + // setStyleSheet(styleSheet() + QString("\nStyledToolButton[adjustSize='true'] {\n\ + // min-width: %1px;\n\ + // min-height: %1px;\n\ + // qproperty-iconSize: %2px;\n\ + // }").arg(b).arg(c)); ensurePolished(); foreach (QDockWidget *w, findChildren()) w->setStyleSheet(""); diff --git a/src/candle/frmmain.h b/src/candle/frmmain.h index 896ee347..8db390bd 100644 --- a/src/candle/frmmain.h +++ b/src/candle/frmmain.h @@ -214,7 +214,6 @@ private slots: void onScriptException(const QScriptValue &exception); void updateHeightMapInterpolationDrawer(bool reset = false); - void placeVisualizerButtons(); protected: void showEvent(QShowEvent* se) override; diff --git a/src/candle/frmmain.ui b/src/candle/frmmain.ui index ca6acaad..d4b12500 100644 --- a/src/candle/frmmain.ui +++ b/src/candle/frmmain.ui @@ -6,8 +6,8 @@ 0 0 - 1469 - 1260 + 1280 + 720 @@ -25,10 +25,10 @@ min-width: 60px; min-height: 60px; qproperty-iconSize: 48px; -}*/ - +} +*/ QMainWindow::separator { - width: 26; + width: 6; } QDockWidget::title { @@ -140,7 +140,7 @@ QSlider::groove:horizontal { QSlider::handle:horizontal { background-image: url(:/images/handle2s.png); border: 0px; - width: 16px; + width: 0px; margin: -7px 0; } @@ -173,13 +173,16 @@ QMainWindow::separator:horizontal { 0 - 0 + 6 - 0 + 6 - 0 + 6 + + + 6 @@ -205,10 +208,13 @@ QLabel[overrided="false"] { - + 0 + + 0 + 0 @@ -216,69 +222,62 @@ QLabel[overrided="false"] { 0 - - - 9 + + + + 9 + - - - - - 9 - - - - Qt::CustomContextMenu - - - QAbstractItemView::AnyKeyPressed|QAbstractItemView::DoubleClicked|QAbstractItemView::EditKeyPressed|QAbstractItemView::SelectedClicked - - - QAbstractItemView::ContiguousSelection - - - QAbstractItemView::SelectRows - - - Qt::DashLine - - - false - - - 50 - - - false - - - - - - - true - - - QAbstractItemView::SingleSelection - - - Qt::DashLine - - - false - - - 60 - - - false - - - false - - - - + + Qt::CustomContextMenu + + + QAbstractItemView::AnyKeyPressed|QAbstractItemView::DoubleClicked|QAbstractItemView::EditKeyPressed|QAbstractItemView::SelectedClicked + + + QAbstractItemView::ContiguousSelection + + + QAbstractItemView::SelectRows + + + Qt::DashLine + + + 50 + + + false + + + false + + + + + + + true + + + QAbstractItemView::SingleSelection + + + Qt::DashLine + + + false + + + 60 + + + false + + + false + + @@ -364,8 +363,8 @@ QLabel[overrided="false"] { 0 0 - 1469 - 31 + 1280 + 25 @@ -439,13 +438,22 @@ QLabel[overrided="false"] { 2 - - + + + Form + + - 0 + 6 + + + 6 - 0 + 6 + + + 6 @@ -460,14 +468,14 @@ QLabel[overrided="false"] { 0 0 - 275 - 804 + 192 + 574 true - + 0 @@ -495,6 +503,18 @@ QLabel[overrided="false"] { false + + 6 + + + 6 + + + 6 + + + 6 + @@ -556,9 +576,21 @@ QLabel[overrided="false"] { false + + 6 + + + 6 + + + 6 + + + 6 + - + 0 @@ -601,15 +633,11 @@ QLabel[overrided="false"] { - - - - - Map: - - - - + + + Map: + + @@ -659,7 +687,7 @@ QLabel[overrided="false"] { - + 0 @@ -672,552 +700,494 @@ QLabel[overrided="false"] { 0 - - + + + + Zt: + + + + + + + H: + + + + + + + F: + + + + + + + + 0 + 0 + + + + + + + Qt::AlignCenter + + + QAbstractSpinBox::NoButtons + + + 0 + + + 0.000000000000000 + + + 9999.000000000000000 + + + 0.000000000000000 + + + + + + + X: + + + + + + + + 0 + 0 + + + + + + + Qt::AlignCenter + + + QAbstractSpinBox::NoButtons + + + 0 + + + 2.000000000000000 + + + 1000.000000000000000 + + + 2.000000000000000 + + + + + + + W: + + + + + + + Y: + + + + + + + Y: + + + + + + + + 0 + 0 + + + + + + + Qt::AlignCenter + + + QAbstractSpinBox::NoButtons + + + 0 + + + 2.000000000000000 + + + 1000.000000000000000 + + + 2.000000000000000 + + + + + + + X: + + + + + + + + 0 + 0 + + + + + + + Qt::AlignCenter + + + QAbstractSpinBox::NoButtons + + + -9999.000000000000000 + + + 9999.000000000000000 + + + + + + + X: + + + + + + + + 0 + 0 + + + + + + + Qt::AlignCenter + + + QAbstractSpinBox::NoButtons + + + -9999.000000000000000 + + + 9999.000000000000000 + + + + + + + Zb: + + + + + + + + 0 + 0 + + + + + + + Qt::AlignCenter + + + QAbstractSpinBox::NoButtons + + + 0 + + + 2.000000000000000 + + + 1000.000000000000000 + + + 2.000000000000000 + + + + + + + Y: + + + + + + + + 0 + 0 + + + + + + + Qt::AlignCenter + + + QAbstractSpinBox::NoButtons + + + -9999.000000000000000 + + + 9999.000000000000000 + + + 10.000000000000000 + + + + + + + + 0 + 0 + + + + + + + Qt::AlignCenter + + + QAbstractSpinBox::NoButtons + + + -9999.000000000000000 + + + 9999.000000000000000 + + + 10.000000000000000 + + + + + + + + 0 + 0 + + + + + + + Qt::AlignCenter + + + QAbstractSpinBox::NoButtons + + + -999.000000000000000 + + + 999.000000000000000 + + + 1.000000000000000 + + + + + + + + 0 + 0 + + + + + + + Qt::AlignCenter + + + QAbstractSpinBox::NoButtons + + + 0 + + + 2.000000000000000 + + + 1000.000000000000000 + + + 2.000000000000000 + + + + + + + Border: + + + + + - + - Border: + Show border + + + true - - - - - X: - - - - - - - - 0 - 0 - - - - - - - Qt::AlignCenter - - - QAbstractSpinBox::NoButtons - - - -9999.000000000000000 - - - 9999.000000000000000 - - - - - - - - 0 - 0 - - - - - - - Qt::AlignCenter - - - QAbstractSpinBox::NoButtons - - - -9999.000000000000000 - - - 9999.000000000000000 - - - 10.000000000000000 - - - - - - - H: - - - - - - - - 0 - 0 - - - - - - - Qt::AlignCenter - - - QAbstractSpinBox::NoButtons - - - -9999.000000000000000 - - - 9999.000000000000000 - - - - - - - Y: - - - - - - - W: - - - - - - - - 0 - 0 - - - - - - - Qt::AlignCenter - - - QAbstractSpinBox::NoButtons - - - -9999.000000000000000 - - - 9999.000000000000000 - - - 10.000000000000000 - - - - - - - - - - - Show border - - - true - - - - - - - - 0 - 0 - - - - Auto - - - - - - - - - - - + + + + 0 + 0 + + - Probe grid: + Auto - - - - - - Zt: - - - - - - - X: - - - - - - - - 0 - 0 - - - - - - - Qt::AlignCenter - - - QAbstractSpinBox::NoButtons - - - 0 - - - 2.000000000000000 - - - 1000.000000000000000 - - - 2.000000000000000 - - - - - - - - 0 - 0 - - - - - - - Qt::AlignCenter - - - QAbstractSpinBox::NoButtons - - - -999.000000000000000 - - - 999.000000000000000 - - - -1.000000000000000 - - - - - - - - 0 - 0 - - - - - - - Qt::AlignCenter - - - QAbstractSpinBox::NoButtons - - - -999.000000000000000 - - - 999.000000000000000 - - - 1.000000000000000 - - - - - - - Y: - - - - - - - Zb: - - - - - - - - 0 - 0 - - - - - - - Qt::AlignCenter - - - QAbstractSpinBox::NoButtons - - - 0 - - - 2.000000000000000 - - - 1000.000000000000000 - - - 2.000000000000000 - - - - - - - F: - - - - - - - - 0 - 0 - - - - - - - Qt::AlignCenter - - - QAbstractSpinBox::NoButtons - - - 0 - - - 0.000000000000000 - - - 9999.000000000000000 - - - 0.000000000000000 - - - - - - - - - - - Show probe grid - - - true - - - - - - - Qt::Horizontal - - - - 40 - 1 - - - - - - - - + + + + Show interpolation grid + + + + + - + - Interpolation grid: + Type: - - - - - Y: - - - - - - - X: - - - - - - - - 0 - 0 - - - - - - - Qt::AlignCenter - - - QAbstractSpinBox::NoButtons - - - 0 - - - 2.000000000000000 - - - 1000.000000000000000 - - - 2.000000000000000 - - - - - - - - 0 - 0 - - - - - - - Qt::AlignCenter - - - QAbstractSpinBox::NoButtons - - - 0 - - - 2.000000000000000 - - - 1000.000000000000000 - - - 2.000000000000000 - - - - - - - - - - - Type: - - - - - - - false - - - - 0 - 0 - - - - - Bicubic - - - - - - - - - - - - Show interpolation grid - - - + + + false + + + + 0 + 0 + + - - - Qt::Horizontal - - - - 40 - 1 - - - + + Bicubic + - + + + + + Interpolation grid: + + + + + + + Show probe grid + + + true + + + + + + + Probe grid: + + + + + + + + 0 + 0 + + + + + + + Qt::AlignCenter + + + QAbstractSpinBox::NoButtons + + + -999.000000000000000 + + + 999.000000000000000 + + + -1.000000000000000 + + + @@ -1265,13 +1235,22 @@ QLabel[overrided="false"] { 1 - - + + + Form + + - 0 + 6 + + + 6 - 0 + 6 + + + 6 @@ -1286,8 +1265,8 @@ QLabel[overrided="false"] { 0 0 - 347 - 801 + 298 + 609 @@ -1314,289 +1293,41 @@ QLabel[overrided="false"] { false - + + + 6 + + + 6 + + + 6 + + + 6 + - - - - - - - Work coordinates: - - - - - - - - - - - - 0 - 0 - - - - X - - - - - - Qt::AlignCenter - - - true - - - QAbstractSpinBox::NoButtons - - - 3 - - - -9999.000000000000000 - - - 9999.000000000000000 - - - 0.000000000000000 - - - - - - - - 0 - 0 - - - - Y - - - - - - Qt::AlignCenter - - - true - - - QAbstractSpinBox::NoButtons - - - 3 - - - -9999.000000000000000 - - - 9999.000000000000000 - - - 0.000000000000000 - - - - - - - - 0 - 0 - - - - Z - - - - - - Qt::AlignCenter - - - true - - - QAbstractSpinBox::NoButtons - - - 3 - - - -9999.000000000000000 - - - 9999.000000000000000 - - - 0.000000000000000 - - - - - - + + + Work coordinates: + + - - - - - - - Machine coordinates: - - - - - + - - - - - - 0 - 0 - - - - X - - - - - - Qt::AlignCenter - - - true - - - QAbstractSpinBox::NoButtons - - - 3 - - - -9999.000000000000000 - - - 9999.000000000000000 - - - 0.000000000000000 - - - - - - - - 0 - 0 - - - - Y - - - - - - Qt::AlignCenter - - - true - - - QAbstractSpinBox::NoButtons - - - 3 - - - -9999.000000000000000 - - - 9999.000000000000000 - - - 0.000000000000000 - - - - - - - - 0 - 0 - - - - Z - - - - - - Qt::AlignCenter - - - true - - - QAbstractSpinBox::NoButtons - - - 3 - - - -9999.000000000000000 - - - 9999.000000000000000 - - - 0.000000000000000 - - - - - - - - - - - 14 - - - - - Status: - - - - - - - false + + + + 0 + 0 + - - false + + X - - QLineEdit {color: palette(text);} + + Qt::AlignCenter @@ -1604,51 +1335,25 @@ QLabel[overrided="false"] { true - - + + QAbstractSpinBox::NoButtons + + + 3 + + + -9999.000000000000000 + + + 9999.000000000000000 + + + 0.000000000000000 - - - - - - - - - - 0 - 2 - - - - border: 2px solid blue; - - - QFrame::StyledPanel - - - QFrame::Raised - - - - - - - Control - - - false - - - - - - - - true - + + 0 @@ -1656,57 +1361,36 @@ QLabel[overrided="false"] { - Unlock - - - ... + Y - - - :/images/unlock1.png:/images/unlock1.png + + - - - 32 - 32 - + + Qt::AlignCenter - + true - - - - - - - 0 - 0 - + + QAbstractSpinBox::NoButtons - - Reset + + 3 - - ... + + -9999.000000000000000 - - - :/images/restart.png:/images/restart.png + + 9999.000000000000000 - - - 32 - 32 - - - - true + + 0.000000000000000 - - + + 0 @@ -1714,28 +1398,47 @@ QLabel[overrided="false"] { - Home - - - ... + Z - - - :/images/search_for_home2.png:/images/search_for_home2.png + + - - - 32 - 32 - + + Qt::AlignCenter - + true + + QAbstractSpinBox::NoButtons + + + 3 + + + -9999.000000000000000 + + + 9999.000000000000000 + + + 0.000000000000000 + - - + + + + + + Machine coordinates: + + + + + + + 0 @@ -1743,31 +1446,36 @@ QLabel[overrided="false"] { - Hold + X - - ... - - - - :/images/pause.png:/images/pause.png + + - - - 32 - 32 - + + Qt::AlignCenter - + true - - true + + QAbstractSpinBox::NoButtons + + + 3 + + + -9999.000000000000000 + + + 9999.000000000000000 + + + 0.000000000000000 - - + + 0 @@ -1775,31 +1483,36 @@ QLabel[overrided="false"] { - Check + Y - - ... - - - - :/images/check1.png:/images/check1.png + + - - - 32 - 32 - + + Qt::AlignCenter - + true - - true + + QAbstractSpinBox::NoButtons + + + 3 + + + -9999.000000000000000 + + + 9999.000000000000000 + + + 0.000000000000000 - - + + 0 @@ -1807,84 +1520,67 @@ QLabel[overrided="false"] { - Sleep + Z - - ... + + - - - :/images/power4.png:/images/power4.png - - - - 32 - 32 - + + Qt::AlignCenter - + true - - - - - - - 0 - 0 - + + QAbstractSpinBox::NoButtons - - Door - - - ... + + 3 - - - :/images/door.png:/images/door.png + + -9999.000000000000000 - - - 32 - 32 - + + 9999.000000000000000 - - true + + 0.000000000000000 - - - - - 0 - 0 - + + + + + + 6 + + + + + Status: - - Flood + + + + + + false - - ... + + false - - - :/images/flood.png:/images/flood.png + + QLineEdit {color: palette(text);} - - - 32 - 32 - + + Qt::AlignCenter - + true - - true + + @@ -1893,6 +1589,293 @@ QLabel[overrided="false"] { + + + + + 0 + 2 + + + + border: 2px solid blue; + + + QFrame::StyledPanel + + + QFrame::Raised + + + + + + + Control + + + false + + + + 6 + + + 6 + + + 6 + + + 6 + + + + + + 0 + 0 + + + + Home + + + ... + + + + :/images/search_for_home2.png:/images/search_for_home2.png + + + + 32 + 32 + + + + true + + + + + + + + 0 + 0 + + + + Hold + + + ... + + + + :/images/pause.png:/images/pause.png + + + + 32 + 32 + + + + true + + + true + + + + + + + + 0 + 0 + + + + Reset + + + ... + + + + :/images/restart.png:/images/restart.png + + + + 32 + 32 + + + + true + + + + + + + true + + + + 0 + 0 + + + + Unlock + + + ... + + + + :/images/unlock1.png:/images/unlock1.png + + + + 32 + 32 + + + + true + + + + + + + + 0 + 0 + + + + Check + + + ... + + + + :/images/check1.png:/images/check1.png + + + + 32 + 32 + + + + true + + + true + + + + + + + + 0 + 0 + + + + Sleep + + + ... + + + + :/images/power4.png:/images/power4.png + + + + 32 + 32 + + + + true + + + + + + + + 0 + 0 + + + + Door + + + ... + + + + :/images/door.png:/images/door.png + + + + 32 + 32 + + + + true + + + + + + + + 0 + 0 + + + + Flood + + + ... + + + + :/images/flood.png:/images/flood.png + + + + 32 + 32 + + + + true + + + true + + + + + + @@ -1908,11 +1891,23 @@ QLabel[overrided="false"] { false + + 6 + + + 6 + + + 6 + + + 6 + - 10 + 6 0 @@ -1980,12 +1975,21 @@ QLabel[overrided="false"] { false + + 6 + + + 6 + + + 6 + + + 6 + - - - 10 - + 0 @@ -1998,249 +2002,57 @@ QLabel[overrided="false"] { 0 - - - - - - - 0 - 0 - - - - X+ - - - - - - - :/images/1401562173_chevron-right.png:/images/1401562173_chevron-right.png - - - - 32 - 32 - - - - true - - - - - - - - 0 - 0 - - - - X- - - - ... - - - - :/images/1401561986_chevron-left.png:/images/1401561986_chevron-left.png - - - - 32 - 32 - - - - true - - - - - - - - 0 - 0 - - - - Y- - - - - - - - :/images/1401562173_chevron-down.png:/images/1401562173_chevron-down.png - - - - 32 - 32 - - - - true - - - - - - - - 0 - 0 - - - - Stop - - - - - - - :/images/brake.png:/images/brake.png - - - - 32 - 32 - - - - true - - - - - - - - 0 - 0 - - - - Y+ - - - - - - - :/images/1401562173_chevron-up.png:/images/1401562173_chevron-up.png - - - - 32 - 32 - - - - true - - - - - - - - - Qt::Horizontal - - - - 20 - 20 - - - - - - - - - 0 - 0 - - - - Z+ - - - - - - - :/images/1401562699_icon-arrow-up-b.png:/images/1401562699_icon-arrow-up-b.png - - - - 32 - 32 - - - - true - - - - - - - - - - - Qt::Horizontal - - - - 20 - 20 - - - - - - - - - 0 - 0 - - - - Z- - - - - - - - :/images/1401562699_icon-arrow-down-b.png:/images/1401562699_icon-arrow-down-b.png - - - - 32 - 32 - - - - true - - - - - - + + + + Qt::Horizontal + + + + 115 + 20 + + + + + + + + + 0 + 0 + + + + Y- + + + + + + + :/images/1401562173_chevron-down.png:/images/1401562173_chevron-down.png + + + + 32 + 32 + + + + true + + - - + + + + + + Step: + + + @@ -2286,13 +2098,6 @@ QLabel[overrided="false"] { - - - - Step: - - - @@ -2342,7 +2147,181 @@ QLabel[overrided="false"] { - + + + + + 0 + 0 + + + + X+ + + + + + + + :/images/1401562173_chevron-right.png:/images/1401562173_chevron-right.png + + + + 32 + 32 + + + + true + + + + + + + + 0 + 0 + + + + Z+ + + + + + + + :/images/1401562699_icon-arrow-up-b.png:/images/1401562699_icon-arrow-up-b.png + + + + 32 + 32 + + + + true + + + + + + + + 0 + 0 + + + + Y+ + + + + + + + :/images/1401562173_chevron-up.png:/images/1401562173_chevron-up.png + + + + 32 + 32 + + + + true + + + + + + + + 0 + 0 + + + + Stop + + + + + + + :/images/brake.png:/images/brake.png + + + + 32 + 32 + + + + true + + + + + + + + 0 + 0 + + + + Z- + + + + + + + :/images/1401562699_icon-arrow-down-b.png:/images/1401562699_icon-arrow-down-b.png + + + + 32 + 32 + + + + true + + + + + + + + 0 + 0 + + + + X- + + + ... + + + + :/images/1401561986_chevron-left.png:/images/1401561986_chevron-left.png + + + + 32 + 32 + + + + true + + + + Keyboard control @@ -2390,43 +2369,40 @@ QLabel[overrided="false"] { 4 - - + + + Form + + - 0 + 6 + + + 6 - 0 + 6 + + + 6 - - - border: 1px solid gray; - - - QFrame::StyledPanel - - - QFrame::Raised - - + + - 0 + 6 - 0 + 6 - 0 + 6 - 0 + 6 - - - - - + + 0 @@ -2434,14 +2410,14 @@ QLabel[overrided="false"] { - Fit + Left view - :/images/fit_1.png:/images/fit_1.png + :/images/cubeLeft.png:/images/cubeLeft.png @@ -2451,8 +2427,8 @@ QLabel[overrided="false"] { - - + + 0 @@ -2460,14 +2436,14 @@ QLabel[overrided="false"] { - Top view + Fit - :/images/cubeTop.png:/images/cubeTop.png + :/images/fit_1.png:/images/fit_1.png @@ -2477,8 +2453,8 @@ QLabel[overrided="false"] { - - + + 0 @@ -2486,14 +2462,14 @@ QLabel[overrided="false"] { - Isometric view + Top view - :/images/cube.png:/images/cube.png + :/images/cubeTop.png:/images/cubeTop.png @@ -2503,7 +2479,7 @@ QLabel[overrided="false"] { - + @@ -2529,8 +2505,8 @@ QLabel[overrided="false"] { - - + + 0 @@ -2538,14 +2514,14 @@ QLabel[overrided="false"] { - Left view + Isometric view - :/images/cubeLeft.png:/images/cubeLeft.png + :/images/cube.png:/images/cube.png @@ -2555,6 +2531,32 @@ QLabel[overrided="false"] { + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + @@ -2574,10 +2576,16 @@ QLabel[overrided="false"] { - 0 + 6 + + + 6 - 0 + 6 + + + 6 @@ -2683,57 +2691,6 @@ padding-right: 8; - - - Qt::PreventContextMenu - - - _spacerTop - - - false - - - TopToolBarArea - - - false - - - - - Qt::PreventContextMenu - - - _spacerLeft - - - false - - - LeftToolBarArea - - - false - - - - - Qt::PreventContextMenu - - - _spacerRight - - - false - - - RightToolBarArea - - - false - - @@ -2750,13 +2707,22 @@ padding-right: 8; 1 - - + + + Form + + - 0 + 6 + + + 6 - 0 + 6 + + + 6 @@ -2771,8 +2737,8 @@ padding-right: 8; 0 0 - 347 - 106 + 315 + 125 @@ -3204,29 +3170,67 @@ padding-right: 8; txtHeightMapBorderX - txtHeightMapBorderWidth txtHeightMapBorderY + txtHeightMapBorderWidth txtHeightMapBorderHeight chkHeightMapBorderShow cmdHeightMapBorderAuto txtHeightMapGridX - txtHeightMapGridZTop txtHeightMapGridY + txtHeightMapGridZTop txtHeightMapGridZBottom + txtHeightMapProbeFeed chkHeightMapGridShow txtHeightMapInterpolationStepX txtHeightMapInterpolationStepY cboHeightMapInterpolationType chkHeightMapInterpolationShow - txtStatus - cmdHome - chkHeightMapUse - cmdHeightMapCreate - cmdHeightMapLoad - cmdHeightMapMode cmdXMinus cmdXPlus chkKeyboardControl + tblProgram + tblHeightMap + chkAutoScroll + cmdFileOpen + cmdFileReset + cmdFileSend + cmdFilePause + cmdFileAbort + grpOverriding + grpHeightMap + cmdHome + cmdHeightMapLoad + chkHeightMapUse + cmdHeightMapMode + txtStatus + cmdHeightMapCreate + txtWPosX + txtWPosY + txtWPosZ + txtMPosX + txtMPosY + txtMPosZ + cmdHold + cmdReset + cmdUnlock + cmdCheck + cmdSleep + cmdDoor + cmdFlood + grpSpindle + cmdSpindle + grpJog + cmdYMinus + cboJogStep + cboJogFeed + cmdZPlus + cmdYPlus + cmdStop + cmdZMinus + txtConsole + cboCommand + cmdCommandSend + cmdClearConsole @@ -3239,12 +3243,12 @@ padding-right: 8; setVisible(bool) - 1415 - 663 + 1105 + 546 - 1415 - 1060 + 1105 + 860 @@ -3255,12 +3259,12 @@ padding-right: 8; setDisabled(bool) - 298 - 1196 + 202 + 895 - 1415 - 450 + 1105 + 383 @@ -3271,12 +3275,12 @@ padding-right: 8; setDisabled(bool) - 183 - 1196 + 199 + 895 - 417 - 527 + 669 + 857 @@ -3287,8 +3291,8 @@ padding-right: 8; setDisabled(bool) - 144 - 1196 + 160 + 895 428 @@ -3303,12 +3307,12 @@ padding-right: 8; setDisabled(bool) - 298 - 1196 + 202 + 895 - 245 - 898 + 157 + 659 @@ -3323,8 +3327,8 @@ padding-right: 8; -1 - 29 - 121 + 39 + 117 @@ -3339,8 +3343,8 @@ padding-right: 8; -1 - 29 - 159 + 39 + 152 @@ -3355,8 +3359,8 @@ padding-right: 8; -1 - 29 - 197 + 39 + 187 @@ -3371,8 +3375,8 @@ padding-right: 8; -1 - 29 - 235 + 39 + 222 @@ -3387,8 +3391,8 @@ padding-right: 8; -1 - 29 - 273 + 39 + 257 @@ -3403,8 +3407,8 @@ padding-right: 8; -1 - 89 - 660 + 58 + 544 @@ -3419,8 +3423,8 @@ padding-right: 8; -1 - 169 - 660 + 58 + 588 @@ -3435,8 +3439,8 @@ padding-right: 8; -1 - 243 - 707 + 154 + 544 @@ -3451,8 +3455,8 @@ padding-right: 8; -1 - 318 - 707 + 202 + 544 @@ -3467,8 +3471,8 @@ padding-right: 8; -1 - 516 - 674 + 299 + 885 @@ -3483,8 +3487,8 @@ padding-right: 8; -1 - 788 - 663 + 600 + 888 @@ -3499,8 +3503,8 @@ padding-right: 8; -1 - 879 - 663 + 643 + 888 @@ -3515,8 +3519,8 @@ padding-right: 8; -1 - 970 - 663 + 724 + 888 @@ -3531,8 +3535,8 @@ padding-right: 8; -1 - 1091 - 663 + 805 + 888 @@ -3547,8 +3551,8 @@ padding-right: 8; -1 - 1415 - 529 + 1105 + 449 @@ -3563,8 +3567,8 @@ padding-right: 8; -1 - 1297 - 628 + 969 + 520 @@ -3579,8 +3583,8 @@ padding-right: 8; -1 - 1414 - 628 + 1104 + 520 @@ -3595,8 +3599,8 @@ padding-right: 8; -1 - 1415 - 663 + 1105 + 546 @@ -3611,8 +3615,8 @@ padding-right: 8; -1 - 1353 - 796 + 1062 + 642 @@ -3627,8 +3631,8 @@ padding-right: 8; -1 - 1341 - 931 + 1105 + 764 @@ -3643,8 +3647,8 @@ padding-right: 8; -1 - 1389 - 1067 + 1105 + 860 @@ -3659,8 +3663,8 @@ padding-right: 8; -1 - 1437 - 982 + 1110 + 985 @@ -3675,8 +3679,8 @@ padding-right: 8; -1 - 300 - 879 + 202 + 659 @@ -3691,8 +3695,8 @@ padding-right: 8; -1 - 173 - 1185 + 189 + 895 @@ -3707,8 +3711,8 @@ padding-right: 8; -1 - 1302 - 407 + 1105 + 351 @@ -3723,8 +3727,8 @@ padding-right: 8; -1 - 1302 - 426 + 1105 + 367 @@ -3739,8 +3743,8 @@ padding-right: 8; -1 - 1302 - 445 + 1105 + 383 @@ -3755,8 +3759,8 @@ padding-right: 8; -1 - 96 - 1023 + 100 + 774 @@ -3771,8 +3775,8 @@ padding-right: 8; -1 - 146 - 523 + 106 + 544 @@ -3787,8 +3791,8 @@ padding-right: 8; -1 - 146 - 570 + 106 + 588 @@ -3803,8 +3807,8 @@ padding-right: 8; -1 - 228 - 570 + 154 + 588 @@ -3819,8 +3823,8 @@ padding-right: 8; -1 - 309 - 570 + 202 + 588