apoorva/greenhouse
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

New feature: we can setup the camera to use a video file intead of the webcam.

Browse Source 
Fixed a crash when user did "Update Objects" with loaded objects.

git-svn-id: http://find-object.googlecode.com/svn/trunk/find_object@76 620bd6b2-0a58-f614-fd9a-1bd335dccda9
This commit is contained in:
matlabbe
2012-01-30 03:16:30 +00:00
parent 465e2d846e
commit 0e3b934316
12 changed files with 194 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ui/mainWindow.ui
+19
View File
@@ -153,8 +153,12 @@
<addaction name="actionLoad_scene_from_file"/>
<addaction name="separator"/>
<addaction name="actionStart_camera"/>
<addaction name="actionPause_camera"/>
<addaction name="actionStop_camera"/>
<addaction name="separator"/>
<addaction name="actionSetup_camera_from_video_file"/>
<addaction name="actionSetup_camera_from_video_file_2"/>
<addaction name="separator"/>
<addaction name="actionRestore_all_default_settings"/>
</widget>
<widget class="QMenu" name="menuView">
@@ -495,6 +499,21 @@
<string>Load scene from file...</string>
</property>
</action>
<action name="actionPause_camera">
<property name="text">
<string>Pause camera</string>
</property>
</action>
<action name="actionSetup_camera_from_video_file">
<property name="text">
<string>Setup camera from video file...</string>
</property>
</action>
<action name="actionSetup_camera_from_video_file_2">
<property name="text">
<string>Setup camera from video file...</string>
</property>
</action>
</widget>
<customwidgets>
<customwidget>