Skip to content
Snippets Groups Projects
Commit 4905bbc0 authored by Peter Albrecht's avatar Peter Albrecht
Browse files

Capitalization

parent 1b27a2b8
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
source/RobotAPI/gui-plugins/SkillManagerPlugin/SkillManagerMonitorWidget.ui
+ 58
− 58
View file @ 4905bbc0
......@@ -55,7 +55,7 @@
</property>
<column>
<property name="text">
<string>ExecutionID</string>
<string>Timestamp</string>
</property>
</column>
<column>
......@@ -168,65 +168,65 @@
<bool>false</bool>
</property>
<widget class="QWidget" name="groupBoxSkillDetailsTop" native="true">
<layout class="QVBoxLayout" name="verticalLayout_2">
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
<layout class="QGridLayout" name="gridLayout_5">
<item row="0" column="0">
<widget class="QPushButton" name="pushButtonPaste">
<property name="text">
<string>Set args from clipboard</string>
</property>
</widget>
</item>
<item row="0" column="3">
<widget class="QPushButton" name="pushButtonReset">
<property name="text">
<string>Reset args to profile</string>
</property>
</widget>
</item>
<item row="1" column="0" colspan="4">
<widget class="QComboBox" name="comboBoxProfiles">
<item>
<layout class="QVBoxLayout" name="verticalLayout_2">
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
<layout class="QGridLayout" name="gridLayout_5">
<item row="0" column="0">
<widget class="QPushButton" name="pushButtonPaste">
<property name="text">
<string>&lt;No Profile selected. Using root&gt;</string>
<string>Set args from clipboard</string>
</property>
</item>
</widget>
</item>
<item row="0" column="1">
<widget class="QPushButton" name="pushButtonCopy">
<property name="text">
<string>Copy args to clipboard</string>
</property>
</widget>
</item>
<item row="0" column="2">
<widget class="QLabel" name="label_2">
<property name="text">
<string/>
</property>
</widget>
</item>
</layout>
</item>
<item>
<widget class="QWidget" name="skillDescription" native="true"/>
</item>
</layout>
</widget>
</widget>
</item>
<item row="0" column="3">
<widget class="QPushButton" name="pushButtonReset">
<property name="text">
<string>Reset args to profile</string>
</property>
</widget>
</item>
<item row="1" column="0" colspan="4">
<widget class="QComboBox" name="comboBoxProfiles">
<item>
<property name="text">
<string>&lt;No Profile selected. Using root&gt;</string>
</property>
</item>
</widget>
</item>
<item row="0" column="1">
<widget class="QPushButton" name="pushButtonCopy">
<property name="text">
<string>Copy args to clipboard</string>
</property>
</widget>
</item>
<item row="0" column="2">
<widget class="QLabel" name="label_2">
<property name="text">
<string/>
</property>
</widget>
</item>
</layout>
</item>
<item>
<widget class="QWidget" name="skillDescription" native="true"/>
</item>
</layout>
</widget>
<widget class="QWidget" name="groupBoxSkillDetailsBottom" native="true">
<layout class="QVBoxLayout" name="verticalLayout_3">
<property name="leftMargin">
......
source/RobotAPI/gui-plugins/SkillManagerPlugin/SkillManagerMonitorWidgetController.cpp
+ 2
− 2
View file @ 4905bbc0
......@@ -102,7 +102,7 @@ namespace armarx
QMenu* menu = new QMenu();
// Stop skill
QAction* stopSkillAction = new QAction("Stop Execution", this);
QAction* stopSkillAction = new QAction("Stop execution", this);
skills::SkillStatus currentStatus =
skillStatusUpdates.at(selectedSkill.skillExecutionId).status;
stopSkillAction->setDisabled(currentStatus == skills::SkillStatus::Aborted ||
......@@ -292,7 +292,7 @@ namespace armarx
if (simox::alg::to_lower(skills::SkillID::FromIce(it->first).skillName)
.find(this->currentSkillSearch.toLower().toStdString()))
{
update.erase(it++);
it = update.erase(it);
}
else
{
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment