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

Static cast int to enum

Browse Source
This commit is contained in:
NeoTheFox 2015-03-19 19:36:29 +03:00
parent c94afa3986
commit 2f4519634a
2 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sender.cpp
View File

@ -126,7 +126,7 @@ void Sender::openPort(QSerialPortInfo i)
printer->setDataTerminalReady(dtr); printer->setDataTerminalReady(dtr);
if(!printer->setBaudRate(baudrate)) if(!printer->setBaudRate(baudrate))
emit baudrateSetFailed(baudrate); emit baudrateSetFailed(baudrate);
printer->setFlowControl(flowcontrol); printer->setFlowControl(static_cast<QSerialPort::FlowControl>(flowcontrol));
} }
readyReceive = true; readyReceive = true;

24
settingswindow.ui
View File

@ -6,8 +6,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>478</width> <width>483</width>
<height>285</height> <height>341</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
@ -24,7 +24,7 @@
<string>Internal</string> <string>Internal</string>
</property> </property>
<layout class="QGridLayout" name="gridLayout"> <layout class="QGridLayout" name="gridLayout">
<item row="3" column="0" colspan="3"> <item row="4" column="0" colspan="3">
<widget class="QCheckBox" name="echobox"> <widget class="QCheckBox" name="echobox">
<property name="enabled"> <property name="enabled">
<bool>false</bool> <bool>false</bool>
@ -99,7 +99,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="5" column="0" colspan="3"> <item row="6" column="0" colspan="3">
<widget class="QCheckBox" name="lockbox"> <widget class="QCheckBox" name="lockbox">
<property name="text"> <property name="text">
<string>Lock controls when printing</string> <string>Lock controls when printing</string>
@ -113,14 +113,14 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="6" column="0" colspan="3"> <item row="7" column="0" colspan="3">
<widget class="QCheckBox" name="sdbox"> <widget class="QCheckBox" name="sdbox">
<property name="text"> <property name="text">
<string>Check SD printing status</string> <string>Check SD printing status</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="7" column="0"> <item row="8" column="0">
<widget class="QCheckBox" name="checksumbox"> <widget class="QCheckBox" name="checksumbox">
<property name="enabled"> <property name="enabled">
<bool>true</bool> <bool>true</bool>
@ -152,13 +152,23 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="4" column="0"> <item row="5" column="0">
<widget class="QCheckBox" name="dtrbox"> <widget class="QCheckBox" name="dtrbox">
<property name="text"> <property name="text">
<string>DTR</string> <string>DTR</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="3" column="0">
<widget class="QLabel" name="label_11">
<property name="text">
<string>Flow control</string>
</property>
</widget>
</item>
<item row="3" column="1" colspan="2">
<widget class="QComboBox" name="flowcontrolbox"/>
</item>
</layout> </layout>
</widget> </widget>
</item> </item>