From 4970162ed571f5082e65f3b0955ee9636e9137f4 Mon Sep 17 00:00:00 2001
From: Emanuele <ema.trabattoni@gmail.com>
Date: Tue, 12 Nov 2019 11:37:31 +0100
Subject: [PATCH] correzioni interfaccia

---
 gui/roboglue_gui.cpp | 14 ++++++++----
 gui/roboglue_gui.ui  | 51 ++++++++++++++++++++++++++++++--------------
 2 files changed, 45 insertions(+), 20 deletions(-)

diff --git a/gui/roboglue_gui.cpp b/gui/roboglue_gui.cpp
index 7e21ab8..6243c0d 100644
--- a/gui/roboglue_gui.cpp
+++ b/gui/roboglue_gui.cpp
@@ -329,15 +329,21 @@ void RoboGlue_GUI::on_btn_home_clicked() {
     emit sendROScommand("HOME", param);
 }
 
-
 void RoboGlue_GUI::on_btn_setFrame_clicked() {
-    QVariantMap param;
-    std::string frametext;
+    QVariantMap param, frm;
+    QList<QString> tempPos, TempOr;
     modlog->debug("setFrame");
     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 sendROScommand("SETFRAME", param);
-
 }
 ////////////////////////////////////////////////
 ////////END INTERNAL PRIVATE SLOTS//////////////
diff --git a/gui/roboglue_gui.ui b/gui/roboglue_gui.ui
index fb01ac2..4b9c297 100644
--- a/gui/roboglue_gui.ui
+++ b/gui/roboglue_gui.ui
@@ -1301,13 +1301,6 @@
           </item>
           <item>
            <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">
              <widget class="QLineEdit" name="txt_framePos">
               <property name="inputMask">
@@ -1315,10 +1308,10 @@
               </property>
              </widget>
             </item>
-            <item row="1" column="2">
-             <widget class="QLineEdit" name="txt_frameOr">
-              <property name="inputMask">
-               <string>rx:000,ry:000,rz:000 </string>
+            <item row="1" column="1">
+             <widget class="QLabel" name="label_21">
+              <property name="text">
+               <string>Orientation</string>
               </property>
              </widget>
             </item>
@@ -1329,13 +1322,39 @@
               </property>
              </widget>
             </item>
-            <item row="1" column="1">
-             <widget class="QLabel" name="label_21">
-              <property name="text">
-               <string>Orientation</string>
+            <item row="1" column="2">
+             <widget class="QLineEdit" name="txt_frameOr">
+              <property name="inputMask">
+               <string>r\x:000,ry:000,rz:000 </string>
               </property>
              </widget>
             </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>
           </item>
           <item>
@@ -1428,12 +1447,12 @@
  <resources/>
  <connections/>
  <buttongroups>
+  <buttongroup name="grp_hilo"/>
   <buttongroup name="gpr_lock">
    <property name="exclusive">
     <bool>false</bool>
    </property>
   </buttongroup>
-  <buttongroup name="grp_hilo"/>
   <buttongroup name="grp_mod"/>
  </buttongroups>
 </ui>