NeoTheFox/RepRaptor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #5 from quillford/master

Browse Source 
Changed Step to Step increment
This commit is contained in:
NeoTheFox 2015-03-13 13:22:58 +03:00
commit d007eb32d9
2 changed files with 74 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mainwindow.cpp
View File

@ -18,6 +18,7 @@ MainWindow::MainWindow(QWidget *parent) :
ui->actionPrint_from_SD->setDisabled(true); ui->actionPrint_from_SD->setDisabled(true);
ui->actionSet_SD_printing_mode->setDisabled(true); ui->actionSet_SD_printing_mode->setDisabled(true);
ui->actionEEPROM_editor->setDisabled(true); ui->actionEEPROM_editor->setDisabled(true);
ui->statusGroup->setDisabled(true);
ui->extruderlcd->setPalette(Qt::red); ui->extruderlcd->setPalette(Qt::red);
ui->bedlcd->setPalette(Qt::red); ui->bedlcd->setPalette(Qt::red);
ui->sendtext->installEventFilter(this); ui->sendtext->installEventFilter(this);
@ -267,6 +268,7 @@ void MainWindow::serialconnect()
ui->progressBar->setValue(0); ui->progressBar->setValue(0);
ui->controlBox->setDisabled(false); ui->controlBox->setDisabled(false);
ui->consoleGroup->setDisabled(false); ui->consoleGroup->setDisabled(false);
ui->statusGroup->setDisabled(false);
ui->actionPrint_from_SD->setEnabled(true); ui->actionPrint_from_SD->setEnabled(true);
ui->actionSet_SD_printing_mode->setEnabled(true); ui->actionSet_SD_printing_mode->setEnabled(true);
if(firmware == Repetier) ui->actionEEPROM_editor->setDisabled(false); if(firmware == Repetier) ui->actionEEPROM_editor->setDisabled(false);
@ -285,6 +287,7 @@ void MainWindow::serialconnect()
ui->consoleGroup->setDisabled(true); ui->consoleGroup->setDisabled(true);
ui->actionPrint_from_SD->setDisabled(true); ui->actionPrint_from_SD->setDisabled(true);
ui->actionSet_SD_printing_mode->setDisabled(true); ui->actionSet_SD_printing_mode->setDisabled(true);
ui->statusGroup->setDisabled(true);
ui->actionEEPROM_editor->setDisabled(false); ui->actionEEPROM_editor->setDisabled(false);
} }
} }

113
mainwindow.ui
View File

@ -43,13 +43,6 @@
<string>Serial</string> <string>Serial</string>
</property> </property>
<layout class="QGridLayout" name="gridLayout"> <layout class="QGridLayout" name="gridLayout">
<item row="0" column="0">
<widget class="QPushButton" name="portsBtn">
<property name="text">
<string>Ports</string>
</property>
</widget>
</item>
<item row="0" column="1"> <item row="0" column="1">
<widget class="QComboBox" name="serialBox"> <widget class="QComboBox" name="serialBox">
<property name="maximumSize"> <property name="maximumSize">
@ -60,6 +53,16 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="1">
<widget class="QComboBox" name="baudbox"/>
</item>
<item row="0" column="0">
<widget class="QPushButton" name="portsBtn">
<property name="text">
<string>Ports</string>
</property>
</widget>
</item>
<item row="1" column="0"> <item row="1" column="0">
<widget class="QPushButton" name="connectBtn"> <widget class="QPushButton" name="connectBtn">
<property name="text"> <property name="text">
@ -67,9 +70,6 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="1">
<widget class="QComboBox" name="baudbox"/>
</item>
</layout> </layout>
</widget> </widget>
</item> </item>
@ -143,6 +143,15 @@
</item> </item>
<item row="1" column="4"> <item row="1" column="4">
<widget class="QPushButton" name="ezerobtn"> <widget class="QPushButton" name="ezerobtn">
<property name="toolTip">
<string>this is tool tip e0</string>
</property>
<property name="statusTip">
<string>this is status e0</string>
</property>
<property name="whatsThis">
<string>this is e0</string>
</property>
<property name="text"> <property name="text">
<string>E0</string> <string>E0</string>
</property> </property>
@ -164,6 +173,9 @@
</item> </item>
<item row="1" column="6"> <item row="1" column="6">
<widget class="QPushButton" name="homeybtn"> <widget class="QPushButton" name="homeybtn">
<property name="whatsThis">
<string/>
</property>
<property name="text"> <property name="text">
<string>H Y</string> <string>H Y</string>
</property> </property>
@ -206,6 +218,9 @@
</item> </item>
<item row="6" column="2" colspan="2"> <item row="6" column="2" colspan="2">
<widget class="QSpinBox" name="etmpspin"> <widget class="QSpinBox" name="etmpspin">
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
<property name="maximum"> <property name="maximum">
<number>500</number> <number>500</number>
</property> </property>
@ -214,19 +229,22 @@
<item row="6" column="6"> <item row="6" column="6">
<widget class="QPushButton" name="etmpoff"> <widget class="QPushButton" name="etmpoff">
<property name="text"> <property name="text">
<string>OFF</string> <string>Off</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="6" column="4"> <item row="6" column="4">
<widget class="QPushButton" name="etmpset"> <widget class="QPushButton" name="etmpset">
<property name="text"> <property name="text">
<string>SET</string> <string>Set</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="7" column="2" colspan="2"> <item row="7" column="2" colspan="2">
<widget class="QSpinBox" name="btmpspin"> <widget class="QSpinBox" name="btmpspin">
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
<property name="maximum"> <property name="maximum">
<number>500</number> <number>500</number>
</property> </property>
@ -235,14 +253,14 @@
<item row="7" column="4"> <item row="7" column="4">
<widget class="QPushButton" name="btmpset"> <widget class="QPushButton" name="btmpset">
<property name="text"> <property name="text">
<string>SET</string> <string>Set</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="7" column="6"> <item row="7" column="6">
<widget class="QPushButton" name="btmpoff"> <widget class="QPushButton" name="btmpoff">
<property name="text"> <property name="text">
<string>OFF</string> <string>Off</string>
</property> </property>
</widget> </widget>
</item> </item>
@ -251,6 +269,9 @@
<property name="text"> <property name="text">
<string>100</string> <string>100</string>
</property> </property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
<property name="clearButtonEnabled"> <property name="clearButtonEnabled">
<bool>false</bool> <bool>false</bool>
</property> </property>
@ -275,15 +296,23 @@
<item row="8" column="5" colspan="2"> <item row="8" column="5" colspan="2">
<widget class="QPushButton" name="speedsetbtn"> <widget class="QPushButton" name="speedsetbtn">
<property name="text"> <property name="text">
<string>SET</string> <string>Set</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="9" column="2"> <item row="9" column="2">
<widget class="QLineEdit" name="flowedit"> <widget class="QLineEdit" name="flowedit">
<property name="font">
<font>
<pointsize>13</pointsize>
</font>
</property>
<property name="text"> <property name="text">
<string>100</string> <string>100</string>
</property> </property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
<property name="clearButtonEnabled"> <property name="clearButtonEnabled">
<bool>false</bool> <bool>false</bool>
</property> </property>
@ -308,35 +337,35 @@
<item row="9" column="5" colspan="2"> <item row="9" column="5" colspan="2">
<widget class="QPushButton" name="flowbutton"> <widget class="QPushButton" name="flowbutton">
<property name="text"> <property name="text">
<string>SET</string> <string>Set</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="10" column="2" colspan="2"> <item row="10" column="2" colspan="2">
<widget class="QPushButton" name="fanonbtn"> <widget class="QPushButton" name="fanonbtn">
<property name="text"> <property name="text">
<string>FAN ON</string> <string>Fan On</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="10" column="4" colspan="3"> <item row="10" column="4" colspan="3">
<widget class="QPushButton" name="fanoffbtn"> <widget class="QPushButton" name="fanoffbtn">
<property name="text"> <property name="text">
<string>FAN OFF</string> <string>Fan Off</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="11" column="2" colspan="2"> <item row="11" column="2" colspan="2">
<widget class="QPushButton" name="atxonbtn"> <widget class="QPushButton" name="atxonbtn">
<property name="text"> <property name="text">
<string>ATX ON</string> <string>ATX On</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="11" column="4" colspan="3"> <item row="11" column="4" colspan="3">
<widget class="QPushButton" name="atxoffbtn"> <widget class="QPushButton" name="atxoffbtn">
<property name="text"> <property name="text">
<string>ATX OFF</string> <string>ATX Off</string>
</property> </property>
</widget> </widget>
</item> </item>
@ -376,19 +405,6 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="4" column="0" colspan="2">
<widget class="QLabel" name="label_2">
<property name="maximumSize">
<size>
<width>16777215</width>
<height>15</height>
</size>
</property>
<property name="text">
<string>Step</string>
</property>
</widget>
</item>
<item row="5" column="0" colspan="3"> <item row="5" column="0" colspan="3">
<widget class="QDoubleSpinBox" name="stepspin"> <widget class="QDoubleSpinBox" name="stepspin">
<property name="locale"> <property name="locale">
@ -415,7 +431,7 @@
<item row="7" column="0" colspan="2"> <item row="7" column="0" colspan="2">
<widget class="QLabel" name="label_4"> <widget class="QLabel" name="label_4">
<property name="text"> <property name="text">
<string>B tmp</string> <string>Bed tmp</string>
</property> </property>
</widget> </widget>
</item> </item>
@ -868,6 +884,19 @@ STOP</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="4" column="0" colspan="3">
<widget class="QLabel" name="label_2">
<property name="maximumSize">
<size>
<width>16777215</width>
<height>15</height>
</size>
</property>
<property name="text">
<string>Step Increment</string>
</property>
</widget>
</item>
</layout> </layout>
</widget> </widget>
</item> </item>
@ -889,6 +918,13 @@ STOP</string>
<string>Console</string> <string>Console</string>
</property> </property>
<layout class="QGridLayout" name="gridLayout_3"> <layout class="QGridLayout" name="gridLayout_3">
<item row="3" column="0">
<widget class="QPushButton" name="sendbtn">
<property name="text">
<string>Send</string>
</property>
</widget>
</item>
<item row="0" column="0"> <item row="0" column="0">
<widget class="QTextBrowser" name="terminal"> <widget class="QTextBrowser" name="terminal">
<property name="acceptDrops"> <property name="acceptDrops">
@ -909,13 +945,6 @@ STOP</string>
<item row="2" column="0"> <item row="2" column="0">
<widget class="QLineEdit" name="sendtext"/> <widget class="QLineEdit" name="sendtext"/>
</item> </item>
<item row="3" column="0">
<widget class="QPushButton" name="sendbtn">
<property name="text">
<string>Send</string>
</property>
</widget>
</item>
</layout> </layout>
</widget> </widget>
</item> </item>
@ -1014,7 +1043,7 @@ STOP</string>
</size> </size>
</property> </property>
<property name="title"> <property name="title">
<string>Status</string> <string>Temperature</string>
</property> </property>
<layout class="QGridLayout" name="gridLayout_5"> <layout class="QGridLayout" name="gridLayout_5">
<item row="0" column="0"> <item row="0" column="0">