diff --git a/src/widgets/atcoreinstancewidget.h b/src/widgets/atcoreinstancewidget.h --- a/src/widgets/atcoreinstancewidget.h +++ b/src/widgets/atcoreinstancewidget.h @@ -18,7 +18,7 @@ #pragma once #include -#include +#include #include #include #include @@ -73,7 +73,7 @@ QAction *m_stopAction; QSettings m_settings; QString m_theme; - AxisControl *m_axisControl; + MovementWidget *m_movementWidget; LogWidget *m_logWidget; PlotWidget *m_plotWidget; SdWidget *m_sdWidget; diff --git a/src/widgets/atcoreinstancewidget.cpp b/src/widgets/atcoreinstancewidget.cpp --- a/src/widgets/atcoreinstancewidget.cpp +++ b/src/widgets/atcoreinstancewidget.cpp @@ -36,8 +36,8 @@ ui->setupUi(this); auto layout = new QHBoxLayout(); - m_axisControl = new AxisControl(); - layout->addWidget(m_axisControl); + m_movementWidget = new MovementWidget(false); + layout->addWidget(m_movementWidget); ui->gridLayout_3->addLayout(layout, 2, 2, Qt::AlignHCenter); m_plotWidget = new PlotWidget(); @@ -255,7 +255,17 @@ connect(ui->ratesControlWidget, &RatesControlWidget::fanSpeedChanged, &m_core, &AtCore::setFanSpeed); connect(ui->ratesControlWidget, &RatesControlWidget::flowRateChanged, &m_core, &AtCore::setFlowRate); connect(ui->ratesControlWidget, &RatesControlWidget::printSpeedChanged, &m_core, &AtCore::setPrinterSpeed); - connect(m_axisControl, &AxisControl::clicked, this, &AtCoreInstanceWidget::axisControlClicked); + //Movement Widget + connect(m_movementWidget, &MovementWidget::absoluteMove, [this](const QLatin1Char & axis, const double & value) { + m_logWidget->appendLog(GCode::description(GCode::G1)); + m_core.move(axis, value); + }); + connect(m_movementWidget, &MovementWidget::relativeMove, [this](const QLatin1Char & axis, const double & value) { + m_logWidget->appendLog(i18n("Relative Move: %1 ,%2",axis, QString::number(value))); + m_core.setRelativePosition(); + m_core.move(axis,value); + m_core.setAbsolutePosition(); + }); //Sd Card Stuff connect(&m_core, &AtCore::sdCardFileListChanged, m_sdWidget, &SdWidget::updateFilelist);