diff --git a/VirtualRobot/examples/RobotViewer/RobotViewer.ui b/VirtualRobot/examples/RobotViewer/RobotViewer.ui index 08eba3f6ff8963be99146c16a7f77da420203cce..2bcffb59b8d85050d2e065aa2a885b0bbb4eff5e 100644 --- a/VirtualRobot/examples/RobotViewer/RobotViewer.ui +++ b/VirtualRobot/examples/RobotViewer/RobotViewer.ui @@ -42,9 +42,9 @@ <property name="geometry"> <rect> <x>0</x> - <y>-91</y> - <width>847</width> - <height>1038</height> + <y>0</y> + <width>841</width> + <height>1061</height> </rect> </property> <layout class="QVBoxLayout" name="verticalLayout_3"> @@ -397,23 +397,85 @@ <widget class="QWidget" name="widget_4" native="true"> <layout class="QGridLayout" name="gridLayout_8"> <item row="1" column="0"> - <widget class="QLabel" name="labelInfo2"> + <widget class="QLabel" name="label_7"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Fixed" vsizetype="Preferred"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="text"> + <string>Total</string> + </property> + </widget> + </item> + <item row="2" column="2"> + <widget class="QLabel" name="labelTriColRNS"> + <property name="text"> + <string/> + </property> + </widget> + </item> + <item row="2" column="1"> + <widget class="QLabel" name="labelTriVisuRNS"> + <property name="text"> + <string/> + </property> + </widget> + </item> + <item row="1" column="1"> + <widget class="QLabel" name="labelTriVisuTotal"> + <property name="text"> + <string/> + </property> + </widget> + </item> + <item row="3" column="2"> + <widget class="QLabel" name="labelTriColJoint"> + <property name="text"> + <string/> + </property> + </widget> + </item> + <item row="3" column="0"> + <widget class="QLabel" name="label_9"> <property name="text"> - <string>TextLabel</string> + <string>Joint</string> </property> </widget> </item> - <item row="0" column="0"> - <widget class="QLabel" name="labelInfo1"> + <item row="1" column="2"> + <widget class="QLabel" name="labelTriColTotal"> <property name="text"> - <string>TextLabel</string> + <string/> + </property> + </widget> + </item> + <item row="3" column="1"> + <widget class="QLabel" name="labelTriVisuJoint"> + <property name="text"> + <string/> </property> </widget> </item> <item row="2" column="0"> - <widget class="QLabel" name="labelInfo3"> + <widget class="QLabel" name="label_10"> + <property name="text"> + <string>RobotNodeSet</string> + </property> + </widget> + </item> + <item row="0" column="1"> + <widget class="QLabel" name="label_14"> + <property name="text"> + <string>Visu</string> + </property> + </widget> + </item> + <item row="0" column="2"> + <widget class="QLabel" name="label_15"> <property name="text"> - <string>TextLabel</string> + <string>Col</string> </property> </widget> </item> diff --git a/VirtualRobot/examples/RobotViewer/showRobotWindow.cpp b/VirtualRobot/examples/RobotViewer/showRobotWindow.cpp index e9ce66481b4f6eb050c85746d8ea71669b0dedfc..f6cf5e01b9f587cfb09ba4e763f4c02edd86faf8 100644 --- a/VirtualRobot/examples/RobotViewer/showRobotWindow.cpp +++ b/VirtualRobot/examples/RobotViewer/showRobotWindow.cpp @@ -217,22 +217,13 @@ void showRobotWindow::displayTriangles() trisJointCol = currentRobotNode->getNumFaces(true); } - if (UI.checkBoxColModel->checkState() == Qt::Checked) - { - text1 = tr("Total\t:") + QString::number(trisAllCol); - text2 = tr("RobotNodeSet:\t") + QString::number(trisRNSCol); - text3 = tr("Joint:\t") + QString::number(trisJointCol); - } - else - { - text1 = tr("Total:\t") + QString::number(trisAllFull); - text2 = tr("RobotNodeSet:\t") + QString::number(trisRNSFull); - text3 = tr("Joint:\t") + QString::number(trisJointFull); - } + UI.labelTriVisuTotal->setText(QString::number(trisAllFull)); + UI.labelTriVisuRNS ->setText(QString::number(trisRNSFull)); + UI.labelTriVisuJoint->setText(QString::number(trisJointFull)); - UI.labelInfo1->setText(text1); - UI.labelInfo2->setText(text2); - UI.labelInfo3->setText(text3); + UI.labelTriColTotal->setText(QString::number(trisAllCol)); + UI.labelTriColRNS ->setText(QString::number(trisRNSCol)); + UI.labelTriColJoint->setText(QString::number(trisJointCol)); } void showRobotWindow::robotFullModel()