1. iorodeo
  2. mct

Commits

iorodeo  committed 9488397 Draft

Swapped out watchdog image in web app - now using image from
the frame_drop_watchdog.

  • Participants
  • Parent commits df0f74d
  • Branches default

Comments (0)

Files changed (3)

File mct_launch/launch/tracking_2d_devel.launch

View file
     <include file="$(find mct_image_stitcher)/launch/image_stitcher_master.launch" />
     <include file="$(find mct_tracking_2d)/launch/three_point_tracker_master.launch" />
     <include file="$(find mct_tracking_2d)/launch/stitched_image_labeler_master.launch" />
-    <include file="$(find mct_watchdog)/launch/time_stamp_watchdog.launch" />
+    <include file="$(find mct_watchdog)/launch/frame_drop_watchdog.launch" />
     <include file="$(find mct_avi_writer)/launch/avi_writer_master.launch" />
     <include file="$(find mct_logging)/launch/tracking_pts_logger_master.launch" />
     <include file="$(find mct_camera_tools)/launch/mjpeg_manager.launch" /> 

File mct_web_apps/src/mct_web_apps/tracking_2d_app.py

View file
     mjpeg_info_dict = redis_tools.get_dict(db,'mjpeg_info_dict')
     watchdog_mjpeg_info = {}
     for v in mjpeg_info_dict.values():
-        if v['image_topic'] == '/image_time_stamp_watchdog':
+        if v['image_topic'] == '/image_frame_drop_watchdog':
             watchdog_mjpeg_info['image_topic'] = v['image_topic']
             watchdog_mjpeg_info['mjpeg_port'] = v['mjpeg_port']
             break

File mct_web_apps/src/mct_web_apps/tracking_2d_node_startup.py

View file
     # Set topics for mjpeg servers
     mjpeg_topics = []
     # Add time stamp watchdog image
-    mjpeg_topics.append('/image_time_stamp_watchdog')
+    mjpeg_topics.append('/image_frame_drop_watchdog')
     
     # Add the stitched and tracking pts images for all regions
     for region in regions_dict: