Obbart/RoboGlue_QT
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

correzioni interfaccia

Browse Source
This commit is contained in:
Emanuele
2019-11-12 11:37:31 +01:00
parent e1e80d16c7
commit 4970162ed5
2 changed files with 45 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
gui/roboglue_gui.cpp
View File

@@ -329,15 +329,21 @@ void RoboGlue_GUI::on_btn_home_clicked() {
emit sendROScommand("HOME", param); emit sendROScommand("HOME", param);
} }
void RoboGlue_GUI::on_btn_setFrame_clicked() { void RoboGlue_GUI::on_btn_setFrame_clicked() {
QVariantMap param; QVariantMap param, frm;
std::string frametext; QList<QString> tempPos, TempOr;
modlog->debug("setFrame"); modlog->debug("setFrame");
param["action"]="set"; param["action"]="set";
param["framename"]=ui->txt_frameName->text();
for(auto tp : ui->txt_framePos->text().split(",")){
frm[tp.split(":").first()]=tp.split(":").last();
}
for(auto tp : ui->txt_frameOr->text().split(",")){
frm[tp.split(":").first()]=tp.split(":").last();
}
param["frame"]=frm;
emit m->commonStatusChange(); emit m->commonStatusChange();
emit sendROScommand("SETFRAME", param); emit sendROScommand("SETFRAME", param);
} }
//////////////////////////////////////////////// ////////////////////////////////////////////////
////////END INTERNAL PRIVATE SLOTS////////////// ////////END INTERNAL PRIVATE SLOTS//////////////

51
gui/roboglue_gui.ui
View File

@@ -1301,13 +1301,6 @@
</item> </item>
<item> <item>
<layout class="QGridLayout" name="gridLayout_5"> <layout class="QGridLayout" name="gridLayout_5">
<item row="0" column="0">
<widget class="QPushButton" name="btn_setFrame">
<property name="text">
<string>SetFrame</string>
</property>
</widget>
</item>
<item row="0" column="2"> <item row="0" column="2">
<widget class="QLineEdit" name="txt_framePos"> <widget class="QLineEdit" name="txt_framePos">
<property name="inputMask"> <property name="inputMask">
@@ -1315,10 +1308,10 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="2"> <item row="1" column="1">
<widget class="QLineEdit" name="txt_frameOr"> <widget class="QLabel" name="label_21">
<property name="inputMask"> <property name="text">
<string>rx:000,ry:000,rz:000 </string> <string>Orientation</string>
</property> </property>
</widget> </widget>
</item> </item>
@@ -1329,13 +1322,39 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="1"> <item row="1" column="2">
<widget class="QLabel" name="label_21"> <widget class="QLineEdit" name="txt_frameOr">
<property name="text"> <property name="inputMask">
<string>Orientation</string> <string>r\x:000,ry:000,rz:000 </string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="0">
<widget class="QPushButton" name="btn_setFrame">
<property name="text">
<string>SetFrame</string>
</property>
</widget>
</item>
<item row="0" column="3">
<widget class="QLabel" name="label_24">
<property name="minimumSize">
<size>
<width>150</width>
<height>0</height>
</size>
</property>
<property name="text">
<string>Name</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
<item row="1" column="3">
<widget class="QLineEdit" name="txt_frameName"/>
</item>
</layout> </layout>
</item> </item>
<item> <item>
@@ -1428,12 +1447,12 @@
<resources/> <resources/>
<connections/> <connections/>
<buttongroups> <buttongroups>
<buttongroup name="grp_hilo"/>
<buttongroup name="gpr_lock"> <buttongroup name="gpr_lock">
<property name="exclusive"> <property name="exclusive">
<bool>false</bool> <bool>false</bool>
</property> </property>
</buttongroup> </buttongroup>
<buttongroup name="grp_hilo"/>
<buttongroup name="grp_mod"/> <buttongroup name="grp_mod"/>
</buttongroups> </buttongroups>
</ui> </ui>