From kde-commits Mon Nov 30 23:47:44 2015 From: Tomaz Canabrava Date: Mon, 30 Nov 2015 23:47:44 +0000 To: kde-commits Subject: [brprint3d] /: Code cleanup Message-Id: X-MARC-Message: https://marc.info/?l=kde-commits&m=144892728419963 Git commit 495898065c552f026e83e45afd55d1599089019d by Tomaz Canabrava. Committed on 30/11/2015 at 23:34. Pushed by tcanabrava into branch 'master'. Code cleanup Signed-off-by: Tomaz Canabrava M +79 -73 ExtruderControlWidget.cpp M +12 -12 ExtruderControlWidget.h http://commits.kde.org/brprint3d/495898065c552f026e83e45afd55d1599089019d diff --git a/ExtruderControlWidget.cpp b/ExtruderControlWidget.cpp index 34732aa..55154e4 100755 --- a/ExtruderControlWidget.cpp +++ b/ExtruderControlWidget.cpp @@ -28,43 +28,40 @@ ExtruderControlWidget::ExtruderControlWidget(QWidget *p= arent) : ui(new Ui::ExtruderControlWidget) { ui->setupUi(this); - connect(ui->bt_homeX,&QPushButton::clicked,this,&ExtruderControlWi= dget::setHome); - connect(ui->bt_homeY,&QPushButton::clicked,this,&ExtruderControlWi= dget::setHome); - connect(ui->bt_homeZ,&QPushButton::clicked,this,&ExtruderControlWi= dget::setHome); - connect(ui->bt_homeXYZ,&QPushButton::clicked,this,&ExtruderControl= Widget::setHome); - - connect(ui->bt_leftX,&QPushButton::clicked,this,&ExtruderControlWi= dget::setPosX); - connect(ui->bt_rightX,&QPushButton::clicked,this,&ExtruderControlW= idget::setPosX); - - connect(ui->bt_upY,&QPushButton::clicked,this,&ExtruderControlWidg= et::setPosY); - connect(ui->bt_downY,&QPushButton::clicked,this,&ExtruderControlWi= dget::setPosY); - - connect(ui->bt_upZ,&QPushButton::clicked,this,&ExtruderControlWidg= et::setPosZ); - connect(ui->bt_downZ,&QPushButton::clicked,this,&ExtruderControlWi= dget::setPosZ); - - ui->bt_homeX->setIcon(QIcon(QPixmap(":/Icons/Icons/homeAxisX.png")= )); - ui->bt_homeY->setIcon(QIcon(QPixmap(":/Icons/Icons/homeaxisY.png")= )); - ui->bt_homeZ->setIcon(QIcon(QPixmap(":/Icons/Icons/homeAxisZ.png")= )); - ui->bt_homeXYZ->setIcon(QIcon(QPixmap(":/Icons/Icons/homeAxisXYZ.p= ng"))); - ui->bt_rightX->setIcon(QIcon(QPixmap(":/Icons/Icons/arrowRight.png= "))); - ui->bt_leftX->setIcon(QIcon(QPixmap(":/Icons/Icons/arrowLeft.png")= )); - ui->bt_upY->setIcon(QIcon(QPixmap(":/Icons/Icons/arrowUp.png"))); - ui->bt_downY->setIcon(QIcon(QPixmap(":/Icons/Icons/arrowDown.png")= )); - ui->bt_upZ->setIcon(QIcon(QPixmap(":/Icons/Icons/arrowUp.png"))); - ui->bt_downZ->setIcon(QIcon(QPixmap(":/Icons/Icons/arrowDown.png")= )); - ui->bt_filOneSpeed->setIcon(QIcon(QPixmap(":/Icons/Icons/extOut.pn= g"))); - ui->bt_filTwoSpeed->setIcon(QIcon(QPixmap(":/Icons/Icons/extOut2.p= ng"))); - ui->bt_filRetract->setIcon(QIcon(QPixmap(":/Icons/Icons/extruderRe= tract.png"))); - ui->lb_XY->setPixmap(QPixmap(":/Icons/Icons/axisXY.png")); - ui->lb_axisZ->setPixmap(QPixmap(":/Icons/Icons/axisZ.png")); - ui->lb_Extruder->setPixmap(QPixmap(":/Icons/Icons/filamentRetract.= png")); - - connect(ui->bt_filRetract,&QPushButton::clicked,this,&ExtruderCont= rolWidget::setFillExtruder); - connect(ui->bt_filOneSpeed,&QPushButton::clicked,this,&ExtruderCon= trolWidget::setFillExtruder); - connect(ui->bt_filTwoSpeed,&QPushButton::clicked,this,&ExtruderCon= trolWidget::setFillExtruder); - - - + connect(ui->bt_homeX,&QPushButton::clicked,this,&ExtruderControlWidget= ::setHome); + connect(ui->bt_homeY,&QPushButton::clicked,this,&ExtruderControlWidget= ::setHome); + connect(ui->bt_homeZ,&QPushButton::clicked,this,&ExtruderControlWidget= ::setHome); + connect(ui->bt_homeXYZ,&QPushButton::clicked,this,&ExtruderControlWidg= et::setHome); + + connect(ui->bt_leftX,&QPushButton::clicked,this,&ExtruderControlWidget= ::setPosX); + connect(ui->bt_rightX,&QPushButton::clicked,this,&ExtruderControlWidge= t::setPosX); + + connect(ui->bt_upY,&QPushButton::clicked,this,&ExtruderControlWidget::= setPosY); + connect(ui->bt_downY,&QPushButton::clicked,this,&ExtruderControlWidget= ::setPosY); + + connect(ui->bt_upZ,&QPushButton::clicked,this,&ExtruderControlWidget::= setPosZ); + connect(ui->bt_downZ,&QPushButton::clicked,this,&ExtruderControlWidget= ::setPosZ); + + ui->bt_homeX->setIcon(QIcon(":/Icons/Icons/homeAxisX.png")); + ui->bt_homeY->setIcon(QIcon(":/Icons/Icons/homeaxisY.png")); + ui->bt_homeZ->setIcon(QIcon(":/Icons/Icons/homeAxisZ.png")); + ui->bt_homeXYZ->setIcon(QIcon(":/Icons/Icons/homeAxisXYZ.png")); + ui->bt_rightX->setIcon(QIcon(":/Icons/Icons/arrowRight.png")); + ui->bt_leftX->setIcon(QIcon(":/Icons/Icons/arrowLeft.png")); + ui->bt_upY->setIcon(QIcon(":/Icons/Icons/arrowUp.png")); + ui->bt_downY->setIcon(QIcon(":/Icons/Icons/arrowDown.png")); + ui->bt_upZ->setIcon(QIcon(":/Icons/Icons/arrowUp.png")); + ui->bt_downZ->setIcon(QIcon(":/Icons/Icons/arrowDown.png")); + ui->bt_filOneSpeed->setIcon(QIcon(":/Icons/Icons/extOut.png")); + ui->bt_filTwoSpeed->setIcon(QIcon(":/Icons/Icons/extOut2.png")); + ui->bt_filRetract->setIcon(QIcon(":/Icons/Icons/extruderRetract.png")); + ui->lb_XY->setPixmap(QPixmap(":/Icons/Icons/axisXY.png")); + ui->lb_axisZ->setPixmap(QPixmap(":/Icons/Icons/axisZ.png")); + ui->lb_Extruder->setPixmap(QPixmap(":/Icons/Icons/filamentRetract.png"= )); + + connect(ui->bt_filRetract,&QPushButton::clicked,this,&ExtruderControlW= idget::setFillExtruder); + connect(ui->bt_filOneSpeed,&QPushButton::clicked,this,&ExtruderControl= Widget::setFillExtruder); + connect(ui->bt_filTwoSpeed,&QPushButton::clicked,this,&ExtruderControl= Widget::setFillExtruder); } = ExtruderControlWidget::~ExtruderControlWidget() @@ -74,84 +71,93 @@ ExtruderControlWidget::~ExtruderControlWidget() = void ExtruderControlWidget::init() { - - } = -//This slot update on UI the position of the Extruder +//This slot updates on UI the position of the Extruder void ExtruderControlWidget::updatePos() -{ //This function update the extruder position on the screen - +{ ui->tb_axisXPos->setText(QString::number(printerObject->getCurrentXPos= ())); ui->tb_axisYPos->setText(QString::number(printerObject->getCurrentYPos= ())); ui->tb_axisZPos->setText(QString::number(printerObject->getCurrentZPos= ())); - } -void ExtruderControlWidget::getPrinterObject(Repetier *pObject){ + +// This function seems to have the wrong name: why it's get if it's not re= turning anything? +void ExtruderControlWidget::getPrinterObject(Repetier *pObject) +{ printerObject =3D pObject; maxX =3D pObject->getMaxX(); maxY =3D pObject->getMaxY(); maxZ =3D pObject->getMaxZ(); } + void ExtruderControlWidget::setHome(){ - if(sender()=3D=3Dui->bt_homeX){ + QPushButton *btn =3D qobject_cast(sender()); + if(!btn) + return; + + if(btn =3D=3D ui->bt_homeX) { printerObject->homeAxis('X'); - } - if(sender()=3D=3Dui->bt_homeY){ + } else if (btn =3D=3D ui->bt_homeY) { printerObject->homeAxis('Y'); - } - if(sender()=3D=3Dui->bt_homeZ){ + } else if (btn =3D=3D ui->bt_homeZ) { printerObject->homeAxis('Z'); - } - if(sender()=3D=3Dui->bt_homeXYZ){ + } else if (btn =3D=3D ui->bt_homeXYZ) { printerObject->homeAllAxis(); } } void ExtruderControlWidget::setPosX() { double pos =3D printerObject->getCurrentXPos(); - if(sender()=3D=3Dui->bt_leftX) - pos-=3Dui->cb_displacement->currentText().toDouble(); - if(sender()=3D=3Dui->bt_rightX) - pos+=3Dui->cb_displacement->currentText().toDouble(); - if(pos>=3D0 && pos<=3DmaxX) + if(sender() =3D=3D ui->bt_leftX) + pos -=3D ui->cb_displacement->currentText().toDouble(); + else if(sender() =3D=3D ui->bt_rightX) + pos +=3D ui->cb_displacement->currentText().toDouble(); + if(pos >=3D 0 && pos<=3DmaxX) printerObject->moveAxisToPos('X',pos); } + void ExtruderControlWidget::setPosY() { double pos =3D printerObject->getCurrentYPos(); - if(sender()=3D=3Dui->bt_upY) - pos+=3Dui->cb_displacement->currentText().toDouble(); - if(sender()=3D=3Dui->bt_downY) - pos-=3Dui->cb_displacement->currentText().toDouble(); + QPushButton *btn =3D qobject_cast(sender()); + + if(btn =3D=3D ui->bt_upY) + pos +=3D ui->cb_displacement->currentText().toDouble(); + else if(btn =3D=3D ui->bt_downY) + pos -=3D ui->cb_displacement->currentText().toDouble(); + if(pos>=3D0 && pos<=3DmaxY) printerObject->moveAxisToPos('Y',pos); - } + void ExtruderControlWidget::setPosZ() { double pos =3D printerObject->getCurrentZPos(); - if(sender()=3D=3Dui->bt_upZ) - pos+=3Dui->cb_displacement->currentText().toDouble(); - if(sender()=3D=3Dui->bt_downZ) - pos-=3Dui->cb_displacement->currentText().toDouble(); + + QComboBox *cmb =3D qobject_cast(sender()); + if(cmb =3D=3D ui->bt_upZ) + pos +=3D ui->cb_displacement->currentText().toDouble(); + else if(cmb =3D=3D ui->bt_downZ) + pos -=3D ui->cb_displacement->currentText().toDouble(); + if(pos>=3D0 && pos<=3DmaxZ) printerObject->moveAxisToPos('Z',pos); - } = -void ExtruderControlWidget::disablePositionsButtons(bool b){ +void ExtruderControlWidget::disablePositionsButtons(bool b) +{ ui->wg_ExtruderButtons->setDisabled(b); } = -void ExtruderControlWidget::setFillExtruder(){ - if(sender()=3D=3Dui->bt_filRetract){ +void ExtruderControlWidget::setFillExtruder() +{ + QPushButton *btn =3D qobject_cast(sender()); = - } - if(sender()=3D=3Dui->bt_filOneSpeed){ + if(btn =3D=3D ui->bt_filRetract) { = - } - if(sender()=3D=3Dui->bt_filTwoSpeed){ + } else if(btn =3D=3D ui->bt_filOneSpeed) { + + } else if(btn =3D=3D ui->bt_filTwoSpeed) { = } } diff --git a/ExtruderControlWidget.h b/ExtruderControlWidget.h index dc8f5a3..9ba306b 100755 --- a/ExtruderControlWidget.h +++ b/ExtruderControlWidget.h @@ -44,18 +44,18 @@ public slots: void disablePositionsButtons(bool b); void updatePos(); = - private: - Ui::ExtruderControlWidget* ui; - Repetier *printerObject=3Dnullptr; - double maxX=3D0,maxY=3D0,maxZ=3D0; - QTimer *timer; - private slots: - - void setHome(); - void setPosX(); - void setPosY(); - void setPosZ(); - void setFillExtruder(); +private: + Ui::ExtruderControlWidget* ui; + Repetier *printerObject=3Dnullptr; + double maxX=3D0,maxY=3D0,maxZ=3D0; + QTimer *timer; +private slots: + + void setHome(); + void setPosX(); + void setPosY(); + void setPosZ(); + void setFillExtruder(); = = };