Updated UI and added asymetric step selection

This commit is contained in:
NeoTheFox 2015-03-03 18:02:59 +03:00
parent 35fe77e08c
commit 868530ab52
8 changed files with 374 additions and 295 deletions

View File

@ -34,13 +34,12 @@
p, li { white-space: pre-wrap; } p, li { white-space: pre-wrap; }
</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;"> </style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;">
<p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><img src=":/icons/logo.png" /></p> <p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><img src=":/icons/logo.png" /></p>
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">RepRaptor</span> is a free and open source software for controlling RepRap and similar mashines. This software is distributed by terms of <a href="https://www.gnu.org/licenses/gpl-2.0.html"><span style=" text-decoration: underline; color:#0000ff;">GPL v2 licence.</span></a></p> <p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;"> RepRaptor</span> is a free and open source software for controlling RepRap and similar mashines. This software is distributed by terms of <a href="https://www.gnu.org/licenses/gpl-2.0.html"><span style=" text-decoration: underline; color:#0000ff;">GPL v2 licence.</span></a> Some graphical images (Fugue Icons) are distributed by terms of <a href="https://creativecommons.org/licenses/by/3.0/deed.ru"><span style=" text-decoration: underline; color:#0000ff;">Creative Commons 3 licence</span></a>.</p>
<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; text-decoration: underline; color:#0000ff;"><br /></p> <p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> RepRaptor's main goal is to be as simple as possible and fast, yet functional. This software is being developed as a primary host software for <span style=" font-weight:600;">MGTU MIREA</span> university's 3D printing labratory by</p>
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">RepRaptor's main goal is to be as simple as possible and fast, yet functional. This software is being developed as a primary host software for <span style=" font-weight:600;">MGTU MIREA</span> university's 3D printing labratory by</p> <p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="mailto:repraptor-dev@repraptor.33mail.com"><span style=" text-decoration: underline; color:#0000ff;">Nickolay (aka "NeoTheFox") Mardanov.</span></a></p>
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="mailto:repraptor-dev@repraptor.33mail.com"><span style=" text-decoration: underline; color:#0000ff;">Nickolay (aka "NeoTheFox") Mardanov.</span></a></p>
<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /></p> <p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /></p>
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="https://github.com/NeoTheFox/RepRaptor"><span style=" text-decoration: underline; color:#0000ff;">GitHub</span></a></p> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="https://github.com/NeoTheFox/RepRaptor"><span style=" text-decoration: underline; color:#0000ff;">GitHub</span></a></p>
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://www.reprap.org"><span style=" text-decoration: underline; color:#0000ff;">RepRap</span></a></p> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://www.reprap.org"><span style=" text-decoration: underline; color:#0000ff;">RepRap wiki</span></a></p>
<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; text-decoration: underline; color:#0000ff;"><br /></p> <p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; text-decoration: underline; color:#0000ff;"><br /></p>
&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; text-decoration: underline; color:#0000ff;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string> &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; text-decoration: underline; color:#0000ff;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property> </property>

View File

@ -4,5 +4,8 @@
<file>icons/logo.png</file> <file>icons/logo.png</file>
<file>icons/error_a.png</file> <file>icons/error_a.png</file>
<file>icons/error_b.png</file> <file>icons/error_b.png</file>
<file>icons/g.png</file>
<file>icons/sd.png</file>
<file>icons/settings.png</file>
</qresource> </qresource>
</RCC> </RCC>

BIN
icons/g.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 604 B

BIN
icons/sd.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
icons/settings.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 699 B

View File

@ -689,3 +689,17 @@ void MainWindow::checkSDStatus()
{ {
if(sdWatcher.isFinished() && sdprinting) injectCommand("M27"); if(sdWatcher.isFinished() && sdprinting) injectCommand("M27");
} }
void MainWindow::on_stepspin_valueChanged(double arg1)
{
if(arg1 < 1) ui->stepspin->setSingleStep(0.1);
else if(arg1 >=10) ui->stepspin->setSingleStep(10);
else if((int)arg1 >= 1) ui->stepspin->setSingleStep(1);
}
void MainWindow::on_estepspin_valueChanged(double arg1)
{
if(arg1 < 1l) ui->estepspin->setSingleStep(0.1);
else if(arg1 >=10) ui->estepspin->setSingleStep(10);
else if((int)arg1 >= 1) ui->estepspin->setSingleStep(1);
}

View File

@ -120,6 +120,10 @@ private slots:
void checkSDStatus(); void checkSDStatus();
void updateSDStatus(); void updateSDStatus();
void on_stepspin_valueChanged(double arg1);
void on_estepspin_valueChanged(double arg1);
signals: signals:
void sdReady(); void sdReady();
}; };

View File

@ -61,296 +61,6 @@
</layout> </layout>
</widget> </widget>
</item> </item>
<item row="0" column="1" rowspan="3">
<widget class="QGroupBox" name="controlBox">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="maximumSize">
<size>
<width>261</width>
<height>500</height>
</size>
</property>
<property name="title">
<string>Control</string>
</property>
<property name="checkable">
<bool>true</bool>
</property>
<layout class="QGridLayout" name="gridLayout_4">
<item row="0" column="8">
<widget class="QPushButton" name="homexbtn">
<property name="sizePolicy">
<sizepolicy hsizetype="Maximum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>H X</string>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QPushButton" name="xminusbtn">
<property name="text">
<string>X-</string>
</property>
</widget>
</item>
<item row="1" column="8">
<widget class="QPushButton" name="homeybtn">
<property name="text">
<string>H Y</string>
</property>
</widget>
</item>
<item row="2" column="8">
<widget class="QPushButton" name="homezbtn">
<property name="text">
<string>H Z</string>
</property>
</widget>
</item>
<item row="5" column="0" colspan="4">
<widget class="QDoubleSpinBox" name="stepspin">
<property name="locale">
<locale language="English" country="UnitedStates"/>
</property>
<property name="minimum">
<double>0.100000000000000</double>
</property>
<property name="maximum">
<double>150.000000000000000</double>
</property>
</widget>
</item>
<item row="6" column="5" colspan="2">
<widget class="QPushButton" name="etmpset">
<property name="text">
<string>SET</string>
</property>
</widget>
</item>
<item row="6" column="0" colspan="2">
<widget class="QLabel" name="label_3">
<property name="text">
<string>E tmp</string>
</property>
</widget>
</item>
<item row="7" column="0" colspan="2">
<widget class="QLabel" name="label_4">
<property name="text">
<string>B tmp</string>
</property>
</widget>
</item>
<item row="7" column="5" colspan="2">
<widget class="QPushButton" name="btmpset">
<property name="text">
<string>SET</string>
</property>
</widget>
</item>
<item row="7" column="7" colspan="2">
<widget class="QPushButton" name="btmpoff">
<property name="text">
<string>OFF</string>
</property>
</widget>
</item>
<item row="8" column="2" colspan="3">
<widget class="QPushButton" name="fanonbtn">
<property name="text">
<string>FAN ON</string>
</property>
</widget>
</item>
<item row="8" column="6" colspan="3">
<widget class="QPushButton" name="fanoffbtn">
<property name="text">
<string>FAN OFF</string>
</property>
</widget>
</item>
<item row="9" column="2" colspan="3">
<widget class="QPushButton" name="atxonbtn">
<property name="text">
<string>ATX ON</string>
</property>
</widget>
</item>
<item row="0" column="6">
<widget class="QPushButton" name="eplusbtn">
<property name="text">
<string>E+</string>
</property>
</widget>
</item>
<item row="9" column="6" colspan="3">
<widget class="QPushButton" name="atxoffbtn">
<property name="text">
<string>ATX OFF</string>
</property>
</widget>
</item>
<item row="0" column="4">
<widget class="QPushButton" name="zplusbtn">
<property name="text">
<string>Z+</string>
</property>
</widget>
</item>
<item row="1" column="6">
<widget class="QPushButton" name="ezerobtn">
<property name="text">
<string>E0</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QPushButton" name="centerbtn">
<property name="text">
<string>C</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QPushButton" name="yplusbtn">
<property name="text">
<string>Y+</string>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QPushButton" name="yminusbtn">
<property name="text">
<string>Y-</string>
</property>
</widget>
</item>
<item row="2" column="6">
<widget class="QPushButton" name="eminusbtn">
<property name="text">
<string>E-</string>
</property>
</widget>
</item>
<item row="2" column="4">
<widget class="QPushButton" name="zminusbtn">
<property name="text">
<string>Z-</string>
</property>
</widget>
</item>
<item row="6" column="2" colspan="3">
<widget class="QSpinBox" name="etmpspin">
<property name="maximum">
<number>500</number>
</property>
</widget>
</item>
<item row="7" column="2" colspan="3">
<widget class="QSpinBox" name="btmpspin">
<property name="maximum">
<number>500</number>
</property>
</widget>
</item>
<item row="3" column="0" colspan="4">
<widget class="QPushButton" name="homeallbtn">
<property name="text">
<string>Home All</string>
</property>
</widget>
</item>
<item row="3" column="4" colspan="5">
<widget class="QPushButton" name="releasebtn">
<property name="text">
<string>Release</string>
</property>
</widget>
</item>
<item row="5" column="4" colspan="5">
<widget class="QDoubleSpinBox" name="estepspin">
<property name="locale">
<locale language="English" country="UnitedStates"/>
</property>
<property name="minimum">
<double>0.100000000000000</double>
</property>
<property name="maximum">
<double>100.000000000000000</double>
</property>
<property name="value">
<double>1.000000000000000</double>
</property>
</widget>
</item>
<item row="1" column="2">
<widget class="QPushButton" name="xplusbtn">
<property name="text">
<string>X+</string>
</property>
</widget>
</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</string>
</property>
</widget>
</item>
<item row="4" column="4" colspan="4">
<widget class="QLabel" name="label">
<property name="maximumSize">
<size>
<width>16777215</width>
<height>15</height>
</size>
</property>
<property name="text">
<string>E Step</string>
</property>
</widget>
</item>
<item row="10" column="2">
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Expanding</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item row="6" column="7" colspan="2">
<widget class="QPushButton" name="etmpoff">
<property name="text">
<string>OFF</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item row="0" column="2" rowspan="3"> <item row="0" column="2" rowspan="3">
<widget class="QGroupBox" name="consoleGroup"> <widget class="QGroupBox" name="consoleGroup">
<property name="sizePolicy"> <property name="sizePolicy">
@ -511,6 +221,299 @@
</layout> </layout>
</widget> </widget>
</item> </item>
<item row="0" column="1" rowspan="3">
<widget class="QGroupBox" name="controlBox">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="maximumSize">
<size>
<width>261</width>
<height>500</height>
</size>
</property>
<property name="title">
<string>Control</string>
</property>
<property name="checkable">
<bool>true</bool>
</property>
<layout class="QGridLayout" name="gridLayout_4">
<item row="0" column="8">
<widget class="QPushButton" name="homexbtn">
<property name="sizePolicy">
<sizepolicy hsizetype="Maximum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>H X</string>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QPushButton" name="xminusbtn">
<property name="text">
<string>X-</string>
</property>
</widget>
</item>
<item row="1" column="8">
<widget class="QPushButton" name="homeybtn">
<property name="text">
<string>H Y</string>
</property>
</widget>
</item>
<item row="2" column="8">
<widget class="QPushButton" name="homezbtn">
<property name="text">
<string>H Z</string>
</property>
</widget>
</item>
<item row="5" column="0" colspan="4">
<widget class="QDoubleSpinBox" name="stepspin">
<property name="locale">
<locale language="English" country="UnitedStates"/>
</property>
<property name="minimum">
<double>0.100000000000000</double>
</property>
<property name="maximum">
<double>150.000000000000000</double>
</property>
<property name="value">
<double>1.000000000000000</double>
</property>
</widget>
</item>
<item row="7" column="0" colspan="2">
<widget class="QLabel" name="label_4">
<property name="text">
<string>B tmp</string>
</property>
</widget>
</item>
<item row="6" column="0" colspan="2">
<widget class="QLabel" name="label_3">
<property name="text">
<string>E tmp</string>
</property>
</widget>
</item>
<item row="6" column="5" colspan="2">
<widget class="QPushButton" name="etmpset">
<property name="text">
<string>SET</string>
</property>
</widget>
</item>
<item row="7" column="5" colspan="2">
<widget class="QPushButton" name="btmpset">
<property name="text">
<string>SET</string>
</property>
</widget>
</item>
<item row="7" column="7" colspan="2">
<widget class="QPushButton" name="btmpoff">
<property name="text">
<string>OFF</string>
</property>
</widget>
</item>
<item row="8" column="2" colspan="3">
<widget class="QPushButton" name="fanonbtn">
<property name="text">
<string>FAN ON</string>
</property>
</widget>
</item>
<item row="8" column="6" colspan="3">
<widget class="QPushButton" name="fanoffbtn">
<property name="text">
<string>FAN OFF</string>
</property>
</widget>
</item>
<item row="9" column="2" colspan="3">
<widget class="QPushButton" name="atxonbtn">
<property name="text">
<string>ATX ON</string>
</property>
</widget>
</item>
<item row="0" column="6">
<widget class="QPushButton" name="eplusbtn">
<property name="text">
<string>E+</string>
</property>
</widget>
</item>
<item row="0" column="4">
<widget class="QPushButton" name="zplusbtn">
<property name="text">
<string>Z+</string>
</property>
</widget>
</item>
<item row="9" column="6" colspan="3">
<widget class="QPushButton" name="atxoffbtn">
<property name="text">
<string>ATX OFF</string>
</property>
</widget>
</item>
<item row="1" column="6">
<widget class="QPushButton" name="ezerobtn">
<property name="text">
<string>E0</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QPushButton" name="centerbtn">
<property name="text">
<string>C</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QPushButton" name="yplusbtn">
<property name="text">
<string>Y+</string>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QPushButton" name="yminusbtn">
<property name="text">
<string>Y-</string>
</property>
</widget>
</item>
<item row="2" column="6">
<widget class="QPushButton" name="eminusbtn">
<property name="text">
<string>E-</string>
</property>
</widget>
</item>
<item row="2" column="4">
<widget class="QPushButton" name="zminusbtn">
<property name="text">
<string>Z-</string>
</property>
</widget>
</item>
<item row="6" column="2" colspan="3">
<widget class="QSpinBox" name="etmpspin">
<property name="maximum">
<number>500</number>
</property>
</widget>
</item>
<item row="7" column="2" colspan="3">
<widget class="QSpinBox" name="btmpspin">
<property name="maximum">
<number>500</number>
</property>
</widget>
</item>
<item row="3" column="0" colspan="4">
<widget class="QPushButton" name="homeallbtn">
<property name="text">
<string>Home All</string>
</property>
</widget>
</item>
<item row="3" column="4" colspan="5">
<widget class="QPushButton" name="releasebtn">
<property name="text">
<string>Release</string>
</property>
</widget>
</item>
<item row="1" column="2">
<widget class="QPushButton" name="xplusbtn">
<property name="text">
<string>X+</string>
</property>
</widget>
</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</string>
</property>
</widget>
</item>
<item row="5" column="4" colspan="5">
<widget class="QDoubleSpinBox" name="estepspin">
<property name="locale">
<locale language="English" country="UnitedStates"/>
</property>
<property name="minimum">
<double>0.100000000000000</double>
</property>
<property name="maximum">
<double>100.000000000000000</double>
</property>
<property name="value">
<double>1.000000000000000</double>
</property>
</widget>
</item>
<item row="4" column="4" colspan="4">
<widget class="QLabel" name="label">
<property name="maximumSize">
<size>
<width>16777215</width>
<height>15</height>
</size>
</property>
<property name="text">
<string>E Step</string>
</property>
</widget>
</item>
<item row="6" column="7" colspan="2">
<widget class="QPushButton" name="etmpoff">
<property name="text">
<string>OFF</string>
</property>
</widget>
</item>
<item row="10" column="2">
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Expanding</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
</item>
</layout> </layout>
</widget> </widget>
<widget class="QMenuBar" name="menuBar"> <widget class="QMenuBar" name="menuBar">
@ -553,7 +556,55 @@
<addaction name="menuAbout"/> <addaction name="menuAbout"/>
</widget> </widget>
<widget class="QStatusBar" name="statusBar"/> <widget class="QStatusBar" name="statusBar"/>
<widget class="QToolBar" name="toolBar">
<property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>26</height>
</size>
</property>
<property name="windowTitle">
<string>Toolbar</string>
</property>
<property name="movable">
<bool>true</bool>
</property>
<property name="allowedAreas">
<set>Qt::AllToolBarAreas</set>
</property>
<property name="iconSize">
<size>
<width>16</width>
<height>16</height>
</size>
</property>
<property name="toolButtonStyle">
<enum>Qt::ToolButtonTextOnly</enum>
</property>
<property name="floatable">
<bool>true</bool>
</property>
<attribute name="toolBarArea">
<enum>TopToolBarArea</enum>
</attribute>
<attribute name="toolBarBreak">
<bool>false</bool>
</attribute>
<addaction name="actionOpen"/>
<addaction name="actionPrint_from_SD"/>
<addaction name="actionSettings"/>
</widget>
<action name="actionOpen"> <action name="actionOpen">
<property name="icon">
<iconset resource="graphics.qrc">
<normaloff>:/icons/g.png</normaloff>:/icons/g.png</iconset>
</property>
<property name="text"> <property name="text">
<string>Open...</string> <string>Open...</string>
</property> </property>
@ -578,6 +629,10 @@
</property> </property>
</action> </action>
<action name="actionSettings"> <action name="actionSettings">
<property name="icon">
<iconset resource="graphics.qrc">
<normaloff>:/icons/settings.png</normaloff>:/icons/settings.png</iconset>
</property>
<property name="text"> <property name="text">
<string>Settings</string> <string>Settings</string>
</property> </property>
@ -594,6 +649,10 @@
<property name="enabled"> <property name="enabled">
<bool>true</bool> <bool>true</bool>
</property> </property>
<property name="icon">
<iconset resource="graphics.qrc">
<normaloff>:/icons/sd.png</normaloff>:/icons/sd.png</iconset>
</property>
<property name="text"> <property name="text">
<string>Print from SD...</string> <string>Print from SD...</string>
</property> </property>