Updated ImageView with GraphicsView mode disabled by default. Updated DataRecorder.

This commit is contained in:
matlabbe
2015-03-30 10:47:38 -04:00
parent 80c7102e67
commit 56e372f8d2
13 changed files with 718 additions and 445 deletions

View File

@@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>1182</width>
<height>804</height>
<height>821</height>
</rect>
</property>
<property name="windowTitle">
@@ -16,7 +16,7 @@
<widget class="QWidget" name="centralwidget">
<layout class="QVBoxLayout" name="verticalLayout_7" stretch="2">
<item>
<layout class="QHBoxLayout" name="horizontalLayout_3">
<layout class="QHBoxLayout" name="horizontalLayout_3" stretch="1,1">
<property name="rightMargin">
<number>0</number>
</property>
@@ -26,7 +26,7 @@
<number>0</number>
</property>
<item>
<widget class="rtabmap::ImageView" name="graphicsView_A"/>
<widget class="rtabmap::ImageView" name="graphicsView_A" native="true"/>
</item>
<item>
<widget class="QScrollArea" name="scrollArea_2">
@@ -41,8 +41,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>136</width>
<height>127</height>
<width>153</width>
<height>136</height>
</rect>
</property>
<layout class="QGridLayout" name="gridLayout" columnstretch="0,1">
@@ -122,7 +122,16 @@
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout">
<property name="margin">
<property name="leftMargin">
<number>12</number>
</property>
<property name="topMargin">
<number>12</number>
</property>
<property name="rightMargin">
<number>12</number>
</property>
<property name="bottomMargin">
<number>12</number>
</property>
<item>
@@ -181,7 +190,7 @@
<number>0</number>
</property>
<item>
<widget class="rtabmap::ImageView" name="graphicsView_B"/>
<widget class="rtabmap::ImageView" name="graphicsView_B" native="true"/>
</item>
<item>
<widget class="QScrollArea" name="scrollArea">
@@ -196,8 +205,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>137</width>
<height>127</height>
<width>152</width>
<height>136</height>
</rect>
</property>
<layout class="QGridLayout" name="gridLayout_2" columnstretch="0,1">
@@ -277,7 +286,16 @@
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_2">
<property name="margin">
<property name="leftMargin">
<number>12</number>
</property>
<property name="topMargin">
<number>12</number>
</property>
<property name="rightMargin">
<number>12</number>
</property>
<property name="bottomMargin">
<number>12</number>
</property>
<item>
@@ -340,7 +358,7 @@
<x>0</x>
<y>0</y>
<width>1182</width>
<height>25</height>
<height>22</height>
</rect>
</property>
<widget class="QMenu" name="menuFile">
@@ -1124,9 +1142,9 @@
<number>4</number>
</attribute>
<widget class="QWidget" name="dockWidgetContents_5">
<layout class="QHBoxLayout" name="horizontalLayout_6">
<layout class="QHBoxLayout" name="horizontalLayout_6" stretch="1,1">
<item>
<widget class="rtabmap::ImageView" name="graphicsView_stereo"/>
<widget class="rtabmap::ImageView" name="graphicsView_stereo" native="true"/>
</item>
<item>
<widget class="rtabmap::CloudViewer" name="stereoViewer" native="true"/>
@@ -1142,7 +1160,7 @@
<number>4</number>
</attribute>
<widget class="QWidget" name="dockWidgetContents_6">
<layout class="QHBoxLayout" name="horizontalLayout_8">
<layout class="QHBoxLayout" name="horizontalLayout_8" stretch="1,1">
<item>
<widget class="rtabmap::CloudViewer" name="widget_cloudA" native="true"/>
</item>
@@ -1679,7 +1697,7 @@
</customwidget>
<customwidget>
<class>rtabmap::ImageView</class>
<extends>QGraphicsView</extends>
<extends>QWidget</extends>
<header>rtabmap/gui/ImageView.h</header>
</customwidget>
<customwidget>

View File

@@ -45,8 +45,6 @@
<addaction name="separator"/>
<addaction name="actionClose_database"/>
<addaction name="separator"/>
<addaction name="actionEdit_database"/>
<addaction name="separator"/>
<addaction name="actionExit"/>
</widget>
<widget class="QMenu" name="menuEdit">
@@ -194,8 +192,11 @@
<property name="title">
<string>Tools</string>
</property>
<addaction name="actionPost_processing"/>
<addaction name="actionEdit_database"/>
<addaction name="separator"/>
<addaction name="actionData_recorder"/>
<addaction name="separator"/>
<addaction name="actionPost_processing"/>
</widget>
<addaction name="menuFile"/>
<addaction name="menuEdit"/>
@@ -735,7 +736,7 @@
<number>1</number>
</attribute>
<widget class="QWidget" name="layout_imageview">
<layout class="QHBoxLayout" name="horizontalLayout_2">
<layout class="QHBoxLayout" name="horizontalLayout_2" stretch="1,1">
<property name="spacing">
<number>0</number>
</property>
@@ -752,7 +753,7 @@
<number>0</number>
</property>
<item>
<layout class="QVBoxLayout" name="verticalLayout_2">
<layout class="QVBoxLayout" name="verticalLayout_2" stretch="0,1">
<property name="spacing">
<number>0</number>
</property>
@@ -773,19 +774,12 @@
</widget>
</item>
<item>
<widget class="rtabmap::ImageView" name="imageView_source">
<property name="verticalScrollBarPolicy">
<enum>Qt::ScrollBarAlwaysOff</enum>
</property>
<property name="horizontalScrollBarPolicy">
<enum>Qt::ScrollBarAlwaysOff</enum>
</property>
</widget>
<widget class="rtabmap::ImageView" name="imageView_source" native="true"/>
</item>
</layout>
</item>
<item>
<layout class="QVBoxLayout" name="verticalLayout">
<layout class="QVBoxLayout" name="verticalLayout" stretch="0,1">
<property name="spacing">
<number>0</number>
</property>
@@ -806,14 +800,7 @@
</widget>
</item>
<item>
<widget class="rtabmap::ImageView" name="imageView_loopClosure">
<property name="verticalScrollBarPolicy">
<enum>Qt::ScrollBarAlwaysOff</enum>
</property>
<property name="horizontalScrollBarPolicy">
<enum>Qt::ScrollBarAlwaysOff</enum>
</property>
</widget>
<widget class="rtabmap::ImageView" name="imageView_loopClosure" native="true"/>
</item>
</layout>
</item>
@@ -845,7 +832,7 @@
<number>0</number>
</property>
<item>
<widget class="rtabmap::ImageView" name="imageView_odometry"/>
<widget class="rtabmap::ImageView" name="imageView_odometry" native="true"/>
</item>
</layout>
</widget>
@@ -1239,10 +1226,6 @@
</property>
</action>
<action name="actionEdit_database">
<property name="icon">
<iconset resource="../GuiLib.qrc">
<normaloff>:/images/document-properties.png</normaloff>:/images/document-properties.png</iconset>
</property>
<property name="text">
<string>Edit database...</string>
</property>
@@ -1275,7 +1258,7 @@
</customwidget>
<customwidget>
<class>rtabmap::ImageView</class>
<extends>QGraphicsView</extends>
<extends>QWidget</extends>
<header>../include/rtabmap/gui/ImageView.h</header>
</customwidget>
<customwidget>