From a7ea7fb3bddb3253ce0d00064f41d0bc195228ec Mon Sep 17 00:00:00 2001 From: "Patricio A. Vela" Date: Thu, 14 Nov 2024 11:44:15 -0500 Subject: [PATCH] Updating docs. Adding Correspondences to group. --- docs/Base_8py.html | 27 - docs/BlackWorkMat_8py.html | 27 - docs/FSM_8py.html | 27 - docs/GMM_8py.html | 2 +- docs/GloveByColor_8py.html | 27 - docs/Glove_8py.html | 27 - docs/HoveringGlove_8py.html | 27 - docs/HoveringHand_8py.html | 27 - docs/PuzzleScene_8py.html | 27 - docs/Surveillance_2README_8md.html | 31 - ...lance_2Surveillance_2____init_____8py.html | 27 - ...veillance_2activity_2____init_____8py.html | 27 - ...nce_2Surveillance_2activity_2base_8py.html | 27 - ...ce_2Surveillance_2activity_2utils_8py.html | 27 - ...eillance_2deployment_2ROS_2README_8md.html | 31 - ...ce_2deployment_2ROS_2____init_____8py.html | 27 - ...illance_2deployment_2____init_____8py.html | 27 - ..._2Surveillance_2deployment_2utils_8py.html | 32 - ...urveillance_2layers_2____init_____8py.html | 27 - ...lance_2Surveillance_2layers_2base_8py.html | 27 - ...Surveillance_2utils_2____init_____8py.html | 27 - ...lance_2Surveillance_2utils_2utils_8py.html | 27 - ...2Surveillance_8egg-info_2SOURCES_8txt.html | 31 - ...nce_8egg-info_2dependency__links_8txt.html | 31 - ...Surveillance_8egg-info_2requires_8txt.html | 31 - ...rveillance_8egg-info_2top__level_8txt.html | 31 - docs/Surveillance_2setup_8py.html | 27 - docs/action_8py.html | 2 +- docs/activity__record_8py.html | 27 - docs/adjacent_8py.html | 2 +- docs/annotated.html | 350 ++- docs/appearance_8py.html | 2 +- docs/arrangement_8py.html | 2 +- docs/aruco_8py.html | 2 +- docs/base__bg_8py.html | 27 - docs/base__fg_8py.html | 27 - docs/bgmodel_2Gaussian_8py.html | 2 +- docs/board_8py.html | 2 +- docs/builders_8py.html | 2 +- docs/byColor_8py.html | 2 +- docs/byMotion_8py.html | 2 +- docs/byRegion_8py.html | 2 +- docs/byShape_8py.html | 2 +- docs/camera_2README_8md.html | 4 +- docs/camera_2camera_2____init_____8py.html | 2 +- docs/camera_2camera_2base_8py.html | 2 +- ...amera_2camera_2d435_2____init_____8py.html | 2 +- docs/camera_2camera_2d435_2runner_8py.html | 2 +- ..._2camera_2extrinsic_2____init_____8py.html | 2 +- ...a_2camera_2tabletop_2____init_____8py.html | 2 +- ...mera_2camera_2utils_2____init_____8py.html | 2 +- docs/camera_2camera_2utils_2utils_8py.html | 27 - docs/camera_2scripts_2README_8md.html | 4 +- docs/camera_2scripts_2____init_____8py.html | 2 +- docs/camera_2setup_8py.html | 2 +- docs/centroidMulti_8py.html | 2 +- docs/centroid_8py.html | 2 +- docs/channels_8py.html | 2 +- ...ce_1_1activity_1_1FSM_1_1Pick-members.html | 25 - ...rveillance_1_1activity_1_1FSM_1_1Pick.html | 35 - ..._1activity_1_1FSM_1_1Pick__coll__graph.map | 3 - ..._1activity_1_1FSM_1_1Pick__coll__graph.md5 | 6 +- ...ctivity_1_1FSM_1_1Pick__inherit__graph.map | 3 - ...ctivity_1_1FSM_1_1Pick__inherit__graph.md5 | 6 +- ...e_1_1activity_1_1FSM_1_1Place-members.html | 25 - ...veillance_1_1activity_1_1FSM_1_1Place.html | 35 - ...1activity_1_1FSM_1_1Place__coll__graph.map | 3 - ...1activity_1_1FSM_1_1Place__coll__graph.md5 | 6 +- ...tivity_1_1FSM_1_1Place__inherit__graph.map | 3 - ...tivity_1_1FSM_1_1Place__inherit__graph.md5 | 6 +- ...e_1_1activity_1_1base_1_1Base-members.html | 25 - ...veillance_1_1activity_1_1base_1_1Base.html | 37 - ...1activity_1_1base_1_1Base__coll__graph.map | 3 - ...1activity_1_1base_1_1Base__coll__graph.md5 | 6 +- ...tivity_1_1base_1_1Base__inherit__graph.map | 5 - ...tivity_1_1base_1_1Base__inherit__graph.md5 | 6 +- ...ivity_1_1state_1_1Base__state-members.html | 45 - ...e_1_1activity_1_1state_1_1Base__state.html | 56 - ...y_1_1state_1_1Base__state__coll__graph.map | 4 - ...y_1_1state_1_1Base__state__coll__graph.md5 | 6 +- ..._1state_1_1Base__state__inherit__graph.map | 5 - ..._1state_1_1Base__state__inherit__graph.md5 | 6 +- ...ty_1_1state_1_1StateEstimator-members.html | 35 - ..._1activity_1_1state_1_1StateEstimator.html | 93 - ..._1state_1_1StateEstimator__coll__graph.map | 5 - ..._1state_1_1StateEstimator__coll__graph.md5 | 6 +- ...tate_1_1StateEstimator__inherit__graph.map | 5 - ...tate_1_1StateEstimator__inherit__graph.md5 | 6 +- ...ty_1_1utils_1_1DynamicDisplay-members.html | 25 - ..._1activity_1_1utils_1_1DynamicDisplay.html | 29 - ...1utils_1_1ParamDynamicDisplay-members.html | 25 - ...ivity_1_1utils_1_1ParamDynamicDisplay.html | 29 - ...ase_1_1BaseSurveillanceDeploy-members.html | 35 - ...ent_1_1Base_1_1BaseSurveillanceDeploy.html | 95 - ...1deployment_1_1Base_1_1Params-members.html | 25 - ...lance_1_1deployment_1_1Base_1_1Params.html | 33 - ...sbag__runner_1_1ImageListener-members.html | 25 - ...OS_1_1rosbag__runner_1_1ImageListener.html | 29 - ...ctivity__record_1_1ActDecoder-members.html | 29 - ...ent_1_1activity__record_1_1ActDecoder.html | 57 - ...1_1BlackWorkMat_1_1Calibrator-members.html | 25 - ...1layers_1_1BlackWorkMat_1_1Calibrator.html | 47 - ...lackWorkMat_1_1Calibrator__coll__graph.map | 3 - ...lackWorkMat_1_1Calibrator__coll__graph.md5 | 6 +- ...kWorkMat_1_1Calibrator__inherit__graph.map | 3 - ...kWorkMat_1_1Calibrator__inherit__graph.md5 | 6 +- ..._1BlackWorkMat_1_1CfgDetector-members.html | 25 - ...layers_1_1BlackWorkMat_1_1CfgDetector.html | 42 - ...ackWorkMat_1_1CfgDetector__coll__graph.map | 3 - ...ackWorkMat_1_1CfgDetector__coll__graph.md5 | 6 +- ...WorkMat_1_1CfgDetector__inherit__graph.map | 3 - ...WorkMat_1_1CfgDetector__inherit__graph.md5 | 6 +- ...WorkMat_1_1CfgPuzzlePerceiver-members.html | 25 - ...1_1BlackWorkMat_1_1CfgPuzzlePerceiver.html | 39 - ...Mat_1_1CfgPuzzlePerceiver__coll__graph.map | 3 - ...Mat_1_1CfgPuzzlePerceiver__coll__graph.md5 | 6 +- ..._1_1CfgPuzzlePerceiver__inherit__graph.map | 3 - ..._1_1CfgPuzzlePerceiver__inherit__graph.md5 | 6 +- ...s_1_1BlackWorkMat_1_1Detector-members.html | 25 - ...1_1layers_1_1BlackWorkMat_1_1Detector.html | 51 - ...1BlackWorkMat_1_1Detector__coll__graph.map | 3 - ...1BlackWorkMat_1_1Detector__coll__graph.md5 | 6 +- ...ackWorkMat_1_1Detector__inherit__graph.map | 3 - ...ackWorkMat_1_1Detector__inherit__graph.md5 | 6 +- ..._1BlackWorkMat_1_1InstPuzzlePerceiver.html | 29 - ...ackWorkMat_1_1PuzzlePerceiver-members.html | 25 - ...rs_1_1BlackWorkMat_1_1PuzzlePerceiver.html | 61 +- ...orkMat_1_1PuzzlePerceiver__coll__graph.map | 3 - ...orkMat_1_1PuzzlePerceiver__coll__graph.md5 | 6 +- ...Mat_1_1PuzzlePerceiver__inherit__graph.map | 3 - ...Mat_1_1PuzzlePerceiver__inherit__graph.md5 | 6 +- ...eByColor_1_1CalibGloveByColor-members.html | 25 - ..._1_1GloveByColor_1_1CalibGloveByColor.html | 220 -- ...olor_1_1CalibGloveByColor__coll__graph.map | 7 - ...olor_1_1CalibGloveByColor__coll__graph.md5 | 6 +- ...r_1_1CalibGloveByColor__inherit__graph.map | 7 - ...r_1_1CalibGloveByColor__inherit__graph.md5 | 6 +- ...veByColor_1_1CfgGloveDetector-members.html | 29 - ...s_1_1GloveByColor_1_1CfgGloveDetector.html | 50 - ...Color_1_1CfgGloveDetector__coll__graph.map | 4 - ...Color_1_1CfgGloveDetector__coll__graph.md5 | 6 +- ...or_1_1CfgGloveDetector__inherit__graph.map | 4 - ...or_1_1CfgGloveDetector__inherit__graph.md5 | 6 +- ...GloveByColor_1_1DetectorState-members.html | 25 - ...yers_1_1GloveByColor_1_1DetectorState.html | 29 - ...1GloveByColor_1_1GloveByColor-members.html | 25 - ...ayers_1_1GloveByColor_1_1GloveByColor.html | 187 -- ...veByColor_1_1GloveByColor__coll__graph.map | 6 - ...veByColor_1_1GloveByColor__coll__graph.md5 | 6 +- ...yColor_1_1GloveByColor__inherit__graph.map | 7 - ...yColor_1_1GloveByColor__inherit__graph.md5 | 6 +- ...1GloveByColor_1_1GlovePointer-members.html | 25 - ...ayers_1_1GloveByColor_1_1GlovePointer.html | 67 - ...veByColor_1_1GlovePointer__coll__graph.map | 3 - ...veByColor_1_1GlovePointer__coll__graph.md5 | 6 +- ...yColor_1_1GlovePointer__inherit__graph.map | 3 - ...yColor_1_1GlovePointer__inherit__graph.md5 | 6 +- ..._1_1GloveByColor_1_1InstGloveDetector.html | 29 - ...1_1GloveByColor_1_1InstGlovePerceiver.html | 29 - ...oveByColor_1_1PerceiveGloveBC-members.html | 25 - ...rs_1_1GloveByColor_1_1PerceiveGloveBC.html | 35 - ...yColor_1_1PerceiveGloveBC__coll__graph.map | 3 - ...yColor_1_1PerceiveGloveBC__coll__graph.md5 | 6 +- ...lor_1_1PerceiveGloveBC__inherit__graph.map | 3 - ...lor_1_1PerceiveGloveBC__inherit__graph.md5 | 6 +- ...layers_1_1Glove_1_1Calibrator-members.html | 25 - ...ance_1_1layers_1_1Glove_1_1Calibrator.html | 152 - ...rs_1_1Glove_1_1Calibrator__coll__graph.map | 4 - ...rs_1_1Glove_1_1Calibrator__coll__graph.md5 | 6 +- ...1_1Glove_1_1Calibrator__inherit__graph.map | 4 - ...1_1Glove_1_1Calibrator__inherit__graph.md5 | 6 +- ..._1_1Glove_1_1CfgGloveDetector-members.html | 29 - ..._1layers_1_1Glove_1_1CfgGloveDetector.html | 50 - ...Glove_1_1CfgGloveDetector__coll__graph.map | 4 - ...Glove_1_1CfgGloveDetector__coll__graph.md5 | 6 +- ...ve_1_1CfgGloveDetector__inherit__graph.map | 4 - ...ve_1_1CfgGloveDetector__inherit__graph.md5 | 6 +- ..._1layers_1_1Glove_1_1Detector-members.html | 25 - ...llance_1_1layers_1_1Glove_1_1Detector.html | 114 - ...ers_1_1Glove_1_1DetectorState-members.html | 25 - ...e_1_1layers_1_1Glove_1_1DetectorState.html | 29 - ...yers_1_1Glove_1_1Detector__coll__graph.map | 3 - ...yers_1_1Glove_1_1Detector__coll__graph.md5 | 6 +- ...s_1_1Glove_1_1Detector__inherit__graph.map | 4 - ...s_1_1Glove_1_1Detector__inherit__graph.md5 | 6 +- ...1layers_1_1Glove_1_1InstGloveDetector.html | 29 - ...layers_1_1Glove_1_1InstGlovePerceiver.html | 29 - ...1layers_1_1Glove_1_1Perceiver-members.html | 25 - ...lance_1_1layers_1_1Glove_1_1Perceiver.html | 35 - ...ers_1_1Glove_1_1Perceiver__coll__graph.map | 3 - ...ers_1_1Glove_1_1Perceiver__coll__graph.md5 | 6 +- ..._1_1Glove_1_1Perceiver__inherit__graph.map | 3 - ..._1_1Glove_1_1Perceiver__inherit__graph.md5 | 6 +- ...yers_1_1Glove_1_1TrackPointer-members.html | 25 - ...ce_1_1layers_1_1Glove_1_1TrackPointer.html | 67 - ..._1_1Glove_1_1TrackPointer__coll__graph.map | 3 - ..._1_1Glove_1_1TrackPointer__coll__graph.md5 | 6 +- ...1Glove_1_1TrackPointer__inherit__graph.map | 3 - ...1Glove_1_1TrackPointer__inherit__graph.md5 | 6 +- ..._1HoveringGlove_1_1Calibrator-members.html | 25 - ...layers_1_1HoveringGlove_1_1Calibrator.html | 139 +- ...veringGlove_1_1Calibrator__coll__graph.map | 4 - ...veringGlove_1_1Calibrator__coll__graph.md5 | 6 +- ...ingGlove_1_1Calibrator__inherit__graph.map | 4 - ...ingGlove_1_1Calibrator__inherit__graph.md5 | 6 +- ...eringGlove_1_1CfgHandDetector-members.html | 29 - ...s_1_1HoveringGlove_1_1CfgHandDetector.html | 50 - ...gGlove_1_1CfgHandDetector__coll__graph.map | 4 - ...gGlove_1_1CfgHandDetector__coll__graph.md5 | 6 +- ...ove_1_1CfgHandDetector__inherit__graph.map | 4 - ...ove_1_1CfgHandDetector__inherit__graph.md5 | 6 +- ..._1_1HoveringGlove_1_1Detector-members.html | 25 - ..._1layers_1_1HoveringGlove_1_1Detector.html | 108 - ...overingGlove_1_1DetectorState-members.html | 25 - ...ers_1_1HoveringGlove_1_1DetectorState.html | 29 - ...HoveringGlove_1_1Detector__coll__graph.map | 3 - ...HoveringGlove_1_1Detector__coll__graph.md5 | 6 +- ...eringGlove_1_1Detector__inherit__graph.map | 4 - ...eringGlove_1_1Detector__inherit__graph.md5 | 6 +- ...yers_1_1HoveringGlove_1_1InstDetector.html | 29 - ...ers_1_1HoveringGlove_1_1InstPerceiver.html | 29 - ...1_1HoveringGlove_1_1Perceiver-members.html | 25 - ...1layers_1_1HoveringGlove_1_1Perceiver.html | 35 - ...overingGlove_1_1Perceiver__coll__graph.map | 3 - ...overingGlove_1_1Perceiver__coll__graph.md5 | 6 +- ...ringGlove_1_1Perceiver__inherit__graph.map | 3 - ...ringGlove_1_1Perceiver__inherit__graph.md5 | 6 +- ...HoveringGlove_1_1TrackPointer-members.html | 25 - ...yers_1_1HoveringGlove_1_1TrackPointer.html | 67 - ...ringGlove_1_1TrackPointer__coll__graph.map | 3 - ...ringGlove_1_1TrackPointer__coll__graph.md5 | 6 +- ...gGlove_1_1TrackPointer__inherit__graph.map | 3 - ...gGlove_1_1TrackPointer__inherit__graph.md5 | 6 +- ...1_1HoveringHand_1_1Calibrator-members.html | 25 - ...1layers_1_1HoveringHand_1_1Calibrator.html | 139 +- ...overingHand_1_1Calibrator__coll__graph.map | 4 - ...overingHand_1_1Calibrator__coll__graph.md5 | 6 +- ...ringHand_1_1Calibrator__inherit__graph.map | 4 - ...ringHand_1_1Calibrator__inherit__graph.md5 | 6 +- ...veringHand_1_1CfgHandDetector-members.html | 29 - ...rs_1_1HoveringHand_1_1CfgHandDetector.html | 50 - ...ngHand_1_1CfgHandDetector__coll__graph.map | 4 - ...ngHand_1_1CfgHandDetector__coll__graph.md5 | 6 +- ...and_1_1CfgHandDetector__inherit__graph.map | 4 - ...and_1_1CfgHandDetector__inherit__graph.md5 | 6 +- ...1HoveringHand_1_1DetStateHand-members.html | 25 - ...ayers_1_1HoveringHand_1_1DetStateHand.html | 29 - ...s_1_1HoveringHand_1_1Detector-members.html | 25 - ...1_1layers_1_1HoveringHand_1_1Detector.html | 108 - ...1HoveringHand_1_1Detector__coll__graph.map | 3 - ...1HoveringHand_1_1Detector__coll__graph.md5 | 6 +- ...veringHand_1_1Detector__inherit__graph.map | 4 - ...veringHand_1_1Detector__inherit__graph.md5 | 6 +- ...ayers_1_1HoveringHand_1_1InstDetector.html | 29 - ...yers_1_1HoveringHand_1_1InstPerceiver.html | 29 - ..._1_1HoveringHand_1_1Perceiver-members.html | 25 - ..._1layers_1_1HoveringHand_1_1Perceiver.html | 35 - ...HoveringHand_1_1Perceiver__coll__graph.map | 3 - ...HoveringHand_1_1Perceiver__coll__graph.md5 | 6 +- ...eringHand_1_1Perceiver__inherit__graph.map | 3 - ...eringHand_1_1Perceiver__inherit__graph.md5 | 6 +- ...1HoveringHand_1_1TrackPointer-members.html | 25 - ...ayers_1_1HoveringHand_1_1TrackPointer.html | 67 - ...eringHand_1_1TrackPointer__coll__graph.map | 3 - ...eringHand_1_1TrackPointer__coll__graph.md5 | 6 +- ...ngHand_1_1TrackPointer__inherit__graph.map | 3 - ...ngHand_1_1TrackPointer__inherit__graph.md5 | 6 +- ..._1_1PuzzleScene_1_1Calibrator-members.html | 25 - ..._1layers_1_1PuzzleScene_1_1Calibrator.html | 151 - ...PuzzleScene_1_1Calibrator__coll__graph.map | 4 - ...PuzzleScene_1_1Calibrator__coll__graph.md5 | 6 +- ...zleScene_1_1Calibrator__inherit__graph.map | 4 - ...zleScene_1_1Calibrator__inherit__graph.md5 | 6 +- ...PuzzleScene_1_1CfgPuzzleScene-members.html | 29 - ...yers_1_1PuzzleScene_1_1CfgPuzzleScene.html | 50 - ...leScene_1_1CfgPuzzleScene__coll__graph.map | 4 - ...leScene_1_1CfgPuzzleScene__coll__graph.md5 | 6 +- ...cene_1_1CfgPuzzleScene__inherit__graph.map | 4 - ...cene_1_1CfgPuzzleScene__inherit__graph.md5 | 6 +- ...s_1_1PuzzleScene_1_1Detectors-members.html | 25 - ...1_1layers_1_1PuzzleScene_1_1Detectors.html | 124 +- ...PuzzleScene_1_1DetectorsState-members.html | 25 - ...yers_1_1PuzzleScene_1_1DetectorsState.html | 29 - ...1PuzzleScene_1_1Detectors__coll__graph.map | 3 - ...1PuzzleScene_1_1Detectors__coll__graph.md5 | 6 +- ...zzleScene_1_1Detectors__inherit__graph.map | 4 - ...zzleScene_1_1Detectors__inherit__graph.md5 | 6 +- ...1_1PuzzleScene_1_1InstPuzzlePerceiver.html | 29 - ...ers_1_1PuzzleScene_1_1InstPuzzleScene.html | 29 - ...s_1_1PuzzleScene_1_1Perceiver-members.html | 25 - ...1_1layers_1_1PuzzleScene_1_1Perceiver.html | 35 - ...1PuzzleScene_1_1Perceiver__coll__graph.map | 3 - ...1PuzzleScene_1_1Perceiver__coll__graph.md5 | 6 +- ...zzleScene_1_1Perceiver__inherit__graph.map | 3 - ...zzleScene_1_1Perceiver__inherit__graph.md5 | 6 +- ...1PuzzleScene_1_1TrackPointers-members.html | 25 - ...ayers_1_1PuzzleScene_1_1TrackPointers.html | 67 - ...zleScene_1_1TrackPointers__coll__graph.map | 3 - ...zleScene_1_1TrackPointers__coll__graph.md5 | 6 +- ...Scene_1_1TrackPointers__inherit__graph.map | 3 - ...Scene_1_1TrackPointers__inherit__graph.md5 | 6 +- ...nce_1_1layers_1_1base_1_1Base-members.html | 29 - ...urveillance_1_1layers_1_1base_1_1Base.html | 67 - ...1_1layers_1_1base_1_1Base__coll__graph.map | 3 - ...1_1layers_1_1base_1_1Base__coll__graph.md5 | 6 +- ...layers_1_1base_1_1Base__inherit__graph.map | 11 - ...layers_1_1base_1_1Base__inherit__graph.md5 | 6 +- ...e_1_1layers_1_1base_1_1Params-members.html | 25 - ...veillance_1_1layers_1_1base_1_1Params.html | 38 - ...1layers_1_1base_1_1Params__coll__graph.map | 3 - ...1layers_1_1base_1_1Params__coll__graph.md5 | 6 +- ...yers_1_1base_1_1Params__inherit__graph.map | 3 - ...yers_1_1base_1_1Params__inherit__graph.md5 | 6 +- ...ayers_1_1base__bg_1_1Base__bg-members.html | 39 - ...nce_1_1layers_1_1base__bg_1_1Base__bg.html | 66 - ...s_1_1base__bg_1_1Base__bg__coll__graph.map | 4 - ...s_1_1base__bg_1_1Base__bg__coll__graph.md5 | 6 +- ..._1base__bg_1_1Base__bg__inherit__graph.map | 5 - ..._1base__bg_1_1Base__bg__inherit__graph.md5 | 6 +- ...1layers_1_1base__bg_1_1Params-members.html | 25 - ...lance_1_1layers_1_1base__bg_1_1Params.html | 45 - ...ers_1_1base__bg_1_1Params__coll__graph.map | 3 - ...ers_1_1base__bg_1_1Params__coll__graph.md5 | 6 +- ..._1_1base__bg_1_1Params__inherit__graph.map | 4 - ..._1_1base__bg_1_1Params__inherit__graph.md5 | 6 +- ...ayers_1_1base__fg_1_1Base__fg-members.html | 39 - ...nce_1_1layers_1_1base__fg_1_1Base__fg.html | 70 - ...s_1_1base__fg_1_1Base__fg__coll__graph.map | 4 - ...s_1_1base__fg_1_1Base__fg__coll__graph.md5 | 6 +- ..._1base__fg_1_1Base__fg__inherit__graph.map | 9 - ..._1base__fg_1_1Base__fg__inherit__graph.md5 | 6 +- ...1layers_1_1base__fg_1_1Params-members.html | 25 - ...lance_1_1layers_1_1base__fg_1_1Params.html | 45 - ...ers_1_1base__fg_1_1Params__coll__graph.map | 3 - ...ers_1_1base__fg_1_1Params__coll__graph.md5 | 6 +- ..._1_1base__fg_1_1Params__inherit__graph.map | 4 - ..._1_1base__fg_1_1Params__inherit__graph.md5 | 6 +- ...1human__seg_1_1Human__ColorSG-members.html | 41 - ...ayers_1_1human__seg_1_1Human__ColorSG.html | 93 - ...Human__ColorSG__HeightInRange-members.html | 37 - ..._seg_1_1Human__ColorSG__HeightInRange.html | 138 - ...n__ColorSG__HeightInRange__coll__graph.map | 6 - ...n__ColorSG__HeightInRange__coll__graph.md5 | 6 +- ...ColorSG__HeightInRange__inherit__graph.map | 6 - ...ColorSG__HeightInRange__inherit__graph.md5 | 6 +- ...an__seg_1_1Human__ColorSG__coll__graph.map | 5 - ...an__seg_1_1Human__ColorSG__coll__graph.md5 | 6 +- ..._seg_1_1Human__ColorSG__inherit__graph.map | 6 - ..._seg_1_1Human__ColorSG__inherit__graph.md5 | 6 +- ...ayers_1_1human__seg_1_1Params-members.html | 25 - ...nce_1_1layers_1_1human__seg_1_1Params.html | 47 - ...s_1_1human__seg_1_1Params__coll__graph.map | 3 - ...s_1_1human__seg_1_1Params__coll__graph.md5 | 6 +- ..._1human__seg_1_1Params__inherit__graph.map | 3 - ..._1human__seg_1_1Params__inherit__graph.md5 | 6 +- ...zzle__seg_1_1Params__Residual-members.html | 25 - ...rs_1_1puzzle__seg_1_1Params__Residual.html | 49 - ...__seg_1_1Params__Residual__coll__graph.map | 4 - ...__seg_1_1Params__Residual__coll__graph.md5 | 6 +- ...eg_1_1Params__Residual__inherit__graph.map | 4 - ...eg_1_1Params__Residual__inherit__graph.md5 | 6 +- ...zzle__seg_1_1Puzzle__Residual-members.html | 45 - ...rs_1_1puzzle__seg_1_1Puzzle__Residual.html | 85 - ...__seg_1_1Puzzle__Residual__coll__graph.map | 5 - ...__seg_1_1Puzzle__Residual__coll__graph.md5 | 6 +- ...eg_1_1Puzzle__Residual__inherit__graph.map | 5 - ...eg_1_1Puzzle__Residual__inherit__graph.md5 | 6 +- ...ayers_1_1robot__seg_1_1Params-members.html | 25 - ...nce_1_1layers_1_1robot__seg_1_1Params.html | 47 - ...s_1_1robot__seg_1_1Params__coll__graph.map | 3 - ...s_1_1robot__seg_1_1Params__coll__graph.md5 | 6 +- ..._1robot__seg_1_1Params__inherit__graph.map | 3 - ..._1robot__seg_1_1Params__inherit__graph.md5 | 6 +- ...1robot__seg_1_1robot__inRange-members.html | 40 - ...ayers_1_1robot__seg_1_1robot__inRange.html | 74 - ...seg_1_1robot__inRange__Height-members.html | 47 - ...1robot__seg_1_1robot__inRange__Height.html | 73 - ...1_1robot__inRange__Height__coll__graph.map | 6 - ...1_1robot__inRange__Height__coll__graph.md5 | 6 +- ...robot__inRange__Height__inherit__graph.map | 6 - ...robot__inRange__Height__inherit__graph.md5 | 6 +- ...ot__seg_1_1robot__inRange__coll__graph.map | 5 - ...ot__seg_1_1robot__inRange__coll__graph.md5 | 6 +- ..._seg_1_1robot__inRange__inherit__graph.map | 6 - ..._seg_1_1robot__inRange__inherit__graph.md5 | 6 +- ..._1_1layers_1_1scene_1_1Params-members.html | 25 - ...eillance_1_1layers_1_1scene_1_1Params.html | 29 - ..._1scene_1_1SceneInterpreterV1-members.html | 143 - ...layers_1_1scene_1_1SceneInterpreterV1.html | 2516 +---------------- ...1tabletop__seg_1_1Params__GMM-members.html | 25 - ...ayers_1_1tabletop__seg_1_1Params__GMM.html | 49 - ...letop__seg_1_1Params__GMM__coll__graph.map | 4 - ...letop__seg_1_1Params__GMM__coll__graph.md5 | 6 +- ...op__seg_1_1Params__GMM__inherit__graph.map | 4 - ...op__seg_1_1Params__GMM__inherit__graph.md5 | 6 +- ...abletop__seg_1_1tabletop__GMM-members.html | 42 - ...ers_1_1tabletop__seg_1_1tabletop__GMM.html | 90 - ...top__seg_1_1tabletop__GMM__coll__graph.map | 5 - ...top__seg_1_1tabletop__GMM__coll__graph.md5 | 6 +- ...__seg_1_1tabletop__GMM__inherit__graph.map | 5 - ...__seg_1_1tabletop__GMM__inherit__graph.md5 | 6 +- ..._1utils_1_1configs_1_1CfgNode-members.html | 25 - ...llance_1_1utils_1_1configs_1_1CfgNode.html | 35 - ...ils_1_1configs_1_1CfgNode__coll__graph.map | 3 - ...ils_1_1configs_1_1CfgNode__coll__graph.md5 | 6 +- ..._1_1configs_1_1CfgNode__inherit__graph.map | 3 - ..._1_1configs_1_1CfgNode__inherit__graph.md5 | 6 +- ...__estimate_1_1HeightEstimator-members.html | 25 - ..._1height__estimate_1_1HeightEstimator.html | 29 - ...1_1region__grow_1_1MaskGrower-members.html | 29 - ..._1utils_1_1region__grow_1_1MaskGrower.html | 57 - ...egion__grow_1_1MaskGrower__coll__graph.map | 4 - ...egion__grow_1_1MaskGrower__coll__graph.md5 | 6 +- ...on__grow_1_1MaskGrower__inherit__graph.map | 4 - ...on__grow_1_1MaskGrower__inherit__graph.md5 | 6 +- ...1_1region__grow_1_1RG__Params-members.html | 25 - ..._1utils_1_1region__grow_1_1RG__Params.html | 29 - ...grow_1_1RegionGrower__ValDiff-members.html | 29 - ...region__grow_1_1RegionGrower__ValDiff.html | 57 - ..._1_1RegionGrower__ValDiff__coll__graph.map | 4 - ..._1_1RegionGrower__ValDiff__coll__graph.md5 | 6 +- ...1RegionGrower__ValDiff__inherit__graph.map | 4 - ...1RegionGrower__ValDiff__inherit__graph.md5 | 6 +- ...n__grow_1_1RegionGrower__base-members.html | 29 - ...1_1region__grow_1_1RegionGrower__base.html | 51 - ..._1_1RegionGrower__base__inherit__graph.map | 5 - ..._1_1RegionGrower__base__inherit__graph.md5 | 6 +- ...specifications_1_1dict2struct-members.html | 29 - ...tils_1_1specifications_1_1dict2struct.html | 42 - ...cifications_1_1specifications-members.html | 25 - ...s_1_1specifications_1_1specifications.html | 29 - ...transform_1_1frameTransformer-members.html | 25 - ...tils_1_1transform_1_1frameTransformer.html | 29 - docs/classbyMotion_1_1CfgMoving.html | 2 +- docs/classbyMotion_1_1MoveState.html | 2 +- docs/classbyMotion_1_1TrackState.html | 2 +- docs/classbyMotion_1_1detector.html | 2 +- docs/classbyRegion_1_1Planar.html | 2 +- docs/classbyRegion_1_1imageOccupancy.html | 2 +- docs/classbyRegion_1_1imageRegions.html | 2 +- docs/classcamera_1_1base_1_1Base.html | 2 +- docs/classcamera_1_1base_1_1CfgCamera.html | 2 +- docs/classcamera_1_1base_1_1Color.html | 2 +- docs/classcamera_1_1base_1_1Grayscale.html | 2 +- docs/classcamera_1_1base_1_1ImageRGBD.html | 2 +- docs/classcamera_1_1base_1_1ReplayColor.html | 2 +- docs/classcamera_1_1cv2cam_1_1CfgColor.html | 2 +- docs/classcamera_1_1cv2cam_1_1Color.html | 2 +- ...a_1_1d435_1_1recorders_1_1D435RecBase.html | 2 +- ...1_1d435_1_1recorders_1_1D435RecRosbag.html | 2 +- ...scamera_1_1d435_1_1runner2_1_1CfgD435.html | 2 +- ...ra_1_1d435_1_1runner2_1_1D435__Runner.html | 2 +- ..._1_1d435_1_1runner2_1_1Replay-members.html | 1 - ...sscamera_1_1d435_1_1runner2_1_1Replay.html | 18 +- ...ra_1_1d435_1_1runner_1_1D435__Configs.html | 2 +- ...era_1_1d435_1_1runner_1_1D435__Runner.html | 2 +- docs/classcamera_1_1d435new_1_1Color.html | 2 +- ...lasscamera_1_1d435new_1_1Config__D435.html | 2 +- docs/classcamera_1_1d435new_1_1Depth.html | 2 +- docs/classcamera_1_1d435new_1_1RGBD.html | 2 +- ...asscamera_1_1d435new_1_1RGBD__Aligned.html | 2 +- ...c_1_1aruco_1_1CtoW__Calibrator__aruco.html | 2 +- .../classcamera_1_1rostopic_1_1CfgROSCam.html | 2 +- docs/classcamera_1_1rostopic_1_1Color.html | 2 +- docs/classcamera_1_1rostopic_1_1Depth.html | 2 +- docs/classcamera_1_1rostopic_1_1RGBD.html | 2 +- ...1height__estimator_1_1HeightEstimator.html | 2 +- ...etop__plane_1_1tabletopPlaneEstimator.html | 2 +- ...camera_1_1utils_1_1display_1_1plotfig.html | 2 +- ...era_1_1utils_1_1writer_1_1frameWriter.html | 2 +- ...amera_1_1utils_1_1writer_1_1vidWriter.html | 2 +- ...tils_1_1writer__ros_1_1vidWriter__ROS.html | 2 +- docs/classchannels_1_1Assignment.html | 2 +- docs/classchannels_1_1CfgChannel.html | 2 +- docs/classchannels_1_1CfgToFile.html | 2 +- docs/classchannels_1_1Channel.html | 2 +- docs/classchannels_1_1toCSV.html | 2 +- docs/classchannels_1_1toFile.html | 2 +- ...etector_1_1Configuration_1_1AlgConfig.html | 57 +- ...iguration_1_1AlgConfig__inherit__graph.map | 53 +- ...iguration_1_1AlgConfig__inherit__graph.md5 | 2 +- ...iguration_1_1AlgConfig__inherit__graph.png | Bin 56534 -> 75944 bytes ...lassdetector_1_1base_1_1ActivityState.html | 2 +- docs/classdetector_1_1base_1_1Base.html | 78 +- ...tector_1_1base_1_1Base__inherit__graph.map | 52 +- ...tector_1_1base_1_1Base__inherit__graph.md5 | 2 +- ...tector_1_1base_1_1Base__inherit__graph.png | Bin 54711 -> 65516 bytes ...lassdetector_1_1base_1_1DetectorState.html | 2 +- ...ector_1_1bgmodel_1_1GMM_1_1CfgGMM__cv.html | 2 +- ...etector_1_1bgmodel_1_1GMM_1_1GMMdebug.html | 2 +- ...etector_1_1bgmodel_1_1GMM_1_1GMMstate.html | 2 +- ...ector_1_1bgmodel_1_1GMM_1_1Params__cv.html | 2 +- ...ector_1_1bgmodel_1_1GMM_1_1bgmodelGMM.html | 2 +- ...r_1_1bgmodel_1_1GMM_1_1bgmodelGMM__cv.html | 2 +- ...r_1_1bgmodel_1_1Gaussian_1_1CfgSGCone.html | 2 +- ...ctor_1_1bgmodel_1_1Gaussian_1_1CfgSGM.html | 2 +- ...or_1_1bgmodel_1_1Gaussian_1_1SGMdebug.html | 2 +- ...or_1_1bgmodel_1_1Gaussian_1_1SGMstate.html | 2 +- ...r_1_1bgmodel_1_1Gaussian_1_1bgConical.html | 2 +- ..._1_1bgmodel_1_1Gaussian_1_1bgGaussian.html | 2 +- ...1_1bgmodel_1_1inCorner_1_1CfgInCorner.html | 2 +- ...1_1bgmodel_1_1inCorner_1_1PlanarModel.html | 2 +- ...bgmodel_1_1inCorner_1_1SphericalModel.html | 2 +- ...gmodel_1_1inCorner_1_1SurfaceCutModel.html | 2 +- ...or_1_1bgmodel_1_1inCorner_1_1inCorner.html | 2 +- ...odel_1_1inCorner_1_1inCornerEstimator.html | 2 +- ..._1_1bgmodel_1_1onWorkspace_1_1CfgOnWS.html | 2 +- ...1_1bgmodel_1_1onWorkspace_1_1RunState.html | 2 +- ...bgmodel_1_1onWorkspace_1_1onWorkspace.html | 2 +- ...ctor_1_1fgmodel_1_1Gaussian_1_1CfgSGT.html | 2 +- ...or_1_1fgmodel_1_1Gaussian_1_1SGMdebug.html | 2 +- ...or_1_1fgmodel_1_1Gaussian_1_1SGMstate.html | 2 +- ..._1_1fgmodel_1_1Gaussian_1_1fgGaussian.html | 2 +- ...fgmodel_1_1appearance_1_1fgAppearance.html | 2 +- ..._1_1fgmodel_1_1targetCorner_1_1TModel.html | 2 +- ...model_1_1targetCorner_1_1targetCorner.html | 2 +- ...1_1fgmodel_1_1targetMagenta_1_1TModel.html | 2 +- ...del_1_1targetMagenta_1_1targetMagenta.html | 2 +- ...tor_1_1fgmodel_1_1targetNeon_1_1MData.html | 2 +- ...or_1_1fgmodel_1_1targetNeon_1_1TModel.html | 2 +- ..._1fgmodel_1_1targetNeon_1_1targetNeon.html | 2 +- ...ctor_1_1fgmodel_1_1targetSG_1_1Params.html | 2 +- ..._1_1fgmodel_1_1targetSG_1_1tModel__SG.html | 2 +- ...or_1_1fgmodel_1_1targetSG_1_1targetSG.html | 2 +- ...assdetector_1_1fromState_1_1fromState.html | 2 +- ...etector_1_1inImageRGBD_1_1bgImageRBGD.html | 2 +- ...etector_1_1inImageRGBD_1_1inImageRGBD.html | 2 +- docs/classdetector_1_1inImage_1_1bgImage.html | 2 +- docs/classdetector_1_1inImage_1_1fgImage.html | 24 +- ..._1_1inImage_1_1fgImage__inherit__graph.map | 22 +- ..._1_1inImage_1_1fgImage__inherit__graph.md5 | 2 +- ..._1_1inImage_1_1fgImage__inherit__graph.png | Bin 19291 -> 23006 bytes docs/classdetector_1_1inImage_1_1inImage.html | 52 +- ..._1_1inImage_1_1inImage__inherit__graph.map | 46 +- ..._1_1inImage_1_1inImage__inherit__graph.md5 | 2 +- ..._1_1inImage_1_1inImage__inherit__graph.png | Bin 46224 -> 58827 bytes docs/classdrafts_1_1Announcement.html | 2 +- docs/classdrafts_1_1CfgAnnouncement.html | 2 +- docs/classdrafts_1_1CfgCommentary.html | 2 +- docs/classdrafts_1_1CfgRunningCommentary.html | 2 +- docs/classdrafts_1_1Commentary.html | 2 +- docs/classdrafts_1_1RunningCommentary.html | 2 +- docs/classes.html | 470 +-- docs/classhistogram_1_1Histogram.html | 2 +- ...ssimprocessor_1_1basic_1_1improcessor.html | 2 +- docs/classimprocessor_1_1mask_1_1mask.html | 2 +- ...ssivapy_1_1Configuration_1_1AlgConfig.html | 2 +- ...ivapy_1_1Configuration_1_1BuildConfig.html | 2 +- ...ssivapy_1_1Configuration_1_1ROSConfig.html | 2 +- .../classivapy_1_1display__cv_1_1plotfig.html | 2 +- docs/classmoments_1_1Moments.html | 2 +- docs/classpaths_1_1CfgStepLines.html | 2 +- docs/classpaths_1_1StepLines.html | 2 +- docs/classpca_1_1PCA.html | 2 +- ...rceiver_1_1monitor_1_1BuildCfgMonitor.html | 2 +- ...assperceiver_1_1monitor_1_1CfgMonitor.html | 2 +- .../classperceiver_1_1monitor_1_1Monitor.html | 2 +- ...ver_1_1perceiver_1_1BuildCfgPerceiver.html | 2 +- ...erceiver_1_1perceiver_1_1CfgPerceiver.html | 2 +- docs/classperceiver_1_1perceiver_1_1Info.html | 2 +- ...ssperceiver_1_1perceiver_1_1Perceiver.html | 2 +- ...ceiver_1_1perceiver_1_1PerceiverState.html | 2 +- ...eiver_1_1progress_1_1BuildCfgProgress.html | 2 +- ...sperceiver_1_1progress_1_1CfgProgress.html | 2 +- ...lassperceiver_1_1progress_1_1Progress.html | 2 +- ...erceiver_1_1progress_1_1ProgressState.html | 2 +- ...erceiver_1_1reporting_1_1BeatReporter.html | 2 +- ...iver_1_1reporting_1_1BuildCfgReporter.html | 2 +- ...eiver_1_1reporting_1_1CfgBeatReporter.html | 2 +- ...perceiver_1_1reporting_1_1CfgReporter.html | 2 +- ...classperceiver_1_1reporting_1_1Editor.html | 2 +- ...assperceiver_1_1reporting_1_1Reporter.html | 2 +- docs/classpuzzle_1_1board_1_1Board.html | 2 +- ...puzzle_1_1board_1_1CfgCorrespondences.html | 21 +- ...uzzle_1_1board_1_1CorrespondenceParms.html | 2 +- ...e_1_1board_1_1Correspondences-members.html | 4 +- ...asspuzzle_1_1board_1_1Correspondences.html | 48 +- ...le_1_1builder_1_1adjacent_1_1Adjacent.html | 2 +- ...1_1builder_1_1adjacent_1_1CfgAdjacent.html | 2 +- ...builder_1_1arrangement_1_1Arrangement.html | 13 +- ...lder_1_1arrangement_1_1CfgArrangement.html | 2 +- ...e_1_1builder_1_1gridded_1_1CfgGridded.html | 2 +- ...zzle_1_1builder_1_1gridded_1_1Gridded.html | 2 +- ...er_1_1interlocking_1_1CfgInterlocking.html | 2 +- ...ilder_1_1interlocking_1_1Interlocking.html | 2 +- ...zle_1_1clusters_1_1byColor_1_1ByColor.html | 2 +- ...sters_1_1byColor_1_1ParamColorCluster.html | 2 +- ...zle_1_1clusters_1_1byShape_1_1ByShape.html | 2 +- ...sters_1_1byShape_1_1ParamShapeCluster.html | 2 +- docs/classpuzzle_1_1manager_1_1Manager.html | 2 +- ...lasspuzzle_1_1manager_1_1ManagerParms.html | 2 +- ...le_1_1parse_1_1fromLayer_1_1FromLayer.html | 2 +- ..._1_1parse_1_1fromLayer_1_1ParamPuzzle.html | 2 +- ..._1_1parse_1_1fromSketch_1_1FromSketch.html | 2 +- ...sspuzzle_1_1parse_1_1simple_1_1Simple.html | 2 +- ...sspuzzle_1_1parser_1_1CfgBoardMeasure.html | 2 +- ...classpuzzle_1_1parser_1_1boardMeasure.html | 2 +- ...lasspuzzle_1_1parser_1_1boardPerceive.html | 2 +- docs/classpuzzle_1_1piece_1_1EdgeDes.html | 2 +- ...classpuzzle_1_1piece_1_1EdgeDirection.html | 2 +- docs/classpuzzle_1_1piece_1_1EdgeType.html | 2 +- docs/classpuzzle_1_1piece_1_1Piece.html | 2 +- docs/classpuzzle_1_1piece_1_1PieceStatus.html | 2 +- ...lasspuzzle_1_1piece_1_1PuzzleTemplate.html | 2 +- docs/classpuzzle_1_1piece_1_1Regular.html | 2 +- docs/classpuzzle_1_1piece_1_1Template.html | 15 +- ...classpuzzle_1_1pieces_1_1edge_1_1Edge.html | 2 +- ...eces_1_1matchDifferent_1_1CfgDistance.html | 2 +- ...s_1_1matchDifferent_1_1CfgHistogramCV.html | 2 +- ...ieces_1_1matchDifferent_1_1CfgMoments.html | 2 +- ...1_1pieces_1_1matchDifferent_1_1CfgPCA.html | 2 +- ...1pieces_1_1matchDifferent_1_1Distance.html | 2 +- ...eces_1_1matchDifferent_1_1HistogramCV.html | 2 +- ..._1pieces_1_1matchDifferent_1_1Moments.html | 2 +- ...le_1_1pieces_1_1matchDifferent_1_1PCA.html | 2 +- ..._1pieces_1_1matchSimilar_1_1CfgSIFTCV.html | 2 +- ...e_1_1pieces_1_1matchSimilar_1_1SIFTCV.html | 2 +- ..._1_1pieces_1_1matcher_1_1CfgDifferent.html | 2 +- ...le_1_1pieces_1_1matcher_1_1CfgMatcher.html | 2 +- ...le_1_1pieces_1_1matcher_1_1CfgSimilar.html | 2 +- ..._1pieces_1_1matcher_1_1MatchDifferent.html | 2 +- ..._1_1pieces_1_1matcher_1_1MatchSimilar.html | 2 +- ...uzzle_1_1pieces_1_1matcher_1_1Matcher.html | 2 +- ...zle_1_1pieces_1_1sift_1_1Sift-members.html | 3 +- ...classpuzzle_1_1pieces_1_1sift_1_1Sift.html | 20 +- ...spuzzle_1_1runnerROS_1_1RealSolverROS.html | 2 +- .../classpuzzle_1_1runner_1_1ParamRunner.html | 2 +- docs/classpuzzle_1_1runner_1_1RealSolver.html | 2 +- ...zle_1_1simulator_1_1action_1_1Actions.html | 2 +- ...puzzle_1_1simulator_1_1basic_1_1Basic.html | 2 +- ...e_1_1simulator_1_1basic_1_1ParamBasic.html | 2 +- ...sspuzzle_1_1simulator_1_1hand_1_1Hand.html | 2 +- ...zle_1_1simulator_1_1hand_1_1ParamHand.html | 2 +- ...mulator_1_1plannerHand_1_1PlannerHand.html | 2 +- ...1simulator_1_1planner_1_1ParamPlanner.html | 2 +- ...le_1_1simulator_1_1planner_1_1Planner.html | 2 +- ...le_1_1simulator_1_1planner_1_1bcolors.html | 2 +- ...le_1_1simulator_1_1simTime_1_1ParamST.html | 2 +- ...le_1_1simulator_1_1simTime_1_1SimTime.html | 2 +- ...1simulator_1_1simTimeless_1_1ParamSTL.html | 2 +- ...mulator_1_1simTimeless_1_1SimTimeLess.html | 2 +- ...classpuzzle_1_1solver_1_1base_1_1Base.html | 2 +- ...spuzzle_1_1solver_1_1simple_1_1Simple.html | 2 +- ...zle_1_1solver_1_1twoAgent_1_1TwoAgent.html | 2 +- ...s_1_1dataProcessing_1_1copyAttributes.html | 2 +- ...pygameProcessing_1_1TextRectException.html | 2 +- ...nter_1_1centroidMulti_1_1CfgCentMulti.html | 2 +- ...ter_1_1centroidMulti_1_1centroidMulti.html | 2 +- ...ackpointer_1_1centroid_1_1CfgCentroid.html | 2 +- ...ckpointer_1_1centroid_1_1CfgCentroind.html | 2 +- ...rackpointer_1_1centroid_1_1TrackState.html | 2 +- ...strackpointer_1_1centroid_1_1centroid.html | 2 +- ...asstrackpointer_1_1toplines_1_1Params.html | 2 +- ...rackpointer_1_1toplines_1_1fromBottom.html | 2 +- ...sstrackpointer_1_1toplines_1_1fromTop.html | 2 +- ...utils_1_1fakeTriangle_1_1fakeTriangle.html | 2 +- docs/classtriggers_1_1Always.html | 2 +- docs/classtriggers_1_1BuildCfgTrigger.html | 2 +- docs/classtriggers_1_1CfgDistTrigger.html | 2 +- docs/classtriggers_1_1CfgTrigger.html | 2 +- docs/classtriggers_1_1Falling.html | 2 +- docs/classtriggers_1_1Rising.html | 2 +- docs/classtriggers_1_1Trigger.html | 2 +- docs/classtriggers_1_1onChange.html | 2 +- docs/classtriggers_1_1onMatch.html | 2 +- docs/classtriggers_1_1whenClose.html | 2 +- docs/classtriggers_1_1whenDiffers.html | 2 +- docs/classtriggers_1_1whenFar.html | 2 +- docs/classtriggers_1_1whenSimilar.html | 2 +- docs/coloBlob_8py.html | 2 +- docs/colorHeight_8py.html | 2 +- docs/configs_8py.html | 27 - docs/cv2cam_8py.html | 2 +- docs/d435__record_8py.html | 2 +- docs/d435__record__rosbag__dev_8py.html | 2 +- docs/d435__record__rosbag__user_8py.html | 2 +- docs/d435new_8py.html | 2 +- docs/dataProcessing_8py.html | 2 +- docs/default__params_8py.html | 27 - docs/defaults_8py.html | 2 +- docs/detector_2README_8md.html | 4 +- ...detector_2detector_2Configuration_8py.html | 2 +- .../detector_2detector_2____init_____8py.html | 2 +- docs/detector_2detector_2base_8py.html | 2 +- ..._2detector_2bgmodel_2____init_____8py.html | 2 +- ..._2detector_2fgmodel_2____init_____8py.html | 2 +- ...tor_2detector_8egg-info_2SOURCES_8txt.html | 4 +- ...tor_8egg-info_2dependency__links_8txt.html | 4 +- ...or_2detector_8egg-info_2requires_8txt.html | 4 +- ..._2detector_8egg-info_2top__level_8txt.html | 4 +- docs/detector_2setup_8py.html | 2 +- docs/detector_8dox.html | 4 +- .../dir_0045b4ebcec45cb582ffea35eaa7f258.html | 27 - .../dir_0403e069501c43ee539a0921c4b7de6d.html | 2 +- .../dir_04e362307cbfffd6d2730de238cbe850.html | 2 +- .../dir_0b13340181f16eb6622f3f0ed42277bf.html | 2 +- .../dir_0c59b900329c6cedd90d0f8d6a3983d0.html | 2 +- .../dir_0f3781d30c336f1e505254c71a9cdb3a.html | 2 +- .../dir_10b498ffc4cb09699b7c12e77852dd74.html | 2 +- .../dir_1299fdc6a2b00f787fb35caf1b895330.html | 27 - .../dir_15b9b05ae82294d257ba35f934e2f377.html | 4 +- .../dir_16e8586de5568fa75dc9e5d71652cfec.html | 27 - .../dir_204329e0df896261ebf3de32e2a74424.html | 2 +- .../dir_22b3235c32cbad2af8ae69d7a845076b.html | 4 +- .../dir_3034611028c446d969fe05177d8aff29.html | 30 - .../dir_3ba26ca23237d9e589eb1436e7fcaa43.html | 2 +- .../dir_4866283467e828315de401b4ecd1346c.html | 2 +- .../dir_4ab88484c356a6bc5d00291989d7f9bc.html | 2 +- .../dir_4f10b86226db55223c9e39ae1ddc3f5c.html | 2 +- .../dir_52f149b75708bde97ebacd757d8d0a45.html | 2 +- .../dir_53629864a52fb453c2a175b61a1ba81e.html | 2 +- .../dir_577b79aa997aea6169c72f94892281b5.html | 4 +- .../dir_5b2abed34995392d1951e07c06dd67a2.html | 2 +- .../dir_656364c716b39487378861f6a33c8e83.html | 2 +- .../dir_65d4dd49c963e4498c6481400603c4aa.html | 2 +- .../dir_6cd7363f5cc76fda51f191f63c2fa568.html | 2 +- .../dir_8d93c0f4e8e30f9072a93bc89e638c60.html | 2 +- .../dir_8d9433177dc817784c962bbda0fc1c03.html | 4 +- .../dir_9f04dda26743be963cc04c040a26720f.html | 2 +- .../dir_9fc1913fd3ec055556b6d305adcb6768.html | 2 +- .../dir_b09f86eb0437b3653fb867ea49a1ade6.html | 2 +- .../dir_bdddeb12d67843163f404d6f95d2de45.html | 2 +- .../dir_c05e674f04cf2487b8c488e1564d6d15.html | 2 +- .../dir_c416a4555837932142c34d229c67b44f.html | 2 +- .../dir_c610ea82569b53ff305729d2e2adaaed.html | 27 - .../dir_c85edcb0ae7d8e3fdb24d8f0313ac012.html | 2 +- .../dir_d7677ff6faa6d2a891294e5207709fc8.html | 2 +- .../dir_d7a7fad18beaaa1ca608bd7db9e212fc.html | 27 - .../dir_d85c6b7af3a2f75aa5577f742ff8bff0.html | 2 +- .../dir_d8c21d96ce4f65af7ad58850847ff291.html | 6 +- .../dir_db49628838c6f6cdc7985c6a80c0e4d6.html | 2 +- .../dir_e7cd403b44593fb4613831dc8b6f89c7.html | 2 +- .../dir_eb2cda882134c8283f4255c732c2c578.html | 2 +- .../dir_ec0d9d8da4df34e2f4f6ed83d9569665.html | 27 - .../dir_f15128ca8c47f4ffe1eba8906de51711.html | 2 +- .../dir_f58ee455fa8a9a8e311b707228908b7e.html | 4 +- docs/display_8py.html | 2 +- docs/display__cv_8py.html | 2 +- docs/drafts_8py.html | 2 +- docs/edge_8py.html | 2 +- docs/fakeTriangle_8py.html | 2 +- docs/fgmodel_2Gaussian_8py.html | 2 +- docs/files.html | 303 +- docs/fromLayer_8py.html | 2 +- docs/fromSketch_8py.html | 2 +- docs/fromState_8py.html | 2 +- docs/functions.html | 73 +- docs/functions_a.html | 58 + docs/functions_b.html | 51 +- docs/functions_c.html | 55 +- docs/functions_d.html | 70 +- docs/functions_e.html | 41 + docs/functions_f.html | 8 + docs/functions_func.html | 73 +- docs/functions_func_a.html | 24 + docs/functions_func_b.html | 38 +- docs/functions_func_c.html | 37 + docs/functions_func_d.html | 46 +- docs/functions_func_e.html | 41 + docs/functions_func_g.html | 77 +- docs/functions_func_h.html | 6 +- docs/functions_func_i.html | 17 + docs/functions_func_l.html | 9 + docs/functions_func_m.html | 32 + docs/functions_func_p.html | 103 +- docs/functions_func_r.html | 7 +- docs/functions_func_s.html | 35 +- docs/functions_func_t.html | 2 +- docs/functions_func_u.html | 15 + docs/functions_func_v.html | 27 + docs/functions_g.html | 95 +- docs/functions_h.html | 49 +- docs/functions_i.html | 55 +- docs/functions_k.html | 3 + docs/functions_l.html | 27 + docs/functions_m.html | 73 +- docs/functions_n.html | 14 +- docs/functions_o.html | 6 + docs/functions_p.html | 141 +- docs/functions_r.html | 43 +- docs/functions_s.html | 93 +- docs/functions_t.html | 40 +- docs/functions_u.html | 17 +- docs/functions_v.html | 31 + docs/functions_vars.html | 34 + docs/functions_vars_b.html | 13 + docs/functions_vars_c.html | 18 +- docs/functions_vars_d.html | 24 +- docs/functions_vars_f.html | 8 + docs/functions_vars_g.html | 18 +- docs/functions_vars_h.html | 43 + docs/functions_vars_i.html | 38 +- docs/functions_vars_k.html | 3 + docs/functions_vars_l.html | 18 + docs/functions_vars_m.html | 41 +- docs/functions_vars_n.html | 14 +- docs/functions_vars_o.html | 6 + docs/functions_vars_p.html | 38 + docs/functions_vars_r.html | 36 +- docs/functions_vars_s.html | 58 +- docs/functions_vars_t.html | 38 +- docs/functions_vars_u.html | 2 +- docs/functions_vars_v.html | 6 + docs/functions_vars_w.html | 4 + docs/functions_vars_x.html | 6 + docs/functions_vars_y.html | 8 +- docs/functions_w.html | 4 + docs/functions_x.html | 6 + docs/functions_y.html | 8 +- docs/gridded_8py.html | 2 +- docs/group__PuzzleSolver.html | 6 + docs/group__Surveillance.html | 25 - docs/hand_8py.html | 2 +- docs/height__estimate_8py.html | 27 - docs/height__estimator_8py.html | 2 +- docs/helper_8py.html | 95 + docs/hierarchy.html | 575 ++-- docs/histogram_8py.html | 2 +- docs/human__seg_8py.html | 27 - docs/imageProcessing_8py.html | 15 +- docs/imgs_8py.html | 53 - docs/improcessor_2README_8md.html | 4 +- ...cessor_2improcessor_2____init_____8py.html | 2 +- docs/improcessor_2improcessor_2basic_8py.html | 2 +- docs/improcessor_2setup_8py.html | 2 +- docs/inCorner_8py.html | 2 +- docs/inImageRGBD_8py.html | 2 +- docs/inImage_8py.html | 2 +- docs/inherit_graph_0.map | 2 +- docs/inherit_graph_0.md5 | 2 +- docs/inherit_graph_0.png | Bin 1297 -> 1274 bytes docs/inherit_graph_1.map | 2 +- docs/inherit_graph_1.md5 | 2 +- docs/inherit_graph_1.png | Bin 1903 -> 1009 bytes docs/inherit_graph_10.map | 56 +- docs/inherit_graph_10.md5 | 2 +- docs/inherit_graph_10.png | Bin 149861 -> 9841 bytes docs/inherit_graph_100.map | 4 - docs/inherit_graph_100.md5 | 6 +- docs/inherit_graph_101.map | 8 +- docs/inherit_graph_101.md5 | 6 +- docs/inherit_graph_101.png | Bin 1312 -> 3866 bytes docs/inherit_graph_102.map | 7 +- docs/inherit_graph_102.md5 | 6 +- docs/inherit_graph_102.png | Bin 2477 -> 1517 bytes docs/inherit_graph_103.map | 8 +- docs/inherit_graph_103.md5 | 6 +- docs/inherit_graph_103.png | Bin 3866 -> 1104 bytes docs/inherit_graph_104.map | 8 +- docs/inherit_graph_104.md5 | 6 +- docs/inherit_graph_104.png | Bin 1517 -> 2492 bytes docs/inherit_graph_105.map | 7 +- docs/inherit_graph_105.md5 | 6 +- docs/inherit_graph_105.png | Bin 1104 -> 1969 bytes docs/inherit_graph_106.map | 7 +- docs/inherit_graph_106.md5 | 6 +- docs/inherit_graph_106.png | Bin 2492 -> 1501 bytes docs/inherit_graph_107.map | 8 +- docs/inherit_graph_107.md5 | 6 +- docs/inherit_graph_107.png | Bin 1969 -> 1486 bytes docs/inherit_graph_108.map | 7 +- docs/inherit_graph_108.md5 | 6 +- docs/inherit_graph_108.png | Bin 1501 -> 1247 bytes docs/inherit_graph_109.map | 15 +- docs/inherit_graph_109.md5 | 6 +- docs/inherit_graph_109.png | Bin 1486 -> 26230 bytes docs/inherit_graph_11.map | 4 +- docs/inherit_graph_11.md5 | 2 +- docs/inherit_graph_11.png | Bin 2846 -> 2303 bytes docs/inherit_graph_12.map | 6 +- docs/inherit_graph_12.md5 | 2 +- docs/inherit_graph_12.png | Bin 7095 -> 2007 bytes docs/inherit_graph_13.map | 56 +- docs/inherit_graph_13.md5 | 2 +- docs/inherit_graph_13.png | Bin 1457 -> 183945 bytes docs/inherit_graph_14.map | 4 +- docs/inherit_graph_14.md5 | 2 +- docs/inherit_graph_14.png | Bin 1457 -> 2197 bytes docs/inherit_graph_15.map | 3 +- docs/inherit_graph_15.md5 | 2 +- docs/inherit_graph_15.png | Bin 2034 -> 2028 bytes docs/inherit_graph_16.map | 3 +- docs/inherit_graph_16.md5 | 2 +- docs/inherit_graph_16.png | Bin 2479 -> 2433 bytes docs/inherit_graph_17.map | 3 +- docs/inherit_graph_17.md5 | 2 +- docs/inherit_graph_17.png | Bin 2176 -> 2628 bytes docs/inherit_graph_18.map | 5 +- docs/inherit_graph_18.md5 | 2 +- docs/inherit_graph_18.png | Bin 2209 -> 6159 bytes docs/inherit_graph_19.map | 3 +- docs/inherit_graph_19.md5 | 2 +- docs/inherit_graph_19.png | Bin 2140 -> 1314 bytes docs/inherit_graph_2.map | 4 +- docs/inherit_graph_2.md5 | 2 +- docs/inherit_graph_2.png | Bin 4386 -> 1500 bytes docs/inherit_graph_20.map | 4 +- docs/inherit_graph_20.md5 | 2 +- docs/inherit_graph_20.png | Bin 3464 -> 1314 bytes docs/inherit_graph_21.map | 3 +- docs/inherit_graph_21.md5 | 2 +- docs/inherit_graph_21.png | Bin 2788 -> 1549 bytes docs/inherit_graph_22.map | 3 +- docs/inherit_graph_22.md5 | 2 +- docs/inherit_graph_22.png | Bin 2392 -> 2014 bytes docs/inherit_graph_23.map | 2 +- docs/inherit_graph_23.md5 | 2 +- docs/inherit_graph_23.png | Bin 1788 -> 1468 bytes docs/inherit_graph_24.map | 2 +- docs/inherit_graph_24.md5 | 2 +- docs/inherit_graph_24.png | Bin 1614 -> 1637 bytes docs/inherit_graph_25.map | 2 +- docs/inherit_graph_25.md5 | 2 +- docs/inherit_graph_25.png | Bin 1118 -> 1864 bytes docs/inherit_graph_26.map | 47 +- docs/inherit_graph_26.md5 | 2 +- docs/inherit_graph_26.png | Bin 138400 -> 2957 bytes docs/inherit_graph_27.map | 5 +- docs/inherit_graph_27.md5 | 2 +- docs/inherit_graph_27.png | Bin 4194 -> 2571 bytes docs/inherit_graph_28.map | 3 +- docs/inherit_graph_28.md5 | 2 +- docs/inherit_graph_28.png | Bin 1745 -> 2062 bytes docs/inherit_graph_29.map | 3 +- docs/inherit_graph_29.md5 | 2 +- docs/inherit_graph_29.png | Bin 1548 -> 2058 bytes docs/inherit_graph_3.map | 14 +- docs/inherit_graph_3.md5 | 2 +- docs/inherit_graph_3.png | Bin 22167 -> 3215 bytes docs/inherit_graph_30.map | 10 +- docs/inherit_graph_30.md5 | 2 +- docs/inherit_graph_30.png | Bin 853 -> 13162 bytes docs/inherit_graph_31.map | 5 +- docs/inherit_graph_31.md5 | 2 +- docs/inherit_graph_31.png | Bin 7646 -> 1477 bytes docs/inherit_graph_32.map | 2 +- docs/inherit_graph_32.md5 | 2 +- docs/inherit_graph_32.png | Bin 2028 -> 1456 bytes docs/inherit_graph_33.map | 2 +- docs/inherit_graph_33.md5 | 2 +- docs/inherit_graph_33.png | Bin 1542 -> 1456 bytes docs/inherit_graph_34.map | 2 +- docs/inherit_graph_34.md5 | 2 +- docs/inherit_graph_34.png | Bin 722 -> 1456 bytes docs/inherit_graph_35.map | 3 +- docs/inherit_graph_35.md5 | 2 +- docs/inherit_graph_35.png | Bin 2801 -> 1456 bytes docs/inherit_graph_36.map | 2 +- docs/inherit_graph_36.md5 | 2 +- docs/inherit_graph_36.png | Bin 1896 -> 1260 bytes docs/inherit_graph_37.map | 3 +- docs/inherit_graph_37.md5 | 2 +- docs/inherit_graph_37.png | Bin 2090 -> 1114 bytes docs/inherit_graph_38.map | 11 +- docs/inherit_graph_38.md5 | 2 +- docs/inherit_graph_38.png | Bin 22048 -> 1514 bytes docs/inherit_graph_39.map | 9 +- docs/inherit_graph_39.md5 | 2 +- docs/inherit_graph_39.png | Bin 23478 -> 1089 bytes docs/inherit_graph_4.map | 14 +- docs/inherit_graph_4.md5 | 2 +- docs/inherit_graph_4.png | Bin 3816 -> 19974 bytes docs/inherit_graph_40.map | 4 +- docs/inherit_graph_40.md5 | 2 +- docs/inherit_graph_40.png | Bin 2908 -> 833 bytes docs/inherit_graph_41.map | 2 +- docs/inherit_graph_41.md5 | 2 +- docs/inherit_graph_41.png | Bin 2033 -> 1443 bytes docs/inherit_graph_42.map | 56 +- docs/inherit_graph_42.md5 | 2 +- docs/inherit_graph_42.png | Bin 1321 -> 165416 bytes docs/inherit_graph_43.map | 6 +- docs/inherit_graph_43.md5 | 2 +- docs/inherit_graph_43.png | Bin 3198 -> 4082 bytes docs/inherit_graph_44.map | 2 +- docs/inherit_graph_44.md5 | 2 +- docs/inherit_graph_44.png | Bin 1551 -> 1434 bytes docs/inherit_graph_45.map | 2 +- docs/inherit_graph_45.md5 | 2 +- docs/inherit_graph_45.png | Bin 1097 -> 1168 bytes docs/inherit_graph_46.map | 2 +- docs/inherit_graph_46.md5 | 2 +- docs/inherit_graph_46.png | Bin 1620 -> 715 bytes docs/inherit_graph_47.map | 2 +- docs/inherit_graph_47.md5 | 2 +- docs/inherit_graph_47.png | Bin 2389 -> 1690 bytes docs/inherit_graph_48.map | 5 +- docs/inherit_graph_48.md5 | 2 +- docs/inherit_graph_48.png | Bin 1922 -> 6503 bytes docs/inherit_graph_49.map | 2 +- docs/inherit_graph_49.md5 | 2 +- docs/inherit_graph_49.png | Bin 931 -> 1321 bytes docs/inherit_graph_5.map | 6 +- docs/inherit_graph_5.md5 | 2 +- docs/inherit_graph_5.png | Bin 3339 -> 3141 bytes docs/inherit_graph_50.map | 3 +- docs/inherit_graph_50.md5 | 2 +- docs/inherit_graph_50.png | Bin 2075 -> 1495 bytes docs/inherit_graph_51.map | 2 +- docs/inherit_graph_51.md5 | 2 +- docs/inherit_graph_51.png | Bin 1141 -> 1223 bytes docs/inherit_graph_52.map | 2 +- docs/inherit_graph_52.md5 | 2 +- docs/inherit_graph_52.png | Bin 1141 -> 598 bytes docs/inherit_graph_53.map | 2 +- docs/inherit_graph_53.md5 | 2 +- docs/inherit_graph_53.png | Bin 1902 -> 1291 bytes docs/inherit_graph_54.map | 2 +- docs/inherit_graph_54.md5 | 2 +- docs/inherit_graph_54.png | Bin 1758 -> 1291 bytes docs/inherit_graph_55.map | 2 +- docs/inherit_graph_55.md5 | 2 +- docs/inherit_graph_55.png | Bin 1758 -> 1794 bytes docs/inherit_graph_56.map | 3 +- docs/inherit_graph_56.md5 | 2 +- docs/inherit_graph_56.png | Bin 2532 -> 1794 bytes docs/inherit_graph_57.map | 3 +- docs/inherit_graph_57.md5 | 2 +- docs/inherit_graph_57.png | Bin 2269 -> 1607 bytes docs/inherit_graph_58.map | 3 +- docs/inherit_graph_58.md5 | 2 +- docs/inherit_graph_58.png | Bin 2257 -> 1607 bytes docs/inherit_graph_59.map | 2 +- docs/inherit_graph_59.md5 | 2 +- docs/inherit_graph_59.png | Bin 2037 -> 1235 bytes docs/inherit_graph_6.map | 11 +- docs/inherit_graph_6.md5 | 2 +- docs/inherit_graph_6.png | Bin 1241 -> 15423 bytes docs/inherit_graph_60.map | 2 +- docs/inherit_graph_60.md5 | 2 +- docs/inherit_graph_60.png | Bin 2037 -> 1235 bytes docs/inherit_graph_61.map | 2 +- docs/inherit_graph_61.md5 | 2 +- docs/inherit_graph_61.png | Bin 1771 -> 1458 bytes docs/inherit_graph_62.map | 2 +- docs/inherit_graph_62.md5 | 2 +- docs/inherit_graph_62.png | Bin 1771 -> 1458 bytes docs/inherit_graph_63.map | 4 +- docs/inherit_graph_63.md5 | 2 +- docs/inherit_graph_63.png | Bin 4658 -> 1454 bytes docs/inherit_graph_64.map | 3 +- docs/inherit_graph_64.md5 | 2 +- docs/inherit_graph_64.png | Bin 1670 -> 2128 bytes docs/inherit_graph_65.map | 3 +- docs/inherit_graph_65.md5 | 2 +- docs/inherit_graph_65.png | Bin 3442 -> 1601 bytes docs/inherit_graph_66.map | 4 +- docs/inherit_graph_66.md5 | 2 +- docs/inherit_graph_66.png | Bin 2433 -> 1628 bytes docs/inherit_graph_67.map | 11 +- docs/inherit_graph_67.md5 | 2 +- docs/inherit_graph_67.png | Bin 1294 -> 19336 bytes docs/inherit_graph_68.map | 8 +- docs/inherit_graph_68.md5 | 2 +- docs/inherit_graph_68.png | Bin 2020 -> 17054 bytes docs/inherit_graph_69.map | 4 +- docs/inherit_graph_69.md5 | 2 +- docs/inherit_graph_69.png | Bin 1888 -> 2434 bytes docs/inherit_graph_7.map | 8 +- docs/inherit_graph_7.md5 | 2 +- docs/inherit_graph_7.png | Bin 11531 -> 2422 bytes docs/inherit_graph_70.map | 2 +- docs/inherit_graph_70.md5 | 2 +- docs/inherit_graph_70.png | Bin 1599 -> 1683 bytes docs/inherit_graph_71.map | 11 +- docs/inherit_graph_71.md5 | 2 +- docs/inherit_graph_71.png | Bin 28642 -> 1702 bytes docs/inherit_graph_72.map | 2 +- docs/inherit_graph_72.md5 | 2 +- docs/inherit_graph_72.png | Bin 1599 -> 982 bytes docs/inherit_graph_73.map | 13 +- docs/inherit_graph_73.md5 | 2 +- docs/inherit_graph_73.png | Bin 28642 -> 2616 bytes docs/inherit_graph_74.map | 8 +- docs/inherit_graph_74.md5 | 6 +- docs/inherit_graph_74.png | Bin 2616 -> 1094 bytes docs/inherit_graph_75.map | 7 +- docs/inherit_graph_75.md5 | 6 +- docs/inherit_graph_75.png | Bin 1094 -> 866 bytes docs/inherit_graph_76.map | 6 +- docs/inherit_graph_76.md5 | 6 +- docs/inherit_graph_77.map | 6 +- docs/inherit_graph_77.md5 | 6 +- docs/inherit_graph_78.map | 15 +- docs/inherit_graph_78.md5 | 6 +- docs/inherit_graph_78.png | Bin 866 -> 12762 bytes docs/inherit_graph_79.map | 15 +- docs/inherit_graph_79.md5 | 6 +- docs/inherit_graph_79.png | Bin 12762 -> 1142 bytes docs/inherit_graph_8.map | 4 +- docs/inherit_graph_8.md5 | 2 +- docs/inherit_graph_8.png | Bin 1240 -> 2652 bytes docs/inherit_graph_80.map | 12 +- docs/inherit_graph_80.md5 | 6 +- docs/inherit_graph_80.png | Bin 1142 -> 1740 bytes docs/inherit_graph_81.map | 7 +- docs/inherit_graph_81.md5 | 6 +- docs/inherit_graph_81.png | Bin 1740 -> 1879 bytes docs/inherit_graph_82.map | 7 +- docs/inherit_graph_82.md5 | 6 +- docs/inherit_graph_82.png | Bin 1879 -> 1318 bytes docs/inherit_graph_83.map | 8 +- docs/inherit_graph_83.md5 | 6 +- docs/inherit_graph_83.png | Bin 1318 -> 2916 bytes docs/inherit_graph_84.map | 8 +- docs/inherit_graph_84.md5 | 6 +- docs/inherit_graph_84.png | Bin 2916 -> 683 bytes docs/inherit_graph_85.map | 8 +- docs/inherit_graph_85.md5 | 6 +- docs/inherit_graph_85.png | Bin 683 -> 1705 bytes docs/inherit_graph_86.map | 7 +- docs/inherit_graph_86.md5 | 6 +- docs/inherit_graph_86.png | Bin 1705 -> 1035 bytes docs/inherit_graph_87.map | 5 - docs/inherit_graph_87.md5 | 6 +- docs/inherit_graph_88.map | 6 +- docs/inherit_graph_88.md5 | 6 +- docs/inherit_graph_88.png | Bin 1035 -> 1633 bytes docs/inherit_graph_89.map | 11 +- docs/inherit_graph_89.md5 | 6 +- docs/inherit_graph_89.png | Bin 1633 -> 10861 bytes docs/inherit_graph_9.map | 3 +- docs/inherit_graph_9.md5 | 2 +- docs/inherit_graph_9.png | Bin 2607 -> 876 bytes docs/inherit_graph_90.map | 11 +- docs/inherit_graph_90.md5 | 6 +- docs/inherit_graph_90.png | Bin 10861 -> 1448 bytes docs/inherit_graph_91.map | 11 +- docs/inherit_graph_91.md5 | 6 +- docs/inherit_graph_91.png | Bin 1448 -> 2057 bytes docs/inherit_graph_92.map | 8 +- docs/inherit_graph_92.md5 | 6 +- docs/inherit_graph_92.png | Bin 1410 -> 5008 bytes docs/inherit_graph_93.map | 10 +- docs/inherit_graph_93.md5 | 6 +- docs/inherit_graph_93.png | Bin 5008 -> 1873 bytes docs/inherit_graph_94.map | 9 +- docs/inherit_graph_94.md5 | 6 +- docs/inherit_graph_94.png | Bin 1873 -> 1177 bytes docs/inherit_graph_95.map | 8 +- docs/inherit_graph_95.md5 | 6 +- docs/inherit_graph_95.png | Bin 1177 -> 1887 bytes docs/inherit_graph_96.map | 7 +- docs/inherit_graph_96.md5 | 6 +- docs/inherit_graph_96.png | Bin 1887 -> 1450 bytes docs/inherit_graph_97.map | 6 +- docs/inherit_graph_97.md5 | 6 +- docs/inherit_graph_97.png | Bin 1450 -> 1560 bytes docs/inherit_graph_98.map | 4 - docs/inherit_graph_98.md5 | 6 +- docs/inherit_graph_99.map | 6 +- docs/inherit_graph_99.md5 | 6 +- docs/inherit_graph_99.png | Bin 1560 -> 1312 bytes docs/inherits.html | 891 +++--- docs/interlocking_8py.html | 2 +- docs/ivapy_2README_8md.html | 4 +- docs/ivapy_2ivapy_2Configuration_8py.html | 2 +- docs/ivapy_2ivapy_2____init_____8py.html | 2 +- .../ivapy_2ivapy_8egg-info_2SOURCES_8txt.html | 4 +- ...apy_8egg-info_2dependency__links_8txt.html | 4 +- ...ivapy_2ivapy_8egg-info_2requires_8txt.html | 4 +- ...apy_2ivapy_8egg-info_2top__level_8txt.html | 4 +- docs/ivapy_2setup_8py.html | 2 +- docs/manager_8py.html | 2 +- docs/mask_8py.html | 2 +- docs/matchDifferent_8py.html | 2 +- docs/matchSimilar_8py.html | 2 +- docs/matcher_8py.html | 2 +- ..._home_mary_python_Surveillance_README.html | 18 +- ...ce_Surveillance_deployment_ROS_README.html | 16 +- docs/md__home_mary_python_camera_README.html | 10 +- ...ome_mary_python_camera_scripts_README.html | 2 +- .../md__home_mary_python_detector_README.html | 6 +- ...__home_mary_python_improcessor_README.html | 4 +- ...md__home_mary_python_perceiver_README.html | 2 +- ...home_mary_python_puzzle_solver_README.html | 9 +- ..._home_mary_python_trackpointer_README.html | 2 +- docs/menudata.js | 40 +- docs/modules.html | 1 + docs/moments_8py.html | 2 +- docs/monitor_8py.html | 2 +- docs/namespaceSurveillance.html | 25 - docs/namespaceSurveillance_1_1activity.html | 25 - ...espaceSurveillance_1_1activity_1_1FSM.html | 25 - ...spaceSurveillance_1_1activity_1_1base.html | 25 - ...paceSurveillance_1_1activity_1_1state.html | 25 - ...paceSurveillance_1_1activity_1_1utils.html | 25 - docs/namespaceSurveillance_1_1deployment.html | 25 - ...aceSurveillance_1_1deployment_1_1Base.html | 37 - ...paceSurveillance_1_1deployment_1_1ROS.html | 25 - ...ment_1_1ROS_1_1rosbag__data__recorder.html | 25 - ..._1deployment_1_1ROS_1_1rosbag__replay.html | 25 - ..._1deployment_1_1ROS_1_1rosbag__runner.html | 37 - ...1deployment_1_1ROS_1_1rosbag__to__avi.html | 25 - ...nce_1_1deployment_1_1activity__record.html | 29 - ...ance_1_1deployment_1_1default__params.html | 49 - ...ceSurveillance_1_1deployment_1_1utils.html | 43 - docs/namespaceSurveillance_1_1layers.html | 25 - ...urveillance_1_1layers_1_1BlackWorkMat.html | 29 - ...espaceSurveillance_1_1layers_1_1Glove.html | 25 - ...urveillance_1_1layers_1_1GloveByColor.html | 25 - ...rveillance_1_1layers_1_1HoveringGlove.html | 25 - ...urveillance_1_1layers_1_1HoveringHand.html | 25 - ...Surveillance_1_1layers_1_1PuzzleScene.html | 25 - ...mespaceSurveillance_1_1layers_1_1base.html | 25 - ...aceSurveillance_1_1layers_1_1base__bg.html | 25 - ...aceSurveillance_1_1layers_1_1base__fg.html | 25 - ...eSurveillance_1_1layers_1_1human__seg.html | 25 - ...Surveillance_1_1layers_1_1puzzle__seg.html | 25 - ...eSurveillance_1_1layers_1_1robot__seg.html | 25 - ...espaceSurveillance_1_1layers_1_1scene.html | 25 - ...rveillance_1_1layers_1_1tabletop__seg.html | 25 - docs/namespaceSurveillance_1_1utils.html | 25 - ...spaceSurveillance_1_1utils_1_1configs.html | 25 - ...eillance_1_1utils_1_1height__estimate.html | 25 - ...amespaceSurveillance_1_1utils_1_1imgs.html | 143 - ...Surveillance_1_1utils_1_1region__grow.html | 25 - ...rveillance_1_1utils_1_1specifications.html | 25 - ...aceSurveillance_1_1utils_1_1transform.html | 25 - ...veillance_1_1utils_1_1transform__mats.html | 29 - ...mespaceSurveillance_1_1utils_1_1utils.html | 25 - docs/namespacedisplay__cv.html | 2 +- docs/namespaceivapy.html | 2 + docs/namespaceivapy_1_1helper.html | 112 + docs/namespacemembers_a.html | 10 + docs/namespacemembers_b.html | 16 + docs/namespacemembers_c.html | 20 + docs/namespacemembers_d.html | 37 + docs/namespacemembers_f.html | 7 + docs/namespacemembers_func.html | 74 +- docs/namespacemembers_g.html | 6 + docs/namespacemembers_h.html | 6 + docs/namespacemembers_i.html | 12 + docs/namespacemembers_k.html | 3 + docs/namespacemembers_l.html | 6 + docs/namespacemembers_m.html | 10 + docs/namespacemembers_n.html | 3 + docs/namespacemembers_p.html | 27 +- docs/namespacemembers_r.html | 28 + docs/namespacemembers_s.html | 13 + docs/namespacemembers_t.html | 21 + docs/namespacemembers_v.html | 3 + docs/namespacemembers_vars.html | 423 +-- docs/namespacemembers_vars_b.html | 13 +- docs/namespacemembers_vars_c.html | 17 +- docs/namespacemembers_vars_d.html | 16 +- docs/namespacemembers_vars_e.html | 13 +- docs/namespacemembers_vars_f.html | 13 +- docs/namespacemembers_vars_h.html | 13 +- docs/namespacemembers_vars_i.html | 15 +- docs/namespacemembers_vars_k.html | 13 +- docs/namespacemembers_vars_l.html | 13 +- docs/namespacemembers_vars_m.html | 13 +- docs/namespacemembers_vars_n.html | 13 +- docs/namespacemembers_vars_o.html | 13 +- docs/namespacemembers_vars_p.html | 13 +- docs/namespacemembers_vars_r.html | 16 +- docs/namespacemembers_vars_s.html | 13 +- docs/namespacemembers_vars_t.html | 16 +- docs/namespacemembers_vars_u.html | 13 +- docs/namespacemembers_vars_v.html | 13 +- docs/namespacemembers_vars_w.html | 13 +- docs/namespacemembers_vars_z.html | 13 +- docs/namespacepuzzle.html | 4 - ...acepuzzle_1_1utils_1_1imageProcessing.html | 139 +- docs/namespaces.html | 199 +- docs/onWorkspace_8py.html | 2 +- docs/pages.html | 22 +- docs/parser_8py.html | 2 +- docs/paths_8py.html | 2 +- docs/pca_8py.html | 2 +- docs/perceiver_2README_8md.html | 4 +- ...erceiver_2perceiver_2____init_____8py.html | 2 +- docs/perceiver_2perceiver_2simple_8py.html | 2 +- ...er_2perceiver_8egg-info_2SOURCES_8txt.html | 4 +- ...ver_8egg-info_2dependency__links_8txt.html | 4 +- ...r_2perceiver_8egg-info_2requires_8txt.html | 4 +- ...2perceiver_8egg-info_2top__level_8txt.html | 4 +- docs/perceiver_2setup_8py.html | 2 +- docs/perceiver_8md.html | 4 +- docs/perceiver_8py.html | 2 +- docs/piece_8py.html | 2 +- docs/plannerHand_8py.html | 2 +- docs/planner_8py.html | 2 +- docs/progress_8py.html | 2 +- docs/puzzleProcessing_8py.html | 2 +- docs/puzzle__seg_8py.html | 27 - docs/puzzle__solver_2README_8md.html | 4 +- ...zle__solver_2puzzle_2____init_____8py.html | 2 +- ...er_2puzzle_2builder_2____init_____8py.html | 2 +- ...r_2puzzle_2clusters_2____init_____8py.html | 2 +- ...lver_2puzzle_2parse_2____init_____8py.html | 2 +- ...le__solver_2puzzle_2parse_2simple_8py.html | 2 +- ...ver_2puzzle_2pieces_2____init_____8py.html | 2 +- docs/puzzle__solver_2puzzle_2runner_8py.html | 2 +- ..._2puzzle_2simulator_2____init_____8py.html | 2 +- ..._solver_2puzzle_2simulator_2basic_8py.html | 2 +- ...ver_2puzzle_2solver_2____init_____8py.html | 2 +- ...zle__solver_2puzzle_2solver_2base_8py.html | 2 +- ...e__solver_2puzzle_2solver_2simple_8py.html | 2 +- ...lver_2puzzle_2utils_2____init_____8py.html | 2 +- ...olver_2puzzle_8egg-info_2SOURCES_8txt.html | 31 - ...zle_8egg-info_2dependency__links_8txt.html | 31 - ...lver_2puzzle_8egg-info_2requires_8txt.html | 31 - ...er_2puzzle_8egg-info_2top__level_8txt.html | 31 - docs/puzzle__solver_2setup_8py.html | 2 +- docs/puzzle__solver_8dox.html | 4 +- docs/pygameProcessing_8py.html | 2 +- docs/recorders_8py.html | 2 +- docs/region__grow_8py.html | 27 - docs/register_8py.html | 2 +- docs/reporting_8dox.html | 4 +- docs/reporting_8py.html | 2 +- docs/robot__seg_8py.html | 27 - docs/rosbag__data__recorder_8py.html | 27 - docs/rosbag__replay_8py.html | 27 - docs/rosbag__runner_8py.html | 27 - docs/rosbag__to__avi_8py.html | 27 - docs/rostopic_8py.html | 2 +- docs/rs__utils_8py.html | 2 +- docs/runner2_8py.html | 2 +- docs/runnerROS_8py.html | 2 +- docs/scene_8py.html | 27 - docs/search/all_0.js | 14 +- docs/search/all_1.js | 116 +- docs/search/all_10.js | 173 +- docs/search/all_11.js | 292 +- docs/search/all_12.js | 184 +- docs/search/all_13.js | 30 +- docs/search/all_14.js | 46 +- docs/search/all_15.js | 37 +- docs/search/all_16.js | 4 +- docs/search/all_17.js | 4 +- docs/search/all_18.js | 2 +- docs/search/all_2.js | 236 +- docs/search/all_3.js | 351 +-- docs/search/all_4.js | 218 +- docs/search/all_5.js | 48 +- docs/search/all_6.js | 112 +- docs/search/all_7.js | 119 +- docs/search/all_8.js | 58 +- docs/search/all_9.js | 132 +- docs/search/all_a.js | 12 +- docs/search/all_b.js | 49 +- docs/search/all_c.js | 110 +- docs/search/all_d.js | 29 +- docs/search/all_e.js | 34 +- docs/search/all_f.js | 347 ++- docs/search/classes_0.js | 17 +- docs/search/classes_1.js | 46 +- docs/search/classes_10.js | 8 +- docs/search/classes_2.js | 110 +- docs/search/classes_3.js | 21 +- docs/search/classes_4.js | 10 +- docs/search/classes_5.js | 23 +- docs/search/classes_6.js | 10 +- docs/search/classes_7.js | 10 +- docs/search/classes_8.js | 27 +- docs/search/classes_9.js | 21 +- docs/search/classes_a.js | 6 +- docs/search/classes_b.js | 56 +- docs/search/classes_c.js | 29 +- docs/search/classes_d.js | 23 +- docs/search/classes_e.js | 31 +- docs/search/classes_f.js | 4 +- docs/search/files_0.js | 2 +- docs/search/files_1.js | 11 +- docs/search/files_10.js | 2 +- docs/search/files_11.js | 8 +- docs/search/files_12.js | 4 +- docs/search/files_2.js | 19 +- docs/search/files_3.js | 15 +- docs/search/files_4.js | 25 +- docs/search/files_5.js | 2 +- docs/search/files_6.js | 9 +- docs/search/files_7.js | 8 +- docs/search/files_8.js | 11 +- docs/search/files_9.js | 11 +- docs/search/files_a.js | 16 +- docs/search/files_b.js | 4 +- docs/search/files_c.js | 26 +- docs/search/files_d.js | 28 +- docs/search/files_e.js | 21 +- docs/search/files_f.js | 21 +- docs/search/functions_0.js | 12 +- docs/search/functions_1.js | 39 +- docs/search/functions_10.js | 65 +- docs/search/functions_11.js | 102 +- docs/search/functions_12.js | 41 +- docs/search/functions_13.js | 20 +- docs/search/functions_14.js | 11 +- docs/search/functions_15.js | 10 +- docs/search/functions_2.js | 110 +- docs/search/functions_3.js | 110 +- docs/search/functions_4.js | 71 +- docs/search/functions_5.js | 26 +- docs/search/functions_6.js | 14 +- docs/search/functions_7.js | 87 +- docs/search/functions_8.js | 2 +- docs/search/functions_9.js | 17 +- docs/search/functions_a.js | 4 +- docs/search/functions_b.js | 12 +- docs/search/functions_c.js | 26 +- docs/search/functions_d.js | 5 +- docs/search/functions_e.js | 8 +- docs/search/functions_f.js | 90 +- docs/search/groups_0.js | 2 +- docs/search/groups_1.js | 10 +- docs/search/groups_2.js | 4 +- docs/search/groups_3.js | 10 +- docs/search/groups_4.js | 2 +- docs/search/groups_5.js | 2 +- docs/search/namespaces_0.js | 4 +- docs/search/namespaces_1.js | 40 +- docs/search/namespaces_2.js | 38 +- docs/search/namespaces_3.js | 2 +- docs/search/namespaces_4.js | 2 +- docs/search/namespaces_5.js | 17 +- docs/search/namespaces_6.js | 2 +- docs/search/namespaces_7.js | 112 +- docs/search/namespaces_8.js | 51 +- docs/search/namespaces_9.js | 14 +- docs/search/namespaces_a.js | 2 +- docs/search/pages_0.js | 4 +- docs/search/pages_1.js | 2 +- docs/search/pages_2.js | 6 +- docs/search/pages_3.js | 6 +- docs/search/pages_4.js | 2 +- docs/search/pages_5.js | 4 +- docs/search/pages_6.html | 17 - docs/search/pages_6.js | 9 +- docs/search/searchdata.js | 4 +- docs/search/variables_0.js | 51 +- docs/search/variables_1.js | 61 +- docs/search/variables_10.js | 95 +- docs/search/variables_11.js | 76 +- docs/search/variables_12.js | 8 +- docs/search/variables_13.js | 22 +- docs/search/variables_14.js | 15 +- docs/search/variables_15.js | 4 +- docs/search/variables_16.js | 4 +- docs/search/variables_17.js | 2 +- docs/search/variables_2.js | 82 +- docs/search/variables_3.js | 70 +- docs/search/variables_4.js | 14 +- docs/search/variables_5.js | 66 +- docs/search/variables_6.js | 14 +- docs/search/variables_7.js | 37 +- docs/search/variables_8.js | 64 +- docs/search/variables_9.js | 8 +- docs/search/variables_a.js | 37 +- docs/search/variables_b.js | 55 +- docs/search/variables_c.js | 24 +- docs/search/variables_d.js | 16 +- docs/search/variables_e.js | 84 +- docs/search/variables_f.js | 52 +- docs/shapeProcessing_8py.html | 2 +- docs/sideExtractor_8py.html | 2 +- docs/sift_8py.html | 2 +- docs/simProcessing_8py.html | 2 +- docs/simTime_8py.html | 2 +- docs/simTimeless_8py.html | 2 +- docs/specifications_8py.html | 27 - docs/state_8py.html | 27 - docs/tabletop__plane_8py.html | 2 +- docs/tabletop__seg_8py.html | 27 - docs/targetCorner_8py.html | 2 +- docs/targetMagenta_8py.html | 2 +- docs/targetNeon_8py.html | 2 +- docs/targetSG_8py.html | 2 +- docs/tests/activity01regions_8py.html | 2 +- docs/tests/activity02regions_8py.html | 2 +- docs/tests/arg01__clusterByColor_8py.html | 2 +- docs/tests/basic01template_8py.html | 2 +- docs/tests/basic02__parser_8py.html | 2 +- docs/tests/basic02moments_8py.html | 2 +- docs/tests/basic03pca_8py.html | 2 +- docs/tests/basic04fromSketch_8py.html | 2 +- docs/tests/basic04regular_8py.html | 2 +- docs/tests/basic05edge_8py.html | 2 +- docs/tests/basic06histogram_8py.html | 2 +- docs/tests/basic07histogram_8py.html | 2 +- docs/tests/basic08sift_8py.html | 2 +- docs/tests/basic09sift_8py.html | 2 +- docs/tests/bg01__Eva_8py.html | 2 +- docs/tests/bg02__cvGMM_8py.html | 2 +- .../tests/class15p__gridded_1_1dataBoard.html | 2 +- .../tests/class15p__gridded_1_1dataImage.html | 2 +- docs/tests/class6p__gridded_1_1dataBoard.html | 2 +- docs/tests/class6p__gridded_1_1dataImage.html | 2 +- ...lassbasic02__arrangement_1_1dataBoard.html | 2 +- ...lassbasic02__arrangement_1_1dataImage.html | 2 +- .../classbasic03__adjacent_1_1dataBoard.html | 2 +- .../classbasic03__adjacent_1_1dataImage.html | 2 +- ...assbasic04__interlocking_1_1dataBoard.html | 2 +- ...assbasic04__interlocking_1_1dataImage.html | 2 +- ...classreal__runnerROS_1_1ImageListener.html | 2 +- docs/tests/classsurvRunner_1_1SurvRunner.html | 2 +- .../dir_03de82443212e0b943db0620f8f27e51.html | 2 +- .../dir_0403e069501c43ee539a0921c4b7de6d.html | 2 +- .../dir_1388d1077e3d4e4cf9d1646ebd7bd5a8.html | 2 +- .../dir_30e885fbf9e783c0caebfb73e93f093a.html | 2 +- .../dir_3888eef36696903efd4210c2835607e1.html | 2 +- .../dir_3dfc1ade349315bbf1da14d82be84443.html | 2 +- .../dir_3ff223ebcd94e7673fb3181f58c425f0.html | 2 +- .../dir_46cd5fe890c9e5da67f46408f5ea7bc2.html | 2 +- .../dir_501c8dfb8d41598c98eba7c6ce6c13f0.html | 2 +- .../dir_577b79aa997aea6169c72f94892281b5.html | 2 +- .../dir_6453587a842a4ad664f7cd7fbe9a3ff5.html | 2 +- .../dir_65d4dd49c963e4498c6481400603c4aa.html | 2 +- .../dir_845de5d634a9270199f3620212c17a17.html | 2 +- .../dir_8f2212e69dd617e50afd29c01a896b4f.html | 8 +- .../dir_a27799fcc5fbe4abb1e42d4842145928.html | 2 +- .../dir_b6de354c89a7d732c18285ce95742ccb.html | 2 +- .../dir_be1e653aaefb90b6a9743f5bce58021a.html | 2 +- .../dir_cbf2ca2afafee285462361463d629822.html | 2 +- .../dir_cc0e3efce8a8ee66bd8177d1b85e3c42.html | 2 +- .../dir_d6c8e5d6daaa66542cf263981febd369.html | 2 +- .../dir_d71c155e325f344ca80e76673b7611c7.html | 2 +- .../dir_d8b87518a909ed7914d59411139e3cfb.html | 2 +- .../dir_ddf41c99297fedce78d8b951274fecd6.html | 2 +- .../dir_e85c83f0212a8f8cc0bff4f77128ac82.html | 2 +- docs/tests/editor01simple_8py.html | 2 +- docs/tests/editor02commentary_8py.html | 2 +- docs/tests/editor03badcsv_8py.html | 2 +- docs/tests/editor04csv_8py.html | 2 +- docs/tests/editor05csv_8py.html | 2 +- docs/tests/editor06pilot_8py.html | 2 +- docs/tests/files.html | 2 + docs/tests/gmmcv01run_8py.html | 2 +- docs/tests/gmmcv02calibrate_8py.html | 2 +- docs/tests/group__TestPuzzle__Tracking.html | 6 + docs/tests/image01__threshold_8py.html | 2 +- docs/tests/image02__threshold_8py.html | 2 +- docs/tests/image03__inRange_8py.html | 2 +- docs/tests/image04__inRange_8py.html | 2 +- docs/tests/image05__inRange_8py.html | 2 +- docs/tests/image06__inRange_8py.html | 2 +- docs/tests/image07__targetSG_8py.html | 2 +- .../tests/image08__targetSG__imgDiff_8py.html | 2 +- docs/tests/image09__targetMagenta_8py.html | 2 +- docs/tests/inimage01basics_8py.html | 2 +- docs/tests/inimage02sketchpoly_8py.html | 2 +- docs/tests/inimage03saveload_8py.html | 2 +- docs/tests/inimage04calibrate_8py.html | 2 +- ...hon_puzzle_solver_testing_core_README.html | 79 + docs/tests/move01basic_8py.html | 2 +- docs/tests/move02filter_8py.html | 2 +- docs/tests/move03filter_8py.html | 2 +- docs/tests/occupancy01basics_8py.html | 2 +- docs/tests/pages.html | 8 +- docs/tests/real01template_8py.html | 2 +- docs/tests/real05edge_8py.html | 2 +- docs/tests/real05sift_8py.html | 89 + docs/tests/real06sift_8py.html | 94 + docs/tests/region01__realsense_8py.html | 2 +- docs/tests/report01flag_8py.html | 2 +- docs/tests/report02int_8py.html | 2 +- docs/tests/report03float_8py.html | 2 +- docs/tests/report04csv_8py.html | 2 +- docs/tests/score01__simByColor_8py.html | 2 +- docs/tests/score02__rosByColor_8py.html | 2 +- docs/tests/search/all_4.js | 2 +- docs/tests/search/all_7.js | 2 +- docs/tests/search/all_9.js | 22 +- docs/tests/search/all_a.js | 20 +- docs/tests/search/all_b.js | 2 +- docs/tests/search/classes_0.js | 4 +- docs/tests/search/classes_1.js | 2 +- docs/tests/search/classes_2.js | 2 +- docs/tests/search/files_0.js | 6 +- docs/tests/search/files_1.js | 26 +- docs/tests/search/files_2.js | 12 +- docs/tests/search/files_3.js | 4 +- docs/tests/search/files_4.js | 26 +- docs/tests/search/files_5.js | 6 +- docs/tests/search/files_6.js | 2 +- docs/tests/search/files_7.js | 16 +- docs/tests/search/files_8.js | 14 +- docs/tests/search/functions_0.js | 2 +- docs/tests/search/groups_0.js | 4 +- docs/tests/search/groups_1.js | 2 +- docs/tests/search/groups_2.js | 12 +- docs/tests/search/namespaces_0.js | 6 +- docs/tests/search/namespaces_1.js | 2 +- docs/tests/search/pages_0.js | 2 +- docs/tests/search/pages_1.js | 2 +- docs/tests/search/pages_2.js | 2 +- docs/tests/search/pages_3.js | 2 +- docs/tests/search/pages_4.js | 2 +- docs/tests/search/pages_5.js | 2 +- docs/tests/search/variables_0.js | 2 +- docs/tests/sgm03color_8py.html | 2 +- docs/tests/sgm04hsv_8py.html | 2 +- docs/tests/simple01graybox_8py.html | 2 +- docs/tests/simple02magentadot_8py.html | 2 +- docs/tests/simple03magentabag_8py.html | 2 +- docs/todo.html | 10 + docs/toplines_8py.html | 2 +- docs/trackpointer_2README_8md.html | 4 +- docs/trackpointer_2setup_8py.html | 2 +- ...inter_2trackpointer_2____init_____8py.html | 2 +- ...trackpointer_2utils_2____init_____8py.html | 2 +- ...2trackpointer_8egg-info_2SOURCES_8txt.html | 4 +- ...ter_8egg-info_2dependency__links_8txt.html | 4 +- ...trackpointer_8egg-info_2requires_8txt.html | 4 +- ...ackpointer_8egg-info_2top__level_8txt.html | 4 +- docs/transform_8py.html | 27 - docs/transform__mats_8py.html | 27 - docs/triggers_8py.html | 2 +- docs/twoAgent_8py.html | 2 +- docs/vid__compress_8py.html | 2 +- docs/vid__compress__bag_8py.html | 2 +- docs/vid__playback_8py.html | 2 +- docs/vision_8py.html | 2 +- docs/writer_8py.html | 2 +- docs/writer__ros_8py.html | 2 +- 1617 files changed, 9548 insertions(+), 19347 deletions(-) create mode 100644 docs/helper_8py.html create mode 100644 docs/namespaceivapy_1_1helper.html create mode 100644 docs/tests/md__home_mary_python_puzzle_solver_testing_core_README.html create mode 100644 docs/tests/real05sift_8py.html create mode 100644 docs/tests/real06sift_8py.html diff --git a/docs/Base_8py.html b/docs/Base_8py.html index 3513c27c..8eddaadc 100644 --- a/docs/Base_8py.html +++ b/docs/Base_8py.html @@ -1,21 +1,11 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD IVALab Python Libraries: /home/mary/python/Surveillance/Surveillance/deployment/Base.py File Reference -======= - - -IVALab Python Libraries: /home/pvela/python/Surveillance/Surveillance/deployment/Base.py File Reference ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d @@ -40,34 +30,21 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
-<<<<<<< HEAD
/home/mary/python/Surveillance/README.md File Reference
-======= -
/home/pvela/python/Surveillance/README.md File Reference
->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
@@ -98,11 +71,7 @@ diff --git a/docs/Surveillance_2Surveillance_2____init_____8py.html b/docs/Surveillance_2Surveillance_2____init_____8py.html index 689a6dd2..d7d974a3 100644 --- a/docs/Surveillance_2Surveillance_2____init_____8py.html +++ b/docs/Surveillance_2Surveillance_2____init_____8py.html @@ -1,21 +1,11 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD IVALab Python Libraries: /home/mary/python/Surveillance/Surveillance/__init__.py File Reference -======= - - -IVALab Python Libraries: /home/pvela/python/Surveillance/Surveillance/__init__.py File Reference ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d @@ -40,34 +30,21 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
-<<<<<<< HEAD
/home/mary/python/Surveillance/Surveillance/deployment/ROS/README.md File Reference
-======= -
/home/pvela/python/Surveillance/Surveillance/deployment/ROS/README.md File Reference
->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
@@ -98,11 +71,7 @@ diff --git a/docs/Surveillance_2Surveillance_2deployment_2ROS_2____init_____8py.html b/docs/Surveillance_2Surveillance_2deployment_2ROS_2____init_____8py.html index 793902be..a6e89305 100644 --- a/docs/Surveillance_2Surveillance_2deployment_2ROS_2____init_____8py.html +++ b/docs/Surveillance_2Surveillance_2deployment_2ROS_2____init_____8py.html @@ -1,21 +1,11 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD IVALab Python Libraries: /home/mary/python/Surveillance/Surveillance/deployment/ROS/__init__.py File Reference -======= - - -IVALab Python Libraries: /home/pvela/python/Surveillance/Surveillance/deployment/ROS/__init__.py File Reference ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d @@ -40,34 +30,21 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
-<<<<<<< HEAD -======= - - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d @@ -135,11 +107,7 @@ diff --git a/docs/Surveillance_2Surveillance_2layers_2____init_____8py.html b/docs/Surveillance_2Surveillance_2layers_2____init_____8py.html index 863a18b8..1b51a102 100644 --- a/docs/Surveillance_2Surveillance_2layers_2____init_____8py.html +++ b/docs/Surveillance_2Surveillance_2layers_2____init_____8py.html @@ -1,21 +1,11 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD IVALab Python Libraries: /home/mary/python/Surveillance/Surveillance/layers/__init__.py File Reference -======= - - -IVALab Python Libraries: /home/pvela/python/Surveillance/Surveillance/layers/__init__.py File Reference ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d @@ -40,34 +30,21 @@

Functions

def calc_closest_factors (int c)
 
def calc_closest_factors
 
def decimalToBinary (n)
 
def depth_scaled (depth)
-<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
-<<<<<<< HEAD
/home/mary/python/Surveillance/Surveillance.egg-info/SOURCES.txt File Reference
-======= -
/home/pvela/python/Surveillance/Surveillance.egg-info/SOURCES.txt File Reference
->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
@@ -98,11 +71,7 @@ diff --git a/docs/Surveillance_2Surveillance_8egg-info_2dependency__links_8txt.html b/docs/Surveillance_2Surveillance_8egg-info_2dependency__links_8txt.html index d2589898..e4e9a7a3 100644 --- a/docs/Surveillance_2Surveillance_8egg-info_2dependency__links_8txt.html +++ b/docs/Surveillance_2Surveillance_8egg-info_2dependency__links_8txt.html @@ -1,21 +1,11 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD IVALab Python Libraries: /home/mary/python/Surveillance/Surveillance.egg-info/dependency_links.txt File Reference -======= - - -IVALab Python Libraries: /home/pvela/python/Surveillance/Surveillance.egg-info/dependency_links.txt File Reference ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d @@ -40,34 +30,21 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
-<<<<<<< HEAD
/home/mary/python/Surveillance/Surveillance.egg-info/dependency_links.txt File Reference
-======= -
/home/pvela/python/Surveillance/Surveillance.egg-info/dependency_links.txt File Reference
->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
@@ -98,11 +71,7 @@ diff --git a/docs/Surveillance_2Surveillance_8egg-info_2requires_8txt.html b/docs/Surveillance_2Surveillance_8egg-info_2requires_8txt.html index 0bc839bd..cd69f060 100644 --- a/docs/Surveillance_2Surveillance_8egg-info_2requires_8txt.html +++ b/docs/Surveillance_2Surveillance_8egg-info_2requires_8txt.html @@ -1,21 +1,11 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD IVALab Python Libraries: /home/mary/python/Surveillance/Surveillance.egg-info/requires.txt File Reference -======= - - -IVALab Python Libraries: /home/pvela/python/Surveillance/Surveillance.egg-info/requires.txt File Reference ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d @@ -40,34 +30,21 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
-<<<<<<< HEAD
/home/mary/python/Surveillance/Surveillance.egg-info/requires.txt File Reference
-======= -
/home/pvela/python/Surveillance/Surveillance.egg-info/requires.txt File Reference
->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
@@ -98,11 +71,7 @@ diff --git a/docs/Surveillance_2Surveillance_8egg-info_2top__level_8txt.html b/docs/Surveillance_2Surveillance_8egg-info_2top__level_8txt.html index 0a889ac8..28e00749 100644 --- a/docs/Surveillance_2Surveillance_8egg-info_2top__level_8txt.html +++ b/docs/Surveillance_2Surveillance_8egg-info_2top__level_8txt.html @@ -1,21 +1,11 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD IVALab Python Libraries: /home/mary/python/Surveillance/Surveillance.egg-info/top_level.txt File Reference -======= - - -IVALab Python Libraries: /home/pvela/python/Surveillance/Surveillance.egg-info/top_level.txt File Reference ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d @@ -40,34 +30,21 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
-<<<<<<< HEAD
/home/mary/python/Surveillance/Surveillance.egg-info/top_level.txt File Reference
-======= -
/home/pvela/python/Surveillance/Surveillance.egg-info/top_level.txt File Reference
->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
@@ -98,11 +71,7 @@ diff --git a/docs/Surveillance_2setup_8py.html b/docs/Surveillance_2setup_8py.html index d2e6742c..4127d8af 100644 --- a/docs/Surveillance_2setup_8py.html +++ b/docs/Surveillance_2setup_8py.html @@ -1,21 +1,11 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD IVALab Python Libraries: /home/mary/python/Surveillance/setup.py File Reference -======= - - -IVALab Python Libraries: /home/pvela/python/Surveillance/setup.py File Reference ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d @@ -40,34 +30,21 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
Here are the classes, structs, unions and interfaces with brief descriptions:
-
[detail level 1234]
+
[detail level 12345]
@@ -284,126 +284,236 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
 NbyMotionImplements activity detectors based on movement (or lack of)
 CCfgMovingConfiguration setting specifier for "motion" detector
 Cdetector
 NmanagerManage the tracking of puzzle pieces
 Nold_board
 Nold_template
 Nparse
 NparserA basic tracking class that processes a layered image (or mask and image) detection output and generates a model of the puzzle pieces in the scene. Converts all accepted, isolated regions into their own puzzle piece instances
 NpieceClasses for puzzle piece specification or description encapsulation
 Npieces
 Nrunner
 NrunnerROS
 Nsimulator
 Nsolver
 Nutils
 Nparse
 NparserA basic tracking class that processes a layered image (or mask and image) detection output and generates a model of the puzzle pieces in the scene. Converts all accepted, isolated regions into their own puzzle piece instances
 NpieceClasses for puzzle piece specification or description encapsulation
 Npieces
 Nrunner
 NrunnerROS
 Nsimulator
 Nsolver
 Nutils
 Nscripts
 Ntrackpointer
 Ncentroid
 NcentroidMulti
 Ntoplines
 Nutils
 Ntriggers
 CAlwaysClass that always triggers a report
 CBuildCfgTriggerConfiguration instance for building a Trigger
 CCfgDistTriggerConfiguration instance for a Trigger
 CCfgTriggerConfiguration instance for a Trigger
 CFallingClass that triggers a report when binary state changes, on falling edge
 ConChangeClass that triggers a report when the state changes
 ConMatchClass that triggers a report when the state matches a target state
 CRisingClass that triggers a report when binary state changes, on rising edge
 CTriggerBase/abstract trigger class
 CwhenCloseClass that triggers a report when current state is close to target state
 CwhenDiffersClass that triggers a report when current state differs from previous state
 CwhenFarClass that triggers a report when current state is far fromo target state
 CwhenSimilarClass that triggers a report when current state is similar to previous state
 NSurveillance
 Nactivity
 Ndeployment
 Nlayers
 Nutils
 Ntrackpointer
 Ncentroid
 NcentroidMulti
 Ntoplines
 Nutils
 Ntriggers
 CAlwaysClass that always triggers a report
 CBuildCfgTriggerConfiguration instance for building a Trigger
 CCfgDistTriggerConfiguration instance for a Trigger
 CCfgTriggerConfiguration instance for a Trigger
 CFallingClass that triggers a report when binary state changes, on falling edge
 ConChangeClass that triggers a report when the state changes
 ConMatchClass that triggers a report when the state matches a target state
 CRisingClass that triggers a report when binary state changes, on rising edge
 CTriggerBase/abstract trigger class
 CwhenCloseClass that triggers a report when current state is close to target state
 CwhenDiffersClass that triggers a report when current state differs from previous state
 CwhenFarClass that triggers a report when current state is far fromo target state
 CwhenSimilarClass that triggers a report when current state is similar to previous state
diff --git a/docs/appearance_8py.html b/docs/appearance_8py.html index 6028f998..ca7dce0b 100644 --- a/docs/appearance_8py.html +++ b/docs/appearance_8py.html @@ -5,7 +5,7 @@ -IVALab Python Libraries: /home/pvela/python/detector/detector/fgmodel/appearance.py File Reference +IVALab Python Libraries: /home/mary/python/detector/detector/fgmodel/appearance.py File Reference diff --git a/docs/arrangement_8py.html b/docs/arrangement_8py.html index 2d5dfbea..33786c54 100644 --- a/docs/arrangement_8py.html +++ b/docs/arrangement_8py.html @@ -5,7 +5,7 @@ -IVALab Python Libraries: /home/pvela/python/puzzle_solver/puzzle/builder/arrangement.py File Reference +IVALab Python Libraries: /home/mary/python/puzzle_solver/puzzle/builder/arrangement.py File Reference diff --git a/docs/aruco_8py.html b/docs/aruco_8py.html index db305293..2c78020a 100644 --- a/docs/aruco_8py.html +++ b/docs/aruco_8py.html @@ -5,7 +5,7 @@ -IVALab Python Libraries: /home/pvela/python/camera/camera/extrinsic/aruco.py File Reference +IVALab Python Libraries: /home/mary/python/camera/camera/extrinsic/aruco.py File Reference diff --git a/docs/base__bg_8py.html b/docs/base__bg_8py.html index 8c79b2ca..1ddb6624 100644 --- a/docs/base__bg_8py.html +++ b/docs/base__bg_8py.html @@ -1,21 +1,11 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD IVALab Python Libraries: /home/mary/python/Surveillance/Surveillance/layers/base_bg.py File Reference -======= - - -IVALab Python Libraries: /home/pvela/python/Surveillance/Surveillance/layers/base_bg.py File Reference ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d @@ -40,34 +30,21 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
-
/home/pvela/python/camera/README.md File Reference
+
/home/mary/python/camera/README.md File Reference
diff --git a/docs/camera_2camera_2____init_____8py.html b/docs/camera_2camera_2____init_____8py.html index 7c012daf..06359e89 100644 --- a/docs/camera_2camera_2____init_____8py.html +++ b/docs/camera_2camera_2____init_____8py.html @@ -5,7 +5,7 @@ -IVALab Python Libraries: /home/pvela/python/camera/camera/__init__.py File Reference +IVALab Python Libraries: /home/mary/python/camera/camera/__init__.py File Reference diff --git a/docs/camera_2camera_2base_8py.html b/docs/camera_2camera_2base_8py.html index cbbb0a3c..f649e797 100644 --- a/docs/camera_2camera_2base_8py.html +++ b/docs/camera_2camera_2base_8py.html @@ -5,7 +5,7 @@ -IVALab Python Libraries: /home/pvela/python/camera/camera/base.py File Reference +IVALab Python Libraries: /home/mary/python/camera/camera/base.py File Reference diff --git a/docs/camera_2camera_2d435_2____init_____8py.html b/docs/camera_2camera_2d435_2____init_____8py.html index 7240a633..90bd86f5 100644 --- a/docs/camera_2camera_2d435_2____init_____8py.html +++ b/docs/camera_2camera_2d435_2____init_____8py.html @@ -5,7 +5,7 @@ -IVALab Python Libraries: /home/pvela/python/camera/camera/d435/__init__.py File Reference +IVALab Python Libraries: /home/mary/python/camera/camera/d435/__init__.py File Reference diff --git a/docs/camera_2camera_2d435_2runner_8py.html b/docs/camera_2camera_2d435_2runner_8py.html index ed121efe..e802d866 100644 --- a/docs/camera_2camera_2d435_2runner_8py.html +++ b/docs/camera_2camera_2d435_2runner_8py.html @@ -5,7 +5,7 @@ -IVALab Python Libraries: /home/pvela/python/camera/camera/d435/runner.py File Reference +IVALab Python Libraries: /home/mary/python/camera/camera/d435/runner.py File Reference diff --git a/docs/camera_2camera_2extrinsic_2____init_____8py.html b/docs/camera_2camera_2extrinsic_2____init_____8py.html index d7046a3b..13128aad 100644 --- a/docs/camera_2camera_2extrinsic_2____init_____8py.html +++ b/docs/camera_2camera_2extrinsic_2____init_____8py.html @@ -5,7 +5,7 @@ -IVALab Python Libraries: /home/pvela/python/camera/camera/extrinsic/__init__.py File Reference +IVALab Python Libraries: /home/mary/python/camera/camera/extrinsic/__init__.py File Reference diff --git a/docs/camera_2camera_2tabletop_2____init_____8py.html b/docs/camera_2camera_2tabletop_2____init_____8py.html index 01e115a0..af64e016 100644 --- a/docs/camera_2camera_2tabletop_2____init_____8py.html +++ b/docs/camera_2camera_2tabletop_2____init_____8py.html @@ -5,7 +5,7 @@ -IVALab Python Libraries: /home/pvela/python/camera/camera/tabletop/__init__.py File Reference +IVALab Python Libraries: /home/mary/python/camera/camera/tabletop/__init__.py File Reference diff --git a/docs/camera_2camera_2utils_2____init_____8py.html b/docs/camera_2camera_2utils_2____init_____8py.html index 40876f40..2a75572f 100644 --- a/docs/camera_2camera_2utils_2____init_____8py.html +++ b/docs/camera_2camera_2utils_2____init_____8py.html @@ -5,7 +5,7 @@ -IVALab Python Libraries: /home/pvela/python/camera/camera/utils/__init__.py File Reference +IVALab Python Libraries: /home/mary/python/camera/camera/utils/__init__.py File Reference diff --git a/docs/camera_2camera_2utils_2utils_8py.html b/docs/camera_2camera_2utils_2utils_8py.html index 9c0a9d2c..a3aed449 100644 --- a/docs/camera_2camera_2utils_2utils_8py.html +++ b/docs/camera_2camera_2utils_2utils_8py.html @@ -1,21 +1,11 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD IVALab Python Libraries: /home/mary/python/camera/camera/utils/utils.py File Reference -======= - - -IVALab Python Libraries: /home/pvela/python/camera/camera/utils/utils.py File Reference ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d @@ -40,34 +30,21 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
-
/home/pvela/python/camera/scripts/README.md File Reference
+
/home/mary/python/camera/scripts/README.md File Reference
diff --git a/docs/camera_2scripts_2____init_____8py.html b/docs/camera_2scripts_2____init_____8py.html index ea2d6335..044c65d0 100644 --- a/docs/camera_2scripts_2____init_____8py.html +++ b/docs/camera_2scripts_2____init_____8py.html @@ -5,7 +5,7 @@ -IVALab Python Libraries: /home/pvela/python/camera/scripts/__init__.py File Reference +IVALab Python Libraries: /home/mary/python/camera/scripts/__init__.py File Reference diff --git a/docs/camera_2setup_8py.html b/docs/camera_2setup_8py.html index 9f40b37d..fb3945c8 100644 --- a/docs/camera_2setup_8py.html +++ b/docs/camera_2setup_8py.html @@ -5,7 +5,7 @@ -IVALab Python Libraries: /home/pvela/python/camera/setup.py File Reference +IVALab Python Libraries: /home/mary/python/camera/setup.py File Reference diff --git a/docs/centroidMulti_8py.html b/docs/centroidMulti_8py.html index 4a1e7537..f37547fd 100644 --- a/docs/centroidMulti_8py.html +++ b/docs/centroidMulti_8py.html @@ -5,7 +5,7 @@ -IVALab Python Libraries: /home/pvela/python/trackpointer/trackpointer/centroidMulti.py File Reference +IVALab Python Libraries: /home/mary/python/trackpointer/trackpointer/centroidMulti.py File Reference diff --git a/docs/centroid_8py.html b/docs/centroid_8py.html index 81e5dbd3..bad8563b 100644 --- a/docs/centroid_8py.html +++ b/docs/centroid_8py.html @@ -5,7 +5,7 @@ -IVALab Python Libraries: /home/pvela/python/trackpointer/trackpointer/centroid.py File Reference +IVALab Python Libraries: /home/mary/python/trackpointer/trackpointer/centroid.py File Reference diff --git a/docs/channels_8py.html b/docs/channels_8py.html index 78b4a77d..6b596cec 100644 --- a/docs/channels_8py.html +++ b/docs/channels_8py.html @@ -5,7 +5,7 @@ -IVALab Python Libraries: /home/pvela/python/perceiver/perceiver/reports/channels.py File Reference +IVALab Python Libraries: /home/mary/python/perceiver/perceiver/reports/channels.py File Reference diff --git a/docs/classSurveillance_1_1activity_1_1FSM_1_1Pick-members.html b/docs/classSurveillance_1_1activity_1_1FSM_1_1Pick-members.html index ca8d0569..6e32976a 100644 --- a/docs/classSurveillance_1_1activity_1_1FSM_1_1Pick-members.html +++ b/docs/classSurveillance_1_1activity_1_1FSM_1_1Pick-members.html @@ -1,17 +1,9 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d IVALab Python Libraries: Member List @@ -38,34 +30,21 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
Inheritance graph
-<<<<<<< HEAD -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
[legend]
Collaboration diagram for Pick:
Collaboration graph
-<<<<<<< HEAD -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
[legend]

@@ -144,22 +117,14 @@

FSM.py -======= -
  • /home/pvela/python/Surveillance/Surveillance/activity/FSM.py
  • ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d diff --git a/docs/classSurveillance_1_1activity_1_1FSM_1_1Pick__coll__graph.map b/docs/classSurveillance_1_1activity_1_1FSM_1_1Pick__coll__graph.map index 1fa997b8..c01405ca 100644 --- a/docs/classSurveillance_1_1activity_1_1FSM_1_1Pick__coll__graph.map +++ b/docs/classSurveillance_1_1activity_1_1FSM_1_1Pick__coll__graph.map @@ -1,7 +1,4 @@ -<<<<<<< HEAD -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d diff --git a/docs/classSurveillance_1_1activity_1_1FSM_1_1Pick__coll__graph.md5 b/docs/classSurveillance_1_1activity_1_1FSM_1_1Pick__coll__graph.md5 index dadceb3e..7a372401 100644 --- a/docs/classSurveillance_1_1activity_1_1FSM_1_1Pick__coll__graph.md5 +++ b/docs/classSurveillance_1_1activity_1_1FSM_1_1Pick__coll__graph.md5 @@ -1,5 +1 @@ -<<<<<<< HEAD -6399be5b24491fc0d904394c0066ed50 -======= -3b42bd23cd65dde668cc57a6b7282ba0 ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d +6399be5b24491fc0d904394c0066ed50 \ No newline at end of file diff --git a/docs/classSurveillance_1_1activity_1_1FSM_1_1Pick__inherit__graph.map b/docs/classSurveillance_1_1activity_1_1FSM_1_1Pick__inherit__graph.map index 1fa997b8..c01405ca 100644 --- a/docs/classSurveillance_1_1activity_1_1FSM_1_1Pick__inherit__graph.map +++ b/docs/classSurveillance_1_1activity_1_1FSM_1_1Pick__inherit__graph.map @@ -1,7 +1,4 @@ -<<<<<<< HEAD -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d diff --git a/docs/classSurveillance_1_1activity_1_1FSM_1_1Pick__inherit__graph.md5 b/docs/classSurveillance_1_1activity_1_1FSM_1_1Pick__inherit__graph.md5 index ca497491..7a372401 100644 --- a/docs/classSurveillance_1_1activity_1_1FSM_1_1Pick__inherit__graph.md5 +++ b/docs/classSurveillance_1_1activity_1_1FSM_1_1Pick__inherit__graph.md5 @@ -1,5 +1 @@ -<<<<<<< HEAD -6399be5b24491fc0d904394c0066ed50 -======= -57cc406b4edb8ee09070c25a82bd632a ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d +6399be5b24491fc0d904394c0066ed50 \ No newline at end of file diff --git a/docs/classSurveillance_1_1activity_1_1FSM_1_1Place-members.html b/docs/classSurveillance_1_1activity_1_1FSM_1_1Place-members.html index aecf2017..accab324 100644 --- a/docs/classSurveillance_1_1activity_1_1FSM_1_1Place-members.html +++ b/docs/classSurveillance_1_1activity_1_1FSM_1_1Place-members.html @@ -1,17 +1,9 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d IVALab Python Libraries: Member List @@ -38,34 +30,21 @@

    -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
    Inheritance graph
    -<<<<<<< HEAD -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
    [legend]
    Collaboration diagram for Place:
    Collaboration graph
    -<<<<<<< HEAD -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
    [legend]

    @@ -144,22 +117,14 @@

    FSM.py -======= -
  • /home/pvela/python/Surveillance/Surveillance/activity/FSM.py
  • ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d diff --git a/docs/classSurveillance_1_1activity_1_1FSM_1_1Place__coll__graph.map b/docs/classSurveillance_1_1activity_1_1FSM_1_1Place__coll__graph.map index edb8860d..553ce14b 100644 --- a/docs/classSurveillance_1_1activity_1_1FSM_1_1Place__coll__graph.map +++ b/docs/classSurveillance_1_1activity_1_1FSM_1_1Place__coll__graph.map @@ -1,7 +1,4 @@ -<<<<<<< HEAD -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d diff --git a/docs/classSurveillance_1_1activity_1_1FSM_1_1Place__coll__graph.md5 b/docs/classSurveillance_1_1activity_1_1FSM_1_1Place__coll__graph.md5 index 241e241e..1c679cb9 100644 --- a/docs/classSurveillance_1_1activity_1_1FSM_1_1Place__coll__graph.md5 +++ b/docs/classSurveillance_1_1activity_1_1FSM_1_1Place__coll__graph.md5 @@ -1,5 +1 @@ -<<<<<<< HEAD -766c20b68dbabb1ba1e1e66d1fecf3f0 -======= -da3ceafc675d7c87e607acfb25574aee ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d +766c20b68dbabb1ba1e1e66d1fecf3f0 \ No newline at end of file diff --git a/docs/classSurveillance_1_1activity_1_1FSM_1_1Place__inherit__graph.map b/docs/classSurveillance_1_1activity_1_1FSM_1_1Place__inherit__graph.map index edb8860d..553ce14b 100644 --- a/docs/classSurveillance_1_1activity_1_1FSM_1_1Place__inherit__graph.map +++ b/docs/classSurveillance_1_1activity_1_1FSM_1_1Place__inherit__graph.map @@ -1,7 +1,4 @@ -<<<<<<< HEAD -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d diff --git a/docs/classSurveillance_1_1activity_1_1FSM_1_1Place__inherit__graph.md5 b/docs/classSurveillance_1_1activity_1_1FSM_1_1Place__inherit__graph.md5 index fe275353..1c679cb9 100644 --- a/docs/classSurveillance_1_1activity_1_1FSM_1_1Place__inherit__graph.md5 +++ b/docs/classSurveillance_1_1activity_1_1FSM_1_1Place__inherit__graph.md5 @@ -1,5 +1 @@ -<<<<<<< HEAD -766c20b68dbabb1ba1e1e66d1fecf3f0 -======= -fac62990164c739e23d8285020eb3b72 ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d +766c20b68dbabb1ba1e1e66d1fecf3f0 \ No newline at end of file diff --git a/docs/classSurveillance_1_1activity_1_1base_1_1Base-members.html b/docs/classSurveillance_1_1activity_1_1base_1_1Base-members.html index 766147ac..a565a3a6 100644 --- a/docs/classSurveillance_1_1activity_1_1base_1_1Base-members.html +++ b/docs/classSurveillance_1_1activity_1_1base_1_1Base-members.html @@ -1,17 +1,9 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d IVALab Python Libraries: Member List @@ -38,34 +30,21 @@

    -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
    Inheritance graph
    -<<<<<<< HEAD -======= - - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
    [legend]
    Collaboration diagram for Base:
    Collaboration graph
    -<<<<<<< HEAD -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
    [legend]

    @@ -291,22 +262,14 @@

    base.py -======= -
  • /home/pvela/python/Surveillance/Surveillance/activity/base.py
  • ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d diff --git a/docs/classSurveillance_1_1activity_1_1base_1_1Base__coll__graph.map b/docs/classSurveillance_1_1activity_1_1base_1_1Base__coll__graph.map index d3b67d25..be78e7aa 100644 --- a/docs/classSurveillance_1_1activity_1_1base_1_1Base__coll__graph.map +++ b/docs/classSurveillance_1_1activity_1_1base_1_1Base__coll__graph.map @@ -1,7 +1,4 @@ -<<<<<<< HEAD -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d diff --git a/docs/classSurveillance_1_1activity_1_1base_1_1Base__coll__graph.md5 b/docs/classSurveillance_1_1activity_1_1base_1_1Base__coll__graph.md5 index 4ab8d978..e78eaf1d 100644 --- a/docs/classSurveillance_1_1activity_1_1base_1_1Base__coll__graph.md5 +++ b/docs/classSurveillance_1_1activity_1_1base_1_1Base__coll__graph.md5 @@ -1,5 +1 @@ -<<<<<<< HEAD -877fd71e5dae78bfc0d022221be4b93b -======= -601fd80a1f952715b6bdd069021a5cfd ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d +877fd71e5dae78bfc0d022221be4b93b \ No newline at end of file diff --git a/docs/classSurveillance_1_1activity_1_1base_1_1Base__inherit__graph.map b/docs/classSurveillance_1_1activity_1_1base_1_1Base__inherit__graph.map index 42de12d1..5fd33594 100644 --- a/docs/classSurveillance_1_1activity_1_1base_1_1Base__inherit__graph.map +++ b/docs/classSurveillance_1_1activity_1_1base_1_1Base__inherit__graph.map @@ -1,11 +1,6 @@ -<<<<<<< HEAD -======= - - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d diff --git a/docs/classSurveillance_1_1activity_1_1base_1_1Base__inherit__graph.md5 b/docs/classSurveillance_1_1activity_1_1base_1_1Base__inherit__graph.md5 index 2c141e93..e1c2fc75 100644 --- a/docs/classSurveillance_1_1activity_1_1base_1_1Base__inherit__graph.md5 +++ b/docs/classSurveillance_1_1activity_1_1base_1_1Base__inherit__graph.md5 @@ -1,5 +1 @@ -<<<<<<< HEAD -80c923ab4d5daa3af70f926b26d2652a -======= -efe8b8884afc7e4689e7b0d5180516be ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d +80c923ab4d5daa3af70f926b26d2652a \ No newline at end of file diff --git a/docs/classSurveillance_1_1activity_1_1state_1_1Base__state-members.html b/docs/classSurveillance_1_1activity_1_1state_1_1Base__state-members.html index 8a98205b..ee9f2196 100644 --- a/docs/classSurveillance_1_1activity_1_1state_1_1Base__state-members.html +++ b/docs/classSurveillance_1_1activity_1_1state_1_1Base__state-members.html @@ -1,17 +1,9 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d IVALab Python Libraries: Member List @@ -38,34 +30,21 @@

    -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
    correct(self)Base f_idxBase_state get_states(self)Base_state -<<<<<<< HEAD measure(self, List cur_signals)Base_state Surveillance::activity::base::Base.measure(self, signal)Base parse(self, cur_signals)Base_state @@ -119,35 +97,12 @@ update(self, cur_signals, cur_states)Base_state visualize_state_evolving(self, fh=None)Base_state xBase -======= - measureBase_state - parse(self, cur_signals)Base_state - predict(self)Base - process(self, signal)Base - signal_cache_countBase_state - signal_cache_limitBase_state - signal_namesBase_state - signal_numberBase_state - signals_cacheBase_state - state_cache_countBase_state - state_cache_limitBase_state - state_namesBase_state - state_numberBase_state - states_cacheBase_state - update(self, cur_signals, cur_states)Base_state - visualize_state_evolving(self, fh=None)Base_state - xBase ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
    diff --git a/docs/classSurveillance_1_1activity_1_1state_1_1Base__state.html b/docs/classSurveillance_1_1activity_1_1state_1_1Base__state.html index 6c25e8c5..73c3e384 100644 --- a/docs/classSurveillance_1_1activity_1_1state_1_1Base__state.html +++ b/docs/classSurveillance_1_1activity_1_1state_1_1Base__state.html @@ -1,17 +1,9 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d IVALab Python Libraries: Base_state Class Reference @@ -38,34 +30,21 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
    Inheritance graph
    -<<<<<<< HEAD -======= - - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
    [legend]
    @@ -116,13 +90,9 @@
    Collaboration graph
    -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
    [legend]
    @@ -132,13 +102,8 @@ -<<<<<<< HEAD -======= - - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d @@ -280,13 +245,8 @@

    ◆ measure()

    -======= - -

    ◆ measure()

    ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
    @@ -300,11 +260,7 @@

    -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d @@ -314,14 +270,10 @@

    -<<<<<<< HEAD
    The workflow of the signal2state 
     
     @param[in]  cur_signals.            An array of the signals, each element of which represents the new income of different signal types
     
    -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
    @@ -577,22 +529,14 @@

    state.py -======= -
  • /home/pvela/python/Surveillance/Surveillance/activity/state.py
  • ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d diff --git a/docs/classSurveillance_1_1activity_1_1state_1_1Base__state__coll__graph.map b/docs/classSurveillance_1_1activity_1_1state_1_1Base__state__coll__graph.map index 68046412..9db06c5c 100644 --- a/docs/classSurveillance_1_1activity_1_1state_1_1Base__state__coll__graph.map +++ b/docs/classSurveillance_1_1activity_1_1state_1_1Base__state__coll__graph.map @@ -1,9 +1,5 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d diff --git a/docs/classSurveillance_1_1activity_1_1state_1_1Base__state__coll__graph.md5 b/docs/classSurveillance_1_1activity_1_1state_1_1Base__state__coll__graph.md5 index ed629024..96dfe84a 100644 --- a/docs/classSurveillance_1_1activity_1_1state_1_1Base__state__coll__graph.md5 +++ b/docs/classSurveillance_1_1activity_1_1state_1_1Base__state__coll__graph.md5 @@ -1,5 +1 @@ -<<<<<<< HEAD -14a1ce6786e620b31360c1e14b6264d2 -======= -5a77c89ffec1c9aac5d0331bfc8e716b ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d +14a1ce6786e620b31360c1e14b6264d2 \ No newline at end of file diff --git a/docs/classSurveillance_1_1activity_1_1state_1_1Base__state__inherit__graph.map b/docs/classSurveillance_1_1activity_1_1state_1_1Base__state__inherit__graph.map index 0a5edf6b..f18d6645 100644 --- a/docs/classSurveillance_1_1activity_1_1state_1_1Base__state__inherit__graph.map +++ b/docs/classSurveillance_1_1activity_1_1state_1_1Base__state__inherit__graph.map @@ -1,11 +1,6 @@ -<<<<<<< HEAD -======= - - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d diff --git a/docs/classSurveillance_1_1activity_1_1state_1_1Base__state__inherit__graph.md5 b/docs/classSurveillance_1_1activity_1_1state_1_1Base__state__inherit__graph.md5 index fc80af45..5a583e0d 100644 --- a/docs/classSurveillance_1_1activity_1_1state_1_1Base__state__inherit__graph.md5 +++ b/docs/classSurveillance_1_1activity_1_1state_1_1Base__state__inherit__graph.md5 @@ -1,5 +1 @@ -<<<<<<< HEAD -e6ff28acb1a8551594978cacdd996219 -======= -bbcdbf1a4a0b5a4da2d7ef3e89c0c95c ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d +e6ff28acb1a8551594978cacdd996219 \ No newline at end of file diff --git a/docs/classSurveillance_1_1activity_1_1state_1_1StateEstimator-members.html b/docs/classSurveillance_1_1activity_1_1state_1_1StateEstimator-members.html index 8104a804..8a1c0e17 100644 --- a/docs/classSurveillance_1_1activity_1_1state_1_1StateEstimator-members.html +++ b/docs/classSurveillance_1_1activity_1_1state_1_1StateEstimator-members.html @@ -1,17 +1,9 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d IVALab Python Libraries: Member List @@ -38,34 +30,21 @@

     
    def get_states (self)
     
    def measure (self, List cur_signals)
     
    def measure
     
    def parse (self, cur_signals)
     
    def update (self, cur_signals, cur_states)
    List  cur_signals 
    -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
    This is the complete list of members for StateEstimator, including all inherited members.

    -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d @@ -106,17 +81,11 @@ -<<<<<<< HEAD -======= - - - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d @@ -143,11 +112,7 @@ diff --git a/docs/classSurveillance_1_1activity_1_1state_1_1StateEstimator.html b/docs/classSurveillance_1_1activity_1_1state_1_1StateEstimator.html index 15bb79de..a3726d09 100644 --- a/docs/classSurveillance_1_1activity_1_1state_1_1StateEstimator.html +++ b/docs/classSurveillance_1_1activity_1_1state_1_1StateEstimator.html @@ -1,17 +1,9 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d IVALab Python Libraries: StateEstimator Class Reference @@ -38,34 +30,21 @@
    __init__(self, signal_number, signal_cache_limit=1000, state_cache_limit=1000, signal_names=[], state_number=3, state_names=["Move", "Progress_Made", "Puzzle_in_Hand"], move_th=2, hand_track_color=[255, 0, 0], state_text_color=[255, 0, 0])StateEstimator
    __init__(self, signal_number, signal_cache_limit=1000, state_cache_limit=1000, signal_names=[], state_number=3, state_names=["Move", Progress_Made, Puzzle_in_Hand, move_th=2, hand_track_color=[255, state_text_color=[255)StateEstimator
    Surveillance::activity::state::Base_state.__init__(self, signal_number, state_number, signal_cache_limit=1000, state_cache_limit=1000, signal_names=[], state_names=[])Base_state
    Surveillance::activity::base::Base.__init__(self)Base
    adapt(self)Base
    f_idxBase_state
    get_states(self)Base_state
    hand_track_colorStateEstimator
    measure(self, List cur_signals)Base_state
    Surveillance::activity::base::Base.measure(self, signal)Base
    move_thStateEstimator
    parse(self, List cur_signals)StateEstimator
    Surveillance::activity::state::Base_state.parse(self, cur_signals)Base_state
    measureBase_state
    move_thStateEstimator
    parseStateEstimator
    parse_move(self, cur_signals)StateEstimator
    parse_PinH(self, cur_signals)StateEstimator
    parse_progress(self, cur_signals)StateEstimator
    -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
    Inheritance graph
    -<<<<<<< HEAD -======= - - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
    [legend]
    @@ -116,31 +90,19 @@
    Collaboration graph
    -<<<<<<< HEAD -======= - - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
    [legend]
    -<<<<<<< HEAD -======= - - - - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d @@ -156,13 +118,8 @@ -<<<<<<< HEAD -======= - - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d @@ -230,13 +187,8 @@ 3. Piece in hand For now allow customization for the signals and the states used for the development purpose

    Constructor & Destructor Documentation

    -<<<<<<< HEAD

    ◆ __init__()

    -======= - -

    ◆ __init__()

    ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
    @@ -281,23 +233,7 @@

    -<<<<<<< HEAD -======= - - - - - - - - - - - - - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d @@ -309,21 +245,13 @@

    -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d @@ -336,13 +264,8 @@

    Member Function Documentation

    -<<<<<<< HEAD

    ◆ parse()

    -======= - -

    ◆ parse()

    ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
    @@ -356,11 +279,7 @@

    -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d @@ -370,7 +289,6 @@

    -<<<<<<< HEAD
    Parse the states out of the signals
     
     Args:
    @@ -382,9 +300,6 @@ 

    @@ -610,22 +525,14 @@

    state.py -======= -
  • /home/pvela/python/Surveillance/Surveillance/activity/state.py
  • ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d diff --git a/docs/classSurveillance_1_1activity_1_1state_1_1StateEstimator__coll__graph.map b/docs/classSurveillance_1_1activity_1_1state_1_1StateEstimator__coll__graph.map index b42a7142..cc265c7a 100644 --- a/docs/classSurveillance_1_1activity_1_1state_1_1StateEstimator__coll__graph.map +++ b/docs/classSurveillance_1_1activity_1_1state_1_1StateEstimator__coll__graph.map @@ -1,11 +1,6 @@ -<<<<<<< HEAD -======= - - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d diff --git a/docs/classSurveillance_1_1activity_1_1state_1_1StateEstimator__coll__graph.md5 b/docs/classSurveillance_1_1activity_1_1state_1_1StateEstimator__coll__graph.md5 index 191a5ccd..f53bcb2b 100644 --- a/docs/classSurveillance_1_1activity_1_1state_1_1StateEstimator__coll__graph.md5 +++ b/docs/classSurveillance_1_1activity_1_1state_1_1StateEstimator__coll__graph.md5 @@ -1,5 +1 @@ -<<<<<<< HEAD -bd79f81974813c5f99a0e4d6ccb7ff4a -======= -bcf2dda8afd2d3c7743d7bbdc329aa2e ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d +bd79f81974813c5f99a0e4d6ccb7ff4a \ No newline at end of file diff --git a/docs/classSurveillance_1_1activity_1_1state_1_1StateEstimator__inherit__graph.map b/docs/classSurveillance_1_1activity_1_1state_1_1StateEstimator__inherit__graph.map index b42a7142..cc265c7a 100644 --- a/docs/classSurveillance_1_1activity_1_1state_1_1StateEstimator__inherit__graph.map +++ b/docs/classSurveillance_1_1activity_1_1state_1_1StateEstimator__inherit__graph.map @@ -1,11 +1,6 @@ -<<<<<<< HEAD -======= - - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d diff --git a/docs/classSurveillance_1_1activity_1_1state_1_1StateEstimator__inherit__graph.md5 b/docs/classSurveillance_1_1activity_1_1state_1_1StateEstimator__inherit__graph.md5 index 46a7c1fd..f53bcb2b 100644 --- a/docs/classSurveillance_1_1activity_1_1state_1_1StateEstimator__inherit__graph.md5 +++ b/docs/classSurveillance_1_1activity_1_1state_1_1StateEstimator__inherit__graph.md5 @@ -1,5 +1 @@ -<<<<<<< HEAD -bd79f81974813c5f99a0e4d6ccb7ff4a -======= -df16402ab6942cccf9070b42a76f5f9e ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d +bd79f81974813c5f99a0e4d6ccb7ff4a \ No newline at end of file diff --git a/docs/classSurveillance_1_1activity_1_1utils_1_1DynamicDisplay-members.html b/docs/classSurveillance_1_1activity_1_1utils_1_1DynamicDisplay-members.html index 2ffb8417..9d02a786 100644 --- a/docs/classSurveillance_1_1activity_1_1utils_1_1DynamicDisplay-members.html +++ b/docs/classSurveillance_1_1activity_1_1utils_1_1DynamicDisplay-members.html @@ -1,17 +1,9 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d IVALab Python Libraries: Member List @@ -38,34 +30,21 @@

    Public Member Functions

    def __init__ (self, signal_number, signal_cache_limit=1000, state_cache_limit=1000, signal_names=[], state_number=3, state_names=["Move", "Progress_Made", "Puzzle_in_Hand"], move_th=2, hand_track_color=[255, 0, 0], state_text_color=[255, 0, 0])
     
    def parse (self, List cur_signals)
     
    def __init__ (self, signal_number, signal_cache_limit=1000, state_cache_limit=1000, signal_names=[], state_number=3, state_names=["Move", Progress_Made, Puzzle_in_Hand, move_th=2, hand_track_color=[255, state_text_color=[255)
     
    def parse
     
    def parse_move (self, cur_signals)
     
    def parse_PinH (self, cur_signals)
     
    def get_states (self)
     
    def measure (self, List cur_signals)
     
    def measure
     
    def parse (self, cur_signals)
     
    def update (self, cur_signals, cur_states)
     state_names = ["Move", "Progress_Made", "Puzzle_in_Hand"], state_names = ["Move",
     Progress_Made,
     Puzzle_in_Hand,
     hand_track_color = [255, 0, 0], hand_track_color = [255,
     state_text_color = [255, 0, 0] state_text_color = [255 
    List  cur_signals 
    -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
    utils.py -======= -
  • /home/pvela/python/Surveillance/Surveillance/activity/utils.py
  • ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
    diff --git a/docs/classSurveillance_1_1activity_1_1utils_1_1ParamDynamicDisplay-members.html b/docs/classSurveillance_1_1activity_1_1utils_1_1ParamDynamicDisplay-members.html index b1638b87..c4c9dce1 100644 --- a/docs/classSurveillance_1_1activity_1_1utils_1_1ParamDynamicDisplay-members.html +++ b/docs/classSurveillance_1_1activity_1_1utils_1_1ParamDynamicDisplay-members.html @@ -1,17 +1,9 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d IVALab Python Libraries: Member List @@ -38,34 +30,21 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
    utils.py -======= -
  • /home/pvela/python/Surveillance/Surveillance/activity/utils.py
  • ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
    diff --git a/docs/classSurveillance_1_1deployment_1_1Base_1_1BaseSurveillanceDeploy-members.html b/docs/classSurveillance_1_1deployment_1_1Base_1_1BaseSurveillanceDeploy-members.html index 5c4c32af..be0e8689 100644 --- a/docs/classSurveillance_1_1deployment_1_1Base_1_1BaseSurveillanceDeploy-members.html +++ b/docs/classSurveillance_1_1deployment_1_1Base_1_1BaseSurveillanceDeploy-members.html @@ -1,17 +1,9 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d IVALab Python Libraries: Member List @@ -38,34 +30,21 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
    This is the complete list of members for BaseSurveillanceDeploy, including all inherited members.

    -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - - - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d @@ -152,11 +121,7 @@ diff --git a/docs/classSurveillance_1_1deployment_1_1Base_1_1BaseSurveillanceDeploy.html b/docs/classSurveillance_1_1deployment_1_1Base_1_1BaseSurveillanceDeploy.html index b0fba01b..4d1f54db 100644 --- a/docs/classSurveillance_1_1deployment_1_1Base_1_1BaseSurveillanceDeploy.html +++ b/docs/classSurveillance_1_1deployment_1_1Base_1_1BaseSurveillanceDeploy.html @@ -1,17 +1,9 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d IVALab Python Libraries: BaseSurveillanceDeploy Class Reference @@ -38,34 +30,21 @@
    __init__(self, imgSource, intrinsic, scene.SceneInterpreterV1 scene_interpreter, M_WtoC, M_WtoR=M_WtoR, Params params=Params())BaseSurveillanceDeploy
    __init__BaseSurveillanceDeploy
    act_codebookBaseSurveillanceDeploy
    act_mark_cacheBaseSurveillanceDeploy
    act_mark_pubBaseSurveillanceDeploy
    BEV_matBaseSurveillanceDeploy
    build(Params params=Params())BaseSurveillanceDeploystatic
    buildFromRosbag(bag_path, Params params)BaseSurveillanceDeploystatic
    buildPub(Params params=Params(), bag_path=None)BaseSurveillanceDeploystatic
    buildBaseSurveillanceDeploystatic
    buildFromRosbagBaseSurveillanceDeploystatic
    buildPubBaseSurveillanceDeploystatic
    depth_scaleBaseSurveillanceDeploy
    hTrackerBaseSurveillanceDeploy
    humanAndhumanImgBaseSurveillanceDeploy
    -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d

    Public Member Functions

    -<<<<<<< HEAD None __init__ (self, imgSource, intrinsic, scene.SceneInterpreterV1 scene_interpreter, M_WtoC, M_WtoR=M_WtoR, Params params=Params())   -======= -def __init__ -  ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d def measure (self, rgb, dep)   def postprocess (self, rgb, dep) @@ -131,7 +105,6 @@ -<<<<<<< HEAD @@ -140,14 +113,6 @@ -======= - - - - - - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d

    Static Public Member Functions

    def build (Params params=Params())
     
    def buildFromRosbag (bag_path, Params params)
    def buildPub (Params params=Params(), bag_path=None)
     Builder for publishing the calibration data to ROS. More...
     
    def build
     
    def buildFromRosbag
     
    def buildPub
     
    @@ -234,23 +199,14 @@ system on the connected camera. The parameter instance params default to Params() if not provided.

    Constructor & Destructor Documentation

    -<<<<<<< HEAD

    ◆ __init__()

    -======= - -

    ◆ __init__()

    ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d

    Public Attributes

    -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d @@ -270,7 +226,6 @@

    -<<<<<<< HEAD @@ -291,10 +246,6 @@

    Params  

    -======= - - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d @@ -307,13 +258,8 @@

    Member Function Documentation

    -<<<<<<< HEAD

    ◆ build()

    -======= - -

    ◆ build()

    ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
    @@ -324,13 +270,8 @@

    def build

    -<<<<<<< HEAD -======= - - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
    None __init__ def __init__ (   self, scene.SceneInterpreterV1  scene_interpreter,
    params = Params()  scene_interpreter 
    (Params   params = Params()) params)
    @@ -340,7 +281,6 @@

    -<<<<<<< HEAD
    Builder for saving the calibration data in the local cache folder.
     
     NOTE: This function is not maintained, might contain bugs, and might be removed in the future. 
    @@ -357,13 +297,6 @@ 

    ◆ buildFromRosbag()

    -======= - -

    - - -

    ◆ buildFromRosbag()

    ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
    @@ -380,11 +313,7 @@

    -<<<<<<< HEAD Params  -======= -   ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d params  @@ -400,7 +329,6 @@

    -<<<<<<< HEAD

    Build the deployment runner instance from a store ROS bag.

    Parameters
    @@ -415,12 +343,6 @@

    ◆ buildPub()

    -======= - - - -

    ◆ buildPub()

    ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
    @@ -431,7 +353,6 @@

    def buildPub

    -<<<<<<< HEAD @@ -445,11 +366,6 @@

      -

    - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
    (Params   params = Params(),
    params)
    @@ -459,13 +375,10 @@

    -<<<<<<< HEAD

    Builder for publishing the calibration data to ROS.

    Args: params (Params, optional): The deployment parameters. Defaults to Params(). If params.reCalibrate is False, then will read the rosbag files for the calibration data to build the system, then run on the camera data bag_path (str): The rosbag file path. Necessary if the params.reCalibrate is False. Defaults to None

    Returns: type: description

    -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d

    @@ -1172,22 +1085,14 @@

    Base.py -======= -
  • /home/pvela/python/Surveillance/Surveillance/deployment/Base.py
  • ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d diff --git a/docs/classSurveillance_1_1deployment_1_1Base_1_1Params-members.html b/docs/classSurveillance_1_1deployment_1_1Base_1_1Params-members.html index 287c96b1..445ab776 100644 --- a/docs/classSurveillance_1_1deployment_1_1Base_1_1Params-members.html +++ b/docs/classSurveillance_1_1deployment_1_1Base_1_1Params-members.html @@ -1,17 +1,9 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d IVALab Python Libraries: Member List @@ -38,34 +30,21 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
     int    str -<<<<<<< HEAD  The calibration topics deployment - camera info. More...
    -======= - The calibration topics deployment - camera info. More...
    ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d  

    Member Function Documentation

    @@ -323,22 +298,14 @@

    Base.py -======= -
  • /home/pvela/python/Surveillance/Surveillance/deployment/Base.py
  • ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d

    diff --git a/docs/classSurveillance_1_1deployment_1_1ROS_1_1rosbag__runner_1_1ImageListener-members.html b/docs/classSurveillance_1_1deployment_1_1ROS_1_1rosbag__runner_1_1ImageListener-members.html index 088765b9..8a52af0c 100644 --- a/docs/classSurveillance_1_1deployment_1_1ROS_1_1rosbag__runner_1_1ImageListener-members.html +++ b/docs/classSurveillance_1_1deployment_1_1ROS_1_1rosbag__runner_1_1ImageListener-members.html @@ -1,17 +1,9 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d IVALab Python Libraries: Member List @@ -38,34 +30,21 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
    rosbag_runner.py -======= -
  • /home/pvela/python/Surveillance/Surveillance/deployment/ROS/rosbag_runner.py
  • ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
    diff --git a/docs/classSurveillance_1_1deployment_1_1activity__record_1_1ActDecoder-members.html b/docs/classSurveillance_1_1deployment_1_1activity__record_1_1ActDecoder-members.html index 73b1208e..f64bd58f 100644 --- a/docs/classSurveillance_1_1deployment_1_1activity__record_1_1ActDecoder-members.html +++ b/docs/classSurveillance_1_1deployment_1_1activity__record_1_1ActDecoder-members.html @@ -1,17 +1,9 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d IVALab Python Libraries: Member List @@ -38,34 +30,21 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
    This is the complete list of members for ActDecoder, including all inherited members.

    -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d @@ -110,11 +85,7 @@ diff --git a/docs/classSurveillance_1_1deployment_1_1activity__record_1_1ActDecoder.html b/docs/classSurveillance_1_1deployment_1_1activity__record_1_1ActDecoder.html index 1d7bdff1..586e2740 100644 --- a/docs/classSurveillance_1_1deployment_1_1activity__record_1_1ActDecoder.html +++ b/docs/classSurveillance_1_1deployment_1_1activity__record_1_1ActDecoder.html @@ -1,17 +1,9 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d IVALab Python Libraries: ActDecoder Class Reference @@ -38,34 +30,21 @@
    __init__(self)ActDecoder
    __init__(self)ActDecoder
    act_codebookActDecoder
    activityActDecoder
    decode(self, key)ActDecoder
    -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d

    Public Member Functions

    -<<<<<<< HEAD None __init__ (self)   -======= -def __init__ (self) -  ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d def decode (self, key)   def get_activity (self) @@ -126,41 +100,18 @@  

    Constructor & Destructor Documentation

    -<<<<<<< HEAD

    ◆ __init__()

    -======= - -

    ◆ __init__()

    ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
    -<<<<<<< HEAD -======= - - - - - - - - - - - - - - - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
    None __init__ (   self) def __init__ ( self,
     None 
    )
    @@ -280,22 +231,14 @@

    activity_record.py -======= -
  • /home/pvela/python/Surveillance/Surveillance/deployment/activity_record.py
  • ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d

    diff --git a/docs/classSurveillance_1_1layers_1_1BlackWorkMat_1_1Calibrator-members.html b/docs/classSurveillance_1_1layers_1_1BlackWorkMat_1_1Calibrator-members.html index 5703cb7f..edd2d7dd 100644 --- a/docs/classSurveillance_1_1layers_1_1BlackWorkMat_1_1Calibrator-members.html +++ b/docs/classSurveillance_1_1layers_1_1BlackWorkMat_1_1Calibrator-members.html @@ -1,17 +1,9 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d IVALab Python Libraries: Member List @@ -38,34 +30,21 @@
    -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
    Inheritance graph
    -<<<<<<< HEAD -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
    [legend]
    Collaboration diagram for Calibrator:
    Collaboration graph
    -<<<<<<< HEAD -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
    [legend]
    -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d @@ -137,11 +106,7 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d @@ -149,11 +114,7 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d

    Public Member Functions

    def __init__ (self, processors=None, detModel=None)
     Constructor for black workspace mat detector. More...
     Constructor for black workspace mat detector. More...
     
    def display_cv (self, I, ratio=None, window_name="foreground objects")
     
    def measure (self, I)
     
    def saveTo (self, fPtr)
     Save results of calibration to HDF5 file. More...
     Save results of calibration to HDF5 file. More...
     
    def setMask (self, theMask)
     

    Static Public Member Functions

    def buildCalibratedFromImage (theData, isRGBD=False)
     def saveConfig(self, outFile): pass More...
     def saveConfig(self, outFile): pass More...
     

    @@ -427,22 +388,14 @@

    BlackWorkMat.py -======= -
  • /home/pvela/python/Surveillance/Surveillance/layers/BlackWorkMat.py
  • ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d diff --git a/docs/classSurveillance_1_1layers_1_1BlackWorkMat_1_1Calibrator__coll__graph.map b/docs/classSurveillance_1_1layers_1_1BlackWorkMat_1_1Calibrator__coll__graph.map index 82b07f89..2d00699f 100644 --- a/docs/classSurveillance_1_1layers_1_1BlackWorkMat_1_1Calibrator__coll__graph.map +++ b/docs/classSurveillance_1_1layers_1_1BlackWorkMat_1_1Calibrator__coll__graph.map @@ -1,7 +1,4 @@ -<<<<<<< HEAD -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d diff --git a/docs/classSurveillance_1_1layers_1_1BlackWorkMat_1_1Calibrator__coll__graph.md5 b/docs/classSurveillance_1_1layers_1_1BlackWorkMat_1_1Calibrator__coll__graph.md5 index 0573e192..b5d299d5 100644 --- a/docs/classSurveillance_1_1layers_1_1BlackWorkMat_1_1Calibrator__coll__graph.md5 +++ b/docs/classSurveillance_1_1layers_1_1BlackWorkMat_1_1Calibrator__coll__graph.md5 @@ -1,5 +1 @@ -<<<<<<< HEAD -144221a7c8abdf8ec07ee7d53f266573 -======= -aa48f91a6bc4d1e53df5e4b48dacaab7 ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d +144221a7c8abdf8ec07ee7d53f266573 \ No newline at end of file diff --git a/docs/classSurveillance_1_1layers_1_1BlackWorkMat_1_1Calibrator__inherit__graph.map b/docs/classSurveillance_1_1layers_1_1BlackWorkMat_1_1Calibrator__inherit__graph.map index 82b07f89..2d00699f 100644 --- a/docs/classSurveillance_1_1layers_1_1BlackWorkMat_1_1Calibrator__inherit__graph.map +++ b/docs/classSurveillance_1_1layers_1_1BlackWorkMat_1_1Calibrator__inherit__graph.map @@ -1,7 +1,4 @@ -<<<<<<< HEAD -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d diff --git a/docs/classSurveillance_1_1layers_1_1BlackWorkMat_1_1Calibrator__inherit__graph.md5 b/docs/classSurveillance_1_1layers_1_1BlackWorkMat_1_1Calibrator__inherit__graph.md5 index 5c4547a5..b5d299d5 100644 --- a/docs/classSurveillance_1_1layers_1_1BlackWorkMat_1_1Calibrator__inherit__graph.md5 +++ b/docs/classSurveillance_1_1layers_1_1BlackWorkMat_1_1Calibrator__inherit__graph.md5 @@ -1,5 +1 @@ -<<<<<<< HEAD -144221a7c8abdf8ec07ee7d53f266573 -======= -bc40b0cb898faeeaebfe5de2b05038b7 ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d +144221a7c8abdf8ec07ee7d53f266573 \ No newline at end of file diff --git a/docs/classSurveillance_1_1layers_1_1BlackWorkMat_1_1CfgDetector-members.html b/docs/classSurveillance_1_1layers_1_1BlackWorkMat_1_1CfgDetector-members.html index a2d9ccc9..e0aa69e5 100644 --- a/docs/classSurveillance_1_1layers_1_1BlackWorkMat_1_1CfgDetector-members.html +++ b/docs/classSurveillance_1_1layers_1_1BlackWorkMat_1_1CfgDetector-members.html @@ -1,17 +1,9 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d IVALab Python Libraries: Member List @@ -38,34 +30,21 @@

    -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
    Inheritance graph
    -<<<<<<< HEAD -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
    [legend]
    Collaboration diagram for CfgDetector:
    Collaboration graph
    -<<<<<<< HEAD -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
    [legend]
    -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d

    Public Member Functions

    def __init__ (self, init_dict=None, key_list=None, new_allowed=True)
     Instantiate a puzzle scene (black mat) detector. More...
     Instantiate a puzzle scene (black mat) detector. More...
     

    @@ -140,11 +109,8 @@

    Detailed Description

    Configuration instance for glove tracking detector.

    -<<<<<<< HEAD


    -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d

    Constructor & Destructor Documentation

    ◆ __init__()

    @@ -215,22 +181,14 @@

    BlackWorkMat.py -======= -
  • /home/pvela/python/Surveillance/Surveillance/layers/BlackWorkMat.py
  • ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d

    diff --git a/docs/classSurveillance_1_1layers_1_1BlackWorkMat_1_1CfgDetector__coll__graph.map b/docs/classSurveillance_1_1layers_1_1BlackWorkMat_1_1CfgDetector__coll__graph.map index ae4f96af..dddc3d6c 100644 --- a/docs/classSurveillance_1_1layers_1_1BlackWorkMat_1_1CfgDetector__coll__graph.map +++ b/docs/classSurveillance_1_1layers_1_1BlackWorkMat_1_1CfgDetector__coll__graph.map @@ -1,7 +1,4 @@ -<<<<<<< HEAD -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d diff --git a/docs/classSurveillance_1_1layers_1_1BlackWorkMat_1_1CfgDetector__coll__graph.md5 b/docs/classSurveillance_1_1layers_1_1BlackWorkMat_1_1CfgDetector__coll__graph.md5 index cd13df3a..b139471b 100644 --- a/docs/classSurveillance_1_1layers_1_1BlackWorkMat_1_1CfgDetector__coll__graph.md5 +++ b/docs/classSurveillance_1_1layers_1_1BlackWorkMat_1_1CfgDetector__coll__graph.md5 @@ -1,5 +1 @@ -<<<<<<< HEAD -438c37937908865e6fae26aa86aceeb7 -======= -536ad93cf695210cd3eac41db1dfadad ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d +438c37937908865e6fae26aa86aceeb7 \ No newline at end of file diff --git a/docs/classSurveillance_1_1layers_1_1BlackWorkMat_1_1CfgDetector__inherit__graph.map b/docs/classSurveillance_1_1layers_1_1BlackWorkMat_1_1CfgDetector__inherit__graph.map index ae4f96af..dddc3d6c 100644 --- a/docs/classSurveillance_1_1layers_1_1BlackWorkMat_1_1CfgDetector__inherit__graph.map +++ b/docs/classSurveillance_1_1layers_1_1BlackWorkMat_1_1CfgDetector__inherit__graph.map @@ -1,7 +1,4 @@ -<<<<<<< HEAD -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d diff --git a/docs/classSurveillance_1_1layers_1_1BlackWorkMat_1_1CfgDetector__inherit__graph.md5 b/docs/classSurveillance_1_1layers_1_1BlackWorkMat_1_1CfgDetector__inherit__graph.md5 index f5716174..b139471b 100644 --- a/docs/classSurveillance_1_1layers_1_1BlackWorkMat_1_1CfgDetector__inherit__graph.md5 +++ b/docs/classSurveillance_1_1layers_1_1BlackWorkMat_1_1CfgDetector__inherit__graph.md5 @@ -1,5 +1 @@ -<<<<<<< HEAD -438c37937908865e6fae26aa86aceeb7 -======= -8abd1249ad5447b644b6b37cfbb3cc37 ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d +438c37937908865e6fae26aa86aceeb7 \ No newline at end of file diff --git a/docs/classSurveillance_1_1layers_1_1BlackWorkMat_1_1CfgPuzzlePerceiver-members.html b/docs/classSurveillance_1_1layers_1_1BlackWorkMat_1_1CfgPuzzlePerceiver-members.html index c357ceac..9969cd3e 100644 --- a/docs/classSurveillance_1_1layers_1_1BlackWorkMat_1_1CfgPuzzlePerceiver-members.html +++ b/docs/classSurveillance_1_1layers_1_1BlackWorkMat_1_1CfgPuzzlePerceiver-members.html @@ -1,17 +1,9 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d IVALab Python Libraries: Member List @@ -38,34 +30,21 @@
    -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
    Inheritance graph
    -<<<<<<< HEAD -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
    [legend]
    Collaboration diagram for CfgPuzzlePerceiver:
    Collaboration graph
    -<<<<<<< HEAD -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
    [legend]
    -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d

    Public Member Functions

    def __init__ (self, init_dict=None, key_list=None, new_allowed=True)
     Instantiate a puzzle scene configuration object. More...
     Instantiate a puzzle scene configuration object. More...
     

    Detailed Description

    @@ -179,22 +148,14 @@

    BlackWorkMat.py -======= -
  • /home/pvela/python/Surveillance/Surveillance/layers/BlackWorkMat.py
  • ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d

    diff --git a/docs/classSurveillance_1_1layers_1_1BlackWorkMat_1_1CfgPuzzlePerceiver__coll__graph.map b/docs/classSurveillance_1_1layers_1_1BlackWorkMat_1_1CfgPuzzlePerceiver__coll__graph.map index fd08b72c..c891d490 100644 --- a/docs/classSurveillance_1_1layers_1_1BlackWorkMat_1_1CfgPuzzlePerceiver__coll__graph.map +++ b/docs/classSurveillance_1_1layers_1_1BlackWorkMat_1_1CfgPuzzlePerceiver__coll__graph.map @@ -1,7 +1,4 @@ -<<<<<<< HEAD -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d diff --git a/docs/classSurveillance_1_1layers_1_1BlackWorkMat_1_1CfgPuzzlePerceiver__coll__graph.md5 b/docs/classSurveillance_1_1layers_1_1BlackWorkMat_1_1CfgPuzzlePerceiver__coll__graph.md5 index 858ea722..5804a310 100644 --- a/docs/classSurveillance_1_1layers_1_1BlackWorkMat_1_1CfgPuzzlePerceiver__coll__graph.md5 +++ b/docs/classSurveillance_1_1layers_1_1BlackWorkMat_1_1CfgPuzzlePerceiver__coll__graph.md5 @@ -1,5 +1 @@ -<<<<<<< HEAD -021ea124e2086c93ef769997d17e491f -======= -40911b1869fa066638547e5b7ea4a805 ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d +021ea124e2086c93ef769997d17e491f \ No newline at end of file diff --git a/docs/classSurveillance_1_1layers_1_1BlackWorkMat_1_1CfgPuzzlePerceiver__inherit__graph.map b/docs/classSurveillance_1_1layers_1_1BlackWorkMat_1_1CfgPuzzlePerceiver__inherit__graph.map index fd08b72c..c891d490 100644 --- a/docs/classSurveillance_1_1layers_1_1BlackWorkMat_1_1CfgPuzzlePerceiver__inherit__graph.map +++ b/docs/classSurveillance_1_1layers_1_1BlackWorkMat_1_1CfgPuzzlePerceiver__inherit__graph.map @@ -1,7 +1,4 @@ -<<<<<<< HEAD -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d diff --git a/docs/classSurveillance_1_1layers_1_1BlackWorkMat_1_1CfgPuzzlePerceiver__inherit__graph.md5 b/docs/classSurveillance_1_1layers_1_1BlackWorkMat_1_1CfgPuzzlePerceiver__inherit__graph.md5 index e087a364..5804a310 100644 --- a/docs/classSurveillance_1_1layers_1_1BlackWorkMat_1_1CfgPuzzlePerceiver__inherit__graph.md5 +++ b/docs/classSurveillance_1_1layers_1_1BlackWorkMat_1_1CfgPuzzlePerceiver__inherit__graph.md5 @@ -1,5 +1 @@ -<<<<<<< HEAD -021ea124e2086c93ef769997d17e491f -======= -7f70d371d78a543a21fb29a867e7de5a ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d +021ea124e2086c93ef769997d17e491f \ No newline at end of file diff --git a/docs/classSurveillance_1_1layers_1_1BlackWorkMat_1_1Detector-members.html b/docs/classSurveillance_1_1layers_1_1BlackWorkMat_1_1Detector-members.html index 7ed2ec02..fe2b44e0 100644 --- a/docs/classSurveillance_1_1layers_1_1BlackWorkMat_1_1Detector-members.html +++ b/docs/classSurveillance_1_1layers_1_1BlackWorkMat_1_1Detector-members.html @@ -1,17 +1,9 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d IVALab Python Libraries: Member List @@ -38,34 +30,21 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
    Inheritance graph
    -<<<<<<< HEAD -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
    [legend]
    Collaboration diagram for Detector:
    Collaboration graph
    -<<<<<<< HEAD -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
    [legend]
    -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d @@ -148,11 +113,7 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d @@ -160,11 +121,7 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d @@ -560,22 +517,14 @@

    BlackWorkMat.py -======= -
  • /home/pvela/python/Surveillance/Surveillance/layers/BlackWorkMat.py
  • ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d diff --git a/docs/classSurveillance_1_1layers_1_1BlackWorkMat_1_1Detector__coll__graph.map b/docs/classSurveillance_1_1layers_1_1BlackWorkMat_1_1Detector__coll__graph.map index 63f2d1d7..616757a6 100644 --- a/docs/classSurveillance_1_1layers_1_1BlackWorkMat_1_1Detector__coll__graph.map +++ b/docs/classSurveillance_1_1layers_1_1BlackWorkMat_1_1Detector__coll__graph.map @@ -1,7 +1,4 @@ -<<<<<<< HEAD -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d diff --git a/docs/classSurveillance_1_1layers_1_1BlackWorkMat_1_1Detector__coll__graph.md5 b/docs/classSurveillance_1_1layers_1_1BlackWorkMat_1_1Detector__coll__graph.md5 index 04add6bc..fa407230 100644 --- a/docs/classSurveillance_1_1layers_1_1BlackWorkMat_1_1Detector__coll__graph.md5 +++ b/docs/classSurveillance_1_1layers_1_1BlackWorkMat_1_1Detector__coll__graph.md5 @@ -1,5 +1 @@ -<<<<<<< HEAD -f0a1fe0a466f4d9df986926fed8dfed2 -======= -eb40e474230ce42e44c23774dfbb1516 ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d +f0a1fe0a466f4d9df986926fed8dfed2 \ No newline at end of file diff --git a/docs/classSurveillance_1_1layers_1_1BlackWorkMat_1_1Detector__inherit__graph.map b/docs/classSurveillance_1_1layers_1_1BlackWorkMat_1_1Detector__inherit__graph.map index 63f2d1d7..616757a6 100644 --- a/docs/classSurveillance_1_1layers_1_1BlackWorkMat_1_1Detector__inherit__graph.map +++ b/docs/classSurveillance_1_1layers_1_1BlackWorkMat_1_1Detector__inherit__graph.map @@ -1,7 +1,4 @@ -<<<<<<< HEAD -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d diff --git a/docs/classSurveillance_1_1layers_1_1BlackWorkMat_1_1Detector__inherit__graph.md5 b/docs/classSurveillance_1_1layers_1_1BlackWorkMat_1_1Detector__inherit__graph.md5 index 72bbb6b4..fa407230 100644 --- a/docs/classSurveillance_1_1layers_1_1BlackWorkMat_1_1Detector__inherit__graph.md5 +++ b/docs/classSurveillance_1_1layers_1_1BlackWorkMat_1_1Detector__inherit__graph.md5 @@ -1,5 +1 @@ -<<<<<<< HEAD -f0a1fe0a466f4d9df986926fed8dfed2 -======= -98771e8bb5193074ee7dea6e7d47ecbc ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d +f0a1fe0a466f4d9df986926fed8dfed2 \ No newline at end of file diff --git a/docs/classSurveillance_1_1layers_1_1BlackWorkMat_1_1InstPuzzlePerceiver.html b/docs/classSurveillance_1_1layers_1_1BlackWorkMat_1_1InstPuzzlePerceiver.html index ea359571..66c1623d 100644 --- a/docs/classSurveillance_1_1layers_1_1BlackWorkMat_1_1InstPuzzlePerceiver.html +++ b/docs/classSurveillance_1_1layers_1_1BlackWorkMat_1_1InstPuzzlePerceiver.html @@ -1,17 +1,9 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d IVALab Python Libraries: InstPuzzlePerceiver Class Reference @@ -38,34 +30,21 @@

    Public Member Functions

    def __init__ (self, processors=None, bgMod=None)
     Constructor for layered puzzle scene detector. More...
     Constructor for layered puzzle scene detector. More...
     
    def display_cv (self, I, ratio=None, window_name="foreground objects")
     
    def getState (self)
     Get the complete detector state, which involves the states of the individual layer detectors. More...
     Get the complete detector state, which involves the states of the individual layer detectors. More...
     
    def info (self)
     
    def measure (self, I)
     
    def saveTo (self, fPtr)
     Save the instantiated Detector to given HDF5 file. More...
     Save the instantiated Detector to given HDF5 file. More...
     
    def setMask (self, theMask)
     

    Static Public Member Functions

    def buildFromCfg (theConfig, processor=None)
     Build an inCorner instance from an algorithm configuration instance. More...
     Build an inCorner instance from an algorithm configuration instance. More...
     
    def calibrate2config (theStream, outFile, isRGBD=False)
     
    -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d

    Class for collecting visual processing methods needed by the Puzzle pieces perceiver.

    It only works to capture the puzzle pieces and assumes there are no distractor objects.


    The documentation for this class was generated from the following file:
      -<<<<<<< HEAD
    • /home/mary/python/Surveillance/Surveillance/layers/BlackWorkMat.py
    • -======= -
    • /home/pvela/python/Surveillance/Surveillance/layers/BlackWorkMat.py
    • ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
    diff --git a/docs/classSurveillance_1_1layers_1_1BlackWorkMat_1_1PuzzlePerceiver-members.html b/docs/classSurveillance_1_1layers_1_1BlackWorkMat_1_1PuzzlePerceiver-members.html index f537a50d..10f1a08d 100644 --- a/docs/classSurveillance_1_1layers_1_1BlackWorkMat_1_1PuzzlePerceiver-members.html +++ b/docs/classSurveillance_1_1layers_1_1BlackWorkMat_1_1PuzzlePerceiver-members.html @@ -1,17 +1,9 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d IVALab Python Libraries: Member List @@ -38,34 +30,21 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
    Inheritance graph
    -<<<<<<< HEAD -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
    [legend]
    Collaboration diagram for PuzzlePerceiver:
    Collaboration graph
    -<<<<<<< HEAD -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
    [legend]
    -<<<<<<< HEAD -======= - - - - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD @@ -151,28 +116,12 @@ -======= - - - - - - - - - - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d

    @@ -125,22 +98,14 @@

    def __init__ (self, perCfg=None, perInst=None)
     
    def adapt (self)
     Adapt parts of the process based on measurements and corrections. More...
     
    def correct (self)
     Correct the estimated state based on measured and predicted. More...
     Adapt parts of the process based on measurements and corrections. More...
     
    def correct (self)
     Correct the estimated state based on measured and predicted. More...
     
    def display_cv (self, I, ratio=None, window_name="puzzle pieces")
     
    def emptyState (self)
     Return state structure with no information. More...
     
    def getState (self)
     
    def predict (self)
     Predict next measurement, if applicable. More...
     Return state structure with no information. More...
     
    def getState (self)
     Returns the current state structure. More...
     
    def measure (self, I)
     Recover track point or track frame based on detector + trackPointer output. More...
     
    def predict (self)
     Predict next measurement, if applicable. More...
     
    -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d

    Static Public Member Functions

    def buildWithBasicTracker (buildConfig)
     Given a stored detector configuration, build out a puzzle perceiver with multi-centroid tracking. More...
     Given a stored detector configuration, build out a puzzle perceiver with multi-centroid tracking. More...
     

    Constructor & Destructor Documentation

    @@ -421,27 +370,19 @@

    Todo:
    Later on, there should be a code review and some unification of code and intent should be done.
    +
    Todo:
    Later on, there should be a code review and some unification of code and intent should be done.


    The documentation for this class was generated from the following file:
      -<<<<<<< HEAD
    • /home/mary/python/Surveillance/Surveillance/layers/BlackWorkMat.py
    • -======= -
    • /home/pvela/python/Surveillance/Surveillance/layers/BlackWorkMat.py
    • ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
    diff --git a/docs/classSurveillance_1_1layers_1_1BlackWorkMat_1_1PuzzlePerceiver__coll__graph.map b/docs/classSurveillance_1_1layers_1_1BlackWorkMat_1_1PuzzlePerceiver__coll__graph.map index 08a84497..8f274dd0 100644 --- a/docs/classSurveillance_1_1layers_1_1BlackWorkMat_1_1PuzzlePerceiver__coll__graph.map +++ b/docs/classSurveillance_1_1layers_1_1BlackWorkMat_1_1PuzzlePerceiver__coll__graph.map @@ -1,7 +1,4 @@ -<<<<<<< HEAD -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d diff --git a/docs/classSurveillance_1_1layers_1_1BlackWorkMat_1_1PuzzlePerceiver__coll__graph.md5 b/docs/classSurveillance_1_1layers_1_1BlackWorkMat_1_1PuzzlePerceiver__coll__graph.md5 index b2d410b5..44fe36a0 100644 --- a/docs/classSurveillance_1_1layers_1_1BlackWorkMat_1_1PuzzlePerceiver__coll__graph.md5 +++ b/docs/classSurveillance_1_1layers_1_1BlackWorkMat_1_1PuzzlePerceiver__coll__graph.md5 @@ -1,5 +1 @@ -<<<<<<< HEAD -b521f8f4fcc2048fbe573b4254c34257 -======= -815af7c09eed70fcce97aac53dacb4fd ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d +b521f8f4fcc2048fbe573b4254c34257 \ No newline at end of file diff --git a/docs/classSurveillance_1_1layers_1_1BlackWorkMat_1_1PuzzlePerceiver__inherit__graph.map b/docs/classSurveillance_1_1layers_1_1BlackWorkMat_1_1PuzzlePerceiver__inherit__graph.map index 08a84497..8f274dd0 100644 --- a/docs/classSurveillance_1_1layers_1_1BlackWorkMat_1_1PuzzlePerceiver__inherit__graph.map +++ b/docs/classSurveillance_1_1layers_1_1BlackWorkMat_1_1PuzzlePerceiver__inherit__graph.map @@ -1,7 +1,4 @@ -<<<<<<< HEAD -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d diff --git a/docs/classSurveillance_1_1layers_1_1BlackWorkMat_1_1PuzzlePerceiver__inherit__graph.md5 b/docs/classSurveillance_1_1layers_1_1BlackWorkMat_1_1PuzzlePerceiver__inherit__graph.md5 index 1dd4ae69..44fe36a0 100644 --- a/docs/classSurveillance_1_1layers_1_1BlackWorkMat_1_1PuzzlePerceiver__inherit__graph.md5 +++ b/docs/classSurveillance_1_1layers_1_1BlackWorkMat_1_1PuzzlePerceiver__inherit__graph.md5 @@ -1,5 +1 @@ -<<<<<<< HEAD -b521f8f4fcc2048fbe573b4254c34257 -======= -34565f6e94d5ec67ad72d62eda7c1cb2 ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d +b521f8f4fcc2048fbe573b4254c34257 \ No newline at end of file diff --git a/docs/classSurveillance_1_1layers_1_1GloveByColor_1_1CalibGloveByColor-members.html b/docs/classSurveillance_1_1layers_1_1GloveByColor_1_1CalibGloveByColor-members.html index 2d104713..b1122095 100644 --- a/docs/classSurveillance_1_1layers_1_1GloveByColor_1_1CalibGloveByColor-members.html +++ b/docs/classSurveillance_1_1layers_1_1GloveByColor_1_1CalibGloveByColor-members.html @@ -1,17 +1,9 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d IVALab Python Libraries: Member List @@ -38,34 +30,21 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
    Inheritance graph
    -<<<<<<< HEAD -======= - - - - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
    [legend]
    @@ -120,26 +92,18 @@
    Collaboration graph
    -<<<<<<< HEAD -======= - - - - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
    [legend]
    -<<<<<<< HEAD @@ -174,44 +138,10 @@ -======= - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD @@ -230,102 +160,6 @@ -======= - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d

    Public Member Functions

    def __init__ (self, detCfg=None, detInst=None, processors=None)
     Constructor for layered puzzle scene detector. More...
     
    def adapt (self)
     
    def process (self, I)
     Apply entire predict to adapt process to source image. More...
     Constructor for layered puzzle scene detector. More...
     
    def adapt (self)
     Adapt the layer detection models. More...
     
    def correct (self)
     Apply correction process to the individual detectors. More...
     
    def detect (self, I)
     Apply predict, measure, correct process to source image. More...
     
    def emptyDebug (self)
     
    def emptyState (self)
     Get and empty state to recover its basic structure. More...
     
    def getDebug (self)
     
    def getState (self)
     Get the complete detector state, which involves the states of the individual layer detectors. More...
     
    def info (self)
     
    def measure (self, I)
     Apply detection to the source image pass. More...
     
    def predict (self)
     Generate prediction of expected measurement. More...
     
    def process (self, I)
     Apply entire predict to adapt process to source image. More...
     
    def saveConfig (self, outFile)
     
    def saveTo (self, fPtr)
     Save the instantiated Detector to given HDF5 file. More...
     
    - Public Member Functions inherited from GloveByColor
    def save (self, fileName)
     Outer method for saving to a file given as a string. More...
     
     
    - Public Member Functions inherited from GloveByColor
    def __init__ (self, detCfg=None, detInst=None, processors=None)
     Constructor for layered puzzle scene detector. More...
     
    def adapt (self)
     Adapt the layer detection models. More...
     
    def correct (self)
     Apply correction process to the individual detectors. More...
     
    def detect (self, I)
     Apply predict, measure, correct process to source image. More...
     
    def emptyDebug (self)
     
    def emptyState (self)
     Get and empty state to recover its basic structure. More...
     
    def getDebug (self)
     
    def getState (self)
     Get the complete detector state, which involves the states of the individual layer detectors. More...
     
    def info (self)
     
    def load (inFile)
     
    def loadFrom (fPtr)
     
    def measure (self, I)
     Apply detection to the source image pass. More...
     
    def predict (self)
     Generate prediction of expected measurement. More...
     
    def process (self, I)
     Apply entire predict to adapt process to source image. More...
     
    def saveTo (self, fPtr)
     Save the instantiated Detector to given HDF5 file. More...
     
    - Public Member Functions inherited from fgImage
    def __init__ (self, processor=None)
     
    - Public Member Functions inherited from inImage
    def __init__ (self, processor=None)
     
    def info (self)
     Provide information about the current class implementation. More...
     
    def measure (self, I)
     Generate detection measurements from image input. More...
     
    - Public Member Functions inherited from Base
    def __init__ (self)
     Instantiate a detector Base activity class object. More...
     
    def adapt (self)
     Adapt any internal parameters based on activity state, signal, and any other historical information. More...
     
    def correct (self)
     Reconcile prediction and measurement as fitting. More...
     
    def detect (self, signal)
     Run detection only processing pipeline (no adaptation). More...
     
    def emptyDebug (self)
     Return empty debug state information. More...
     
    def emptyState (self)
     Return empty state. More...
     
    def getDebug (self)
     Return current/latest debug state information. More...
     
    def getState (self)
     Return current/latest state. More...
     
    def measure (self, signal)
     Generate measurement of activity state from passed signal. More...
     
    def predict (self)
     Predict next state from current state. More...
     
    def process (self, signal)
     Process the new incoming signal on full detection pipeline. More...
     
    def save (self, fileName)
     Outer method for saving to a file given as a string. More...
     
    def saveTo (self, fPtr)
     Empty method for saving internal information to HDF5 file. More...
     
    @@ -362,12 +196,6 @@ -<<<<<<< HEAD -======= - - - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d

    Public Attributes

    def load (fileName, relpath=None)
     Outer method for loading file given as a string (with path). More...
     
    def loadFrom (fPtr)
     Empty method for loading internal information from HDF5 file. More...
     

    Constructor & Destructor Documentation

    @@ -418,11 +246,8 @@

    GloveByColor.

    -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d

    Member Function Documentation

    @@ -445,11 +270,8 @@

    GloveByColor.

    -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d @@ -469,14 +291,10 @@

    Apply correction process to the individual detectors.

    -<<<<<<< HEAD

    Apply naive correction on a per detector basis. As a layered system, there might be interdependencies that would impact the correction step. Ignoring that for now since it does not immediately come to mind what needs to be done.

    Reimplemented from GloveByColor.

    -======= -

    Apply naive correction on a per detector basis. As a layered system, there might be interdependencies that would impact the correction step. Ignoring that for now since it does not immediately come to mind what needs to be done.

    ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d @@ -515,11 +333,8 @@

    GloveByColor.

    -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d @@ -538,14 +353,11 @@

    -<<<<<<< HEAD

    Return empty debug state information.

    Useful if contents needed beforehand.

    Reimplemented from GloveByColor.

    -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d @@ -572,11 +384,8 @@

    GloveByColor.

    -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d @@ -595,14 +404,11 @@

    -<<<<<<< HEAD

    Return current/latest debug state information.

    Usually the debug state consists of internally computed information that is useful for debugging purposes and can help to isolate problems within the implemented class or with downstream processing that may rely on assumptions built into this implemented class.

    Reimplemented from GloveByColor.

    -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d @@ -629,11 +435,8 @@

    GloveByColor.

    -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d @@ -652,14 +455,11 @@

    -<<<<<<< HEAD

    Provide information about the current class implementation.

    Exists for reproducibility purposes. Usually stores the factory information used to build the current class instance.

    Reimplemented from GloveByColor.

    -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d @@ -696,11 +496,8 @@

    GloveByColor.

    -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d @@ -722,11 +519,8 @@

    GloveByColor.

    -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d @@ -763,11 +557,8 @@

    GloveByColor.

    -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d @@ -824,7 +615,6 @@

    -<<<<<<< HEAD

    Save the instantiated Detector to given HDF5 file.

    The save to function writes the necessary information to re-instantiate a Detectors class object to the passed HDF5 file pointer/instance.

    Parameters
    @@ -836,8 +626,6 @@

    GloveByColor.

    -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d

    Member Data Documentation

    @@ -856,22 +644,14 @@

    GloveByColor.py -======= -
  • /home/pvela/python/Surveillance/Surveillance/layers/GloveByColor.py
  • ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d diff --git a/docs/classSurveillance_1_1layers_1_1GloveByColor_1_1CalibGloveByColor__coll__graph.map b/docs/classSurveillance_1_1layers_1_1GloveByColor_1_1CalibGloveByColor__coll__graph.map index 3c207bb2..f9943c21 100644 --- a/docs/classSurveillance_1_1layers_1_1GloveByColor_1_1CalibGloveByColor__coll__graph.map +++ b/docs/classSurveillance_1_1layers_1_1GloveByColor_1_1CalibGloveByColor__coll__graph.map @@ -1,15 +1,8 @@ -<<<<<<< HEAD -======= - - - - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d diff --git a/docs/classSurveillance_1_1layers_1_1GloveByColor_1_1CalibGloveByColor__coll__graph.md5 b/docs/classSurveillance_1_1layers_1_1GloveByColor_1_1CalibGloveByColor__coll__graph.md5 index 106bd8a6..a43e850b 100644 --- a/docs/classSurveillance_1_1layers_1_1GloveByColor_1_1CalibGloveByColor__coll__graph.md5 +++ b/docs/classSurveillance_1_1layers_1_1GloveByColor_1_1CalibGloveByColor__coll__graph.md5 @@ -1,5 +1 @@ -<<<<<<< HEAD -8fadb0630b95f38ab128801ee94c4832 -======= -67a5d7106d27135097d59bbd92184d36 ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d +8fadb0630b95f38ab128801ee94c4832 \ No newline at end of file diff --git a/docs/classSurveillance_1_1layers_1_1GloveByColor_1_1CalibGloveByColor__inherit__graph.map b/docs/classSurveillance_1_1layers_1_1GloveByColor_1_1CalibGloveByColor__inherit__graph.map index 3c207bb2..f9943c21 100644 --- a/docs/classSurveillance_1_1layers_1_1GloveByColor_1_1CalibGloveByColor__inherit__graph.map +++ b/docs/classSurveillance_1_1layers_1_1GloveByColor_1_1CalibGloveByColor__inherit__graph.map @@ -1,15 +1,8 @@ -<<<<<<< HEAD -======= - - - - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d diff --git a/docs/classSurveillance_1_1layers_1_1GloveByColor_1_1CalibGloveByColor__inherit__graph.md5 b/docs/classSurveillance_1_1layers_1_1GloveByColor_1_1CalibGloveByColor__inherit__graph.md5 index 1812ef51..a43e850b 100644 --- a/docs/classSurveillance_1_1layers_1_1GloveByColor_1_1CalibGloveByColor__inherit__graph.md5 +++ b/docs/classSurveillance_1_1layers_1_1GloveByColor_1_1CalibGloveByColor__inherit__graph.md5 @@ -1,5 +1 @@ -<<<<<<< HEAD -8fadb0630b95f38ab128801ee94c4832 -======= -9b63fb23d48b600b9790190838c712af ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d +8fadb0630b95f38ab128801ee94c4832 \ No newline at end of file diff --git a/docs/classSurveillance_1_1layers_1_1GloveByColor_1_1CfgGloveDetector-members.html b/docs/classSurveillance_1_1layers_1_1GloveByColor_1_1CfgGloveDetector-members.html index c22131c5..746cdeee 100644 --- a/docs/classSurveillance_1_1layers_1_1GloveByColor_1_1CfgGloveDetector-members.html +++ b/docs/classSurveillance_1_1layers_1_1GloveByColor_1_1CfgGloveDetector-members.html @@ -1,17 +1,9 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d IVALab Python Libraries: Member List @@ -38,34 +30,21 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
    This is the complete list of members for CfgGloveDetector, including all inherited members.

    -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
    __init__(self, init_dict=None, key_list=None, new_allowed=True)CfgGloveDetector
    dump(self, **kwargs)AlgConfig
    dump(self, kwargs)AlgConfig
    get_default_settings()CfgGloveDetectorstatic
    gloveCfgGloveDetector
    @@ -107,11 +82,7 @@ diff --git a/docs/classSurveillance_1_1layers_1_1GloveByColor_1_1CfgGloveDetector.html b/docs/classSurveillance_1_1layers_1_1GloveByColor_1_1CfgGloveDetector.html index 47149586..db3b6e59 100644 --- a/docs/classSurveillance_1_1layers_1_1GloveByColor_1_1CfgGloveDetector.html +++ b/docs/classSurveillance_1_1layers_1_1GloveByColor_1_1CfgGloveDetector.html @@ -1,17 +1,9 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d IVALab Python Libraries: CfgGloveDetector Class Reference @@ -38,34 +30,21 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
    Inheritance graph
    -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
    [legend]
    @@ -118,34 +93,20 @@
    Collaboration graph
    -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
    [legend]
    -<<<<<<< HEAD -======= - - - - - - - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d

    Public Member Functions

    def __init__ (self, init_dict=None, key_list=None, new_allowed=True)
     Instantiate a puzzle scene configuration object. More...
     
    - Public Member Functions inherited from AlgConfig
    def dump (self, **kwargs)
     
     Instantiate a puzzle scene configuration object. More...
     
    - Public Member Functions inherited from AlgConfig
    def __init__ (self, init_dict=None, key_list=None, new_allowed=True)
     
    def dump (self, kwargs)
     
    @@ -201,11 +162,8 @@

    AlgConfig.

    -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d

    Member Function Documentation

    @@ -250,22 +208,14 @@

    GloveByColor.py -======= -
  • /home/pvela/python/Surveillance/Surveillance/layers/GloveByColor.py
  • ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d diff --git a/docs/classSurveillance_1_1layers_1_1GloveByColor_1_1CfgGloveDetector__coll__graph.map b/docs/classSurveillance_1_1layers_1_1GloveByColor_1_1CfgGloveDetector__coll__graph.map index bd12baff..acf6582c 100644 --- a/docs/classSurveillance_1_1layers_1_1GloveByColor_1_1CfgGloveDetector__coll__graph.map +++ b/docs/classSurveillance_1_1layers_1_1GloveByColor_1_1CfgGloveDetector__coll__graph.map @@ -1,9 +1,5 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d diff --git a/docs/classSurveillance_1_1layers_1_1GloveByColor_1_1CfgGloveDetector__coll__graph.md5 b/docs/classSurveillance_1_1layers_1_1GloveByColor_1_1CfgGloveDetector__coll__graph.md5 index 538a725a..a9b25180 100644 --- a/docs/classSurveillance_1_1layers_1_1GloveByColor_1_1CfgGloveDetector__coll__graph.md5 +++ b/docs/classSurveillance_1_1layers_1_1GloveByColor_1_1CfgGloveDetector__coll__graph.md5 @@ -1,5 +1 @@ -<<<<<<< HEAD -c9af91feda7fa0ffd3bea6cdfbe2e344 -======= -3ddc5f9678796cdd4286d1e5f30e5eec ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d +c9af91feda7fa0ffd3bea6cdfbe2e344 \ No newline at end of file diff --git a/docs/classSurveillance_1_1layers_1_1GloveByColor_1_1CfgGloveDetector__inherit__graph.map b/docs/classSurveillance_1_1layers_1_1GloveByColor_1_1CfgGloveDetector__inherit__graph.map index bd12baff..acf6582c 100644 --- a/docs/classSurveillance_1_1layers_1_1GloveByColor_1_1CfgGloveDetector__inherit__graph.map +++ b/docs/classSurveillance_1_1layers_1_1GloveByColor_1_1CfgGloveDetector__inherit__graph.map @@ -1,9 +1,5 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d diff --git a/docs/classSurveillance_1_1layers_1_1GloveByColor_1_1CfgGloveDetector__inherit__graph.md5 b/docs/classSurveillance_1_1layers_1_1GloveByColor_1_1CfgGloveDetector__inherit__graph.md5 index ca70f7a6..a9b25180 100644 --- a/docs/classSurveillance_1_1layers_1_1GloveByColor_1_1CfgGloveDetector__inherit__graph.md5 +++ b/docs/classSurveillance_1_1layers_1_1GloveByColor_1_1CfgGloveDetector__inherit__graph.md5 @@ -1,5 +1 @@ -<<<<<<< HEAD -c9af91feda7fa0ffd3bea6cdfbe2e344 -======= -5d2b80efd4f7ceb2306a6919aba4032c ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d +c9af91feda7fa0ffd3bea6cdfbe2e344 \ No newline at end of file diff --git a/docs/classSurveillance_1_1layers_1_1GloveByColor_1_1DetectorState-members.html b/docs/classSurveillance_1_1layers_1_1GloveByColor_1_1DetectorState-members.html index e8fa5618..cb5d42d1 100644 --- a/docs/classSurveillance_1_1layers_1_1GloveByColor_1_1DetectorState-members.html +++ b/docs/classSurveillance_1_1layers_1_1GloveByColor_1_1DetectorState-members.html @@ -1,17 +1,9 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d IVALab Python Libraries: Member List @@ -38,34 +30,21 @@

    Static Public Member Functions

    -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
    GloveByColor.py -======= -
  • /home/pvela/python/Surveillance/Surveillance/layers/GloveByColor.py
  • ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
    diff --git a/docs/classSurveillance_1_1layers_1_1GloveByColor_1_1GloveByColor-members.html b/docs/classSurveillance_1_1layers_1_1GloveByColor_1_1GloveByColor-members.html index 70984f4f..bda5765b 100644 --- a/docs/classSurveillance_1_1layers_1_1GloveByColor_1_1GloveByColor-members.html +++ b/docs/classSurveillance_1_1layers_1_1GloveByColor_1_1GloveByColor-members.html @@ -1,17 +1,9 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d IVALab Python Libraries: Member List @@ -38,34 +30,21 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
    Inheritance graph
    -<<<<<<< HEAD -======= - - - - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
    [legend]
    @@ -124,24 +96,17 @@
    Collaboration graph
    -<<<<<<< HEAD -======= - - - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
    [legend]
    -<<<<<<< HEAD @@ -167,35 +132,10 @@ -======= - - - - - - - - - - - - - - - - - - - - - - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD @@ -209,25 +149,10 @@ -======= - - - - - - - - - - - - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD @@ -235,66 +160,11 @@ -======= - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d

    Public Member Functions

    def __init__ (self, detCfg=None, detInst=None, processors=None)
     Constructor for layered puzzle scene detector. More...
     
    def adapt (self)
     
    def info (self)
     Provide information about the current class implementation. More...
     Constructor for layered puzzle scene detector. More...
     
    def adapt (self)
     Adapt the layer detection models. More...
     
    def correct (self)
     Apply correction process to the individual detectors. More...
     
    def detect (self, I)
     Apply predict, measure, correct process to source image. More...
     
    def emptyDebug (self)
     
    def emptyState (self)
     Get and empty state to recover its basic structure. More...
     
    def getDebug (self)
     
    def getState (self)
     Get the complete detector state, which involves the states of the individual layer detectors. More...
     
    def info (self)
     
    def load (inFile)
     
    def loadFrom (fPtr)
     Empty method for loading internal information from HDF5 file. More...
     
    def measure (self, I)
     
    def saveTo (self, fPtr)
     Save the instantiated Detector to given HDF5 file. More...
     
    def measure (self, I)
     Apply detection to the source image pass. More...
     
    def predict (self)
     Generate prediction of expected measurement. More...
     
    def process (self, I)
     Apply entire predict to adapt process to source image. More...
     
    def saveTo (self, fPtr)
     Save the instantiated Detector to given HDF5 file. More...
     
    - Public Member Functions inherited from fgImage
    def __init__ (self, processor=None)
     
    - Public Member Functions inherited from Base
    def __init__ (self)
     Instantiate a detector Base activity class object. More...
    def save (self, fileName)
     Outer method for saving to a file given as a string. More...
     
    - Public Member Functions inherited from inImage
    def __init__ (self, processor=None)
     
    def info (self)
     Provide information about the current class implementation. More...
     
    def measure (self, I)
     Generate detection measurements from image input. More...
     
    - Public Member Functions inherited from Base
    def __init__ (self)
     Instantiate a detector Base activity class object. More...
     
    def adapt (self)
     Adapt any internal parameters based on activity state, signal, and any other historical information. More...
     
    def correct (self)
     Reconcile prediction and measurement as fitting. More...
     
    def detect (self, signal)
     Run detection only processing pipeline (no adaptation). More...
     
    def emptyDebug (self)
     Return empty debug state information. More...
     
    def emptyState (self)
     Return empty state. More...
     
    def getDebug (self)
     Return current/latest debug state information. More...
     
    def getState (self)
     Return current/latest state. More...
     
    def measure (self, signal)
     Generate measurement of activity state from passed signal. More...
     
    def predict (self)
     Predict next state from current state. More...
     
    def process (self, signal)
     Process the new incoming signal on full detection pipeline. More...
     
    def save (self, fileName)
     Outer method for saving to a file given as a string. More...
     
    def saveTo (self, fPtr)
     Empty method for saving internal information to HDF5 file. More...
     
    -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d @@ -302,12 +172,6 @@ -<<<<<<< HEAD -======= - - - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d

    Static Public Member Functions

    def buildFromCfg (theConfig)
     Instantiate from stored configuration file (YAML). More...
     Instantiate from stored configuration file (YAML). More...
     
    def calibrate2config (theStream, outFile, initModel=None)
     
    def load (fileName, relpath=None)
     Outer method for loading file given as a string (with path). More...
     
    def loadFrom (fPtr)
     Empty method for loading internal information from HDF5 file. More...
     
    @@ -380,11 +244,8 @@

    CalibGloveByColor.

    -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d

    Member Function Documentation

    @@ -407,13 +268,10 @@

    Base.

    Reimplemented in CalibGloveByColor.

    -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d @@ -503,16 +361,12 @@

    Apply correction process to the individual detectors.

    -<<<<<<< HEAD

    Apply naive correction on a per detector basis. As a layered system, there might be interdependencies that would impact the correction step. Ignoring that for now since it does not immediately come to mind what needs to be done.

    Reimplemented from Base.

    Reimplemented in CalibGloveByColor.

    -======= -

    Apply naive correction on a per detector basis. As a layered system, there might be interdependencies that would impact the correction step. Ignoring that for now since it does not immediately come to mind what needs to be done.

    ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d @@ -551,13 +405,10 @@

    Base.

    Reimplemented in CalibGloveByColor.

    -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d @@ -576,7 +427,6 @@

    -<<<<<<< HEAD

    Return empty debug state information.

    Useful if contents needed beforehand.

    @@ -584,8 +434,6 @@

    CalibGloveByColor.

    -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d @@ -612,13 +460,10 @@

    Base.

    Reimplemented in CalibGloveByColor.

    -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d @@ -637,7 +482,6 @@

    -<<<<<<< HEAD

    Return current/latest debug state information.

    Usually the debug state consists of internally computed information that is useful for debugging purposes and can help to isolate problems within the implemented class or with downstream processing that may rely on assumptions built into this implemented class.

    @@ -645,8 +489,6 @@

    CalibGloveByColor.

    -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d @@ -673,13 +515,10 @@

    Base.

    Reimplemented in CalibGloveByColor.

    -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d @@ -698,7 +537,6 @@

    -<<<<<<< HEAD

    Provide information about the current class implementation.

    Exists for reproducibility purposes. Usually stores the factory information used to build the current class instance.

    @@ -706,8 +544,6 @@

    CalibGloveByColor.

    -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d @@ -744,14 +580,11 @@

    -<<<<<<< HEAD

    Empty method for loading internal information from HDF5 file.

    Load data from given HDF5 pointer. Assumes in root from current file pointer location.

    Reimplemented from Base.

    -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d @@ -788,13 +621,10 @@

    inImage.

    Reimplemented in CalibGloveByColor.

    -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d @@ -816,13 +646,10 @@

    Base.

    Reimplemented in CalibGloveByColor.

    -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d @@ -859,13 +686,10 @@

    Base.

    Reimplemented in CalibGloveByColor.

    -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d @@ -903,13 +727,10 @@

    Base.

    Reimplemented in CalibGloveByColor.

    -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d

    Member Data Documentation

    @@ -970,22 +791,14 @@

    GloveByColor.py -======= -
  • /home/pvela/python/Surveillance/Surveillance/layers/GloveByColor.py
  • ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d diff --git a/docs/classSurveillance_1_1layers_1_1GloveByColor_1_1GloveByColor__coll__graph.map b/docs/classSurveillance_1_1layers_1_1GloveByColor_1_1GloveByColor__coll__graph.map index 1dd4024f..a8b7c9b1 100644 --- a/docs/classSurveillance_1_1layers_1_1GloveByColor_1_1GloveByColor__coll__graph.map +++ b/docs/classSurveillance_1_1layers_1_1GloveByColor_1_1GloveByColor__coll__graph.map @@ -1,13 +1,7 @@ -<<<<<<< HEAD -======= - - - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d diff --git a/docs/classSurveillance_1_1layers_1_1GloveByColor_1_1GloveByColor__coll__graph.md5 b/docs/classSurveillance_1_1layers_1_1GloveByColor_1_1GloveByColor__coll__graph.md5 index 8834a307..bcc47734 100644 --- a/docs/classSurveillance_1_1layers_1_1GloveByColor_1_1GloveByColor__coll__graph.md5 +++ b/docs/classSurveillance_1_1layers_1_1GloveByColor_1_1GloveByColor__coll__graph.md5 @@ -1,5 +1 @@ -<<<<<<< HEAD -4c574254e471c837cdb6a1b0196f191a -======= -13c87f4c82f62e0f9586a26f65d2da35 ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d +4c574254e471c837cdb6a1b0196f191a \ No newline at end of file diff --git a/docs/classSurveillance_1_1layers_1_1GloveByColor_1_1GloveByColor__inherit__graph.map b/docs/classSurveillance_1_1layers_1_1GloveByColor_1_1GloveByColor__inherit__graph.map index be78b34d..411a3eeb 100644 --- a/docs/classSurveillance_1_1layers_1_1GloveByColor_1_1GloveByColor__inherit__graph.map +++ b/docs/classSurveillance_1_1layers_1_1GloveByColor_1_1GloveByColor__inherit__graph.map @@ -1,15 +1,8 @@ -<<<<<<< HEAD -======= - - - - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d diff --git a/docs/classSurveillance_1_1layers_1_1GloveByColor_1_1GloveByColor__inherit__graph.md5 b/docs/classSurveillance_1_1layers_1_1GloveByColor_1_1GloveByColor__inherit__graph.md5 index 38110223..47d6df40 100644 --- a/docs/classSurveillance_1_1layers_1_1GloveByColor_1_1GloveByColor__inherit__graph.md5 +++ b/docs/classSurveillance_1_1layers_1_1GloveByColor_1_1GloveByColor__inherit__graph.md5 @@ -1,5 +1 @@ -<<<<<<< HEAD -d137911a1637118006e2399989a3d172 -======= -ccdd198b0c976ea90ca40a30b9a6aad6 ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d +d137911a1637118006e2399989a3d172 \ No newline at end of file diff --git a/docs/classSurveillance_1_1layers_1_1GloveByColor_1_1GlovePointer-members.html b/docs/classSurveillance_1_1layers_1_1GloveByColor_1_1GlovePointer-members.html index c1fb4e15..5951638a 100644 --- a/docs/classSurveillance_1_1layers_1_1GloveByColor_1_1GlovePointer-members.html +++ b/docs/classSurveillance_1_1layers_1_1GloveByColor_1_1GlovePointer-members.html @@ -1,17 +1,9 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d IVALab Python Libraries: Member List @@ -38,34 +30,21 @@

    Public Attributes

    -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
    Inheritance graph
    -<<<<<<< HEAD -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
    [legend]
    Collaboration diagram for GlovePointer:
    Collaboration graph
    -<<<<<<< HEAD -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
    [legend]
    -<<<<<<< HEAD @@ -131,40 +103,22 @@ -======= - - - - - - - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD @@ -172,15 +126,6 @@ -======= - - - - - - - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d

    Public Member Functions

    def __init__ (self, iState=None, trackCfg=None)
     Constructor for layered puzzle scene tracker. More...
     
    def adapt (self)
     
    def correct (self)
     Apply correction process to the individual detectors. More...
     Constructor for layered puzzle scene tracker. More...
     
    def adapt (self)
     Adapt the layer detection models. More...
     
    def correct (self)
     Apply correction process to the individual detectors. More...
     
    def display_cv (self, I, ratio=None, window_name="trackpoints")
     
    def emptyDebug (self)
     
    def emptyState (self)
     Get and empty state to recover its basic structure. More...
     Get and empty state to recover its basic structure. More...
     
    def getDebug (self)
     
    def getState (self)
     Get the complete detector state, which involves the states of the individual layer detectors. More...
     Get the complete detector state, which involves the states of the individual layer detectors. More...
     
    def info (self)
     
    def measure (self, I)
     Apply detection to the source image pass. More...
     
    def predict (self)
     
    def process (self, I)
     Apply entire predict to adapt process to source image(s). More...
     Apply detection to the source image pass. More...
     
    def predict (self)
     Generate prediction of expected measurement. More...
     
    def process (self, I)
     Apply entire predict to adapt process to source image(s). More...
     

    @@ -271,12 +216,8 @@

    Apply correction process to the individual detectors.

    -<<<<<<< HEAD

    Apply naive correction on a per detector basis. As a layered system, there might be interdependencies that would impact the correction step. Ignoring that for now since it does not immediately come to mind what needs to be done.

    -======= -

    Apply naive correction on a per detector basis. As a layered system, there might be interdependencies that would impact the correction step. Ignoring that for now since it does not immediately come to mind what needs to be done.

    ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d @@ -535,22 +476,14 @@

    GloveByColor.py -======= -
  • /home/pvela/python/Surveillance/Surveillance/layers/GloveByColor.py
  • ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d diff --git a/docs/classSurveillance_1_1layers_1_1GloveByColor_1_1GlovePointer__coll__graph.map b/docs/classSurveillance_1_1layers_1_1GloveByColor_1_1GlovePointer__coll__graph.map index e29543b7..44201ab8 100644 --- a/docs/classSurveillance_1_1layers_1_1GloveByColor_1_1GlovePointer__coll__graph.map +++ b/docs/classSurveillance_1_1layers_1_1GloveByColor_1_1GlovePointer__coll__graph.map @@ -1,7 +1,4 @@ -<<<<<<< HEAD -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d diff --git a/docs/classSurveillance_1_1layers_1_1GloveByColor_1_1GlovePointer__coll__graph.md5 b/docs/classSurveillance_1_1layers_1_1GloveByColor_1_1GlovePointer__coll__graph.md5 index 2f672bcc..7f247740 100644 --- a/docs/classSurveillance_1_1layers_1_1GloveByColor_1_1GlovePointer__coll__graph.md5 +++ b/docs/classSurveillance_1_1layers_1_1GloveByColor_1_1GlovePointer__coll__graph.md5 @@ -1,5 +1 @@ -<<<<<<< HEAD -d3581708ae4c86039f4391cd7b73ac3c -======= -767c9212763b8b66c74617ee48793927 ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d +d3581708ae4c86039f4391cd7b73ac3c \ No newline at end of file diff --git a/docs/classSurveillance_1_1layers_1_1GloveByColor_1_1GlovePointer__inherit__graph.map b/docs/classSurveillance_1_1layers_1_1GloveByColor_1_1GlovePointer__inherit__graph.map index e29543b7..44201ab8 100644 --- a/docs/classSurveillance_1_1layers_1_1GloveByColor_1_1GlovePointer__inherit__graph.map +++ b/docs/classSurveillance_1_1layers_1_1GloveByColor_1_1GlovePointer__inherit__graph.map @@ -1,7 +1,4 @@ -<<<<<<< HEAD -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d diff --git a/docs/classSurveillance_1_1layers_1_1GloveByColor_1_1GlovePointer__inherit__graph.md5 b/docs/classSurveillance_1_1layers_1_1GloveByColor_1_1GlovePointer__inherit__graph.md5 index ee5a0fea..7f247740 100644 --- a/docs/classSurveillance_1_1layers_1_1GloveByColor_1_1GlovePointer__inherit__graph.md5 +++ b/docs/classSurveillance_1_1layers_1_1GloveByColor_1_1GlovePointer__inherit__graph.md5 @@ -1,5 +1 @@ -<<<<<<< HEAD -d3581708ae4c86039f4391cd7b73ac3c -======= -3a8680552e8a6899f7d132f3f9ee2404 ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d +d3581708ae4c86039f4391cd7b73ac3c \ No newline at end of file diff --git a/docs/classSurveillance_1_1layers_1_1GloveByColor_1_1InstGloveDetector.html b/docs/classSurveillance_1_1layers_1_1GloveByColor_1_1InstGloveDetector.html index 8021b827..b2a9e0da 100644 --- a/docs/classSurveillance_1_1layers_1_1GloveByColor_1_1InstGloveDetector.html +++ b/docs/classSurveillance_1_1layers_1_1GloveByColor_1_1InstGloveDetector.html @@ -1,17 +1,9 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d IVALab Python Libraries: InstGloveDetector Class Reference @@ -38,34 +30,21 @@

    -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d

    Detailed Description

    Class for collecting visual processing methods needed by the PuzzleScene scene interpreter.


    The documentation for this class was generated from the following file:
      -<<<<<<< HEAD
    • /home/mary/python/Surveillance/Surveillance/layers/GloveByColor.py
    • -======= -
    • /home/pvela/python/Surveillance/Surveillance/layers/GloveByColor.py
    • ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
    diff --git a/docs/classSurveillance_1_1layers_1_1GloveByColor_1_1InstGlovePerceiver.html b/docs/classSurveillance_1_1layers_1_1GloveByColor_1_1InstGlovePerceiver.html index 91bfdcf1..e453982b 100644 --- a/docs/classSurveillance_1_1layers_1_1GloveByColor_1_1InstGlovePerceiver.html +++ b/docs/classSurveillance_1_1layers_1_1GloveByColor_1_1InstGlovePerceiver.html @@ -1,17 +1,9 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d IVALab Python Libraries: InstGlovePerceiver Class Reference @@ -38,34 +30,21 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d

    Detailed Description

    Class for collecting visual processing methods needed by the PuzzleScene perceiver.


    The documentation for this class was generated from the following file:
      -<<<<<<< HEAD
    • /home/mary/python/Surveillance/Surveillance/layers/GloveByColor.py
    • -======= -
    • /home/pvela/python/Surveillance/Surveillance/layers/GloveByColor.py
    • ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
    diff --git a/docs/classSurveillance_1_1layers_1_1GloveByColor_1_1PerceiveGloveBC-members.html b/docs/classSurveillance_1_1layers_1_1GloveByColor_1_1PerceiveGloveBC-members.html index 772b1d78..410a440b 100644 --- a/docs/classSurveillance_1_1layers_1_1GloveByColor_1_1PerceiveGloveBC-members.html +++ b/docs/classSurveillance_1_1layers_1_1GloveByColor_1_1PerceiveGloveBC-members.html @@ -1,17 +1,9 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d IVALab Python Libraries: Member List @@ -38,34 +30,21 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
    Inheritance graph
    -<<<<<<< HEAD -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
    [legend]
    Collaboration diagram for PerceiveGloveBC:
    Collaboration graph
    -<<<<<<< HEAD -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
    [legend]

    @@ -497,22 +470,14 @@

    GloveByColor.py -======= -
  • /home/pvela/python/Surveillance/Surveillance/layers/GloveByColor.py
  • ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d diff --git a/docs/classSurveillance_1_1layers_1_1GloveByColor_1_1PerceiveGloveBC__coll__graph.map b/docs/classSurveillance_1_1layers_1_1GloveByColor_1_1PerceiveGloveBC__coll__graph.map index a6f535cf..0ea165f7 100644 --- a/docs/classSurveillance_1_1layers_1_1GloveByColor_1_1PerceiveGloveBC__coll__graph.map +++ b/docs/classSurveillance_1_1layers_1_1GloveByColor_1_1PerceiveGloveBC__coll__graph.map @@ -1,7 +1,4 @@ -<<<<<<< HEAD -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d diff --git a/docs/classSurveillance_1_1layers_1_1GloveByColor_1_1PerceiveGloveBC__coll__graph.md5 b/docs/classSurveillance_1_1layers_1_1GloveByColor_1_1PerceiveGloveBC__coll__graph.md5 index 19eded79..9eadfe41 100644 --- a/docs/classSurveillance_1_1layers_1_1GloveByColor_1_1PerceiveGloveBC__coll__graph.md5 +++ b/docs/classSurveillance_1_1layers_1_1GloveByColor_1_1PerceiveGloveBC__coll__graph.md5 @@ -1,5 +1 @@ -<<<<<<< HEAD -64054a34aac9ac5a96301bb7a870dadd -======= -364ab4ceceab01b8e6e074044a763c06 ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d +64054a34aac9ac5a96301bb7a870dadd \ No newline at end of file diff --git a/docs/classSurveillance_1_1layers_1_1GloveByColor_1_1PerceiveGloveBC__inherit__graph.map b/docs/classSurveillance_1_1layers_1_1GloveByColor_1_1PerceiveGloveBC__inherit__graph.map index a6f535cf..0ea165f7 100644 --- a/docs/classSurveillance_1_1layers_1_1GloveByColor_1_1PerceiveGloveBC__inherit__graph.map +++ b/docs/classSurveillance_1_1layers_1_1GloveByColor_1_1PerceiveGloveBC__inherit__graph.map @@ -1,7 +1,4 @@ -<<<<<<< HEAD -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d diff --git a/docs/classSurveillance_1_1layers_1_1GloveByColor_1_1PerceiveGloveBC__inherit__graph.md5 b/docs/classSurveillance_1_1layers_1_1GloveByColor_1_1PerceiveGloveBC__inherit__graph.md5 index 7ea18a18..9eadfe41 100644 --- a/docs/classSurveillance_1_1layers_1_1GloveByColor_1_1PerceiveGloveBC__inherit__graph.md5 +++ b/docs/classSurveillance_1_1layers_1_1GloveByColor_1_1PerceiveGloveBC__inherit__graph.md5 @@ -1,5 +1 @@ -<<<<<<< HEAD -64054a34aac9ac5a96301bb7a870dadd -======= -ba003d8dcfe4d0a2fd8704481cd81a78 ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d +64054a34aac9ac5a96301bb7a870dadd \ No newline at end of file diff --git a/docs/classSurveillance_1_1layers_1_1Glove_1_1Calibrator-members.html b/docs/classSurveillance_1_1layers_1_1Glove_1_1Calibrator-members.html index 2cbd0ea8..e1ba28f3 100644 --- a/docs/classSurveillance_1_1layers_1_1Glove_1_1Calibrator-members.html +++ b/docs/classSurveillance_1_1layers_1_1Glove_1_1Calibrator-members.html @@ -1,17 +1,9 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d IVALab Python Libraries: Member List @@ -38,34 +30,21 @@

    -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
    Inheritance graph
    -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
    [legend]
    @@ -114,20 +89,15 @@
    Collaboration graph
    -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
    [legend]
    -<<<<<<< HEAD @@ -138,41 +108,20 @@ -======= - - - - - - - - - - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD @@ -180,70 +129,17 @@ -======= - - - - - - - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - - - - - - - - - - - - - - - - - - - - - - - - - - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - - - - - - - - - - - - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d

    Public Member Functions

    def __init__ (self, detCfg=None, processors=None, detModel=None)
     Constructor for layered puzzle scene detector. More...
     
    def adapt (self)
     
    def detect (self, I)
     Apply predict, measure, correct process to source image. More...
     Constructor for layered puzzle scene detector. More...
     
    def adapt (self)
     Adapt the layer detection models. More...
     
    def correct (self)
     Apply correction process to the individual detectors. More...
     
    def detect (self, I)
     Apply predict, measure, correct process to source image. More...
     
    def emptyDebug (self)
     
    def emptyState (self)
     Get and empty state to recover its basic structure. More...
     Get and empty state to recover its basic structure. More...
     
    def getDebug (self)
     
    def getState (self)
     Get the complete detector state, which involves the states of the individual layer detectors. More...
     Get the complete detector state, which involves the states of the individual layer detectors. More...
     
    def info (self)
     
    def measure (self, I)
     Apply detection to the source image pass. More...
     
    def predict (self)
     
    def process (self, I)
     Apply entire predict to adapt process to source image. More...
     Apply detection to the source image pass. More...
     
    def predict (self)
     Generate prediction of expected measurement. More...
     
    def process (self, I)
     Apply entire predict to adapt process to source image. More...
     
    def saveConfig (self, outFile)
     
    def saveTo (self, fPtr)
     Save the instantiated Detector to given HDF5 file. More...
     
    - Public Member Functions inherited from Detector
     
    - Public Member Functions inherited from Detector
    def __init__ (self, detCfg=None, detInst=None, processors=None)
     Constructor for layered puzzle scene detector. More...
     
    def adapt (self)
     Adapt the layer detection models. More...
     
    def correct (self)
     Apply correction process to the individual detectors. More...
     
    def detect (self, I)
     Apply predict, measure, correct process to source image. More...
     
    def emptyDebug (self)
     
    def emptyState (self)
     Get and empty state to recover its basic structure. More...
     
    def getDebug (self)
     
    def getState (self)
     Get the complete detector state, which involves the states of the individual layer detectors. More...
     
    def info (self)
     
    def load (inFile)
     
    def loadFrom (fPtr)
     
    def measure (self, I)
     Apply detection to the source image pass. More...
     
    def predict (self)
     Generate prediction of expected measurement. More...
     
    def process (self, I)
     Apply entire predict to adapt process to source image. More...
     
    def saveTo (self, fPtr)
     Save the instantiated Detector to given HDF5 file. More...
     
    @@ -323,11 +219,8 @@

    Detector.

    -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d

    Member Function Documentation

    @@ -350,11 +243,8 @@

    Detector.

    -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d @@ -374,14 +264,10 @@

    Apply correction process to the individual detectors.

    -<<<<<<< HEAD

    Apply naive correction on a per detector basis. As a layered system, there might be interdependencies that would impact the correction step. Ignoring that for now since it does not immediately come to mind what needs to be done.

    Reimplemented from Detector.

    -======= -

    Apply naive correction on a per detector basis. As a layered system, there might be interdependencies that would impact the correction step. Ignoring that for now since it does not immediately come to mind what needs to be done.

    ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d @@ -420,11 +306,8 @@

    Detector.

    -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d @@ -443,11 +326,8 @@

    -<<<<<<< HEAD

    Reimplemented from Detector.

    -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d @@ -474,11 +354,8 @@

    Detector.

    -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d @@ -497,11 +374,8 @@

    -<<<<<<< HEAD

    Reimplemented from Detector.

    -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d @@ -528,11 +402,8 @@

    Detector.

    -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d @@ -551,11 +422,8 @@

    -<<<<<<< HEAD

    Reimplemented from Detector.

    -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d @@ -592,11 +460,8 @@

    Detector.

    -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d @@ -618,11 +483,8 @@

    Detector.

    -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d @@ -659,11 +521,8 @@

    Detector.

    -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d @@ -720,7 +579,6 @@

    -<<<<<<< HEAD

    Save the instantiated Detector to given HDF5 file.

    The save to function writes the necessary information to re-instantiate a Detectors class object to the passed HDF5 file pointer/instance.

    Parameters
    @@ -732,8 +590,6 @@

    Detector.

    -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d

    Member Data Documentation

    @@ -780,22 +636,14 @@

    Glove.py -======= -
  • /home/pvela/python/Surveillance/Surveillance/layers/Glove.py
  • ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d diff --git a/docs/classSurveillance_1_1layers_1_1Glove_1_1Calibrator__coll__graph.map b/docs/classSurveillance_1_1layers_1_1Glove_1_1Calibrator__coll__graph.map index 6789dd4a..4bf7ab32 100644 --- a/docs/classSurveillance_1_1layers_1_1Glove_1_1Calibrator__coll__graph.map +++ b/docs/classSurveillance_1_1layers_1_1Glove_1_1Calibrator__coll__graph.map @@ -1,9 +1,5 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d diff --git a/docs/classSurveillance_1_1layers_1_1Glove_1_1Calibrator__coll__graph.md5 b/docs/classSurveillance_1_1layers_1_1Glove_1_1Calibrator__coll__graph.md5 index 04dd2459..d1f050f8 100644 --- a/docs/classSurveillance_1_1layers_1_1Glove_1_1Calibrator__coll__graph.md5 +++ b/docs/classSurveillance_1_1layers_1_1Glove_1_1Calibrator__coll__graph.md5 @@ -1,5 +1 @@ -<<<<<<< HEAD -204361d113500a629b339a312dfd289f -======= -cef070636c29ac0a755eea0c944ed965 ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d +204361d113500a629b339a312dfd289f \ No newline at end of file diff --git a/docs/classSurveillance_1_1layers_1_1Glove_1_1Calibrator__inherit__graph.map b/docs/classSurveillance_1_1layers_1_1Glove_1_1Calibrator__inherit__graph.map index 6789dd4a..4bf7ab32 100644 --- a/docs/classSurveillance_1_1layers_1_1Glove_1_1Calibrator__inherit__graph.map +++ b/docs/classSurveillance_1_1layers_1_1Glove_1_1Calibrator__inherit__graph.map @@ -1,9 +1,5 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d diff --git a/docs/classSurveillance_1_1layers_1_1Glove_1_1Calibrator__inherit__graph.md5 b/docs/classSurveillance_1_1layers_1_1Glove_1_1Calibrator__inherit__graph.md5 index bacfd657..d1f050f8 100644 --- a/docs/classSurveillance_1_1layers_1_1Glove_1_1Calibrator__inherit__graph.md5 +++ b/docs/classSurveillance_1_1layers_1_1Glove_1_1Calibrator__inherit__graph.md5 @@ -1,5 +1 @@ -<<<<<<< HEAD -204361d113500a629b339a312dfd289f -======= -4297de50cd8ec7df14f944163267906c ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d +204361d113500a629b339a312dfd289f \ No newline at end of file diff --git a/docs/classSurveillance_1_1layers_1_1Glove_1_1CfgGloveDetector-members.html b/docs/classSurveillance_1_1layers_1_1Glove_1_1CfgGloveDetector-members.html index 60a50ae8..84ad5db1 100644 --- a/docs/classSurveillance_1_1layers_1_1Glove_1_1CfgGloveDetector-members.html +++ b/docs/classSurveillance_1_1layers_1_1Glove_1_1CfgGloveDetector-members.html @@ -1,17 +1,9 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d IVALab Python Libraries: Member List @@ -38,34 +30,21 @@

    Public Attributes

    -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
    This is the complete list of members for CfgGloveDetector, including all inherited members.

    -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
    __init__(self, init_dict=None, key_list=None, new_allowed=True)CfgGloveDetector
    dump(self, **kwargs)AlgConfig
    dump(self, kwargs)AlgConfig
    get_default_settings()CfgGloveDetectorstatic
    gloveCfgGloveDetector
    @@ -107,11 +82,7 @@ diff --git a/docs/classSurveillance_1_1layers_1_1Glove_1_1CfgGloveDetector.html b/docs/classSurveillance_1_1layers_1_1Glove_1_1CfgGloveDetector.html index 03badb0a..e3840529 100644 --- a/docs/classSurveillance_1_1layers_1_1Glove_1_1CfgGloveDetector.html +++ b/docs/classSurveillance_1_1layers_1_1Glove_1_1CfgGloveDetector.html @@ -1,17 +1,9 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d IVALab Python Libraries: CfgGloveDetector Class Reference @@ -38,34 +30,21 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
    Inheritance graph
    -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
    [legend]
    @@ -118,34 +93,20 @@
    Collaboration graph
    -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
    [legend]
    -<<<<<<< HEAD -======= - - - - - - - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d

    Public Member Functions

    def __init__ (self, init_dict=None, key_list=None, new_allowed=True)
     Instantiate a puzzle scene configuration object. More...
     
    - Public Member Functions inherited from AlgConfig
    def dump (self, **kwargs)
     
     Instantiate a puzzle scene configuration object. More...
     
    - Public Member Functions inherited from AlgConfig
    def __init__ (self, init_dict=None, key_list=None, new_allowed=True)
     
    def dump (self, kwargs)
     
    @@ -201,11 +162,8 @@

    AlgConfig.

    -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d

    Member Function Documentation

    @@ -250,22 +208,14 @@

    Glove.py -======= -
  • /home/pvela/python/Surveillance/Surveillance/layers/Glove.py
  • ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d diff --git a/docs/classSurveillance_1_1layers_1_1Glove_1_1CfgGloveDetector__coll__graph.map b/docs/classSurveillance_1_1layers_1_1Glove_1_1CfgGloveDetector__coll__graph.map index bd12baff..acf6582c 100644 --- a/docs/classSurveillance_1_1layers_1_1Glove_1_1CfgGloveDetector__coll__graph.map +++ b/docs/classSurveillance_1_1layers_1_1Glove_1_1CfgGloveDetector__coll__graph.map @@ -1,9 +1,5 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d diff --git a/docs/classSurveillance_1_1layers_1_1Glove_1_1CfgGloveDetector__coll__graph.md5 b/docs/classSurveillance_1_1layers_1_1Glove_1_1CfgGloveDetector__coll__graph.md5 index 538a725a..a9b25180 100644 --- a/docs/classSurveillance_1_1layers_1_1Glove_1_1CfgGloveDetector__coll__graph.md5 +++ b/docs/classSurveillance_1_1layers_1_1Glove_1_1CfgGloveDetector__coll__graph.md5 @@ -1,5 +1 @@ -<<<<<<< HEAD -c9af91feda7fa0ffd3bea6cdfbe2e344 -======= -3ddc5f9678796cdd4286d1e5f30e5eec ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d +c9af91feda7fa0ffd3bea6cdfbe2e344 \ No newline at end of file diff --git a/docs/classSurveillance_1_1layers_1_1Glove_1_1CfgGloveDetector__inherit__graph.map b/docs/classSurveillance_1_1layers_1_1Glove_1_1CfgGloveDetector__inherit__graph.map index bd12baff..acf6582c 100644 --- a/docs/classSurveillance_1_1layers_1_1Glove_1_1CfgGloveDetector__inherit__graph.map +++ b/docs/classSurveillance_1_1layers_1_1Glove_1_1CfgGloveDetector__inherit__graph.map @@ -1,9 +1,5 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d diff --git a/docs/classSurveillance_1_1layers_1_1Glove_1_1CfgGloveDetector__inherit__graph.md5 b/docs/classSurveillance_1_1layers_1_1Glove_1_1CfgGloveDetector__inherit__graph.md5 index ca70f7a6..a9b25180 100644 --- a/docs/classSurveillance_1_1layers_1_1Glove_1_1CfgGloveDetector__inherit__graph.md5 +++ b/docs/classSurveillance_1_1layers_1_1Glove_1_1CfgGloveDetector__inherit__graph.md5 @@ -1,5 +1 @@ -<<<<<<< HEAD -c9af91feda7fa0ffd3bea6cdfbe2e344 -======= -5d2b80efd4f7ceb2306a6919aba4032c ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d +c9af91feda7fa0ffd3bea6cdfbe2e344 \ No newline at end of file diff --git a/docs/classSurveillance_1_1layers_1_1Glove_1_1Detector-members.html b/docs/classSurveillance_1_1layers_1_1Glove_1_1Detector-members.html index 0a53afb7..51c592a4 100644 --- a/docs/classSurveillance_1_1layers_1_1Glove_1_1Detector-members.html +++ b/docs/classSurveillance_1_1layers_1_1Glove_1_1Detector-members.html @@ -1,17 +1,9 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d IVALab Python Libraries: Member List @@ -38,34 +30,21 @@

    Static Public Member Functions

    -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
    Inheritance graph
    -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
    [legend]
    Collaboration diagram for Detector:
    Collaboration graph
    -<<<<<<< HEAD -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
    [legend]
    -<<<<<<< HEAD @@ -137,36 +108,16 @@ -======= - - - - - - - - - - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d @@ -175,7 +126,6 @@ -<<<<<<< HEAD @@ -186,28 +136,12 @@ -======= - - - - - - - - - - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d

    Public Member Functions

    def __init__ (self, detCfg=None, detInst=None, processors=None)
     Constructor for layered puzzle scene detector. More...
     
    def adapt (self)
     
    def detect (self, I)
     Apply predict, measure, correct process to source image. More...
     Constructor for layered puzzle scene detector. More...
     
    def adapt (self)
     Adapt the layer detection models. More...
     
    def correct (self)
     Apply correction process to the individual detectors. More...
     
    def detect (self, I)
     Apply predict, measure, correct process to source image. More...
     
    def emptyDebug (self)
     
    def emptyState (self)
     Get and empty state to recover its basic structure. More...
     Get and empty state to recover its basic structure. More...
     
    def getDebug (self)
     
    def getState (self)
     Get the complete detector state, which involves the states of the individual layer detectors. More...
     Get the complete detector state, which involves the states of the individual layer detectors. More...
     
    def info (self)
     
    def loadFrom (fPtr)
     
    def measure (self, I)
     Apply detection to the source image pass. More...
     
    def predict (self)
     
    def saveTo (self, fPtr)
     Save the instantiated Detector to given HDF5 file. More...
     Apply detection to the source image pass. More...
     
    def predict (self)
     Generate prediction of expected measurement. More...
     
    def process (self, I)
     Apply entire predict to adapt process to source image. More...
     
    def saveTo (self, fPtr)
     Save the instantiated Detector to given HDF5 file. More...
     
    -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d @@ -274,11 +208,8 @@

    Calibrator.

    -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d

    Member Function Documentation

    @@ -301,11 +232,8 @@

    Calibrator.

    -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d @@ -395,14 +323,10 @@

    Apply correction process to the individual detectors.

    -<<<<<<< HEAD

    Apply naive correction on a per detector basis. As a layered system, there might be interdependencies that would impact the correction step. Ignoring that for now since it does not immediately come to mind what needs to be done.

    Reimplemented in Calibrator.

    -======= -

    Apply naive correction on a per detector basis. As a layered system, there might be interdependencies that would impact the correction step. Ignoring that for now since it does not immediately come to mind what needs to be done.

    ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d @@ -441,11 +365,8 @@

    Calibrator.

    -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d @@ -464,11 +385,8 @@

    -<<<<<<< HEAD

    Reimplemented in Calibrator.

    -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d @@ -495,11 +413,8 @@

    Calibrator.

    -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d @@ -518,11 +433,8 @@

    -<<<<<<< HEAD

    Reimplemented in Calibrator.

    -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d @@ -549,11 +461,8 @@

    Calibrator.

    -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d @@ -572,11 +481,8 @@

    -<<<<<<< HEAD

    Reimplemented in Calibrator.

    -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d @@ -649,11 +555,8 @@

    Calibrator.

    -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d @@ -675,11 +578,8 @@

    Calibrator.

    -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d @@ -716,11 +616,8 @@

    Calibrator.

    -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d @@ -758,11 +655,8 @@

    Calibrator.

    -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d

    Member Data Documentation

    @@ -837,22 +731,14 @@

    Glove.py -======= -
  • /home/pvela/python/Surveillance/Surveillance/layers/Glove.py
  • ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d diff --git a/docs/classSurveillance_1_1layers_1_1Glove_1_1DetectorState-members.html b/docs/classSurveillance_1_1layers_1_1Glove_1_1DetectorState-members.html index 90cc02e5..e5fc2053 100644 --- a/docs/classSurveillance_1_1layers_1_1Glove_1_1DetectorState-members.html +++ b/docs/classSurveillance_1_1layers_1_1Glove_1_1DetectorState-members.html @@ -1,17 +1,9 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d IVALab Python Libraries: Member List @@ -38,34 +30,21 @@

    Static Public Member Functions

    def buildFromCfg (theConfig)
     Instantiate from stored configuration file (YAML). More...
     Instantiate from stored configuration file (YAML). More...
     
    def calibrate2config (theStream, outFile, initModel=None)
     
    -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
    Glove.py -======= -
  • /home/pvela/python/Surveillance/Surveillance/layers/Glove.py
  • ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
    diff --git a/docs/classSurveillance_1_1layers_1_1Glove_1_1Detector__coll__graph.map b/docs/classSurveillance_1_1layers_1_1Glove_1_1Detector__coll__graph.map index 9d0bb060..e1d8f820 100644 --- a/docs/classSurveillance_1_1layers_1_1Glove_1_1Detector__coll__graph.map +++ b/docs/classSurveillance_1_1layers_1_1Glove_1_1Detector__coll__graph.map @@ -1,7 +1,4 @@ -<<<<<<< HEAD -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d diff --git a/docs/classSurveillance_1_1layers_1_1Glove_1_1Detector__coll__graph.md5 b/docs/classSurveillance_1_1layers_1_1Glove_1_1Detector__coll__graph.md5 index e5cead9f..e49590ec 100644 --- a/docs/classSurveillance_1_1layers_1_1Glove_1_1Detector__coll__graph.md5 +++ b/docs/classSurveillance_1_1layers_1_1Glove_1_1Detector__coll__graph.md5 @@ -1,5 +1 @@ -<<<<<<< HEAD -6bbaf775d2e12a3f8fb6233a40c4de59 -======= -656f0241f341637810ddc33d40dc1751 ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d +6bbaf775d2e12a3f8fb6233a40c4de59 \ No newline at end of file diff --git a/docs/classSurveillance_1_1layers_1_1Glove_1_1Detector__inherit__graph.map b/docs/classSurveillance_1_1layers_1_1Glove_1_1Detector__inherit__graph.map index 34f8575a..1a4cb97e 100644 --- a/docs/classSurveillance_1_1layers_1_1Glove_1_1Detector__inherit__graph.map +++ b/docs/classSurveillance_1_1layers_1_1Glove_1_1Detector__inherit__graph.map @@ -1,9 +1,5 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d diff --git a/docs/classSurveillance_1_1layers_1_1Glove_1_1Detector__inherit__graph.md5 b/docs/classSurveillance_1_1layers_1_1Glove_1_1Detector__inherit__graph.md5 index 42cc5d16..1dcba275 100644 --- a/docs/classSurveillance_1_1layers_1_1Glove_1_1Detector__inherit__graph.md5 +++ b/docs/classSurveillance_1_1layers_1_1Glove_1_1Detector__inherit__graph.md5 @@ -1,5 +1 @@ -<<<<<<< HEAD -5061bf17f10f071c459d87ee08001100 -======= -ae6ddae5d480014900f35dc2169e8e0f ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d +5061bf17f10f071c459d87ee08001100 \ No newline at end of file diff --git a/docs/classSurveillance_1_1layers_1_1Glove_1_1InstGloveDetector.html b/docs/classSurveillance_1_1layers_1_1Glove_1_1InstGloveDetector.html index d1d1cf3d..8f95f763 100644 --- a/docs/classSurveillance_1_1layers_1_1Glove_1_1InstGloveDetector.html +++ b/docs/classSurveillance_1_1layers_1_1Glove_1_1InstGloveDetector.html @@ -1,17 +1,9 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d IVALab Python Libraries: InstGloveDetector Class Reference @@ -38,34 +30,21 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d

    Detailed Description

    Class for collecting visual processing methods needed by the PuzzleScene scene interpreter.


    The documentation for this class was generated from the following file:
      -<<<<<<< HEAD
    • /home/mary/python/Surveillance/Surveillance/layers/Glove.py
    • -======= -
    • /home/pvela/python/Surveillance/Surveillance/layers/Glove.py
    • ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
    diff --git a/docs/classSurveillance_1_1layers_1_1Glove_1_1InstGlovePerceiver.html b/docs/classSurveillance_1_1layers_1_1Glove_1_1InstGlovePerceiver.html index 57cb2680..264ce070 100644 --- a/docs/classSurveillance_1_1layers_1_1Glove_1_1InstGlovePerceiver.html +++ b/docs/classSurveillance_1_1layers_1_1Glove_1_1InstGlovePerceiver.html @@ -1,17 +1,9 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d IVALab Python Libraries: InstGlovePerceiver Class Reference @@ -38,34 +30,21 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d

    Detailed Description

    Class for collecting visual processing methods needed by the PuzzleScene perceiver.


    The documentation for this class was generated from the following file:
      -<<<<<<< HEAD
    • /home/mary/python/Surveillance/Surveillance/layers/Glove.py
    • -======= -
    • /home/pvela/python/Surveillance/Surveillance/layers/Glove.py
    • ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
    diff --git a/docs/classSurveillance_1_1layers_1_1Glove_1_1Perceiver-members.html b/docs/classSurveillance_1_1layers_1_1Glove_1_1Perceiver-members.html index 0e65ca68..08a06ed4 100644 --- a/docs/classSurveillance_1_1layers_1_1Glove_1_1Perceiver-members.html +++ b/docs/classSurveillance_1_1layers_1_1Glove_1_1Perceiver-members.html @@ -1,17 +1,9 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d IVALab Python Libraries: Member List @@ -38,34 +30,21 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
    Inheritance graph
    -<<<<<<< HEAD -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
    [legend]
    Collaboration diagram for Perceiver:
    Collaboration graph
    -<<<<<<< HEAD -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
    [legend]

    @@ -421,22 +394,14 @@

    Glove.py -======= -
  • /home/pvela/python/Surveillance/Surveillance/layers/Glove.py
  • ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d diff --git a/docs/classSurveillance_1_1layers_1_1Glove_1_1Perceiver__coll__graph.map b/docs/classSurveillance_1_1layers_1_1Glove_1_1Perceiver__coll__graph.map index 836cb55f..09a9830a 100644 --- a/docs/classSurveillance_1_1layers_1_1Glove_1_1Perceiver__coll__graph.map +++ b/docs/classSurveillance_1_1layers_1_1Glove_1_1Perceiver__coll__graph.map @@ -1,6 +1,3 @@ -<<<<<<< HEAD -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d diff --git a/docs/classSurveillance_1_1layers_1_1Glove_1_1Perceiver__coll__graph.md5 b/docs/classSurveillance_1_1layers_1_1Glove_1_1Perceiver__coll__graph.md5 index 62e5a77f..b474311b 100644 --- a/docs/classSurveillance_1_1layers_1_1Glove_1_1Perceiver__coll__graph.md5 +++ b/docs/classSurveillance_1_1layers_1_1Glove_1_1Perceiver__coll__graph.md5 @@ -1,5 +1 @@ -<<<<<<< HEAD -55355afe94335fd8ebcf7eac022ca3c4 -======= -58c45b62a35b4f08d3515b211d40fbf8 ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d +55355afe94335fd8ebcf7eac022ca3c4 \ No newline at end of file diff --git a/docs/classSurveillance_1_1layers_1_1Glove_1_1Perceiver__inherit__graph.map b/docs/classSurveillance_1_1layers_1_1Glove_1_1Perceiver__inherit__graph.map index 836cb55f..09a9830a 100644 --- a/docs/classSurveillance_1_1layers_1_1Glove_1_1Perceiver__inherit__graph.map +++ b/docs/classSurveillance_1_1layers_1_1Glove_1_1Perceiver__inherit__graph.map @@ -1,6 +1,3 @@ -<<<<<<< HEAD -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d diff --git a/docs/classSurveillance_1_1layers_1_1Glove_1_1Perceiver__inherit__graph.md5 b/docs/classSurveillance_1_1layers_1_1Glove_1_1Perceiver__inherit__graph.md5 index b2407267..282a0d03 100644 --- a/docs/classSurveillance_1_1layers_1_1Glove_1_1Perceiver__inherit__graph.md5 +++ b/docs/classSurveillance_1_1layers_1_1Glove_1_1Perceiver__inherit__graph.md5 @@ -1,5 +1 @@ -<<<<<<< HEAD -fdde7811a79b338b119973fd42e1804b -======= -06323bb4b4536772440983ab6c8c3ef7 ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d +fdde7811a79b338b119973fd42e1804b \ No newline at end of file diff --git a/docs/classSurveillance_1_1layers_1_1Glove_1_1TrackPointer-members.html b/docs/classSurveillance_1_1layers_1_1Glove_1_1TrackPointer-members.html index ba7c4df1..6bb9186d 100644 --- a/docs/classSurveillance_1_1layers_1_1Glove_1_1TrackPointer-members.html +++ b/docs/classSurveillance_1_1layers_1_1Glove_1_1TrackPointer-members.html @@ -1,17 +1,9 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d IVALab Python Libraries: Member List @@ -38,34 +30,21 @@

    -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
    Inheritance graph
    -<<<<<<< HEAD -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
    [legend]
    Collaboration diagram for TrackPointer:
    Collaboration graph
    -<<<<<<< HEAD -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
    [legend]
    -<<<<<<< HEAD @@ -131,40 +103,22 @@ -======= - - - - - - - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD @@ -172,15 +126,6 @@ -======= - - - - - - - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d

    Public Member Functions

    def __init__ (self, iState=None, trackCfg=None)
     Constructor for layered puzzle scene tracker. More...
     
    def adapt (self)
     
    def correct (self)
     Apply correction process to the individual detectors. More...
     Constructor for layered puzzle scene tracker. More...
     
    def adapt (self)
     Adapt the layer detection models. More...
     
    def correct (self)
     Apply correction process to the individual detectors. More...
     
    def display_cv (self, I, ratio=None, window_name="trackpoints")
     
    def emptyDebug (self)
     
    def emptyState (self)
     Get and empty state to recover its basic structure. More...
     Get and empty state to recover its basic structure. More...
     
    def getDebug (self)
     
    def getState (self)
     Get the complete detector state, which involves the states of the individual layer detectors. More...
     Get the complete detector state, which involves the states of the individual layer detectors. More...
     
    def info (self)
     
    def measure (self, I)
     Apply detection to the source image pass. More...
     
    def predict (self)
     
    def process (self, I)
     Apply entire predict to adapt process to source image(s). More...
     Apply detection to the source image pass. More...
     
    def predict (self)
     Generate prediction of expected measurement. More...
     
    def process (self, I)
     Apply entire predict to adapt process to source image(s). More...
     

    @@ -271,12 +216,8 @@

    Apply correction process to the individual detectors.

    -<<<<<<< HEAD

    Apply naive correction on a per detector basis. As a layered system, there might be interdependencies that would impact the correction step. Ignoring that for now since it does not immediately come to mind what needs to be done.

    -======= -

    Apply naive correction on a per detector basis. As a layered system, there might be interdependencies that would impact the correction step. Ignoring that for now since it does not immediately come to mind what needs to be done.

    ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d @@ -535,22 +476,14 @@

    Glove.py -======= -
  • /home/pvela/python/Surveillance/Surveillance/layers/Glove.py
  • ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d diff --git a/docs/classSurveillance_1_1layers_1_1Glove_1_1TrackPointer__coll__graph.map b/docs/classSurveillance_1_1layers_1_1Glove_1_1TrackPointer__coll__graph.map index fe82091d..2a11724c 100644 --- a/docs/classSurveillance_1_1layers_1_1Glove_1_1TrackPointer__coll__graph.map +++ b/docs/classSurveillance_1_1layers_1_1Glove_1_1TrackPointer__coll__graph.map @@ -1,7 +1,4 @@ -<<<<<<< HEAD -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d diff --git a/docs/classSurveillance_1_1layers_1_1Glove_1_1TrackPointer__coll__graph.md5 b/docs/classSurveillance_1_1layers_1_1Glove_1_1TrackPointer__coll__graph.md5 index a6b040fb..cdec5d9e 100644 --- a/docs/classSurveillance_1_1layers_1_1Glove_1_1TrackPointer__coll__graph.md5 +++ b/docs/classSurveillance_1_1layers_1_1Glove_1_1TrackPointer__coll__graph.md5 @@ -1,5 +1 @@ -<<<<<<< HEAD -4fe341fce14fca7140771c88811b01ea -======= -f3a1f41086a696f37df6c9baa3222788 ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d +4fe341fce14fca7140771c88811b01ea \ No newline at end of file diff --git a/docs/classSurveillance_1_1layers_1_1Glove_1_1TrackPointer__inherit__graph.map b/docs/classSurveillance_1_1layers_1_1Glove_1_1TrackPointer__inherit__graph.map index fe82091d..2a11724c 100644 --- a/docs/classSurveillance_1_1layers_1_1Glove_1_1TrackPointer__inherit__graph.map +++ b/docs/classSurveillance_1_1layers_1_1Glove_1_1TrackPointer__inherit__graph.map @@ -1,7 +1,4 @@ -<<<<<<< HEAD -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d diff --git a/docs/classSurveillance_1_1layers_1_1Glove_1_1TrackPointer__inherit__graph.md5 b/docs/classSurveillance_1_1layers_1_1Glove_1_1TrackPointer__inherit__graph.md5 index eac11b8a..cdec5d9e 100644 --- a/docs/classSurveillance_1_1layers_1_1Glove_1_1TrackPointer__inherit__graph.md5 +++ b/docs/classSurveillance_1_1layers_1_1Glove_1_1TrackPointer__inherit__graph.md5 @@ -1,5 +1 @@ -<<<<<<< HEAD -4fe341fce14fca7140771c88811b01ea -======= -36249f817dcca90c009a1f7136fcb643 ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d +4fe341fce14fca7140771c88811b01ea \ No newline at end of file diff --git a/docs/classSurveillance_1_1layers_1_1HoveringGlove_1_1Calibrator-members.html b/docs/classSurveillance_1_1layers_1_1HoveringGlove_1_1Calibrator-members.html index fe72c9a9..ac3235cb 100644 --- a/docs/classSurveillance_1_1layers_1_1HoveringGlove_1_1Calibrator-members.html +++ b/docs/classSurveillance_1_1layers_1_1HoveringGlove_1_1Calibrator-members.html @@ -1,17 +1,9 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d IVALab Python Libraries: Member List @@ -38,34 +30,21 @@

    -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
    Inheritance graph
    -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
    [legend]
    @@ -114,20 +89,15 @@
    Collaboration graph
    -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
    [legend]
    -<<<<<<< HEAD @@ -138,87 +108,31 @@ -======= - - - - - - - - - - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - - - - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - - - - - - - - - - - - - - - - - - - - - - - - - - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d @@ -229,15 +143,6 @@ -<<<<<<< HEAD -======= - - - - - - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d

    Public Member Functions

    def __init__ (self, detCfg=None, processors=None, detModel=None)
     Constructor for layered puzzle scene detector. More...
     
    def adapt (self)
     
    def detect (self, I)
     Apply predict, measure, correct process to source image. More...
     Constructor for layered puzzle scene detector. More...
     
    def adapt (self)
     Adapt the layer detection models. More...
     
    def correct (self)
     Apply correction process to the individual detectors. More...
     
    def detect (self, I)
     Apply predict, measure, correct process to source image. More...
     
    def emptyDebug (self)
     
    def emptyState (self)
     Get and empty state to recover its basic structure. More...
     Get and empty state to recover its basic structure. More...
     
    def getDebug (self)
     
    def getState (self)
     Get the complete detector state, which involves the states of the individual layer detectors. More...
     Get the complete detector state, which involves the states of the individual layer detectors. More...
     
    def info (self)
     
    def measure (self, I)
     Apply detection to the source image pass. More...
     
    def process (self, I)
     Apply entire predict to adapt process to source image. More...
     Apply detection to the source image pass. More...
     
    def process (self, I)
     Apply entire predict to adapt process to source image. More...
     
    def saveConfig (self, outFile)
     
    def saveTo (self, fPtr)
     Save the instantiated Detector to given HDF5 file. More...
     
    - Public Member Functions inherited from Detector
     
    - Public Member Functions inherited from Detector
    def __init__ (self, detCfg=None, detInst=None, processors=None)
     Constructor for layered puzzle scene detector. More...
     
    def adapt (self)
     Adapt the layer detection models. More...
     
    def correct (self)
     Apply correction process to the individual detectors. More...
     
    def detect (self, I)
     Apply predict, measure, correct process to source image. More...
     
    def emptyDebug (self)
     
    def emptyState (self)
     Get and empty state to recover its basic structure. More...
     
    def getDebug (self)
     
    def getState (self)
     Get the complete detector state, which involves the states of the individual layer detectors. More...
     
    def info (self)
     
    def load (inFile)
     
    def loadFrom (fPtr)
    def predict (self)
     Generate prediction of expected measurement. More...
     
    def process (self, I)
     Apply entire predict to adapt process to source image. More...
     
    def saveTo (self, fPtr)
     Save the instantiated Detector to given HDF5 file. More...
     
    @@ -317,11 +222,8 @@

    Detector.

    -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d

    Member Function Documentation

    @@ -343,13 +245,10 @@

    Todo:
    Figure out proper approach here.
    +
    Todo:
    Figure out proper approach here.
    -<<<<<<< HEAD

    Reimplemented from Detector.

    -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d @@ -369,14 +268,10 @@

    Apply correction process to the individual detectors.

    -<<<<<<< HEAD

    Apply naive correction on a per detector basis. As a layered system, there might be interdependencies that would impact the correction step. Ignoring that for now since it does not immediately come to mind what needs to be done.

    Reimplemented from Detector.

    -======= -

    Apply naive correction on a per detector basis. As a layered system, there might be interdependencies that would impact the correction step. Ignoring that for now since it does not immediately come to mind what needs to be done.

    ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d @@ -415,11 +310,8 @@

    Detector.

    -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d @@ -438,11 +330,8 @@

    -<<<<<<< HEAD

    Reimplemented from Detector.

    -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d @@ -469,11 +358,8 @@

    Detector.

    -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d @@ -492,11 +378,8 @@

    -<<<<<<< HEAD

    Reimplemented from Detector.

    -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d @@ -523,11 +406,8 @@

    Detector.

    -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d @@ -546,11 +426,8 @@

    -<<<<<<< HEAD

    Reimplemented from Detector.

    -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d @@ -623,11 +500,8 @@

    Detector.

    -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d @@ -684,7 +558,6 @@

    -<<<<<<< HEAD

    Save the instantiated Detector to given HDF5 file.

    The save to function writes the necessary information to re-instantiate a Detectors class object to the passed HDF5 file pointer/instance.

    Parameters
    @@ -696,8 +569,6 @@

    Detector.

    -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d

    Member Data Documentation

    @@ -744,22 +615,14 @@

    HoveringGlove.py -======= -
  • /home/pvela/python/Surveillance/Surveillance/layers/HoveringGlove.py
  • ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d diff --git a/docs/classSurveillance_1_1layers_1_1HoveringGlove_1_1Calibrator__coll__graph.map b/docs/classSurveillance_1_1layers_1_1HoveringGlove_1_1Calibrator__coll__graph.map index 2d984a05..bce8cc80 100644 --- a/docs/classSurveillance_1_1layers_1_1HoveringGlove_1_1Calibrator__coll__graph.map +++ b/docs/classSurveillance_1_1layers_1_1HoveringGlove_1_1Calibrator__coll__graph.map @@ -1,9 +1,5 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d diff --git a/docs/classSurveillance_1_1layers_1_1HoveringGlove_1_1Calibrator__coll__graph.md5 b/docs/classSurveillance_1_1layers_1_1HoveringGlove_1_1Calibrator__coll__graph.md5 index 20957864..f0969682 100644 --- a/docs/classSurveillance_1_1layers_1_1HoveringGlove_1_1Calibrator__coll__graph.md5 +++ b/docs/classSurveillance_1_1layers_1_1HoveringGlove_1_1Calibrator__coll__graph.md5 @@ -1,5 +1 @@ -<<<<<<< HEAD -c3a15f73947ca4e8f46f20aeabae15ff -======= -f3e584e647921acc00814f74ca7afa7a ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d +c3a15f73947ca4e8f46f20aeabae15ff \ No newline at end of file diff --git a/docs/classSurveillance_1_1layers_1_1HoveringGlove_1_1Calibrator__inherit__graph.map b/docs/classSurveillance_1_1layers_1_1HoveringGlove_1_1Calibrator__inherit__graph.map index 2d984a05..bce8cc80 100644 --- a/docs/classSurveillance_1_1layers_1_1HoveringGlove_1_1Calibrator__inherit__graph.map +++ b/docs/classSurveillance_1_1layers_1_1HoveringGlove_1_1Calibrator__inherit__graph.map @@ -1,9 +1,5 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d diff --git a/docs/classSurveillance_1_1layers_1_1HoveringGlove_1_1Calibrator__inherit__graph.md5 b/docs/classSurveillance_1_1layers_1_1HoveringGlove_1_1Calibrator__inherit__graph.md5 index 27c35348..f0969682 100644 --- a/docs/classSurveillance_1_1layers_1_1HoveringGlove_1_1Calibrator__inherit__graph.md5 +++ b/docs/classSurveillance_1_1layers_1_1HoveringGlove_1_1Calibrator__inherit__graph.md5 @@ -1,5 +1 @@ -<<<<<<< HEAD -c3a15f73947ca4e8f46f20aeabae15ff -======= -f31a7fe361f9187d3c4c228e55bb2066 ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d +c3a15f73947ca4e8f46f20aeabae15ff \ No newline at end of file diff --git a/docs/classSurveillance_1_1layers_1_1HoveringGlove_1_1CfgHandDetector-members.html b/docs/classSurveillance_1_1layers_1_1HoveringGlove_1_1CfgHandDetector-members.html index 03ffcecb..add0d542 100644 --- a/docs/classSurveillance_1_1layers_1_1HoveringGlove_1_1CfgHandDetector-members.html +++ b/docs/classSurveillance_1_1layers_1_1HoveringGlove_1_1CfgHandDetector-members.html @@ -1,17 +1,9 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d IVALab Python Libraries: Member List @@ -38,34 +30,21 @@

    Public Attributes

    -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
    This is the complete list of members for CfgHandDetector, including all inherited members.

    -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
    __init__(self, init_dict=None, key_list=None, new_allowed=True)CfgHandDetector
    dump(self, **kwargs)AlgConfig
    dump(self, kwargs)AlgConfig
    get_default_settings()CfgHandDetectorstatic
    diff --git a/docs/classSurveillance_1_1layers_1_1HoveringGlove_1_1CfgHandDetector.html b/docs/classSurveillance_1_1layers_1_1HoveringGlove_1_1CfgHandDetector.html index 91a2621c..45f12b8f 100644 --- a/docs/classSurveillance_1_1layers_1_1HoveringGlove_1_1CfgHandDetector.html +++ b/docs/classSurveillance_1_1layers_1_1HoveringGlove_1_1CfgHandDetector.html @@ -1,17 +1,9 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d IVALab Python Libraries: CfgHandDetector Class Reference @@ -38,34 +30,21 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
    Inheritance graph
    -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
    [legend]
    @@ -117,34 +92,20 @@
    Collaboration graph
    -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
    [legend]
    -<<<<<<< HEAD -======= - - - - - - - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d

    Public Member Functions

    def __init__ (self, init_dict=None, key_list=None, new_allowed=True)
     Instantiate a puzzle scene configuration object. More...
     
    - Public Member Functions inherited from AlgConfig
    def dump (self, **kwargs)
     
     Instantiate a puzzle scene configuration object. More...
     
    - Public Member Functions inherited from AlgConfig
    def __init__ (self, init_dict=None, key_list=None, new_allowed=True)
     
    def dump (self, kwargs)
     
    @@ -195,11 +156,8 @@

    AlgConfig.

    -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d

    Member Function Documentation

    @@ -229,22 +187,14 @@

    HoveringGlove.py -======= -
  • /home/pvela/python/Surveillance/Surveillance/layers/HoveringGlove.py
  • ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d diff --git a/docs/classSurveillance_1_1layers_1_1HoveringGlove_1_1CfgHandDetector__coll__graph.map b/docs/classSurveillance_1_1layers_1_1HoveringGlove_1_1CfgHandDetector__coll__graph.map index 127fb48f..14a2101f 100644 --- a/docs/classSurveillance_1_1layers_1_1HoveringGlove_1_1CfgHandDetector__coll__graph.map +++ b/docs/classSurveillance_1_1layers_1_1HoveringGlove_1_1CfgHandDetector__coll__graph.map @@ -1,9 +1,5 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d diff --git a/docs/classSurveillance_1_1layers_1_1HoveringGlove_1_1CfgHandDetector__coll__graph.md5 b/docs/classSurveillance_1_1layers_1_1HoveringGlove_1_1CfgHandDetector__coll__graph.md5 index 06de6d5a..29d2dc27 100644 --- a/docs/classSurveillance_1_1layers_1_1HoveringGlove_1_1CfgHandDetector__coll__graph.md5 +++ b/docs/classSurveillance_1_1layers_1_1HoveringGlove_1_1CfgHandDetector__coll__graph.md5 @@ -1,5 +1 @@ -<<<<<<< HEAD -fc3e27cb13b333551485d3c1bc86a1e0 -======= -ca583c5e747572e22f768d8406b05d2e ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d +fc3e27cb13b333551485d3c1bc86a1e0 \ No newline at end of file diff --git a/docs/classSurveillance_1_1layers_1_1HoveringGlove_1_1CfgHandDetector__inherit__graph.map b/docs/classSurveillance_1_1layers_1_1HoveringGlove_1_1CfgHandDetector__inherit__graph.map index 127fb48f..14a2101f 100644 --- a/docs/classSurveillance_1_1layers_1_1HoveringGlove_1_1CfgHandDetector__inherit__graph.map +++ b/docs/classSurveillance_1_1layers_1_1HoveringGlove_1_1CfgHandDetector__inherit__graph.map @@ -1,9 +1,5 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d diff --git a/docs/classSurveillance_1_1layers_1_1HoveringGlove_1_1CfgHandDetector__inherit__graph.md5 b/docs/classSurveillance_1_1layers_1_1HoveringGlove_1_1CfgHandDetector__inherit__graph.md5 index 88bc56c7..29d2dc27 100644 --- a/docs/classSurveillance_1_1layers_1_1HoveringGlove_1_1CfgHandDetector__inherit__graph.md5 +++ b/docs/classSurveillance_1_1layers_1_1HoveringGlove_1_1CfgHandDetector__inherit__graph.md5 @@ -1,5 +1 @@ -<<<<<<< HEAD -fc3e27cb13b333551485d3c1bc86a1e0 -======= -6f3bced92ee12ed18d8792744bc0e521 ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d +fc3e27cb13b333551485d3c1bc86a1e0 \ No newline at end of file diff --git a/docs/classSurveillance_1_1layers_1_1HoveringGlove_1_1Detector-members.html b/docs/classSurveillance_1_1layers_1_1HoveringGlove_1_1Detector-members.html index 84afdc7d..ea467f0e 100644 --- a/docs/classSurveillance_1_1layers_1_1HoveringGlove_1_1Detector-members.html +++ b/docs/classSurveillance_1_1layers_1_1HoveringGlove_1_1Detector-members.html @@ -1,17 +1,9 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d IVALab Python Libraries: Member List @@ -38,34 +30,21 @@

    Static Public Member Functions

    -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
    Inheritance graph
    -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
    [legend]
    Collaboration diagram for Detector:
    Collaboration graph
    -<<<<<<< HEAD -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
    [legend]
    -<<<<<<< HEAD @@ -137,36 +108,16 @@ -======= - - - - - - - - - - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d @@ -175,7 +126,6 @@ -<<<<<<< HEAD @@ -186,28 +136,12 @@ -======= - - - - - - - - - - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d

    Public Member Functions

    def __init__ (self, detCfg=None, detInst=None, processors=None)
     Constructor for layered puzzle scene detector. More...
     
    def adapt (self)
     
    def detect (self, I)
     Apply predict, measure, correct process to source image. More...
     Constructor for layered puzzle scene detector. More...
     
    def adapt (self)
     Adapt the layer detection models. More...
     
    def correct (self)
     Apply correction process to the individual detectors. More...
     
    def detect (self, I)
     Apply predict, measure, correct process to source image. More...
     
    def emptyDebug (self)
     
    def emptyState (self)
     Get and empty state to recover its basic structure. More...
     Get and empty state to recover its basic structure. More...
     
    def getDebug (self)
     
    def getState (self)
     Get the complete detector state, which involves the states of the individual layer detectors. More...
     Get the complete detector state, which involves the states of the individual layer detectors. More...
     
    def info (self)
     
    def loadFrom (fPtr)
     
    def measure (self, I, M=None)
     Apply detection to the source image pass. More...
     
    def predict (self)
     
    def saveTo (self, fPtr)
     Save the instantiated Detector to given HDF5 file. More...
     Apply detection to the source image pass. More...
     
    def predict (self)
     Generate prediction of expected measurement. More...
     
    def process (self, I)
     Apply entire predict to adapt process to source image. More...
     
    def saveTo (self, fPtr)
     Save the instantiated Detector to given HDF5 file. More...
     
    -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d @@ -274,11 +208,8 @@

    Calibrator.

    -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d

    Member Function Documentation

    @@ -301,11 +232,8 @@

    Calibrator.

    -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d @@ -395,14 +323,10 @@

    Apply correction process to the individual detectors.

    -<<<<<<< HEAD

    Apply naive correction on a per detector basis. As a layered system, there might be interdependencies that would impact the correction step. Ignoring that for now since it does not immediately come to mind what needs to be done.

    Reimplemented in Calibrator.

    -======= -

    Apply naive correction on a per detector basis. As a layered system, there might be interdependencies that would impact the correction step. Ignoring that for now since it does not immediately come to mind what needs to be done.

    ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d @@ -441,11 +365,8 @@

    Calibrator.

    -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d @@ -464,11 +385,8 @@

    -<<<<<<< HEAD

    Reimplemented in Calibrator.

    -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d @@ -495,11 +413,8 @@

    Calibrator.

    -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d @@ -518,11 +433,8 @@

    -<<<<<<< HEAD

    Reimplemented in Calibrator.

    -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d @@ -549,11 +461,8 @@

    Calibrator.

    -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d @@ -572,11 +481,8 @@

    -<<<<<<< HEAD

    Reimplemented in Calibrator.

    -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d @@ -713,11 +619,8 @@

    Calibrator.

    -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d @@ -755,11 +658,8 @@

    Calibrator.

    -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d

    Member Data Documentation

    @@ -834,22 +734,14 @@

    HoveringGlove.py -======= -
  • /home/pvela/python/Surveillance/Surveillance/layers/HoveringGlove.py
  • ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d diff --git a/docs/classSurveillance_1_1layers_1_1HoveringGlove_1_1DetectorState-members.html b/docs/classSurveillance_1_1layers_1_1HoveringGlove_1_1DetectorState-members.html index cccfbac4..abd90e2a 100644 --- a/docs/classSurveillance_1_1layers_1_1HoveringGlove_1_1DetectorState-members.html +++ b/docs/classSurveillance_1_1layers_1_1HoveringGlove_1_1DetectorState-members.html @@ -1,17 +1,9 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d IVALab Python Libraries: Member List @@ -38,34 +30,21 @@

    Static Public Member Functions

    def buildFromCfg (theConfig)
     Instantiate from stored configuration file (YAML). More...
     Instantiate from stored configuration file (YAML). More...
     
    def calibrate2config (theStream, outFile, initModel=None)
     
    -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
    HoveringGlove.py -======= -
  • /home/pvela/python/Surveillance/Surveillance/layers/HoveringGlove.py
  • ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
    diff --git a/docs/classSurveillance_1_1layers_1_1HoveringGlove_1_1Detector__coll__graph.map b/docs/classSurveillance_1_1layers_1_1HoveringGlove_1_1Detector__coll__graph.map index 9d0bb060..e1d8f820 100644 --- a/docs/classSurveillance_1_1layers_1_1HoveringGlove_1_1Detector__coll__graph.map +++ b/docs/classSurveillance_1_1layers_1_1HoveringGlove_1_1Detector__coll__graph.map @@ -1,7 +1,4 @@ -<<<<<<< HEAD -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d diff --git a/docs/classSurveillance_1_1layers_1_1HoveringGlove_1_1Detector__coll__graph.md5 b/docs/classSurveillance_1_1layers_1_1HoveringGlove_1_1Detector__coll__graph.md5 index e5cead9f..e49590ec 100644 --- a/docs/classSurveillance_1_1layers_1_1HoveringGlove_1_1Detector__coll__graph.md5 +++ b/docs/classSurveillance_1_1layers_1_1HoveringGlove_1_1Detector__coll__graph.md5 @@ -1,5 +1 @@ -<<<<<<< HEAD -6bbaf775d2e12a3f8fb6233a40c4de59 -======= -656f0241f341637810ddc33d40dc1751 ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d +6bbaf775d2e12a3f8fb6233a40c4de59 \ No newline at end of file diff --git a/docs/classSurveillance_1_1layers_1_1HoveringGlove_1_1Detector__inherit__graph.map b/docs/classSurveillance_1_1layers_1_1HoveringGlove_1_1Detector__inherit__graph.map index f5f65162..ec26440f 100644 --- a/docs/classSurveillance_1_1layers_1_1HoveringGlove_1_1Detector__inherit__graph.map +++ b/docs/classSurveillance_1_1layers_1_1HoveringGlove_1_1Detector__inherit__graph.map @@ -1,9 +1,5 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d diff --git a/docs/classSurveillance_1_1layers_1_1HoveringGlove_1_1Detector__inherit__graph.md5 b/docs/classSurveillance_1_1layers_1_1HoveringGlove_1_1Detector__inherit__graph.md5 index b475e97a..1eb024c4 100644 --- a/docs/classSurveillance_1_1layers_1_1HoveringGlove_1_1Detector__inherit__graph.md5 +++ b/docs/classSurveillance_1_1layers_1_1HoveringGlove_1_1Detector__inherit__graph.md5 @@ -1,5 +1 @@ -<<<<<<< HEAD -f2eb287d9d9a3255f692b9be11ac7fc8 -======= -7af38b1201deaba656d90287203361e1 ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d +f2eb287d9d9a3255f692b9be11ac7fc8 \ No newline at end of file diff --git a/docs/classSurveillance_1_1layers_1_1HoveringGlove_1_1InstDetector.html b/docs/classSurveillance_1_1layers_1_1HoveringGlove_1_1InstDetector.html index 0fb01da2..a8dfb60b 100644 --- a/docs/classSurveillance_1_1layers_1_1HoveringGlove_1_1InstDetector.html +++ b/docs/classSurveillance_1_1layers_1_1HoveringGlove_1_1InstDetector.html @@ -1,17 +1,9 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d IVALab Python Libraries: InstDetector Class Reference @@ -38,34 +30,21 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d

    Detailed Description

    Class for collecting visual processing methods needed by the PuzzleScene scene interpreter.


    The documentation for this class was generated from the following file:
      -<<<<<<< HEAD
    • /home/mary/python/Surveillance/Surveillance/layers/HoveringGlove.py
    • -======= -
    • /home/pvela/python/Surveillance/Surveillance/layers/HoveringGlove.py
    • ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
    diff --git a/docs/classSurveillance_1_1layers_1_1HoveringGlove_1_1InstPerceiver.html b/docs/classSurveillance_1_1layers_1_1HoveringGlove_1_1InstPerceiver.html index cc1abc37..f417d08a 100644 --- a/docs/classSurveillance_1_1layers_1_1HoveringGlove_1_1InstPerceiver.html +++ b/docs/classSurveillance_1_1layers_1_1HoveringGlove_1_1InstPerceiver.html @@ -1,17 +1,9 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d IVALab Python Libraries: InstPerceiver Class Reference @@ -38,34 +30,21 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d

    Detailed Description

    Class for collecting visual processing methods needed by the PuzzleScene perceiver.


    The documentation for this class was generated from the following file:
      -<<<<<<< HEAD
    • /home/mary/python/Surveillance/Surveillance/layers/HoveringGlove.py
    • -======= -
    • /home/pvela/python/Surveillance/Surveillance/layers/HoveringGlove.py
    • ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
    diff --git a/docs/classSurveillance_1_1layers_1_1HoveringGlove_1_1Perceiver-members.html b/docs/classSurveillance_1_1layers_1_1HoveringGlove_1_1Perceiver-members.html index be504129..4a6777ff 100644 --- a/docs/classSurveillance_1_1layers_1_1HoveringGlove_1_1Perceiver-members.html +++ b/docs/classSurveillance_1_1layers_1_1HoveringGlove_1_1Perceiver-members.html @@ -1,17 +1,9 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d IVALab Python Libraries: Member List @@ -38,34 +30,21 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
    Inheritance graph
    -<<<<<<< HEAD -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
    [legend]
    Collaboration diagram for Perceiver:
    Collaboration graph
    -<<<<<<< HEAD -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
    [legend]

    @@ -423,22 +396,14 @@

    HoveringGlove.py -======= -
  • /home/pvela/python/Surveillance/Surveillance/layers/HoveringGlove.py
  • ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d diff --git a/docs/classSurveillance_1_1layers_1_1HoveringGlove_1_1Perceiver__coll__graph.map b/docs/classSurveillance_1_1layers_1_1HoveringGlove_1_1Perceiver__coll__graph.map index b3eb40ea..896e3c4f 100644 --- a/docs/classSurveillance_1_1layers_1_1HoveringGlove_1_1Perceiver__coll__graph.map +++ b/docs/classSurveillance_1_1layers_1_1HoveringGlove_1_1Perceiver__coll__graph.map @@ -1,7 +1,4 @@ -<<<<<<< HEAD -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d diff --git a/docs/classSurveillance_1_1layers_1_1HoveringGlove_1_1Perceiver__coll__graph.md5 b/docs/classSurveillance_1_1layers_1_1HoveringGlove_1_1Perceiver__coll__graph.md5 index 30e3a853..cbd04fba 100644 --- a/docs/classSurveillance_1_1layers_1_1HoveringGlove_1_1Perceiver__coll__graph.md5 +++ b/docs/classSurveillance_1_1layers_1_1HoveringGlove_1_1Perceiver__coll__graph.md5 @@ -1,5 +1 @@ -<<<<<<< HEAD -b0f205ebd9df613371f1e99ae1e156f8 -======= -36021d8fb3a446c6e47df08795a65e7c ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d +b0f205ebd9df613371f1e99ae1e156f8 \ No newline at end of file diff --git a/docs/classSurveillance_1_1layers_1_1HoveringGlove_1_1Perceiver__inherit__graph.map b/docs/classSurveillance_1_1layers_1_1HoveringGlove_1_1Perceiver__inherit__graph.map index b3eb40ea..896e3c4f 100644 --- a/docs/classSurveillance_1_1layers_1_1HoveringGlove_1_1Perceiver__inherit__graph.map +++ b/docs/classSurveillance_1_1layers_1_1HoveringGlove_1_1Perceiver__inherit__graph.map @@ -1,7 +1,4 @@ -<<<<<<< HEAD -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d diff --git a/docs/classSurveillance_1_1layers_1_1HoveringGlove_1_1Perceiver__inherit__graph.md5 b/docs/classSurveillance_1_1layers_1_1HoveringGlove_1_1Perceiver__inherit__graph.md5 index f751185b..cbd04fba 100644 --- a/docs/classSurveillance_1_1layers_1_1HoveringGlove_1_1Perceiver__inherit__graph.md5 +++ b/docs/classSurveillance_1_1layers_1_1HoveringGlove_1_1Perceiver__inherit__graph.md5 @@ -1,5 +1 @@ -<<<<<<< HEAD -b0f205ebd9df613371f1e99ae1e156f8 -======= -f1644123fa23e5a822dfd706a206b21b ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d +b0f205ebd9df613371f1e99ae1e156f8 \ No newline at end of file diff --git a/docs/classSurveillance_1_1layers_1_1HoveringGlove_1_1TrackPointer-members.html b/docs/classSurveillance_1_1layers_1_1HoveringGlove_1_1TrackPointer-members.html index c317cd21..5eb2b0e0 100644 --- a/docs/classSurveillance_1_1layers_1_1HoveringGlove_1_1TrackPointer-members.html +++ b/docs/classSurveillance_1_1layers_1_1HoveringGlove_1_1TrackPointer-members.html @@ -1,17 +1,9 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d IVALab Python Libraries: Member List @@ -38,34 +30,21 @@

    -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
    Inheritance graph
    -<<<<<<< HEAD -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
    [legend]
    Collaboration diagram for TrackPointer:
    Collaboration graph
    -<<<<<<< HEAD -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
    [legend]
    -<<<<<<< HEAD @@ -131,40 +103,22 @@ -======= - - - - - - - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD @@ -172,15 +126,6 @@ -======= - - - - - - - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d

    Public Member Functions

    def __init__ (self, iState=None, trackCfg=None)
     Constructor for layered puzzle scene tracker. More...
     
    def adapt (self)
     
    def correct (self)
     Apply correction process to the individual detectors. More...
     Constructor for layered puzzle scene tracker. More...
     
    def adapt (self)
     Adapt the layer detection models. More...
     
    def correct (self)
     Apply correction process to the individual detectors. More...
     
    def display_cv (self, I, ratio=None, window_name="trackpoints")
     
    def emptyDebug (self)
     
    def emptyState (self)
     Get and empty state to recover its basic structure. More...
     Get and empty state to recover its basic structure. More...
     
    def getDebug (self)
     
    def getState (self)
     Get the complete detector state, which involves the states of the individual layer detectors. More...
     Get the complete detector state, which involves the states of the individual layer detectors. More...
     
    def info (self)
     
    def measure (self, I)
     Apply detection to the source image pass. More...
     
    def predict (self)
     
    def process (self, I)
     Apply entire predict to adapt process to source image(s). More...
     Apply detection to the source image pass. More...
     
    def predict (self)
     Generate prediction of expected measurement. More...
     
    def process (self, I)
     Apply entire predict to adapt process to source image(s). More...
     

    @@ -271,12 +216,8 @@

    Apply correction process to the individual detectors.

    -<<<<<<< HEAD

    Apply naive correction on a per detector basis. As a layered system, there might be interdependencies that would impact the correction step. Ignoring that for now since it does not immediately come to mind what needs to be done.

    -======= -

    Apply naive correction on a per detector basis. As a layered system, there might be interdependencies that would impact the correction step. Ignoring that for now since it does not immediately come to mind what needs to be done.

    ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d @@ -535,22 +476,14 @@

    HoveringGlove.py -======= -
  • /home/pvela/python/Surveillance/Surveillance/layers/HoveringGlove.py
  • ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d diff --git a/docs/classSurveillance_1_1layers_1_1HoveringGlove_1_1TrackPointer__coll__graph.map b/docs/classSurveillance_1_1layers_1_1HoveringGlove_1_1TrackPointer__coll__graph.map index fe82091d..2a11724c 100644 --- a/docs/classSurveillance_1_1layers_1_1HoveringGlove_1_1TrackPointer__coll__graph.map +++ b/docs/classSurveillance_1_1layers_1_1HoveringGlove_1_1TrackPointer__coll__graph.map @@ -1,7 +1,4 @@ -<<<<<<< HEAD -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d diff --git a/docs/classSurveillance_1_1layers_1_1HoveringGlove_1_1TrackPointer__coll__graph.md5 b/docs/classSurveillance_1_1layers_1_1HoveringGlove_1_1TrackPointer__coll__graph.md5 index a6b040fb..cdec5d9e 100644 --- a/docs/classSurveillance_1_1layers_1_1HoveringGlove_1_1TrackPointer__coll__graph.md5 +++ b/docs/classSurveillance_1_1layers_1_1HoveringGlove_1_1TrackPointer__coll__graph.md5 @@ -1,5 +1 @@ -<<<<<<< HEAD -4fe341fce14fca7140771c88811b01ea -======= -f3a1f41086a696f37df6c9baa3222788 ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d +4fe341fce14fca7140771c88811b01ea \ No newline at end of file diff --git a/docs/classSurveillance_1_1layers_1_1HoveringGlove_1_1TrackPointer__inherit__graph.map b/docs/classSurveillance_1_1layers_1_1HoveringGlove_1_1TrackPointer__inherit__graph.map index fe82091d..2a11724c 100644 --- a/docs/classSurveillance_1_1layers_1_1HoveringGlove_1_1TrackPointer__inherit__graph.map +++ b/docs/classSurveillance_1_1layers_1_1HoveringGlove_1_1TrackPointer__inherit__graph.map @@ -1,7 +1,4 @@ -<<<<<<< HEAD -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d diff --git a/docs/classSurveillance_1_1layers_1_1HoveringGlove_1_1TrackPointer__inherit__graph.md5 b/docs/classSurveillance_1_1layers_1_1HoveringGlove_1_1TrackPointer__inherit__graph.md5 index eac11b8a..cdec5d9e 100644 --- a/docs/classSurveillance_1_1layers_1_1HoveringGlove_1_1TrackPointer__inherit__graph.md5 +++ b/docs/classSurveillance_1_1layers_1_1HoveringGlove_1_1TrackPointer__inherit__graph.md5 @@ -1,5 +1 @@ -<<<<<<< HEAD -4fe341fce14fca7140771c88811b01ea -======= -36249f817dcca90c009a1f7136fcb643 ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d +4fe341fce14fca7140771c88811b01ea \ No newline at end of file diff --git a/docs/classSurveillance_1_1layers_1_1HoveringHand_1_1Calibrator-members.html b/docs/classSurveillance_1_1layers_1_1HoveringHand_1_1Calibrator-members.html index 274545f9..afa030ea 100644 --- a/docs/classSurveillance_1_1layers_1_1HoveringHand_1_1Calibrator-members.html +++ b/docs/classSurveillance_1_1layers_1_1HoveringHand_1_1Calibrator-members.html @@ -1,17 +1,9 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d IVALab Python Libraries: Member List @@ -38,34 +30,21 @@

    -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
    Inheritance graph
    -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
    [legend]
    @@ -114,20 +89,15 @@
    Collaboration graph
    -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
    [legend]
    -<<<<<<< HEAD @@ -138,87 +108,31 @@ -======= - - - - - - - - - - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - - - - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - - - - - - - - - - - - - - - - - - - - - - - - - - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d @@ -229,15 +143,6 @@ -<<<<<<< HEAD -======= - - - - - - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d

    Public Member Functions

    def __init__ (self, detCfg=None, processors=None, detModel=None)
     Constructor for layered puzzle scene detector. More...
     
    def adapt (self)
     
    def detect (self, I)
     Apply predict, measure, correct process to source image. More...
     Constructor for layered puzzle scene detector. More...
     
    def adapt (self)
     Adapt the layer detection models. More...
     
    def correct (self)
     Apply correction process to the individual detectors. More...
     
    def detect (self, I)
     Apply predict, measure, correct process to source image. More...
     
    def emptyDebug (self)
     
    def emptyState (self)
     Get and empty state to recover its basic structure. More...
     Get and empty state to recover its basic structure. More...
     
    def getDebug (self)
     
    def getState (self)
     Get the complete detector state, which involves the states of the individual layer detectors. More...
     Get the complete detector state, which involves the states of the individual layer detectors. More...
     
    def info (self)
     
    def measure (self, I)
     Apply detection to the source image pass. More...
     
    def process (self, I)
     Apply entire predict to adapt process to source image. More...
     Apply detection to the source image pass. More...
     
    def process (self, I)
     Apply entire predict to adapt process to source image. More...
     
    def saveConfig (self, outFile)
     
    def saveTo (self, fPtr)
     Save the instantiated Detector to given HDF5 file. More...
     
    - Public Member Functions inherited from Detector
     
    - Public Member Functions inherited from Detector
    def __init__ (self, detCfg=None, detInst=None, processors=None)
     Constructor for layered puzzle scene detector. More...
     
    def adapt (self)
     Adapt the layer detection models. More...
     
    def correct (self)
     Apply correction process to the individual detectors. More...
     
    def detect (self, I)
     Apply predict, measure, correct process to source image. More...
     
    def emptyDebug (self)
     
    def emptyState (self)
     Get and empty state to recover its basic structure. More...
     
    def getDebug (self)
     
    def getState (self)
     Get the complete detector state, which involves the states of the individual layer detectors. More...
     
    def info (self)
     
    def load (inFile)
     
    def loadFrom (fPtr)
    def predict (self)
     Generate prediction of expected measurement. More...
     
    def process (self, I)
     Apply entire predict to adapt process to source image. More...
     
    def saveTo (self, fPtr)
     Save the instantiated Detector to given HDF5 file. More...
     
    @@ -317,11 +222,8 @@

    Detector.

    -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d

    Member Function Documentation

    @@ -343,13 +245,10 @@

    Todo:
    Figure out proper approach here.
    +
    Todo:
    Figure out proper approach here.
    -<<<<<<< HEAD

    Reimplemented from Detector.

    -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d @@ -369,14 +268,10 @@

    Apply correction process to the individual detectors.

    -<<<<<<< HEAD

    Apply naive correction on a per detector basis. As a layered system, there might be interdependencies that would impact the correction step. Ignoring that for now since it does not immediately come to mind what needs to be done.

    Reimplemented from Detector.

    -======= -

    Apply naive correction on a per detector basis. As a layered system, there might be interdependencies that would impact the correction step. Ignoring that for now since it does not immediately come to mind what needs to be done.

    ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d @@ -415,11 +310,8 @@

    Detector.

    -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d @@ -438,11 +330,8 @@

    -<<<<<<< HEAD

    Reimplemented from Detector.

    -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d @@ -469,11 +358,8 @@

    Detector.

    -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d @@ -492,11 +378,8 @@

    -<<<<<<< HEAD

    Reimplemented from Detector.

    -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d @@ -523,11 +406,8 @@

    Detector.

    -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d @@ -546,11 +426,8 @@

    -<<<<<<< HEAD

    Reimplemented from Detector.

    -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d @@ -623,11 +500,8 @@

    Detector.

    -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d @@ -684,7 +558,6 @@

    -<<<<<<< HEAD

    Save the instantiated Detector to given HDF5 file.

    The save to function writes the necessary information to re-instantiate a Detectors class object to the passed HDF5 file pointer/instance.

    Parameters
    @@ -696,8 +569,6 @@

    Detector.

    -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d

    Member Data Documentation

    @@ -744,22 +615,14 @@

    HoveringHand.py -======= -
  • /home/pvela/python/Surveillance/Surveillance/layers/HoveringHand.py
  • ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d diff --git a/docs/classSurveillance_1_1layers_1_1HoveringHand_1_1Calibrator__coll__graph.map b/docs/classSurveillance_1_1layers_1_1HoveringHand_1_1Calibrator__coll__graph.map index 7710f124..f54bc76f 100644 --- a/docs/classSurveillance_1_1layers_1_1HoveringHand_1_1Calibrator__coll__graph.map +++ b/docs/classSurveillance_1_1layers_1_1HoveringHand_1_1Calibrator__coll__graph.map @@ -1,9 +1,5 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d diff --git a/docs/classSurveillance_1_1layers_1_1HoveringHand_1_1Calibrator__coll__graph.md5 b/docs/classSurveillance_1_1layers_1_1HoveringHand_1_1Calibrator__coll__graph.md5 index 89c85002..ccd1844e 100644 --- a/docs/classSurveillance_1_1layers_1_1HoveringHand_1_1Calibrator__coll__graph.md5 +++ b/docs/classSurveillance_1_1layers_1_1HoveringHand_1_1Calibrator__coll__graph.md5 @@ -1,5 +1 @@ -<<<<<<< HEAD -7e60282bdda48cfc86224508984956c7 -======= -7a2d45e2ad376017990f1ea846b022a9 ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d +7e60282bdda48cfc86224508984956c7 \ No newline at end of file diff --git a/docs/classSurveillance_1_1layers_1_1HoveringHand_1_1Calibrator__inherit__graph.map b/docs/classSurveillance_1_1layers_1_1HoveringHand_1_1Calibrator__inherit__graph.map index 7710f124..f54bc76f 100644 --- a/docs/classSurveillance_1_1layers_1_1HoveringHand_1_1Calibrator__inherit__graph.map +++ b/docs/classSurveillance_1_1layers_1_1HoveringHand_1_1Calibrator__inherit__graph.map @@ -1,9 +1,5 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d diff --git a/docs/classSurveillance_1_1layers_1_1HoveringHand_1_1Calibrator__inherit__graph.md5 b/docs/classSurveillance_1_1layers_1_1HoveringHand_1_1Calibrator__inherit__graph.md5 index 9d91691b..ccd1844e 100644 --- a/docs/classSurveillance_1_1layers_1_1HoveringHand_1_1Calibrator__inherit__graph.md5 +++ b/docs/classSurveillance_1_1layers_1_1HoveringHand_1_1Calibrator__inherit__graph.md5 @@ -1,5 +1 @@ -<<<<<<< HEAD -7e60282bdda48cfc86224508984956c7 -======= -4cca7f99736fc40488637a43f25b1f28 ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d +7e60282bdda48cfc86224508984956c7 \ No newline at end of file diff --git a/docs/classSurveillance_1_1layers_1_1HoveringHand_1_1CfgHandDetector-members.html b/docs/classSurveillance_1_1layers_1_1HoveringHand_1_1CfgHandDetector-members.html index d631c032..3b0b26fd 100644 --- a/docs/classSurveillance_1_1layers_1_1HoveringHand_1_1CfgHandDetector-members.html +++ b/docs/classSurveillance_1_1layers_1_1HoveringHand_1_1CfgHandDetector-members.html @@ -1,17 +1,9 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d IVALab Python Libraries: Member List @@ -38,34 +30,21 @@

    Public Attributes

    -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
    This is the complete list of members for CfgHandDetector, including all inherited members.

    -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
    __init__(self, init_dict=None, key_list=None, new_allowed=True)CfgHandDetector
    dump(self, **kwargs)AlgConfig
    dump(self, kwargs)AlgConfig
    get_default_settings()CfgHandDetectorstatic
    diff --git a/docs/classSurveillance_1_1layers_1_1HoveringHand_1_1CfgHandDetector.html b/docs/classSurveillance_1_1layers_1_1HoveringHand_1_1CfgHandDetector.html index 02ca940e..78f6c796 100644 --- a/docs/classSurveillance_1_1layers_1_1HoveringHand_1_1CfgHandDetector.html +++ b/docs/classSurveillance_1_1layers_1_1HoveringHand_1_1CfgHandDetector.html @@ -1,17 +1,9 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d IVALab Python Libraries: CfgHandDetector Class Reference @@ -38,34 +30,21 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
    Inheritance graph
    -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
    [legend]
    @@ -117,34 +92,20 @@
    Collaboration graph
    -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
    [legend]
    -<<<<<<< HEAD -======= - - - - - - - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d

    Public Member Functions

    def __init__ (self, init_dict=None, key_list=None, new_allowed=True)
     Instantiate a puzzle scene configuration object. More...
     
    - Public Member Functions inherited from AlgConfig
    def dump (self, **kwargs)
     
     Instantiate a puzzle scene configuration object. More...
     
    - Public Member Functions inherited from AlgConfig
    def __init__ (self, init_dict=None, key_list=None, new_allowed=True)
     
    def dump (self, kwargs)
     
    @@ -195,11 +156,8 @@

    AlgConfig.

    -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d

    Member Function Documentation

    @@ -229,22 +187,14 @@

    HoveringHand.py -======= -
  • /home/pvela/python/Surveillance/Surveillance/layers/HoveringHand.py
  • ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d diff --git a/docs/classSurveillance_1_1layers_1_1HoveringHand_1_1CfgHandDetector__coll__graph.map b/docs/classSurveillance_1_1layers_1_1HoveringHand_1_1CfgHandDetector__coll__graph.map index 127fb48f..14a2101f 100644 --- a/docs/classSurveillance_1_1layers_1_1HoveringHand_1_1CfgHandDetector__coll__graph.map +++ b/docs/classSurveillance_1_1layers_1_1HoveringHand_1_1CfgHandDetector__coll__graph.map @@ -1,9 +1,5 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d diff --git a/docs/classSurveillance_1_1layers_1_1HoveringHand_1_1CfgHandDetector__coll__graph.md5 b/docs/classSurveillance_1_1layers_1_1HoveringHand_1_1CfgHandDetector__coll__graph.md5 index 06de6d5a..29d2dc27 100644 --- a/docs/classSurveillance_1_1layers_1_1HoveringHand_1_1CfgHandDetector__coll__graph.md5 +++ b/docs/classSurveillance_1_1layers_1_1HoveringHand_1_1CfgHandDetector__coll__graph.md5 @@ -1,5 +1 @@ -<<<<<<< HEAD -fc3e27cb13b333551485d3c1bc86a1e0 -======= -ca583c5e747572e22f768d8406b05d2e ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d +fc3e27cb13b333551485d3c1bc86a1e0 \ No newline at end of file diff --git a/docs/classSurveillance_1_1layers_1_1HoveringHand_1_1CfgHandDetector__inherit__graph.map b/docs/classSurveillance_1_1layers_1_1HoveringHand_1_1CfgHandDetector__inherit__graph.map index 127fb48f..14a2101f 100644 --- a/docs/classSurveillance_1_1layers_1_1HoveringHand_1_1CfgHandDetector__inherit__graph.map +++ b/docs/classSurveillance_1_1layers_1_1HoveringHand_1_1CfgHandDetector__inherit__graph.map @@ -1,9 +1,5 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d diff --git a/docs/classSurveillance_1_1layers_1_1HoveringHand_1_1CfgHandDetector__inherit__graph.md5 b/docs/classSurveillance_1_1layers_1_1HoveringHand_1_1CfgHandDetector__inherit__graph.md5 index 88bc56c7..29d2dc27 100644 --- a/docs/classSurveillance_1_1layers_1_1HoveringHand_1_1CfgHandDetector__inherit__graph.md5 +++ b/docs/classSurveillance_1_1layers_1_1HoveringHand_1_1CfgHandDetector__inherit__graph.md5 @@ -1,5 +1 @@ -<<<<<<< HEAD -fc3e27cb13b333551485d3c1bc86a1e0 -======= -6f3bced92ee12ed18d8792744bc0e521 ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d +fc3e27cb13b333551485d3c1bc86a1e0 \ No newline at end of file diff --git a/docs/classSurveillance_1_1layers_1_1HoveringHand_1_1DetStateHand-members.html b/docs/classSurveillance_1_1layers_1_1HoveringHand_1_1DetStateHand-members.html index f2f321e7..a27a0560 100644 --- a/docs/classSurveillance_1_1layers_1_1HoveringHand_1_1DetStateHand-members.html +++ b/docs/classSurveillance_1_1layers_1_1HoveringHand_1_1DetStateHand-members.html @@ -1,17 +1,9 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d IVALab Python Libraries: Member List @@ -38,34 +30,21 @@

    Static Public Member Functions

    -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
    HoveringHand.py -======= -
  • /home/pvela/python/Surveillance/Surveillance/layers/HoveringHand.py
  • ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
    diff --git a/docs/classSurveillance_1_1layers_1_1HoveringHand_1_1Detector-members.html b/docs/classSurveillance_1_1layers_1_1HoveringHand_1_1Detector-members.html index 72435807..3516fe41 100644 --- a/docs/classSurveillance_1_1layers_1_1HoveringHand_1_1Detector-members.html +++ b/docs/classSurveillance_1_1layers_1_1HoveringHand_1_1Detector-members.html @@ -1,17 +1,9 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d IVALab Python Libraries: Member List @@ -38,34 +30,21 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
    Inheritance graph
    -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
    [legend]
    Collaboration diagram for Detector:
    Collaboration graph
    -<<<<<<< HEAD -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
    [legend]
    -<<<<<<< HEAD @@ -137,36 +108,16 @@ -======= - - - - - - - - - - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d @@ -175,7 +126,6 @@ -<<<<<<< HEAD @@ -186,28 +136,12 @@ -======= - - - - - - - - - - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d

    Public Member Functions

    def __init__ (self, detCfg=None, detInst=None, processors=None)
     Constructor for layered puzzle scene detector. More...
     
    def adapt (self)
     
    def detect (self, I)
     Apply predict, measure, correct process to source image. More...
     Constructor for layered puzzle scene detector. More...
     
    def adapt (self)
     Adapt the layer detection models. More...
     
    def correct (self)
     Apply correction process to the individual detectors. More...
     
    def detect (self, I)
     Apply predict, measure, correct process to source image. More...
     
    def emptyDebug (self)
     
    def emptyState (self)
     Get and empty state to recover its basic structure. More...
     Get and empty state to recover its basic structure. More...
     
    def getDebug (self)
     
    def getState (self)
     Get the complete detector state, which involves the states of the individual layer detectors. More...
     Get the complete detector state, which involves the states of the individual layer detectors. More...
     
    def info (self)
     
    def loadFrom (fPtr)
     
    def measure (self, I, M=None)
     Apply detection to the source image pass. More...
     
    def predict (self)
     
    def saveTo (self, fPtr)
     Save the instantiated Detector to given HDF5 file. More...
     Apply detection to the source image pass. More...
     
    def predict (self)
     Generate prediction of expected measurement. More...
     
    def process (self, I)
     Apply entire predict to adapt process to source image. More...
     
    def saveTo (self, fPtr)
     Save the instantiated Detector to given HDF5 file. More...
     
    -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d @@ -274,11 +208,8 @@

    Calibrator.

    -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d

    Member Function Documentation

    @@ -301,11 +232,8 @@

    Calibrator.

    -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d @@ -395,14 +323,10 @@

    Apply correction process to the individual detectors.

    -<<<<<<< HEAD

    Apply naive correction on a per detector basis. As a layered system, there might be interdependencies that would impact the correction step. Ignoring that for now since it does not immediately come to mind what needs to be done.

    Reimplemented in Calibrator.

    -======= -

    Apply naive correction on a per detector basis. As a layered system, there might be interdependencies that would impact the correction step. Ignoring that for now since it does not immediately come to mind what needs to be done.

    ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d @@ -441,11 +365,8 @@

    Calibrator.

    -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d @@ -464,11 +385,8 @@

    -<<<<<<< HEAD

    Reimplemented in Calibrator.

    -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d @@ -495,11 +413,8 @@

    Calibrator.

    -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d @@ -518,11 +433,8 @@

    -<<<<<<< HEAD

    Reimplemented in Calibrator.

    -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d @@ -549,11 +461,8 @@

    Calibrator.

    -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d @@ -572,11 +481,8 @@

    -<<<<<<< HEAD

    Reimplemented in Calibrator.

    -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d @@ -713,11 +619,8 @@

    Calibrator.

    -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d @@ -755,11 +658,8 @@

    Calibrator.

    -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d

    Member Data Documentation

    @@ -834,22 +734,14 @@

    HoveringHand.py -======= -
  • /home/pvela/python/Surveillance/Surveillance/layers/HoveringHand.py
  • ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d diff --git a/docs/classSurveillance_1_1layers_1_1HoveringHand_1_1Detector__coll__graph.map b/docs/classSurveillance_1_1layers_1_1HoveringHand_1_1Detector__coll__graph.map index 9d0bb060..e1d8f820 100644 --- a/docs/classSurveillance_1_1layers_1_1HoveringHand_1_1Detector__coll__graph.map +++ b/docs/classSurveillance_1_1layers_1_1HoveringHand_1_1Detector__coll__graph.map @@ -1,7 +1,4 @@ -<<<<<<< HEAD -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d diff --git a/docs/classSurveillance_1_1layers_1_1HoveringHand_1_1Detector__coll__graph.md5 b/docs/classSurveillance_1_1layers_1_1HoveringHand_1_1Detector__coll__graph.md5 index e5cead9f..e49590ec 100644 --- a/docs/classSurveillance_1_1layers_1_1HoveringHand_1_1Detector__coll__graph.md5 +++ b/docs/classSurveillance_1_1layers_1_1HoveringHand_1_1Detector__coll__graph.md5 @@ -1,5 +1 @@ -<<<<<<< HEAD -6bbaf775d2e12a3f8fb6233a40c4de59 -======= -656f0241f341637810ddc33d40dc1751 ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d +6bbaf775d2e12a3f8fb6233a40c4de59 \ No newline at end of file diff --git a/docs/classSurveillance_1_1layers_1_1HoveringHand_1_1Detector__inherit__graph.map b/docs/classSurveillance_1_1layers_1_1HoveringHand_1_1Detector__inherit__graph.map index 02835b87..9afab509 100644 --- a/docs/classSurveillance_1_1layers_1_1HoveringHand_1_1Detector__inherit__graph.map +++ b/docs/classSurveillance_1_1layers_1_1HoveringHand_1_1Detector__inherit__graph.map @@ -1,9 +1,5 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d diff --git a/docs/classSurveillance_1_1layers_1_1HoveringHand_1_1Detector__inherit__graph.md5 b/docs/classSurveillance_1_1layers_1_1HoveringHand_1_1Detector__inherit__graph.md5 index 3c321a07..1e79c151 100644 --- a/docs/classSurveillance_1_1layers_1_1HoveringHand_1_1Detector__inherit__graph.md5 +++ b/docs/classSurveillance_1_1layers_1_1HoveringHand_1_1Detector__inherit__graph.md5 @@ -1,5 +1 @@ -<<<<<<< HEAD -68b31fb7e6389ce00bcaf7deb3b83248 -======= -fd5919d2546cb2de5f40c5f1d296a8fd ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d +68b31fb7e6389ce00bcaf7deb3b83248 \ No newline at end of file diff --git a/docs/classSurveillance_1_1layers_1_1HoveringHand_1_1InstDetector.html b/docs/classSurveillance_1_1layers_1_1HoveringHand_1_1InstDetector.html index 858ed2fc..0cf880e3 100644 --- a/docs/classSurveillance_1_1layers_1_1HoveringHand_1_1InstDetector.html +++ b/docs/classSurveillance_1_1layers_1_1HoveringHand_1_1InstDetector.html @@ -1,17 +1,9 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d IVALab Python Libraries: InstDetector Class Reference @@ -38,34 +30,21 @@

    Static Public Member Functions

    def buildFromCfg (theConfig)
     Instantiate from stored configuration file (YAML). More...
     Instantiate from stored configuration file (YAML). More...
     
    def calibrate2config (theStream, outFile, initModel=None)
     
    -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d

    Detailed Description

    Class for collecting visual processing methods needed by the PuzzleScene scene interpreter.


    The documentation for this class was generated from the following file:
      -<<<<<<< HEAD
    • /home/mary/python/Surveillance/Surveillance/layers/HoveringHand.py
    • -======= -
    • /home/pvela/python/Surveillance/Surveillance/layers/HoveringHand.py
    • ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
    diff --git a/docs/classSurveillance_1_1layers_1_1HoveringHand_1_1InstPerceiver.html b/docs/classSurveillance_1_1layers_1_1HoveringHand_1_1InstPerceiver.html index aa27a6bf..2a553aab 100644 --- a/docs/classSurveillance_1_1layers_1_1HoveringHand_1_1InstPerceiver.html +++ b/docs/classSurveillance_1_1layers_1_1HoveringHand_1_1InstPerceiver.html @@ -1,17 +1,9 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d IVALab Python Libraries: InstPerceiver Class Reference @@ -38,34 +30,21 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d

    Detailed Description

    Class for collecting visual processing methods needed by the PuzzleScene perceiver.


    The documentation for this class was generated from the following file:
      -<<<<<<< HEAD
    • /home/mary/python/Surveillance/Surveillance/layers/HoveringHand.py
    • -======= -
    • /home/pvela/python/Surveillance/Surveillance/layers/HoveringHand.py
    • ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
    diff --git a/docs/classSurveillance_1_1layers_1_1HoveringHand_1_1Perceiver-members.html b/docs/classSurveillance_1_1layers_1_1HoveringHand_1_1Perceiver-members.html index edba25d9..2e796702 100644 --- a/docs/classSurveillance_1_1layers_1_1HoveringHand_1_1Perceiver-members.html +++ b/docs/classSurveillance_1_1layers_1_1HoveringHand_1_1Perceiver-members.html @@ -1,17 +1,9 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d IVALab Python Libraries: Member List @@ -38,34 +30,21 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
    Inheritance graph
    -<<<<<<< HEAD -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
    [legend]
    Collaboration diagram for Perceiver:
    Collaboration graph
    -<<<<<<< HEAD -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
    [legend]

    @@ -423,22 +396,14 @@

    HoveringHand.py -======= -
  • /home/pvela/python/Surveillance/Surveillance/layers/HoveringHand.py
  • ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d diff --git a/docs/classSurveillance_1_1layers_1_1HoveringHand_1_1Perceiver__coll__graph.map b/docs/classSurveillance_1_1layers_1_1HoveringHand_1_1Perceiver__coll__graph.map index 97a41445..fbb744be 100644 --- a/docs/classSurveillance_1_1layers_1_1HoveringHand_1_1Perceiver__coll__graph.map +++ b/docs/classSurveillance_1_1layers_1_1HoveringHand_1_1Perceiver__coll__graph.map @@ -1,7 +1,4 @@ -<<<<<<< HEAD -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d diff --git a/docs/classSurveillance_1_1layers_1_1HoveringHand_1_1Perceiver__coll__graph.md5 b/docs/classSurveillance_1_1layers_1_1HoveringHand_1_1Perceiver__coll__graph.md5 index 68494c84..0d1ca003 100644 --- a/docs/classSurveillance_1_1layers_1_1HoveringHand_1_1Perceiver__coll__graph.md5 +++ b/docs/classSurveillance_1_1layers_1_1HoveringHand_1_1Perceiver__coll__graph.md5 @@ -1,5 +1 @@ -<<<<<<< HEAD -f7ca9b6cc253622167498d87762661c6 -======= -58c45b62a35b4f08d3515b211d40fbf8 ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d +f7ca9b6cc253622167498d87762661c6 \ No newline at end of file diff --git a/docs/classSurveillance_1_1layers_1_1HoveringHand_1_1Perceiver__inherit__graph.map b/docs/classSurveillance_1_1layers_1_1HoveringHand_1_1Perceiver__inherit__graph.map index 97a41445..fbb744be 100644 --- a/docs/classSurveillance_1_1layers_1_1HoveringHand_1_1Perceiver__inherit__graph.map +++ b/docs/classSurveillance_1_1layers_1_1HoveringHand_1_1Perceiver__inherit__graph.map @@ -1,7 +1,4 @@ -<<<<<<< HEAD -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d diff --git a/docs/classSurveillance_1_1layers_1_1HoveringHand_1_1Perceiver__inherit__graph.md5 b/docs/classSurveillance_1_1layers_1_1HoveringHand_1_1Perceiver__inherit__graph.md5 index b5ceec16..0d1ca003 100644 --- a/docs/classSurveillance_1_1layers_1_1HoveringHand_1_1Perceiver__inherit__graph.md5 +++ b/docs/classSurveillance_1_1layers_1_1HoveringHand_1_1Perceiver__inherit__graph.md5 @@ -1,5 +1 @@ -<<<<<<< HEAD -f7ca9b6cc253622167498d87762661c6 -======= -06323bb4b4536772440983ab6c8c3ef7 ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d +f7ca9b6cc253622167498d87762661c6 \ No newline at end of file diff --git a/docs/classSurveillance_1_1layers_1_1HoveringHand_1_1TrackPointer-members.html b/docs/classSurveillance_1_1layers_1_1HoveringHand_1_1TrackPointer-members.html index b0828e51..9d21d850 100644 --- a/docs/classSurveillance_1_1layers_1_1HoveringHand_1_1TrackPointer-members.html +++ b/docs/classSurveillance_1_1layers_1_1HoveringHand_1_1TrackPointer-members.html @@ -1,17 +1,9 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d IVALab Python Libraries: Member List @@ -38,34 +30,21 @@

    -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
    Inheritance graph
    -<<<<<<< HEAD -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
    [legend]
    Collaboration diagram for TrackPointer:
    Collaboration graph
    -<<<<<<< HEAD -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
    [legend]
    -<<<<<<< HEAD @@ -131,40 +103,22 @@ -======= - - - - - - - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD @@ -172,15 +126,6 @@ -======= - - - - - - - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d

    Public Member Functions

    def __init__ (self, iState=None, trackCfg=None)
     Constructor for layered puzzle scene tracker. More...
     
    def adapt (self)
     
    def correct (self)
     Apply correction process to the individual detectors. More...
     Constructor for layered puzzle scene tracker. More...
     
    def adapt (self)
     Adapt the layer detection models. More...
     
    def correct (self)
     Apply correction process to the individual detectors. More...
     
    def display_cv (self, I, ratio=None, window_name="trackpoints")
     
    def emptyDebug (self)
     
    def emptyState (self)
     Get and empty state to recover its basic structure. More...
     Get and empty state to recover its basic structure. More...
     
    def getDebug (self)
     
    def getState (self)
     Get the complete detector state, which involves the states of the individual layer detectors. More...
     Get the complete detector state, which involves the states of the individual layer detectors. More...
     
    def info (self)
     
    def measure (self, I)
     Apply detection to the source image pass. More...
     
    def predict (self)
     
    def process (self, I)
     Apply entire predict to adapt process to source image(s). More...
     Apply detection to the source image pass. More...
     
    def predict (self)
     Generate prediction of expected measurement. More...
     
    def process (self, I)
     Apply entire predict to adapt process to source image(s). More...
     

    @@ -271,12 +216,8 @@

    Apply correction process to the individual detectors.

    -<<<<<<< HEAD

    Apply naive correction on a per detector basis. As a layered system, there might be interdependencies that would impact the correction step. Ignoring that for now since it does not immediately come to mind what needs to be done.

    -======= -

    Apply naive correction on a per detector basis. As a layered system, there might be interdependencies that would impact the correction step. Ignoring that for now since it does not immediately come to mind what needs to be done.

    ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d @@ -535,22 +476,14 @@

    HoveringHand.py -======= -
  • /home/pvela/python/Surveillance/Surveillance/layers/HoveringHand.py
  • ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d diff --git a/docs/classSurveillance_1_1layers_1_1HoveringHand_1_1TrackPointer__coll__graph.map b/docs/classSurveillance_1_1layers_1_1HoveringHand_1_1TrackPointer__coll__graph.map index fe82091d..2a11724c 100644 --- a/docs/classSurveillance_1_1layers_1_1HoveringHand_1_1TrackPointer__coll__graph.map +++ b/docs/classSurveillance_1_1layers_1_1HoveringHand_1_1TrackPointer__coll__graph.map @@ -1,7 +1,4 @@ -<<<<<<< HEAD -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d diff --git a/docs/classSurveillance_1_1layers_1_1HoveringHand_1_1TrackPointer__coll__graph.md5 b/docs/classSurveillance_1_1layers_1_1HoveringHand_1_1TrackPointer__coll__graph.md5 index a6b040fb..cdec5d9e 100644 --- a/docs/classSurveillance_1_1layers_1_1HoveringHand_1_1TrackPointer__coll__graph.md5 +++ b/docs/classSurveillance_1_1layers_1_1HoveringHand_1_1TrackPointer__coll__graph.md5 @@ -1,5 +1 @@ -<<<<<<< HEAD -4fe341fce14fca7140771c88811b01ea -======= -f3a1f41086a696f37df6c9baa3222788 ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d +4fe341fce14fca7140771c88811b01ea \ No newline at end of file diff --git a/docs/classSurveillance_1_1layers_1_1HoveringHand_1_1TrackPointer__inherit__graph.map b/docs/classSurveillance_1_1layers_1_1HoveringHand_1_1TrackPointer__inherit__graph.map index fe82091d..2a11724c 100644 --- a/docs/classSurveillance_1_1layers_1_1HoveringHand_1_1TrackPointer__inherit__graph.map +++ b/docs/classSurveillance_1_1layers_1_1HoveringHand_1_1TrackPointer__inherit__graph.map @@ -1,7 +1,4 @@ -<<<<<<< HEAD -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d diff --git a/docs/classSurveillance_1_1layers_1_1HoveringHand_1_1TrackPointer__inherit__graph.md5 b/docs/classSurveillance_1_1layers_1_1HoveringHand_1_1TrackPointer__inherit__graph.md5 index eac11b8a..cdec5d9e 100644 --- a/docs/classSurveillance_1_1layers_1_1HoveringHand_1_1TrackPointer__inherit__graph.md5 +++ b/docs/classSurveillance_1_1layers_1_1HoveringHand_1_1TrackPointer__inherit__graph.md5 @@ -1,5 +1 @@ -<<<<<<< HEAD -4fe341fce14fca7140771c88811b01ea -======= -36249f817dcca90c009a1f7136fcb643 ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d +4fe341fce14fca7140771c88811b01ea \ No newline at end of file diff --git a/docs/classSurveillance_1_1layers_1_1PuzzleScene_1_1Calibrator-members.html b/docs/classSurveillance_1_1layers_1_1PuzzleScene_1_1Calibrator-members.html index 32a43cda..f0303d5b 100644 --- a/docs/classSurveillance_1_1layers_1_1PuzzleScene_1_1Calibrator-members.html +++ b/docs/classSurveillance_1_1layers_1_1PuzzleScene_1_1Calibrator-members.html @@ -1,17 +1,9 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d IVALab Python Libraries: Member List @@ -38,34 +30,21 @@

    -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
    Inheritance graph
    -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
    [legend]
    @@ -114,20 +89,15 @@
    Collaboration graph
    -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
    [legend]
    -<<<<<<< HEAD @@ -138,41 +108,20 @@ -======= - - - - - - - - - - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD @@ -180,67 +129,15 @@ -======= - - - - - - - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d

    Public Member Functions

    def __init__ (self, detCfg=None, processors=None, detModel=None)
     Constructor for layered puzzle scene detector. More...
     
    def adapt (self)
     
    def detect (self, I)
     Apply predict, measure, correct process to source image. More...
     Constructor for layered puzzle scene detector. More...
     
    def adapt (self)
     Adapt the layer detection models. More...
     
    def correct (self)
     Apply correction process to the individual detectors. More...
     
    def detect (self, I)
     Apply predict, measure, correct process to source image. More...
     
    def emptyDebug (self)
     
    def emptyState (self)
     Get and empty state to recover its basic structure. More...
     Get and empty state to recover its basic structure. More...
     
    def getDebug (self)
     
    def getState (self)
     Get the complete detector state, which involves the states of the individual layer detectors. More...
     Get the complete detector state, which involves the states of the individual layer detectors. More...
     
    def info (self)
     
    def measure (self, I)
     Apply detection to the source image pass. More...
     
    def predict (self)
     
    def process (self, I)
     Apply entire predict to adapt process to source image. More...
     Apply detection to the source image pass. More...
     
    def predict (self)
     Generate prediction of expected measurement. More...
     
    def process (self, I)
     Apply entire predict to adapt process to source image. More...
     
    def saveConfig (self, outFile)
     
    def saveTo (self, fPtr)
     Save the instantiated Detector to given HDF5 file. More...
     
    - Public Member Functions inherited from Detectors
    def loadFrom (fPtr)
     
     
    - Public Member Functions inherited from Detectors
    def __init__ (self, detCfg=None, detInst=None, processors=None)
     Constructor for layered puzzle scene detector. More...
     
    def adapt (self)
     Adapt the layer detection models. More...
     
    def correct (self)
     Apply correction process to the individual detectors. More...
     
    def detect (self, I)
     Apply predict, measure, correct process to source image. More...
     
    def emptyDebug (self)
     
    def emptyState (self)
     Get and empty state to recover its basic structure. More...
     
    def getDebug (self)
     
    def getState (self)
     Get the complete detector state, which involves the states of the individual layer detectors. More...
     
    def info (self)
     
    def loadFrom (fPtr)
     
    def measure (self, I)
     Apply detection to the source image pass. More...
     
    def predict (self)
     Generate prediction of expected measurement. More...
     
    def process (self, I)
     Apply entire predict to adapt process to source image. More...
     
    def saveTo (self, fPtr)
     Save the instantiated Detector to given HDF5 file. More...
     
    @@ -327,11 +224,8 @@

    Detectors.

    -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d

    Member Function Documentation

    @@ -354,11 +248,8 @@

    Detectors.

    -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d @@ -378,14 +269,10 @@

    Apply correction process to the individual detectors.

    -<<<<<<< HEAD

    Apply naive correction on a per detector basis. As a layered system, there might be interdependencies that would impact the correction step. Ignoring that for now since it does not immediately come to mind what needs to be done.

    Reimplemented from Detectors.

    -======= -

    Apply naive correction on a per detector basis. As a layered system, there might be interdependencies that would impact the correction step. Ignoring that for now since it does not immediately come to mind what needs to be done.

    ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d @@ -424,11 +311,8 @@

    Detectors.

    -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d @@ -447,11 +331,8 @@

    -<<<<<<< HEAD

    Reimplemented from Detectors.

    -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d @@ -478,11 +359,8 @@

    Detectors.

    -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d @@ -501,11 +379,8 @@

    -<<<<<<< HEAD

    Reimplemented from Detectors.

    -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d @@ -532,11 +407,8 @@

    Detectors.

    -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d @@ -555,11 +427,8 @@

    -<<<<<<< HEAD

    Reimplemented from Detectors.

    -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d @@ -596,11 +465,8 @@

    Detectors.

    -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d @@ -622,11 +488,8 @@

    Detectors.

    -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d @@ -663,11 +526,8 @@

    Detectors.

    -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d @@ -724,7 +584,6 @@

    -<<<<<<< HEAD

    Save the instantiated Detector to given HDF5 file.

    The save process saves the necessary information to re-instantiate a Detectors class object.

    Parameters
    @@ -736,8 +595,6 @@

    Detectors.

    -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d

    Member Data Documentation

    @@ -798,22 +655,14 @@

    PuzzleScene.py -======= -
  • /home/pvela/python/Surveillance/Surveillance/layers/PuzzleScene.py
  • ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d diff --git a/docs/classSurveillance_1_1layers_1_1PuzzleScene_1_1Calibrator__coll__graph.map b/docs/classSurveillance_1_1layers_1_1PuzzleScene_1_1Calibrator__coll__graph.map index 9b538d1a..b484e3fb 100644 --- a/docs/classSurveillance_1_1layers_1_1PuzzleScene_1_1Calibrator__coll__graph.map +++ b/docs/classSurveillance_1_1layers_1_1PuzzleScene_1_1Calibrator__coll__graph.map @@ -1,9 +1,5 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d diff --git a/docs/classSurveillance_1_1layers_1_1PuzzleScene_1_1Calibrator__coll__graph.md5 b/docs/classSurveillance_1_1layers_1_1PuzzleScene_1_1Calibrator__coll__graph.md5 index 88423d95..cf74067c 100644 --- a/docs/classSurveillance_1_1layers_1_1PuzzleScene_1_1Calibrator__coll__graph.md5 +++ b/docs/classSurveillance_1_1layers_1_1PuzzleScene_1_1Calibrator__coll__graph.md5 @@ -1,5 +1 @@ -<<<<<<< HEAD -d5b7e0c52a81fb5a14e338c9fd0b1adb -======= -2333e8c624c7ece49f761833d0d142a7 ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d +d5b7e0c52a81fb5a14e338c9fd0b1adb \ No newline at end of file diff --git a/docs/classSurveillance_1_1layers_1_1PuzzleScene_1_1Calibrator__inherit__graph.map b/docs/classSurveillance_1_1layers_1_1PuzzleScene_1_1Calibrator__inherit__graph.map index 9b538d1a..b484e3fb 100644 --- a/docs/classSurveillance_1_1layers_1_1PuzzleScene_1_1Calibrator__inherit__graph.map +++ b/docs/classSurveillance_1_1layers_1_1PuzzleScene_1_1Calibrator__inherit__graph.map @@ -1,9 +1,5 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d diff --git a/docs/classSurveillance_1_1layers_1_1PuzzleScene_1_1Calibrator__inherit__graph.md5 b/docs/classSurveillance_1_1layers_1_1PuzzleScene_1_1Calibrator__inherit__graph.md5 index 132f6029..cf74067c 100644 --- a/docs/classSurveillance_1_1layers_1_1PuzzleScene_1_1Calibrator__inherit__graph.md5 +++ b/docs/classSurveillance_1_1layers_1_1PuzzleScene_1_1Calibrator__inherit__graph.md5 @@ -1,5 +1 @@ -<<<<<<< HEAD -d5b7e0c52a81fb5a14e338c9fd0b1adb -======= -9e971c5df5321b0e344afbdd6ce78bb4 ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d +d5b7e0c52a81fb5a14e338c9fd0b1adb \ No newline at end of file diff --git a/docs/classSurveillance_1_1layers_1_1PuzzleScene_1_1CfgPuzzleScene-members.html b/docs/classSurveillance_1_1layers_1_1PuzzleScene_1_1CfgPuzzleScene-members.html index 92177b99..f533c865 100644 --- a/docs/classSurveillance_1_1layers_1_1PuzzleScene_1_1CfgPuzzleScene-members.html +++ b/docs/classSurveillance_1_1layers_1_1PuzzleScene_1_1CfgPuzzleScene-members.html @@ -1,17 +1,9 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d IVALab Python Libraries: Member List @@ -38,34 +30,21 @@

    Public Attributes

    -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
    This is the complete list of members for CfgPuzzleScene, including all inherited members.

    -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
    __init__(self, init_dict=None, key_list=None, new_allowed=True)CfgPuzzleScene
    dump(self, **kwargs)AlgConfig
    dump(self, kwargs)AlgConfig
    get_default_settings()CfgPuzzleScenestatic
    gloveCfgPuzzleScene
    @@ -107,11 +82,7 @@ diff --git a/docs/classSurveillance_1_1layers_1_1PuzzleScene_1_1CfgPuzzleScene.html b/docs/classSurveillance_1_1layers_1_1PuzzleScene_1_1CfgPuzzleScene.html index 817ad084..39477241 100644 --- a/docs/classSurveillance_1_1layers_1_1PuzzleScene_1_1CfgPuzzleScene.html +++ b/docs/classSurveillance_1_1layers_1_1PuzzleScene_1_1CfgPuzzleScene.html @@ -1,17 +1,9 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d IVALab Python Libraries: CfgPuzzleScene Class Reference @@ -38,34 +30,21 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
    Inheritance graph
    -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
    [legend]
    @@ -118,34 +93,20 @@
    Collaboration graph
    -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
    [legend]
    -<<<<<<< HEAD -======= - - - - - - - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d

    Public Member Functions

    def __init__ (self, init_dict=None, key_list=None, new_allowed=True)
     Instantiate a puzzle scene configuration object. More...
     
    - Public Member Functions inherited from AlgConfig
    def dump (self, **kwargs)
     
     Instantiate a puzzle scene configuration object. More...
     
    - Public Member Functions inherited from AlgConfig
    def __init__ (self, init_dict=None, key_list=None, new_allowed=True)
     
    def dump (self, kwargs)
     
    @@ -201,11 +162,8 @@

    AlgConfig.

    -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d

    Member Function Documentation

    @@ -250,22 +208,14 @@

    PuzzleScene.py -======= -
  • /home/pvela/python/Surveillance/Surveillance/layers/PuzzleScene.py
  • ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d diff --git a/docs/classSurveillance_1_1layers_1_1PuzzleScene_1_1CfgPuzzleScene__coll__graph.map b/docs/classSurveillance_1_1layers_1_1PuzzleScene_1_1CfgPuzzleScene__coll__graph.map index b4e92651..d80a1c93 100644 --- a/docs/classSurveillance_1_1layers_1_1PuzzleScene_1_1CfgPuzzleScene__coll__graph.map +++ b/docs/classSurveillance_1_1layers_1_1PuzzleScene_1_1CfgPuzzleScene__coll__graph.map @@ -1,9 +1,5 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d diff --git a/docs/classSurveillance_1_1layers_1_1PuzzleScene_1_1CfgPuzzleScene__coll__graph.md5 b/docs/classSurveillance_1_1layers_1_1PuzzleScene_1_1CfgPuzzleScene__coll__graph.md5 index 60a92dbc..72f3419f 100644 --- a/docs/classSurveillance_1_1layers_1_1PuzzleScene_1_1CfgPuzzleScene__coll__graph.md5 +++ b/docs/classSurveillance_1_1layers_1_1PuzzleScene_1_1CfgPuzzleScene__coll__graph.md5 @@ -1,5 +1 @@ -<<<<<<< HEAD -d5b283c2724cc38f083337f7052a7c40 -======= -16e12353408813f3a214f03a9cb5fef6 ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d +d5b283c2724cc38f083337f7052a7c40 \ No newline at end of file diff --git a/docs/classSurveillance_1_1layers_1_1PuzzleScene_1_1CfgPuzzleScene__inherit__graph.map b/docs/classSurveillance_1_1layers_1_1PuzzleScene_1_1CfgPuzzleScene__inherit__graph.map index b4e92651..d80a1c93 100644 --- a/docs/classSurveillance_1_1layers_1_1PuzzleScene_1_1CfgPuzzleScene__inherit__graph.map +++ b/docs/classSurveillance_1_1layers_1_1PuzzleScene_1_1CfgPuzzleScene__inherit__graph.map @@ -1,9 +1,5 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d diff --git a/docs/classSurveillance_1_1layers_1_1PuzzleScene_1_1CfgPuzzleScene__inherit__graph.md5 b/docs/classSurveillance_1_1layers_1_1PuzzleScene_1_1CfgPuzzleScene__inherit__graph.md5 index 1dac0c5c..72f3419f 100644 --- a/docs/classSurveillance_1_1layers_1_1PuzzleScene_1_1CfgPuzzleScene__inherit__graph.md5 +++ b/docs/classSurveillance_1_1layers_1_1PuzzleScene_1_1CfgPuzzleScene__inherit__graph.md5 @@ -1,5 +1 @@ -<<<<<<< HEAD -d5b283c2724cc38f083337f7052a7c40 -======= -4c83b12694e94ad2348b40263a63d78f ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d +d5b283c2724cc38f083337f7052a7c40 \ No newline at end of file diff --git a/docs/classSurveillance_1_1layers_1_1PuzzleScene_1_1Detectors-members.html b/docs/classSurveillance_1_1layers_1_1PuzzleScene_1_1Detectors-members.html index c09f49ee..b468aa5e 100644 --- a/docs/classSurveillance_1_1layers_1_1PuzzleScene_1_1Detectors-members.html +++ b/docs/classSurveillance_1_1layers_1_1PuzzleScene_1_1Detectors-members.html @@ -1,17 +1,9 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d IVALab Python Libraries: Member List @@ -38,34 +30,21 @@

    Static Public Member Functions

    -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
    Inheritance graph
    -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
    [legend]
    Collaboration diagram for Detectors:
    Collaboration graph
    -<<<<<<< HEAD -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
    [legend]
    -<<<<<<< HEAD @@ -137,43 +108,22 @@ -======= - - - - - - - - - - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD @@ -184,28 +134,12 @@ -======= - - - - - - - - - - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d

    Public Member Functions

    def __init__ (self, detCfg=None, detInst=None, processors=None)
     Constructor for layered puzzle scene detector. More...
     
    def adapt (self)
     
    def detect (self, I)
     Apply predict, measure, correct process to source image. More...
     Constructor for layered puzzle scene detector. More...
     
    def adapt (self)
     Adapt the layer detection models. More...
     
    def correct (self)
     Apply correction process to the individual detectors. More...
     
    def detect (self, I)
     Apply predict, measure, correct process to source image. More...
     
    def emptyDebug (self)
     
    def emptyState (self)
     Get and empty state to recover its basic structure. More...
     Get and empty state to recover its basic structure. More...
     
    def getDebug (self)
     
    def getState (self)
     Get the complete detector state, which involves the states of the individual layer detectors. More...
     Get the complete detector state, which involves the states of the individual layer detectors. More...
     
    def info (self)
     
    def loadFrom (fPtr)
     
    def measure (self, I)
     Apply detection to the source image pass. More...
     
    def predict (self)
     
    def saveTo (self, fPtr)
     Save the instantiated Detector to given HDF5 file. More...
     Apply detection to the source image pass. More...
     
    def predict (self)
     Generate prediction of expected measurement. More...
     
    def process (self, I)
     Apply entire predict to adapt process to source image. More...
     
    def saveTo (self, fPtr)
     Save the instantiated Detector to given HDF5 file. More...
     
    -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d @@ -219,11 +153,7 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d @@ -281,11 +211,8 @@

    Calibrator.

    -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d

    Member Function Documentation

    @@ -308,11 +235,8 @@

    Calibrator.

    -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d @@ -396,14 +320,10 @@

    Apply correction process to the individual detectors.

    -<<<<<<< HEAD

    Apply naive correction on a per detector basis. As a layered system, there might be interdependencies that would impact the correction step. Ignoring that for now since it does not immediately come to mind what needs to be done.

    Reimplemented in Calibrator.

    -======= -

    Apply naive correction on a per detector basis. As a layered system, there might be interdependencies that would impact the correction step. Ignoring that for now since it does not immediately come to mind what needs to be done.

    ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d @@ -442,11 +362,8 @@

    Calibrator.

    -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d @@ -465,11 +382,8 @@

    -<<<<<<< HEAD

    Reimplemented in Calibrator.

    -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d @@ -496,11 +410,8 @@

    Calibrator.

    -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d @@ -519,11 +430,8 @@

    -<<<<<<< HEAD

    Reimplemented in Calibrator.

    -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d @@ -550,11 +458,8 @@

    Calibrator.

    -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d @@ -573,11 +478,8 @@

    -<<<<<<< HEAD

    Reimplemented in Calibrator.

    -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d @@ -658,11 +560,8 @@

    Calibrator.

    -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d @@ -684,11 +583,8 @@

    Calibrator.

    -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d @@ -725,11 +621,8 @@

    Calibrator.

    -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d @@ -767,11 +660,8 @@

    Calibrator.

    -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d

    Member Data Documentation

    @@ -817,13 +707,9 @@

    Note
    Not dealing with pre-processor, but it might be important.
    -
    Todo:
    Figure out how to use the improcessor.
    -<<<<<<< HEAD +
    Todo:
    Figure out how to use the improcessor.

    Second, invoke the layer detectors and post-processor to differentiate the actual semantic layers of the scene. The layer detectors should be considered as raw detectors that need further polishing to extract the desired semantic layer information. These layers are further processed by customized track pointers and filters. The post processing here is hard-coded rather than a private member function invocation.

    -======= -

    Second, invoke the layer detectors and post-processor to differentiate the actual semantic layers of the scene. The layer detectors should be considered as raw detectors that need further polishing to extract the desired semantic layer information. These layers are further processed by customized track pointers and filters. The post processing here is hard-coded rather than a private member function invocation.

    ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d

    Shrink region associated to the surface just to clean up potential sources of confusion and promote recovery of puzzle pieces that are fully captured. Package the processed layers started with the glove. Next, remove any parts of the not surface layer that intersect with the expanded glove region. May remove adjacent puzzle piece area; that's OK since we can't rely on those pieces having been fully measured/captured. After that

    @@ -871,22 +757,14 @@

    PuzzleScene.py -======= -
  • /home/pvela/python/Surveillance/Surveillance/layers/PuzzleScene.py
  • ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d diff --git a/docs/classSurveillance_1_1layers_1_1PuzzleScene_1_1DetectorsState-members.html b/docs/classSurveillance_1_1layers_1_1PuzzleScene_1_1DetectorsState-members.html index fa3847e3..ecf6481d 100644 --- a/docs/classSurveillance_1_1layers_1_1PuzzleScene_1_1DetectorsState-members.html +++ b/docs/classSurveillance_1_1layers_1_1PuzzleScene_1_1DetectorsState-members.html @@ -1,17 +1,9 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d IVALab Python Libraries: Member List @@ -38,34 +30,21 @@

    Static Public Member Functions

    def buildFromCfg (theConfig)
     Instantiate from stored configuration file (YAML). More...
     Instantiate from stored configuration file (YAML). More...
     
    def calibrate2config (theStream, outFile)
     
     glove
     
     imGlove
     First, perform any specified pre-processing. More...
     First, perform any specified pre-processing. More...
     
     imPuzzle
     
    -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
    PuzzleScene.py -======= -
  • /home/pvela/python/Surveillance/Surveillance/layers/PuzzleScene.py
  • ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
    diff --git a/docs/classSurveillance_1_1layers_1_1PuzzleScene_1_1Detectors__coll__graph.map b/docs/classSurveillance_1_1layers_1_1PuzzleScene_1_1Detectors__coll__graph.map index 05b2ab71..edb56fe3 100644 --- a/docs/classSurveillance_1_1layers_1_1PuzzleScene_1_1Detectors__coll__graph.map +++ b/docs/classSurveillance_1_1layers_1_1PuzzleScene_1_1Detectors__coll__graph.map @@ -1,7 +1,4 @@ -<<<<<<< HEAD -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d diff --git a/docs/classSurveillance_1_1layers_1_1PuzzleScene_1_1Detectors__coll__graph.md5 b/docs/classSurveillance_1_1layers_1_1PuzzleScene_1_1Detectors__coll__graph.md5 index 3b013758..d8cd6fd4 100644 --- a/docs/classSurveillance_1_1layers_1_1PuzzleScene_1_1Detectors__coll__graph.md5 +++ b/docs/classSurveillance_1_1layers_1_1PuzzleScene_1_1Detectors__coll__graph.md5 @@ -1,5 +1 @@ -<<<<<<< HEAD -429fba87517a061eb2810a7490d5d349 -======= -4320c88e3f027c8dccc58a86bbb20440 ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d +429fba87517a061eb2810a7490d5d349 \ No newline at end of file diff --git a/docs/classSurveillance_1_1layers_1_1PuzzleScene_1_1Detectors__inherit__graph.map b/docs/classSurveillance_1_1layers_1_1PuzzleScene_1_1Detectors__inherit__graph.map index a3f2f851..b616824d 100644 --- a/docs/classSurveillance_1_1layers_1_1PuzzleScene_1_1Detectors__inherit__graph.map +++ b/docs/classSurveillance_1_1layers_1_1PuzzleScene_1_1Detectors__inherit__graph.map @@ -1,9 +1,5 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d diff --git a/docs/classSurveillance_1_1layers_1_1PuzzleScene_1_1Detectors__inherit__graph.md5 b/docs/classSurveillance_1_1layers_1_1PuzzleScene_1_1Detectors__inherit__graph.md5 index 36fbac08..ca1c9b39 100644 --- a/docs/classSurveillance_1_1layers_1_1PuzzleScene_1_1Detectors__inherit__graph.md5 +++ b/docs/classSurveillance_1_1layers_1_1PuzzleScene_1_1Detectors__inherit__graph.md5 @@ -1,5 +1 @@ -<<<<<<< HEAD -fb5edb5a461dc8e0163969c43133b04b -======= -14416d381603986ea6a801a924ca4d8b ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d +fb5edb5a461dc8e0163969c43133b04b \ No newline at end of file diff --git a/docs/classSurveillance_1_1layers_1_1PuzzleScene_1_1InstPuzzlePerceiver.html b/docs/classSurveillance_1_1layers_1_1PuzzleScene_1_1InstPuzzlePerceiver.html index 13b6444a..421a07c6 100644 --- a/docs/classSurveillance_1_1layers_1_1PuzzleScene_1_1InstPuzzlePerceiver.html +++ b/docs/classSurveillance_1_1layers_1_1PuzzleScene_1_1InstPuzzlePerceiver.html @@ -1,17 +1,9 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d IVALab Python Libraries: InstPuzzlePerceiver Class Reference @@ -38,34 +30,21 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d

    Detailed Description

    Class for collecting visual processing methods needed by the PuzzleScene perceiver.


    The documentation for this class was generated from the following file:
      -<<<<<<< HEAD
    • /home/mary/python/Surveillance/Surveillance/layers/PuzzleScene.py
    • -======= -
    • /home/pvela/python/Surveillance/Surveillance/layers/PuzzleScene.py
    • ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
    diff --git a/docs/classSurveillance_1_1layers_1_1PuzzleScene_1_1InstPuzzleScene.html b/docs/classSurveillance_1_1layers_1_1PuzzleScene_1_1InstPuzzleScene.html index ef334ec2..d1deab44 100644 --- a/docs/classSurveillance_1_1layers_1_1PuzzleScene_1_1InstPuzzleScene.html +++ b/docs/classSurveillance_1_1layers_1_1PuzzleScene_1_1InstPuzzleScene.html @@ -1,17 +1,9 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d IVALab Python Libraries: InstPuzzleScene Class Reference @@ -38,34 +30,21 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d

    Detailed Description

    Class for collecting visual processing methods needed by the PuzzleScene scene interpreter.


    The documentation for this class was generated from the following file:
      -<<<<<<< HEAD
    • /home/mary/python/Surveillance/Surveillance/layers/PuzzleScene.py
    • -======= -
    • /home/pvela/python/Surveillance/Surveillance/layers/PuzzleScene.py
    • ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
    diff --git a/docs/classSurveillance_1_1layers_1_1PuzzleScene_1_1Perceiver-members.html b/docs/classSurveillance_1_1layers_1_1PuzzleScene_1_1Perceiver-members.html index 0a3f98ea..4db01547 100644 --- a/docs/classSurveillance_1_1layers_1_1PuzzleScene_1_1Perceiver-members.html +++ b/docs/classSurveillance_1_1layers_1_1PuzzleScene_1_1Perceiver-members.html @@ -1,17 +1,9 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d IVALab Python Libraries: Member List @@ -38,34 +30,21 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
    Inheritance graph
    -<<<<<<< HEAD -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
    [legend]
    Collaboration diagram for Perceiver:
    Collaboration graph
    -<<<<<<< HEAD -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
    [legend]

    @@ -421,22 +394,14 @@

    PuzzleScene.py -======= -
  • /home/pvela/python/Surveillance/Surveillance/layers/PuzzleScene.py
  • ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d diff --git a/docs/classSurveillance_1_1layers_1_1PuzzleScene_1_1Perceiver__coll__graph.map b/docs/classSurveillance_1_1layers_1_1PuzzleScene_1_1Perceiver__coll__graph.map index 836cb55f..09a9830a 100644 --- a/docs/classSurveillance_1_1layers_1_1PuzzleScene_1_1Perceiver__coll__graph.map +++ b/docs/classSurveillance_1_1layers_1_1PuzzleScene_1_1Perceiver__coll__graph.map @@ -1,6 +1,3 @@ -<<<<<<< HEAD -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d diff --git a/docs/classSurveillance_1_1layers_1_1PuzzleScene_1_1Perceiver__coll__graph.md5 b/docs/classSurveillance_1_1layers_1_1PuzzleScene_1_1Perceiver__coll__graph.md5 index 62e5a77f..b474311b 100644 --- a/docs/classSurveillance_1_1layers_1_1PuzzleScene_1_1Perceiver__coll__graph.md5 +++ b/docs/classSurveillance_1_1layers_1_1PuzzleScene_1_1Perceiver__coll__graph.md5 @@ -1,5 +1 @@ -<<<<<<< HEAD -55355afe94335fd8ebcf7eac022ca3c4 -======= -58c45b62a35b4f08d3515b211d40fbf8 ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d +55355afe94335fd8ebcf7eac022ca3c4 \ No newline at end of file diff --git a/docs/classSurveillance_1_1layers_1_1PuzzleScene_1_1Perceiver__inherit__graph.map b/docs/classSurveillance_1_1layers_1_1PuzzleScene_1_1Perceiver__inherit__graph.map index 836cb55f..09a9830a 100644 --- a/docs/classSurveillance_1_1layers_1_1PuzzleScene_1_1Perceiver__inherit__graph.map +++ b/docs/classSurveillance_1_1layers_1_1PuzzleScene_1_1Perceiver__inherit__graph.map @@ -1,6 +1,3 @@ -<<<<<<< HEAD -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d diff --git a/docs/classSurveillance_1_1layers_1_1PuzzleScene_1_1Perceiver__inherit__graph.md5 b/docs/classSurveillance_1_1layers_1_1PuzzleScene_1_1Perceiver__inherit__graph.md5 index b2407267..282a0d03 100644 --- a/docs/classSurveillance_1_1layers_1_1PuzzleScene_1_1Perceiver__inherit__graph.md5 +++ b/docs/classSurveillance_1_1layers_1_1PuzzleScene_1_1Perceiver__inherit__graph.md5 @@ -1,5 +1 @@ -<<<<<<< HEAD -fdde7811a79b338b119973fd42e1804b -======= -06323bb4b4536772440983ab6c8c3ef7 ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d +fdde7811a79b338b119973fd42e1804b \ No newline at end of file diff --git a/docs/classSurveillance_1_1layers_1_1PuzzleScene_1_1TrackPointers-members.html b/docs/classSurveillance_1_1layers_1_1PuzzleScene_1_1TrackPointers-members.html index 728e9e2f..2608bd6e 100644 --- a/docs/classSurveillance_1_1layers_1_1PuzzleScene_1_1TrackPointers-members.html +++ b/docs/classSurveillance_1_1layers_1_1PuzzleScene_1_1TrackPointers-members.html @@ -1,17 +1,9 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d IVALab Python Libraries: Member List @@ -38,34 +30,21 @@

    -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
    Inheritance graph
    -<<<<<<< HEAD -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
    [legend]
    Collaboration diagram for TrackPointers:
    Collaboration graph
    -<<<<<<< HEAD -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
    [legend]
    -<<<<<<< HEAD @@ -131,40 +103,22 @@ -======= - - - - - - - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD @@ -172,15 +126,6 @@ -======= - - - - - - - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d

    Public Member Functions

    def __init__ (self, iState=None, trackCfg=None)
     Constructor for layered puzzle scene tracker. More...
     
    def adapt (self)
     
    def correct (self)
     Apply correction process to the individual detectors. More...
     Constructor for layered puzzle scene tracker. More...
     
    def adapt (self)
     Adapt the layer detection models. More...
     
    def correct (self)
     Apply correction process to the individual detectors. More...
     
    def display_cv (self, I, ratio=None, window_name="trackpoints")
     
    def emptyDebug (self)
     
    def emptyState (self)
     Get and empty state to recover its basic structure. More...
     Get and empty state to recover its basic structure. More...
     
    def getDebug (self)
     
    def getState (self)
     Get the complete detector state, which involves the states of the individual layer detectors. More...
     Get the complete detector state, which involves the states of the individual layer detectors. More...
     
    def info (self)
     
    def measure (self, I)
     Apply detection to the source image pass. More...
     
    def predict (self)
     
    def process (self, I)
     Apply entire predict to adapt process to source image(s). More...
     Apply detection to the source image pass. More...
     
    def predict (self)
     Generate prediction of expected measurement. More...
     
    def process (self, I)
     Apply entire predict to adapt process to source image(s). More...
     

    @@ -273,12 +218,8 @@

    Apply correction process to the individual detectors.

    -<<<<<<< HEAD

    Apply naive correction on a per detector basis. As a layered system, there might be interdependencies that would impact the correction step. Ignoring that for now since it does not immediately come to mind what needs to be done.

    -======= -

    Apply naive correction on a per detector basis. As a layered system, there might be interdependencies that would impact the correction step. Ignoring that for now since it does not immediately come to mind what needs to be done.

    ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d @@ -551,22 +492,14 @@

    PuzzleScene.py -======= -
  • /home/pvela/python/Surveillance/Surveillance/layers/PuzzleScene.py
  • ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d diff --git a/docs/classSurveillance_1_1layers_1_1PuzzleScene_1_1TrackPointers__coll__graph.map b/docs/classSurveillance_1_1layers_1_1PuzzleScene_1_1TrackPointers__coll__graph.map index 5cd3b083..2ca9c112 100644 --- a/docs/classSurveillance_1_1layers_1_1PuzzleScene_1_1TrackPointers__coll__graph.map +++ b/docs/classSurveillance_1_1layers_1_1PuzzleScene_1_1TrackPointers__coll__graph.map @@ -1,7 +1,4 @@ -<<<<<<< HEAD -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d diff --git a/docs/classSurveillance_1_1layers_1_1PuzzleScene_1_1TrackPointers__coll__graph.md5 b/docs/classSurveillance_1_1layers_1_1PuzzleScene_1_1TrackPointers__coll__graph.md5 index 9d1b1583..a26564df 100644 --- a/docs/classSurveillance_1_1layers_1_1PuzzleScene_1_1TrackPointers__coll__graph.md5 +++ b/docs/classSurveillance_1_1layers_1_1PuzzleScene_1_1TrackPointers__coll__graph.md5 @@ -1,5 +1 @@ -<<<<<<< HEAD -ef66f4c7a0311dc7de8082e8c162c897 -======= -68dea8eca55f6a4971ea234481632d2c ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d +ef66f4c7a0311dc7de8082e8c162c897 \ No newline at end of file diff --git a/docs/classSurveillance_1_1layers_1_1PuzzleScene_1_1TrackPointers__inherit__graph.map b/docs/classSurveillance_1_1layers_1_1PuzzleScene_1_1TrackPointers__inherit__graph.map index 5cd3b083..2ca9c112 100644 --- a/docs/classSurveillance_1_1layers_1_1PuzzleScene_1_1TrackPointers__inherit__graph.map +++ b/docs/classSurveillance_1_1layers_1_1PuzzleScene_1_1TrackPointers__inherit__graph.map @@ -1,7 +1,4 @@ -<<<<<<< HEAD -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d diff --git a/docs/classSurveillance_1_1layers_1_1PuzzleScene_1_1TrackPointers__inherit__graph.md5 b/docs/classSurveillance_1_1layers_1_1PuzzleScene_1_1TrackPointers__inherit__graph.md5 index 31b3b43a..a26564df 100644 --- a/docs/classSurveillance_1_1layers_1_1PuzzleScene_1_1TrackPointers__inherit__graph.md5 +++ b/docs/classSurveillance_1_1layers_1_1PuzzleScene_1_1TrackPointers__inherit__graph.md5 @@ -1,5 +1 @@ -<<<<<<< HEAD -ef66f4c7a0311dc7de8082e8c162c897 -======= -c2f54c9626073a56db6c26a337ef1b2e ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d +ef66f4c7a0311dc7de8082e8c162c897 \ No newline at end of file diff --git a/docs/classSurveillance_1_1layers_1_1base_1_1Base-members.html b/docs/classSurveillance_1_1layers_1_1base_1_1Base-members.html index c1d2d399..10fd6f31 100644 --- a/docs/classSurveillance_1_1layers_1_1base_1_1Base-members.html +++ b/docs/classSurveillance_1_1layers_1_1base_1_1Base-members.html @@ -1,17 +1,9 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d IVALab Python Libraries: Member List @@ -38,34 +30,21 @@

    -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
    This is the complete list of members for Base, including all inherited members.

    -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d @@ -114,11 +89,7 @@ diff --git a/docs/classSurveillance_1_1layers_1_1base_1_1Base.html b/docs/classSurveillance_1_1layers_1_1base_1_1Base.html index b71822a4..91fcf971 100644 --- a/docs/classSurveillance_1_1layers_1_1base_1_1Base.html +++ b/docs/classSurveillance_1_1layers_1_1base_1_1Base.html @@ -1,17 +1,9 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d IVALab Python Libraries: Base Class Reference @@ -38,34 +30,21 @@
    __init__(self, theDetector, theTracker, trackFilter, Params params)Base
    __init__Base
    det_mask(self)Base
    draw_layer(self, img=None, raw_detect=False, ax=None)Base
    get_mask(self)Base
    -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
    Inheritance graph
    -<<<<<<< HEAD @@ -111,40 +89,22 @@ -======= - - - - - - - - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
    [legend]
    Collaboration diagram for Base:
    Collaboration graph
    -<<<<<<< HEAD -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
    [legend]
    -<<<<<<< HEAD -======= - - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d @@ -170,13 +130,8 @@

    Public Member Functions

    def __init__ (self, theDetector, theTracker, trackFilter, Params params)
     
    def __init__
     
    def det_mask (self)
     
    def draw_layer (self, img=None, raw_detect=False, ax=None)
     

    Constructor & Destructor Documentation

    -<<<<<<< HEAD

    ◆ __init__()

    -======= - -

    ◆ __init__()

    ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
    @@ -208,11 +163,7 @@

    -<<<<<<< HEAD Params  -======= -   ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d params  @@ -222,7 +173,6 @@

    -<<<<<<< HEAD
    Base class for the layer segmentation approach
     
     Build upon the the simple detector -> tracker -> trackfilter pipeline
    @@ -234,9 +184,6 @@ 

    Member Function Documentation

    @@ -259,11 +206,8 @@

    Puzzle_Residual, robot_inRange, Human_ColorSG, Base_bg, and Base_fg.

    -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d

    @@ -384,11 +328,8 @@

    Human_ColorSG_HeightInRange.

    -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d @@ -484,22 +425,14 @@

    base.py -======= -
  • /home/pvela/python/Surveillance/Surveillance/layers/base.py
  • ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d diff --git a/docs/classSurveillance_1_1layers_1_1base_1_1Base__coll__graph.map b/docs/classSurveillance_1_1layers_1_1base_1_1Base__coll__graph.map index eba8ada6..4068d2a5 100644 --- a/docs/classSurveillance_1_1layers_1_1base_1_1Base__coll__graph.map +++ b/docs/classSurveillance_1_1layers_1_1base_1_1Base__coll__graph.map @@ -1,7 +1,4 @@ -<<<<<<< HEAD -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d diff --git a/docs/classSurveillance_1_1layers_1_1base_1_1Base__coll__graph.md5 b/docs/classSurveillance_1_1layers_1_1base_1_1Base__coll__graph.md5 index 6fdf763e..a6bc33ee 100644 --- a/docs/classSurveillance_1_1layers_1_1base_1_1Base__coll__graph.md5 +++ b/docs/classSurveillance_1_1layers_1_1base_1_1Base__coll__graph.md5 @@ -1,5 +1 @@ -<<<<<<< HEAD -a3b4d3cb7aa27753329f4440c7619cd9 -======= -0b6ee02f1f902f4b0e99a0ddaeb62cc8 ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d +a3b4d3cb7aa27753329f4440c7619cd9 \ No newline at end of file diff --git a/docs/classSurveillance_1_1layers_1_1base_1_1Base__inherit__graph.map b/docs/classSurveillance_1_1layers_1_1base_1_1Base__inherit__graph.map index 58c91207..5b8a2e17 100644 --- a/docs/classSurveillance_1_1layers_1_1base_1_1Base__inherit__graph.map +++ b/docs/classSurveillance_1_1layers_1_1base_1_1Base__inherit__graph.map @@ -1,5 +1,4 @@ -<<<<<<< HEAD @@ -10,14 +9,4 @@ -======= - - - - - - - - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d diff --git a/docs/classSurveillance_1_1layers_1_1base_1_1Base__inherit__graph.md5 b/docs/classSurveillance_1_1layers_1_1base_1_1Base__inherit__graph.md5 index f1536f68..22bbb96c 100644 --- a/docs/classSurveillance_1_1layers_1_1base_1_1Base__inherit__graph.md5 +++ b/docs/classSurveillance_1_1layers_1_1base_1_1Base__inherit__graph.md5 @@ -1,5 +1 @@ -<<<<<<< HEAD -088f37ef77b5afb0979cff4b16e35c71 -======= -65ae352399cfa8b299e20c0587eb95b3 ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d +088f37ef77b5afb0979cff4b16e35c71 \ No newline at end of file diff --git a/docs/classSurveillance_1_1layers_1_1base_1_1Params-members.html b/docs/classSurveillance_1_1layers_1_1base_1_1Params-members.html index 3bc0c793..73db11aa 100644 --- a/docs/classSurveillance_1_1layers_1_1base_1_1Params-members.html +++ b/docs/classSurveillance_1_1layers_1_1base_1_1Params-members.html @@ -1,17 +1,9 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d IVALab Python Libraries: Member List @@ -38,34 +30,21 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
    Inheritance graph
    -<<<<<<< HEAD -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
    [legend]
    Collaboration diagram for Params:
    Collaboration graph
    -<<<<<<< HEAD -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
    [legend]

    @@ -150,11 +123,8 @@

    -<<<<<<< HEAD

    Reimplemented in Params, Params_Residual, Params_GMM, Params, Params, and Params.

    -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d

    Member Data Documentation

    @@ -181,22 +151,14 @@

    base.py -======= -
  • /home/pvela/python/Surveillance/Surveillance/layers/base.py
  • ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d diff --git a/docs/classSurveillance_1_1layers_1_1base_1_1Params__coll__graph.map b/docs/classSurveillance_1_1layers_1_1base_1_1Params__coll__graph.map index 588a9527..a7927c55 100644 --- a/docs/classSurveillance_1_1layers_1_1base_1_1Params__coll__graph.map +++ b/docs/classSurveillance_1_1layers_1_1base_1_1Params__coll__graph.map @@ -1,7 +1,4 @@ -<<<<<<< HEAD -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d diff --git a/docs/classSurveillance_1_1layers_1_1base_1_1Params__coll__graph.md5 b/docs/classSurveillance_1_1layers_1_1base_1_1Params__coll__graph.md5 index 2124ae23..87fd2092 100644 --- a/docs/classSurveillance_1_1layers_1_1base_1_1Params__coll__graph.md5 +++ b/docs/classSurveillance_1_1layers_1_1base_1_1Params__coll__graph.md5 @@ -1,5 +1 @@ -<<<<<<< HEAD -b81706e6cacf9821138a554ee716e0eb -======= -55cfaabc9c8c73585518988a2cbeae27 ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d +b81706e6cacf9821138a554ee716e0eb \ No newline at end of file diff --git a/docs/classSurveillance_1_1layers_1_1base_1_1Params__inherit__graph.map b/docs/classSurveillance_1_1layers_1_1base_1_1Params__inherit__graph.map index 588a9527..a7927c55 100644 --- a/docs/classSurveillance_1_1layers_1_1base_1_1Params__inherit__graph.map +++ b/docs/classSurveillance_1_1layers_1_1base_1_1Params__inherit__graph.map @@ -1,7 +1,4 @@ -<<<<<<< HEAD -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d diff --git a/docs/classSurveillance_1_1layers_1_1base_1_1Params__inherit__graph.md5 b/docs/classSurveillance_1_1layers_1_1base_1_1Params__inherit__graph.md5 index 652be206..0ddc4ff4 100644 --- a/docs/classSurveillance_1_1layers_1_1base_1_1Params__inherit__graph.md5 +++ b/docs/classSurveillance_1_1layers_1_1base_1_1Params__inherit__graph.md5 @@ -1,5 +1 @@ -<<<<<<< HEAD -a63bb83b4da69a8ca9a60d187f05df61 -======= -f6eba4c1c52841effb503295c4e05887 ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d +a63bb83b4da69a8ca9a60d187f05df61 \ No newline at end of file diff --git a/docs/classSurveillance_1_1layers_1_1base__bg_1_1Base__bg-members.html b/docs/classSurveillance_1_1layers_1_1base__bg_1_1Base__bg-members.html index cd9afc70..ada8c4ad 100644 --- a/docs/classSurveillance_1_1layers_1_1base__bg_1_1Base__bg-members.html +++ b/docs/classSurveillance_1_1layers_1_1base__bg_1_1Base__bg-members.html @@ -1,17 +1,9 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d IVALab Python Libraries: Member List @@ -38,34 +30,21 @@

    -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
    This is the complete list of members for Base_bg, including all inherited members.

    -<<<<<<< HEAD @@ -107,29 +85,12 @@ -======= - - - - - - - - - - - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
    __init__(self, theDetector, theTracker, trackFilter, Params params)Base_bg
    Surveillance::layers::base::Base.__init__(self, theDetector, theTracker, trackFilter, Params params)Base
    det_mask(self)Base_bg
    measure(self, I)Base
    paramsBase
    update_params(self, name, val)Base
    __init__Base_bg
    det_mask(self)Base_bg
    draw_layer(self, img=None, raw_detect=False, ax=None)Base
    get_mask(self)Base
    get_state(self)Base
    layer_maskBase
    layer_mask_detBase
    layer_stateBase
    measure(self, I)Base
    paramsBase
    update_params(self, name, val)Base
    diff --git a/docs/classSurveillance_1_1layers_1_1base__bg_1_1Base__bg.html b/docs/classSurveillance_1_1layers_1_1base__bg_1_1Base__bg.html index 9f1df300..d0ba96d5 100644 --- a/docs/classSurveillance_1_1layers_1_1base__bg_1_1Base__bg.html +++ b/docs/classSurveillance_1_1layers_1_1base__bg_1_1Base__bg.html @@ -1,17 +1,9 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d IVALab Python Libraries: Base_bg Class Reference @@ -38,34 +30,21 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
    Inheritance graph
    -<<<<<<< HEAD -======= - - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
    [legend]
    @@ -115,19 +89,14 @@
    Collaboration graph
    -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
    [legend]
    -<<<<<<< HEAD @@ -135,17 +104,6 @@ -======= - - - - - - - - - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d @@ -170,13 +128,8 @@

    Public Member Functions

    def __init__ (self, theDetector, theTracker, trackFilter, Params params)
     
    def det_mask (self)
    - Public Member Functions inherited from Base
    def __init__ (self, theDetector, theTracker, trackFilter, Params params)
     
    def __init__
     
    def det_mask (self)
     
    - Public Member Functions inherited from Base
    def __init__
     
    def det_mask (self)
     
    def draw_layer (self, img=None, raw_detect=False, ax=None)
     
    def get_mask (self)
     

    Constructor & Destructor Documentation

    -<<<<<<< HEAD

    ◆ __init__()

    -======= - -

    ◆ __init__()

    ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d

    Member Function Documentation

    @@ -250,30 +195,19 @@

    Overwrite the det_mask function
     
    -<<<<<<< HEAD

    Reimplemented from Base.


    The documentation for this class was generated from the following file:
    • /home/mary/python/Surveillance/Surveillance/layers/base_bg.py
    • -======= - - -
      The documentation for this class was generated from the following file:
        -
      • /home/pvela/python/Surveillance/Surveillance/layers/base_bg.py
      • ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
      diff --git a/docs/classSurveillance_1_1layers_1_1base__bg_1_1Base__bg__coll__graph.map b/docs/classSurveillance_1_1layers_1_1base__bg_1_1Base__bg__coll__graph.map index 411b5ad7..daba398f 100644 --- a/docs/classSurveillance_1_1layers_1_1base__bg_1_1Base__bg__coll__graph.map +++ b/docs/classSurveillance_1_1layers_1_1base__bg_1_1Base__bg__coll__graph.map @@ -1,9 +1,5 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d diff --git a/docs/classSurveillance_1_1layers_1_1base__bg_1_1Base__bg__coll__graph.md5 b/docs/classSurveillance_1_1layers_1_1base__bg_1_1Base__bg__coll__graph.md5 index b4e05964..a9b048d5 100644 --- a/docs/classSurveillance_1_1layers_1_1base__bg_1_1Base__bg__coll__graph.md5 +++ b/docs/classSurveillance_1_1layers_1_1base__bg_1_1Base__bg__coll__graph.md5 @@ -1,5 +1 @@ -<<<<<<< HEAD -3fb03f7b6a9fc8e05f5a33131c5a6f18 -======= -fcf4553b70e13e24dbecb3f56c18c841 ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d +3fb03f7b6a9fc8e05f5a33131c5a6f18 \ No newline at end of file diff --git a/docs/classSurveillance_1_1layers_1_1base__bg_1_1Base__bg__inherit__graph.map b/docs/classSurveillance_1_1layers_1_1base__bg_1_1Base__bg__inherit__graph.map index 09292629..223e97e3 100644 --- a/docs/classSurveillance_1_1layers_1_1base__bg_1_1Base__bg__inherit__graph.map +++ b/docs/classSurveillance_1_1layers_1_1base__bg_1_1Base__bg__inherit__graph.map @@ -1,11 +1,6 @@ -<<<<<<< HEAD -======= - - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d diff --git a/docs/classSurveillance_1_1layers_1_1base__bg_1_1Base__bg__inherit__graph.md5 b/docs/classSurveillance_1_1layers_1_1base__bg_1_1Base__bg__inherit__graph.md5 index 1eccd07b..7cecce38 100644 --- a/docs/classSurveillance_1_1layers_1_1base__bg_1_1Base__bg__inherit__graph.md5 +++ b/docs/classSurveillance_1_1layers_1_1base__bg_1_1Base__bg__inherit__graph.md5 @@ -1,5 +1 @@ -<<<<<<< HEAD -c129662e42d896cf013a8bffe86ccd6c -======= -ef2a043c759c8974c3483ddf242c3ee6 ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d +c129662e42d896cf013a8bffe86ccd6c \ No newline at end of file diff --git a/docs/classSurveillance_1_1layers_1_1base__bg_1_1Params-members.html b/docs/classSurveillance_1_1layers_1_1base__bg_1_1Params-members.html index dcf7bb4a..0f2ceb14 100644 --- a/docs/classSurveillance_1_1layers_1_1base__bg_1_1Params-members.html +++ b/docs/classSurveillance_1_1layers_1_1base__bg_1_1Params-members.html @@ -1,17 +1,9 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d IVALab Python Libraries: Member List @@ -38,34 +30,21 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
      Inheritance graph
      -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
      [legend]
      Collaboration diagram for Params:
      Collaboration graph
      -<<<<<<< HEAD -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
      [legend]
      -<<<<<<< HEAD -======= - - - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d

      Public Member Functions

      def __post_init__ (self)
       
      - Public Member Functions inherited from Params
      def __post_init__ (self)
       
      @@ -156,7 +122,6 @@

      -<<<<<<< HEAD

      Reimplemented from Params.

      Reimplemented in Params_GMM.

      @@ -165,23 +130,13 @@

      base_bg.py -======= - - -
      The documentation for this class was generated from the following file:
        -
      • /home/pvela/python/Surveillance/Surveillance/layers/base_bg.py
      • ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
      diff --git a/docs/classSurveillance_1_1layers_1_1base__bg_1_1Params__coll__graph.map b/docs/classSurveillance_1_1layers_1_1base__bg_1_1Params__coll__graph.map index b28018a9..d863e18b 100644 --- a/docs/classSurveillance_1_1layers_1_1base__bg_1_1Params__coll__graph.map +++ b/docs/classSurveillance_1_1layers_1_1base__bg_1_1Params__coll__graph.map @@ -1,6 +1,3 @@ -<<<<<<< HEAD -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d diff --git a/docs/classSurveillance_1_1layers_1_1base__bg_1_1Params__coll__graph.md5 b/docs/classSurveillance_1_1layers_1_1base__bg_1_1Params__coll__graph.md5 index 2bc4530e..4566e02c 100644 --- a/docs/classSurveillance_1_1layers_1_1base__bg_1_1Params__coll__graph.md5 +++ b/docs/classSurveillance_1_1layers_1_1base__bg_1_1Params__coll__graph.md5 @@ -1,5 +1 @@ -<<<<<<< HEAD -2f3eb0acf1777274cf319a1a4d488eab -======= -7530712c072b59a3d1158834060f8d63 ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d +2f3eb0acf1777274cf319a1a4d488eab \ No newline at end of file diff --git a/docs/classSurveillance_1_1layers_1_1base__bg_1_1Params__inherit__graph.map b/docs/classSurveillance_1_1layers_1_1base__bg_1_1Params__inherit__graph.map index 07f23535..ff5842e2 100644 --- a/docs/classSurveillance_1_1layers_1_1base__bg_1_1Params__inherit__graph.map +++ b/docs/classSurveillance_1_1layers_1_1base__bg_1_1Params__inherit__graph.map @@ -1,8 +1,4 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d diff --git a/docs/classSurveillance_1_1layers_1_1base__bg_1_1Params__inherit__graph.md5 b/docs/classSurveillance_1_1layers_1_1base__bg_1_1Params__inherit__graph.md5 index 32b819d3..6c349ae9 100644 --- a/docs/classSurveillance_1_1layers_1_1base__bg_1_1Params__inherit__graph.md5 +++ b/docs/classSurveillance_1_1layers_1_1base__bg_1_1Params__inherit__graph.md5 @@ -1,5 +1 @@ -<<<<<<< HEAD -e06ba74f4ac4de012345405ef2b4a0ca -======= -0f27679154ae68504a269814b824f0c2 ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d +e06ba74f4ac4de012345405ef2b4a0ca \ No newline at end of file diff --git a/docs/classSurveillance_1_1layers_1_1base__fg_1_1Base__fg-members.html b/docs/classSurveillance_1_1layers_1_1base__fg_1_1Base__fg-members.html index 70f742b7..a1e797a0 100644 --- a/docs/classSurveillance_1_1layers_1_1base__fg_1_1Base__fg-members.html +++ b/docs/classSurveillance_1_1layers_1_1base__fg_1_1Base__fg-members.html @@ -1,17 +1,9 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d IVALab Python Libraries: Member List @@ -38,34 +30,21 @@

      Additional Inherited Members

      -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
      This is the complete list of members for Base_fg, including all inherited members.

      -<<<<<<< HEAD @@ -107,29 +85,12 @@ -======= - - - - - - - - - - - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
      __init__(self, theDetector, theTracker, trackFilter, Params params)Base_fg
      Surveillance::layers::base::Base.__init__(self, theDetector, theTracker, trackFilter, Params params)Base
      det_mask(self)Base_fg
      measure(self, I)Base
      paramsBase
      update_params(self, name, val)Base
      __init__Base_fg
      det_mask(self)Base_fg
      draw_layer(self, img=None, raw_detect=False, ax=None)Base
      get_mask(self)Base
      get_state(self)Base
      layer_maskBase
      layer_mask_detBase
      layer_stateBase
      measure(self, I)Base
      paramsBase
      update_params(self, name, val)Base
      diff --git a/docs/classSurveillance_1_1layers_1_1base__fg_1_1Base__fg.html b/docs/classSurveillance_1_1layers_1_1base__fg_1_1Base__fg.html index 7d022a92..213be6fe 100644 --- a/docs/classSurveillance_1_1layers_1_1base__fg_1_1Base__fg.html +++ b/docs/classSurveillance_1_1layers_1_1base__fg_1_1Base__fg.html @@ -1,17 +1,9 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d IVALab Python Libraries: Base_fg Class Reference @@ -38,34 +30,21 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
      Inheritance graph
      -<<<<<<< HEAD @@ -108,14 +86,6 @@ -======= - - - - - - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
      [legend]
      @@ -123,19 +93,14 @@
      Collaboration graph
      -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
      [legend]
      -<<<<<<< HEAD @@ -143,17 +108,6 @@ -======= - - - - - - - - - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d @@ -178,13 +132,8 @@

      Public Member Functions

      def __init__ (self, theDetector, theTracker, trackFilter, Params params)
       
      def det_mask (self)
      - Public Member Functions inherited from Base
      def __init__ (self, theDetector, theTracker, trackFilter, Params params)
       
      def __init__
       
      def det_mask (self)
       
      - Public Member Functions inherited from Base
      def __init__
       
      def det_mask (self)
       
      def draw_layer (self, img=None, raw_detect=False, ax=None)
       
      def get_mask (self)
       

      Constructor & Destructor Documentation

      -<<<<<<< HEAD

      ◆ __init__()

      -======= - -

      ◆ __init__()

      ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d

      Member Function Documentation

      @@ -258,7 +199,6 @@

      Overwrite the det_mask function
       
      -<<<<<<< HEAD

      Reimplemented from Base.

      Reimplemented in Puzzle_Residual, robot_inRange, and Human_ColorSG.

      @@ -267,23 +207,13 @@

      base_fg.py -======= -

      - -
      The documentation for this class was generated from the following file:
        -
      • /home/pvela/python/Surveillance/Surveillance/layers/base_fg.py
      • ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
      diff --git a/docs/classSurveillance_1_1layers_1_1base__fg_1_1Base__fg__coll__graph.map b/docs/classSurveillance_1_1layers_1_1base__fg_1_1Base__fg__coll__graph.map index ed4f25bc..b79e8fc5 100644 --- a/docs/classSurveillance_1_1layers_1_1base__fg_1_1Base__fg__coll__graph.map +++ b/docs/classSurveillance_1_1layers_1_1base__fg_1_1Base__fg__coll__graph.map @@ -1,9 +1,5 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d diff --git a/docs/classSurveillance_1_1layers_1_1base__fg_1_1Base__fg__coll__graph.md5 b/docs/classSurveillance_1_1layers_1_1base__fg_1_1Base__fg__coll__graph.md5 index f3eb0ac7..7c941221 100644 --- a/docs/classSurveillance_1_1layers_1_1base__fg_1_1Base__fg__coll__graph.md5 +++ b/docs/classSurveillance_1_1layers_1_1base__fg_1_1Base__fg__coll__graph.md5 @@ -1,5 +1 @@ -<<<<<<< HEAD -e5979a0103e2415932c7d308bd62d2de -======= -3b43f6e20135def2461d12ec8da04685 ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d +e5979a0103e2415932c7d308bd62d2de \ No newline at end of file diff --git a/docs/classSurveillance_1_1layers_1_1base__fg_1_1Base__fg__inherit__graph.map b/docs/classSurveillance_1_1layers_1_1base__fg_1_1Base__fg__inherit__graph.map index 47719e49..bb62e94b 100644 --- a/docs/classSurveillance_1_1layers_1_1base__fg_1_1Base__fg__inherit__graph.map +++ b/docs/classSurveillance_1_1layers_1_1base__fg_1_1Base__fg__inherit__graph.map @@ -1,5 +1,4 @@ -<<<<<<< HEAD @@ -8,12 +7,4 @@ -======= - - - - - - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d diff --git a/docs/classSurveillance_1_1layers_1_1base__fg_1_1Base__fg__inherit__graph.md5 b/docs/classSurveillance_1_1layers_1_1base__fg_1_1Base__fg__inherit__graph.md5 index d6cf4bc8..f0c8800e 100644 --- a/docs/classSurveillance_1_1layers_1_1base__fg_1_1Base__fg__inherit__graph.md5 +++ b/docs/classSurveillance_1_1layers_1_1base__fg_1_1Base__fg__inherit__graph.md5 @@ -1,5 +1 @@ -<<<<<<< HEAD -f3e348e9aad1c46e4cf34b29e6cf37b4 -======= -c85cbe13b8b6d9aa27776d012605a6a3 ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d +f3e348e9aad1c46e4cf34b29e6cf37b4 \ No newline at end of file diff --git a/docs/classSurveillance_1_1layers_1_1base__fg_1_1Params-members.html b/docs/classSurveillance_1_1layers_1_1base__fg_1_1Params-members.html index 3596f1f7..643951c3 100644 --- a/docs/classSurveillance_1_1layers_1_1base__fg_1_1Params-members.html +++ b/docs/classSurveillance_1_1layers_1_1base__fg_1_1Params-members.html @@ -1,17 +1,9 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d IVALab Python Libraries: Member List @@ -38,34 +30,21 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
      Inheritance graph
      -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
      [legend]
      Collaboration diagram for Params:
      Collaboration graph
      -<<<<<<< HEAD -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
      [legend]
      -<<<<<<< HEAD -======= - - - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d

      Public Member Functions

      def __post_init__ (self)
       
      - Public Member Functions inherited from Params
      def __post_init__ (self)
       
      @@ -153,7 +119,6 @@

      -<<<<<<< HEAD

      Reimplemented from Params.

      Reimplemented in Params, Params_Residual, and Params.

      @@ -162,23 +127,13 @@

      base_fg.py -======= - - -
      The documentation for this class was generated from the following file:
        -
      • /home/pvela/python/Surveillance/Surveillance/layers/base_fg.py
      • ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
      diff --git a/docs/classSurveillance_1_1layers_1_1base__fg_1_1Params__coll__graph.map b/docs/classSurveillance_1_1layers_1_1base__fg_1_1Params__coll__graph.map index b28018a9..d863e18b 100644 --- a/docs/classSurveillance_1_1layers_1_1base__fg_1_1Params__coll__graph.map +++ b/docs/classSurveillance_1_1layers_1_1base__fg_1_1Params__coll__graph.map @@ -1,6 +1,3 @@ -<<<<<<< HEAD -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d diff --git a/docs/classSurveillance_1_1layers_1_1base__fg_1_1Params__coll__graph.md5 b/docs/classSurveillance_1_1layers_1_1base__fg_1_1Params__coll__graph.md5 index 2bc4530e..4566e02c 100644 --- a/docs/classSurveillance_1_1layers_1_1base__fg_1_1Params__coll__graph.md5 +++ b/docs/classSurveillance_1_1layers_1_1base__fg_1_1Params__coll__graph.md5 @@ -1,5 +1 @@ -<<<<<<< HEAD -2f3eb0acf1777274cf319a1a4d488eab -======= -7530712c072b59a3d1158834060f8d63 ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d +2f3eb0acf1777274cf319a1a4d488eab \ No newline at end of file diff --git a/docs/classSurveillance_1_1layers_1_1base__fg_1_1Params__inherit__graph.map b/docs/classSurveillance_1_1layers_1_1base__fg_1_1Params__inherit__graph.map index 9cb72dee..12ff37f6 100644 --- a/docs/classSurveillance_1_1layers_1_1base__fg_1_1Params__inherit__graph.map +++ b/docs/classSurveillance_1_1layers_1_1base__fg_1_1Params__inherit__graph.map @@ -1,8 +1,4 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d diff --git a/docs/classSurveillance_1_1layers_1_1base__fg_1_1Params__inherit__graph.md5 b/docs/classSurveillance_1_1layers_1_1base__fg_1_1Params__inherit__graph.md5 index afe27d71..d85aa626 100644 --- a/docs/classSurveillance_1_1layers_1_1base__fg_1_1Params__inherit__graph.md5 +++ b/docs/classSurveillance_1_1layers_1_1base__fg_1_1Params__inherit__graph.md5 @@ -1,5 +1 @@ -<<<<<<< HEAD -7bc19477ce9eb8b5262542b5bd7fcaf4 -======= -9e678bbe2f425cd4e74f457863fe34e5 ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d +7bc19477ce9eb8b5262542b5bd7fcaf4 \ No newline at end of file diff --git a/docs/classSurveillance_1_1layers_1_1human__seg_1_1Human__ColorSG-members.html b/docs/classSurveillance_1_1layers_1_1human__seg_1_1Human__ColorSG-members.html index 595a37a0..51e1ec53 100644 --- a/docs/classSurveillance_1_1layers_1_1human__seg_1_1Human__ColorSG-members.html +++ b/docs/classSurveillance_1_1layers_1_1human__seg_1_1Human__ColorSG-members.html @@ -1,17 +1,9 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d IVALab Python Libraries: Member List @@ -38,34 +30,21 @@

      Additional Inherited Members

      -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
      This is the complete list of members for Human_ColorSG, including all inherited members.

      -<<<<<<< HEAD @@ -109,31 +87,12 @@ -======= - - - - - - - - - - - - - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
      __init__(self, targetSG theDetector, theTracker, trackFilter, Params params)Human_ColorSG
      Surveillance::layers::base_fg::Base_fg.__init__(self, theDetector, theTracker, trackFilter, Params params)Base_fg
      Surveillance::layers::base::Base.__init__(self, theDetector, theTracker, trackFilter, Params params)Base
      measure(self, I)Base
      paramsBase
      update_params(self, name, val)Base
      __init__Human_ColorSG
      Surveillance::layers::base_fg::Base_fg.__init__Base_fg
      buildFromImageHuman_ColorSGstatic
      det_mask(self)Human_ColorSG
      draw_layer(self, img=None, raw_detect=False, ax=None)Base
      get_mask(self)Base
      get_state(self)Base
      layer_maskBase
      layer_mask_detBase
      layer_stateBase
      measure(self, I)Base
      paramsBase
      update_params(self, name, val)Base
      diff --git a/docs/classSurveillance_1_1layers_1_1human__seg_1_1Human__ColorSG.html b/docs/classSurveillance_1_1layers_1_1human__seg_1_1Human__ColorSG.html index 1b39e2f5..80f6b989 100644 --- a/docs/classSurveillance_1_1layers_1_1human__seg_1_1Human__ColorSG.html +++ b/docs/classSurveillance_1_1layers_1_1human__seg_1_1Human__ColorSG.html @@ -1,17 +1,9 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d IVALab Python Libraries: Human_ColorSG Class Reference @@ -38,34 +30,21 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
      Inheritance graph
      -<<<<<<< HEAD -======= - - - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
      [legend]
      @@ -118,21 +91,15 @@
      Collaboration graph
      -<<<<<<< HEAD -======= - - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
      [legend]
      -<<<<<<< HEAD @@ -143,22 +110,6 @@ -======= - - - - - - - - - - - - - - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d @@ -172,13 +123,8 @@

      Public Member Functions

      def __init__ (self, targetSG theDetector, theTracker, trackFilter, Params params)
       
      def det_mask (self)
      - Public Member Functions inherited from Base
      def __init__ (self, theDetector, theTracker, trackFilter, Params params)
       
      def __init__
       
      def det_mask (self)
       
      - Public Member Functions inherited from Base_fg
      def __init__
       
      def det_mask (self)
       
      - Public Member Functions inherited from Base
      def __init__
       
      def det_mask (self)
       
      def draw_layer (self, img=None, raw_detect=False, ax=None)
       
      def get_mask (self)
      -<<<<<<< HEAD -======= - - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d

      Static Public Member Functions

      def buildFromImage (img, tracker=None, trackFilter=None, Params params=Params())
       
      def buildFromImage
       
      @@ -193,13 +139,8 @@

      Additional Inherited Members

       

      Constructor & Destructor Documentation

      -<<<<<<< HEAD

      ◆ __init__()

      -======= - -

      ◆ __init__()

      ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
      @@ -213,7 +154,6 @@

      -<<<<<<< HEAD targetSG  theDetector, @@ -234,10 +174,6 @@

      Params  params  -======= -   - theDetector  ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d @@ -246,7 +182,6 @@

      -<<<<<<< HEAD
      The human segmentor with the single-Gaussian based color detector  
       

      @@ -254,14 +189,6 @@

      Member Function Documentation

      ◆ buildFromImage()

      -======= - -
      -
      -

      Member Function Documentation

      - -

      ◆ buildFromImage()

      ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
      @@ -290,13 +217,8 @@

      -<<<<<<< HEAD Params  params = Params()  -======= -   - params  ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d @@ -310,12 +232,8 @@

      -<<<<<<< HEAD
      Return a Human_colorSG instance whose detector(targetSG) is built from the input image
       
      -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d

      @@ -336,30 +254,19 @@

      det_mask only gets the detection mask without postprocess refinement Overwrite the det_mask function -<<<<<<< HEAD

      Reimplemented from Base_fg.


      The documentation for this class was generated from the following file:
      • /home/mary/python/Surveillance/Surveillance/layers/human_seg.py
      • -======= - - -
        The documentation for this class was generated from the following file:
          -
        • /home/pvela/python/Surveillance/Surveillance/layers/human_seg.py
        • ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
        diff --git a/docs/classSurveillance_1_1layers_1_1human__seg_1_1Human__ColorSG__HeightInRange-members.html b/docs/classSurveillance_1_1layers_1_1human__seg_1_1Human__ColorSG__HeightInRange-members.html index 49c0f88d..066bd30c 100644 --- a/docs/classSurveillance_1_1layers_1_1human__seg_1_1Human__ColorSG__HeightInRange-members.html +++ b/docs/classSurveillance_1_1layers_1_1human__seg_1_1Human__ColorSG__HeightInRange-members.html @@ -1,17 +1,9 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d IVALab Python Libraries: Member List @@ -38,34 +30,21 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
        This is the complete list of members for Human_ColorSG_HeightInRange, including all inherited members.

        -<<<<<<< HEAD @@ -102,13 +80,6 @@ -======= - - - - - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d @@ -128,21 +99,13 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
        __init__(self, targetSG theDetector, HeightEstimator theHeightEstimator=None, theTracker=None, trackFilter=None, Params params=Params())Human_ColorSG_HeightInRange
        Surveillance::layers::human_seg::Human_ColorSG.__init__(self, targetSG theDetector, theTracker, trackFilter, Params params)Human_ColorSG
        Surveillance::layers::base_fg::Base_fg.__init__(self, theDetector, theTracker, trackFilter, Params params)Base_fg
        buildFromImage(img_color, dep_height=None, intrinsics=None, tracker=None, trackerFilter=None, Params params=Params())Human_ColorSG_HeightInRangestatic
        Surveillance::layers::human_seg::Human_ColorSG.buildFromImage(img, tracker=None, trackFilter=None, Params params=Params())Human_ColorSGstatic
        buildImgDiff(img_bg, img_fg, dep_height=None, intrinsics=None, tracker=None, trackerFilter=None, Params params=Params())Human_ColorSG_HeightInRangestatic
        __init__Human_ColorSG_HeightInRange
        Surveillance::layers::base_fg::Base_fg.__init__Base_fg
        buildFromImageHuman_ColorSG_HeightInRangestatic
        Surveillance::layers::human_seg::Human_ColorSG.buildFromImageHuman_ColorSGstatic
        buildImgDiffHuman_ColorSG_HeightInRangestatic
        depthHuman_ColorSG_HeightInRange
        det_mask(self)Human_ColorSG
        draw_height(self, ax=None)Human_ColorSG_HeightInRange
        update_depth(self, depth)Human_ColorSG_HeightInRange
        update_height_map(self, height_map)Human_ColorSG_HeightInRange
        update_params(self, name, val)Base
        update_postprocess(self, callable postprocessor)Human_ColorSG_HeightInRange
        update_postprocessHuman_ColorSG_HeightInRange
        diff --git a/docs/classSurveillance_1_1layers_1_1human__seg_1_1Human__ColorSG__HeightInRange.html b/docs/classSurveillance_1_1layers_1_1human__seg_1_1Human__ColorSG__HeightInRange.html index 5f1e8e97..6ec6f903 100644 --- a/docs/classSurveillance_1_1layers_1_1human__seg_1_1Human__ColorSG__HeightInRange.html +++ b/docs/classSurveillance_1_1layers_1_1human__seg_1_1Human__ColorSG__HeightInRange.html @@ -1,17 +1,9 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d IVALab Python Libraries: Human_ColorSG_HeightInRange Class Reference @@ -38,34 +30,21 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
        Inheritance graph
        -<<<<<<< HEAD -======= - - - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
        [legend]
        @@ -119,29 +92,18 @@
        Collaboration graph
        -<<<<<<< HEAD -======= - - - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
        [legend]
        -<<<<<<< HEAD -======= - - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d @@ -152,7 +114,6 @@ -<<<<<<< HEAD @@ -166,42 +127,17 @@ -======= - - - - - - - - - - - - - - - - - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d

        Public Member Functions

        def __init__ (self, targetSG theDetector, HeightEstimator theHeightEstimator=None, theTracker=None, trackFilter=None, Params params=Params())
         
        def __init__
         
        def draw_height (self, ax=None)
         
        def measure (self, I)
         
        def update_height_map (self, height_map)
         
        def update_postprocess (self, callable postprocessor)
         
        - Public Member Functions inherited from Human_ColorSG
        - Public Member Functions inherited from Base
        def __init__ (self, theDetector, theTracker, trackFilter, Params params)
         
        def update_postprocess
         
        - Public Member Functions inherited from Human_ColorSG
        def __init__
         
        def det_mask (self)
         
        - Public Member Functions inherited from Base_fg
        def __init__
         
        def det_mask (self)
         
        - Public Member Functions inherited from Base
        def __init__
         
        def det_mask (self)
         
        def draw_layer (self, img=None, raw_detect=False, ax=None)
         
        def get_mask (self)
         
        def get_state (self)
         
        def measure (self, I)
         
        def update_params (self, name, val)
         
        -<<<<<<< HEAD @@ -209,15 +145,6 @@ -======= - - - - - - - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d

        Static Public Member Functions

        def buildFromImage (img_color, dep_height=None, intrinsics=None, tracker=None, trackerFilter=None, Params params=Params())
         
        def buildImgDiff (img_bg, img_fg, dep_height=None, intrinsics=None, tracker=None, trackerFilter=None, Params params=Params())
        - Static Public Member Functions inherited from Human_ColorSG
        def buildFromImage (img, tracker=None, trackFilter=None, Params params=Params())
         
        def buildFromImage
         
        def buildImgDiff
         
        - Static Public Member Functions inherited from Human_ColorSG
        def buildFromImage
         
        @@ -234,11 +161,7 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d @@ -259,13 +182,8 @@ The postprocessor passed to the class constructor will be performed after the heightInRange process

        Constructor & Destructor Documentation

        -<<<<<<< HEAD

        ◆ __init__()

        -======= - -

        ◆ __init__()

        ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
        @@ -279,7 +197,6 @@

        -<<<<<<< HEAD @@ -306,10 +223,6 @@

        Params  

        -======= - - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d @@ -322,13 +235,8 @@

        Member Function Documentation

        -<<<<<<< HEAD

        ◆ buildFromImage()

        -======= - -

        ◆ buildFromImage()

        ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
        @@ -369,13 +277,8 @@

        -<<<<<<< HEAD -======= - - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d @@ -389,7 +292,6 @@

        -<<<<<<< HEAD
        Overwrite the base buildFromImage
         
         Now building a ColorSG_HeightInRange human segmentor requires three things
        @@ -407,13 +309,6 @@ 

        ◆ buildImgDiff()

        -======= - - - - -

        ◆ buildImgDiff()

        ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
        @@ -460,13 +355,8 @@

        -<<<<<<< HEAD -======= - - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d @@ -480,7 +370,6 @@

        -<<<<<<< HEAD
        Create a ColorSG_HeightInRange human segmenter by using the image difference method
         to automatically extract the target color samples and optionally using the empty table 
         depth data to calibrate a height estimator
        @@ -499,9 +388,6 @@ 

        @@ -563,11 +449,8 @@

        Base.

        -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d @@ -662,13 +545,8 @@

        ◆ update_postprocess()

        -======= - -

        ◆ update_postprocess()

        ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
        @@ -682,11 +560,7 @@

        -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d @@ -696,12 +570,8 @@

        -<<<<<<< HEAD
        update the postprocessor, which is the customized one after applying the height-based segmentation process.
         
        -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d

        Member Data Documentation

        @@ -820,22 +690,14 @@

        human_seg.py -======= -
      • /home/pvela/python/Surveillance/Surveillance/layers/human_seg.py
      • ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d diff --git a/docs/classSurveillance_1_1layers_1_1human__seg_1_1Human__ColorSG__HeightInRange__coll__graph.map b/docs/classSurveillance_1_1layers_1_1human__seg_1_1Human__ColorSG__HeightInRange__coll__graph.map index ef66b1c1..ea08a8bc 100644 --- a/docs/classSurveillance_1_1layers_1_1human__seg_1_1Human__ColorSG__HeightInRange__coll__graph.map +++ b/docs/classSurveillance_1_1layers_1_1human__seg_1_1Human__ColorSG__HeightInRange__coll__graph.map @@ -1,13 +1,7 @@ -<<<<<<< HEAD -======= - - - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d diff --git a/docs/classSurveillance_1_1layers_1_1human__seg_1_1Human__ColorSG__HeightInRange__coll__graph.md5 b/docs/classSurveillance_1_1layers_1_1human__seg_1_1Human__ColorSG__HeightInRange__coll__graph.md5 index 55175ef4..9793a4c1 100644 --- a/docs/classSurveillance_1_1layers_1_1human__seg_1_1Human__ColorSG__HeightInRange__coll__graph.md5 +++ b/docs/classSurveillance_1_1layers_1_1human__seg_1_1Human__ColorSG__HeightInRange__coll__graph.md5 @@ -1,5 +1 @@ -<<<<<<< HEAD -31c5d37aabb3a9bc22f9c7883bd97877 -======= -6de8358a4b6fa5cb5c7acc937a74bbc7 ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d +31c5d37aabb3a9bc22f9c7883bd97877 \ No newline at end of file diff --git a/docs/classSurveillance_1_1layers_1_1human__seg_1_1Human__ColorSG__HeightInRange__inherit__graph.map b/docs/classSurveillance_1_1layers_1_1human__seg_1_1Human__ColorSG__HeightInRange__inherit__graph.map index ef66b1c1..ea08a8bc 100644 --- a/docs/classSurveillance_1_1layers_1_1human__seg_1_1Human__ColorSG__HeightInRange__inherit__graph.map +++ b/docs/classSurveillance_1_1layers_1_1human__seg_1_1Human__ColorSG__HeightInRange__inherit__graph.map @@ -1,13 +1,7 @@ -<<<<<<< HEAD -======= - - - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d diff --git a/docs/classSurveillance_1_1layers_1_1human__seg_1_1Human__ColorSG__HeightInRange__inherit__graph.md5 b/docs/classSurveillance_1_1layers_1_1human__seg_1_1Human__ColorSG__HeightInRange__inherit__graph.md5 index 4a0ce020..9793a4c1 100644 --- a/docs/classSurveillance_1_1layers_1_1human__seg_1_1Human__ColorSG__HeightInRange__inherit__graph.md5 +++ b/docs/classSurveillance_1_1layers_1_1human__seg_1_1Human__ColorSG__HeightInRange__inherit__graph.md5 @@ -1,5 +1 @@ -<<<<<<< HEAD -31c5d37aabb3a9bc22f9c7883bd97877 -======= -1dad038e4477ca75751b67d9d5230b3a ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d +31c5d37aabb3a9bc22f9c7883bd97877 \ No newline at end of file diff --git a/docs/classSurveillance_1_1layers_1_1human__seg_1_1Human__ColorSG__coll__graph.map b/docs/classSurveillance_1_1layers_1_1human__seg_1_1Human__ColorSG__coll__graph.map index 33359292..449a091b 100644 --- a/docs/classSurveillance_1_1layers_1_1human__seg_1_1Human__ColorSG__coll__graph.map +++ b/docs/classSurveillance_1_1layers_1_1human__seg_1_1Human__ColorSG__coll__graph.map @@ -1,11 +1,6 @@ -<<<<<<< HEAD -======= - - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d diff --git a/docs/classSurveillance_1_1layers_1_1human__seg_1_1Human__ColorSG__coll__graph.md5 b/docs/classSurveillance_1_1layers_1_1human__seg_1_1Human__ColorSG__coll__graph.md5 index f243743e..7492a760 100644 --- a/docs/classSurveillance_1_1layers_1_1human__seg_1_1Human__ColorSG__coll__graph.md5 +++ b/docs/classSurveillance_1_1layers_1_1human__seg_1_1Human__ColorSG__coll__graph.md5 @@ -1,5 +1 @@ -<<<<<<< HEAD -0ed53297597959b48a4fecdd5443315d -======= -3e8e8a8ef94e05eb907837773a22937c ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d +0ed53297597959b48a4fecdd5443315d \ No newline at end of file diff --git a/docs/classSurveillance_1_1layers_1_1human__seg_1_1Human__ColorSG__inherit__graph.map b/docs/classSurveillance_1_1layers_1_1human__seg_1_1Human__ColorSG__inherit__graph.map index 60a45473..3a5d7f1c 100644 --- a/docs/classSurveillance_1_1layers_1_1human__seg_1_1Human__ColorSG__inherit__graph.map +++ b/docs/classSurveillance_1_1layers_1_1human__seg_1_1Human__ColorSG__inherit__graph.map @@ -1,13 +1,7 @@ -<<<<<<< HEAD -======= - - - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d diff --git a/docs/classSurveillance_1_1layers_1_1human__seg_1_1Human__ColorSG__inherit__graph.md5 b/docs/classSurveillance_1_1layers_1_1human__seg_1_1Human__ColorSG__inherit__graph.md5 index f88bb73e..4b742ac0 100644 --- a/docs/classSurveillance_1_1layers_1_1human__seg_1_1Human__ColorSG__inherit__graph.md5 +++ b/docs/classSurveillance_1_1layers_1_1human__seg_1_1Human__ColorSG__inherit__graph.md5 @@ -1,5 +1 @@ -<<<<<<< HEAD -e3c985458b43231fb13b0d17ab8dfb9b -======= -c1cef83693bb0f86c7c98eb3827737e3 ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d +e3c985458b43231fb13b0d17ab8dfb9b \ No newline at end of file diff --git a/docs/classSurveillance_1_1layers_1_1human__seg_1_1Params-members.html b/docs/classSurveillance_1_1layers_1_1human__seg_1_1Params-members.html index 179515f6..2f4b4bf9 100644 --- a/docs/classSurveillance_1_1layers_1_1human__seg_1_1Params-members.html +++ b/docs/classSurveillance_1_1layers_1_1human__seg_1_1Params-members.html @@ -1,17 +1,9 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d IVALab Python Libraries: Member List @@ -38,34 +30,21 @@

        Public Attributes

         layer_mask_det
         
         layer_state
         -NOTE: this is the only overwritten part More...
         -NOTE: this is the only overwritten part More...
         
         post_process_custom
         
        targetSG  theDetector,
        params = Params()  theDetector 
        Params  params = Params()  params 
        Params  params = Params()  params 
        callable  postprocessor 
        -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
        Inheritance graph
        -<<<<<<< HEAD -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
        [legend]
        Collaboration diagram for Params:
        Collaboration graph
        -<<<<<<< HEAD -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
        [legend]
        -<<<<<<< HEAD -======= - - - - - - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d

        Public Member Functions

        def __post_init__ (self)
         
        - Public Member Functions inherited from Params
        def __post_init__ (self)
         
        - Public Member Functions inherited from Params
        def __post_init__ (self)
         
        @@ -159,30 +123,19 @@

        -<<<<<<< HEAD

        Reimplemented from Params.


        The documentation for this class was generated from the following file:
        • /home/mary/python/Surveillance/Surveillance/layers/human_seg.py
        • -======= - - -
          The documentation for this class was generated from the following file:
            -
          • /home/pvela/python/Surveillance/Surveillance/layers/human_seg.py
          • ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
          diff --git a/docs/classSurveillance_1_1layers_1_1human__seg_1_1Params__coll__graph.map b/docs/classSurveillance_1_1layers_1_1human__seg_1_1Params__coll__graph.map index c20fae89..4d1de349 100644 --- a/docs/classSurveillance_1_1layers_1_1human__seg_1_1Params__coll__graph.map +++ b/docs/classSurveillance_1_1layers_1_1human__seg_1_1Params__coll__graph.map @@ -1,7 +1,4 @@ -<<<<<<< HEAD -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d diff --git a/docs/classSurveillance_1_1layers_1_1human__seg_1_1Params__coll__graph.md5 b/docs/classSurveillance_1_1layers_1_1human__seg_1_1Params__coll__graph.md5 index c48a1b26..a4db29e4 100644 --- a/docs/classSurveillance_1_1layers_1_1human__seg_1_1Params__coll__graph.md5 +++ b/docs/classSurveillance_1_1layers_1_1human__seg_1_1Params__coll__graph.md5 @@ -1,5 +1 @@ -<<<<<<< HEAD -dae024f3d95705df261ec8600fd4e7a1 -======= -8d398af9ca51b11a3ee4e7e05dca137d ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d +dae024f3d95705df261ec8600fd4e7a1 \ No newline at end of file diff --git a/docs/classSurveillance_1_1layers_1_1human__seg_1_1Params__inherit__graph.map b/docs/classSurveillance_1_1layers_1_1human__seg_1_1Params__inherit__graph.map index c20fae89..4d1de349 100644 --- a/docs/classSurveillance_1_1layers_1_1human__seg_1_1Params__inherit__graph.map +++ b/docs/classSurveillance_1_1layers_1_1human__seg_1_1Params__inherit__graph.map @@ -1,7 +1,4 @@ -<<<<<<< HEAD -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d diff --git a/docs/classSurveillance_1_1layers_1_1human__seg_1_1Params__inherit__graph.md5 b/docs/classSurveillance_1_1layers_1_1human__seg_1_1Params__inherit__graph.md5 index 8a421df1..9f8508b8 100644 --- a/docs/classSurveillance_1_1layers_1_1human__seg_1_1Params__inherit__graph.md5 +++ b/docs/classSurveillance_1_1layers_1_1human__seg_1_1Params__inherit__graph.md5 @@ -1,5 +1 @@ -<<<<<<< HEAD -894c654d1176749b9486a5a95c094af4 -======= -fe51f6acd708a4abfad061aaa0ce0c9b ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d +894c654d1176749b9486a5a95c094af4 \ No newline at end of file diff --git a/docs/classSurveillance_1_1layers_1_1puzzle__seg_1_1Params__Residual-members.html b/docs/classSurveillance_1_1layers_1_1puzzle__seg_1_1Params__Residual-members.html index 3e4daff2..4d55cfa6 100644 --- a/docs/classSurveillance_1_1layers_1_1puzzle__seg_1_1Params__Residual-members.html +++ b/docs/classSurveillance_1_1layers_1_1puzzle__seg_1_1Params__Residual-members.html @@ -1,17 +1,9 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d IVALab Python Libraries: Member List @@ -38,34 +30,21 @@

        Additional Inherited Members

        -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
        Inheritance graph
        -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
        [legend]
        @@ -112,12 +87,8 @@
        Collaboration graph
        -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
        [legend]
        @@ -125,15 +96,6 @@ Public Member Functions -<<<<<<< HEAD -======= - - - - - - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
        def __post_init__ (self)
         
        - Public Member Functions inherited from Params
        def __post_init__ (self)
         
        - Public Member Functions inherited from Params
        def __post_init__ (self)
         
        @@ -161,30 +123,19 @@

        -<<<<<<< HEAD

        Reimplemented from Params.


        The documentation for this class was generated from the following file:
        • /home/mary/python/Surveillance/Surveillance/layers/puzzle_seg.py
        • -======= - - -
          The documentation for this class was generated from the following file:
            -
          • /home/pvela/python/Surveillance/Surveillance/layers/puzzle_seg.py
          • ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
          diff --git a/docs/classSurveillance_1_1layers_1_1puzzle__seg_1_1Params__Residual__coll__graph.map b/docs/classSurveillance_1_1layers_1_1puzzle__seg_1_1Params__Residual__coll__graph.map index 03ed7719..3d2c394e 100644 --- a/docs/classSurveillance_1_1layers_1_1puzzle__seg_1_1Params__Residual__coll__graph.map +++ b/docs/classSurveillance_1_1layers_1_1puzzle__seg_1_1Params__Residual__coll__graph.map @@ -1,8 +1,4 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d diff --git a/docs/classSurveillance_1_1layers_1_1puzzle__seg_1_1Params__Residual__coll__graph.md5 b/docs/classSurveillance_1_1layers_1_1puzzle__seg_1_1Params__Residual__coll__graph.md5 index c1b8d9dd..3dad12fc 100644 --- a/docs/classSurveillance_1_1layers_1_1puzzle__seg_1_1Params__Residual__coll__graph.md5 +++ b/docs/classSurveillance_1_1layers_1_1puzzle__seg_1_1Params__Residual__coll__graph.md5 @@ -1,5 +1 @@ -<<<<<<< HEAD -9120fe51f128c366424359ac65d53aa6 -======= -9eb5ef7ec314a554479d70e908ebb67b ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d +9120fe51f128c366424359ac65d53aa6 \ No newline at end of file diff --git a/docs/classSurveillance_1_1layers_1_1puzzle__seg_1_1Params__Residual__inherit__graph.map b/docs/classSurveillance_1_1layers_1_1puzzle__seg_1_1Params__Residual__inherit__graph.map index 03ed7719..3d2c394e 100644 --- a/docs/classSurveillance_1_1layers_1_1puzzle__seg_1_1Params__Residual__inherit__graph.map +++ b/docs/classSurveillance_1_1layers_1_1puzzle__seg_1_1Params__Residual__inherit__graph.map @@ -1,8 +1,4 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d diff --git a/docs/classSurveillance_1_1layers_1_1puzzle__seg_1_1Params__Residual__inherit__graph.md5 b/docs/classSurveillance_1_1layers_1_1puzzle__seg_1_1Params__Residual__inherit__graph.md5 index ef26722c..3dad12fc 100644 --- a/docs/classSurveillance_1_1layers_1_1puzzle__seg_1_1Params__Residual__inherit__graph.md5 +++ b/docs/classSurveillance_1_1layers_1_1puzzle__seg_1_1Params__Residual__inherit__graph.md5 @@ -1,5 +1 @@ -<<<<<<< HEAD -9120fe51f128c366424359ac65d53aa6 -======= -1a141697ce75eba67de9afae8e498f54 ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d +9120fe51f128c366424359ac65d53aa6 \ No newline at end of file diff --git a/docs/classSurveillance_1_1layers_1_1puzzle__seg_1_1Puzzle__Residual-members.html b/docs/classSurveillance_1_1layers_1_1puzzle__seg_1_1Puzzle__Residual-members.html index 6c9ef6e5..84e0c8b2 100644 --- a/docs/classSurveillance_1_1layers_1_1puzzle__seg_1_1Puzzle__Residual-members.html +++ b/docs/classSurveillance_1_1layers_1_1puzzle__seg_1_1Puzzle__Residual-members.html @@ -1,17 +1,9 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d IVALab Python Libraries: Member List @@ -38,34 +30,21 @@

        Additional Inherited Members

        -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
        This is the complete list of members for Puzzle_Residual, including all inherited members.

        -<<<<<<< HEAD @@ -113,35 +91,12 @@ -======= - - - - - - - - - - - - - - - - - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
        __init__(self, theTracker=None, trackFilter=None, Params_Residual params=Params_Residual())Puzzle_Residual
        Surveillance::layers::base_fg::Base_fg.__init__(self, theDetector, theTracker, trackFilter, Params params)Base_fg
        Surveillance::layers::base::Base.__init__(self, theDetector, theTracker, trackFilter, Params params)Base
        set_detected_masks(self, masks)Puzzle_Residual
        update_params(self, name, val)Base
        update_postprocess(self, callable postprocessor)Puzzle_Residual
        __init__Puzzle_Residual
        Surveillance::layers::base_fg::Base_fg.__init__Base_fg
        det_mask(self)Puzzle_Residual
        detected_masksPuzzle_Residual
        draw_layer(self, img=None, raw_detect=False, ax=None)Base
        get_mask(self)Base
        get_state(self)Base
        layer_maskBase
        layer_mask_detBase
        layer_stateBase
        measure(self, I)Base
        paramsBase
        post_process(self, det_mask)Puzzle_Residual
        post_process_customPuzzle_Residual
        set_detected_masks(self, masks)Puzzle_Residual
        update_params(self, name, val)Base
        update_postprocessPuzzle_Residual
        diff --git a/docs/classSurveillance_1_1layers_1_1puzzle__seg_1_1Puzzle__Residual.html b/docs/classSurveillance_1_1layers_1_1puzzle__seg_1_1Puzzle__Residual.html index be60b636..90403043 100644 --- a/docs/classSurveillance_1_1layers_1_1puzzle__seg_1_1Puzzle__Residual.html +++ b/docs/classSurveillance_1_1layers_1_1puzzle__seg_1_1Puzzle__Residual.html @@ -1,17 +1,9 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d IVALab Python Libraries: Puzzle_Residual Class Reference @@ -38,34 +30,21 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
        Inheritance graph
        -<<<<<<< HEAD -======= - - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
        [legend]
        @@ -116,34 +90,23 @@
        Collaboration graph
        -<<<<<<< HEAD -======= - - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
        [legend]
        -<<<<<<< HEAD -======= - - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD @@ -152,20 +115,6 @@ -======= - - - - - - - - - - - - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d @@ -198,13 +147,8 @@ The process of taking residual is treated as the roution postprocess

        Constructor & Destructor Documentation

        -<<<<<<< HEAD

        ◆ __init__()

        -======= - -

        ◆ __init__()

        ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
        @@ -230,13 +174,8 @@

        -<<<<<<< HEAD -======= - - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d @@ -268,11 +207,8 @@

        Base_fg.

        -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d @@ -338,13 +274,8 @@

        ◆ update_postprocess()

        -======= - -

        ◆ update_postprocess()

        ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
        @@ -358,11 +289,7 @@

        -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d @@ -372,12 +299,8 @@

        -<<<<<<< HEAD
        update the postprocessor, which is the customized one after applying the height-based segmentation process.
         
        -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d

        Member Data Documentation

        @@ -413,22 +336,14 @@

        puzzle_seg.py -======= -
      • /home/pvela/python/Surveillance/Surveillance/layers/puzzle_seg.py
      • ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d diff --git a/docs/classSurveillance_1_1layers_1_1puzzle__seg_1_1Puzzle__Residual__coll__graph.map b/docs/classSurveillance_1_1layers_1_1puzzle__seg_1_1Puzzle__Residual__coll__graph.map index 7c5a7f6d..676e3d0a 100644 --- a/docs/classSurveillance_1_1layers_1_1puzzle__seg_1_1Puzzle__Residual__coll__graph.map +++ b/docs/classSurveillance_1_1layers_1_1puzzle__seg_1_1Puzzle__Residual__coll__graph.map @@ -1,11 +1,6 @@ -<<<<<<< HEAD -======= - - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d diff --git a/docs/classSurveillance_1_1layers_1_1puzzle__seg_1_1Puzzle__Residual__coll__graph.md5 b/docs/classSurveillance_1_1layers_1_1puzzle__seg_1_1Puzzle__Residual__coll__graph.md5 index d4077d21..ebb5cceb 100644 --- a/docs/classSurveillance_1_1layers_1_1puzzle__seg_1_1Puzzle__Residual__coll__graph.md5 +++ b/docs/classSurveillance_1_1layers_1_1puzzle__seg_1_1Puzzle__Residual__coll__graph.md5 @@ -1,5 +1 @@ -<<<<<<< HEAD -ec858cf18ec534a418085e494ef6afec -======= -1bfa2da38e6c2222fe9a268c5537a461 ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d +ec858cf18ec534a418085e494ef6afec \ No newline at end of file diff --git a/docs/classSurveillance_1_1layers_1_1puzzle__seg_1_1Puzzle__Residual__inherit__graph.map b/docs/classSurveillance_1_1layers_1_1puzzle__seg_1_1Puzzle__Residual__inherit__graph.map index 7c5a7f6d..676e3d0a 100644 --- a/docs/classSurveillance_1_1layers_1_1puzzle__seg_1_1Puzzle__Residual__inherit__graph.map +++ b/docs/classSurveillance_1_1layers_1_1puzzle__seg_1_1Puzzle__Residual__inherit__graph.map @@ -1,11 +1,6 @@ -<<<<<<< HEAD -======= - - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d diff --git a/docs/classSurveillance_1_1layers_1_1puzzle__seg_1_1Puzzle__Residual__inherit__graph.md5 b/docs/classSurveillance_1_1layers_1_1puzzle__seg_1_1Puzzle__Residual__inherit__graph.md5 index b4bcdb4f..ebb5cceb 100644 --- a/docs/classSurveillance_1_1layers_1_1puzzle__seg_1_1Puzzle__Residual__inherit__graph.md5 +++ b/docs/classSurveillance_1_1layers_1_1puzzle__seg_1_1Puzzle__Residual__inherit__graph.md5 @@ -1,5 +1 @@ -<<<<<<< HEAD -ec858cf18ec534a418085e494ef6afec -======= -c4ee894aa4bf03de390b1f53dae067fc ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d +ec858cf18ec534a418085e494ef6afec \ No newline at end of file diff --git a/docs/classSurveillance_1_1layers_1_1robot__seg_1_1Params-members.html b/docs/classSurveillance_1_1layers_1_1robot__seg_1_1Params-members.html index 2669ff6d..eb1ddd4c 100644 --- a/docs/classSurveillance_1_1layers_1_1robot__seg_1_1Params-members.html +++ b/docs/classSurveillance_1_1layers_1_1robot__seg_1_1Params-members.html @@ -1,17 +1,9 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d IVALab Python Libraries: Member List @@ -38,34 +30,21 @@

        Public Member Functions

        def __init__ (self, theTracker=None, trackFilter=None, Params_Residual params=Params_Residual())
         
        def __init__
         
        def det_mask (self)
         
        def post_process (self, det_mask)
         
        def set_detected_masks (self, masks)
         
        def update_postprocess (self, callable postprocessor)
         
        - Public Member Functions inherited from Base_fg
        - Public Member Functions inherited from Base
        def __init__ (self, theDetector, theTracker, trackFilter, Params params)
         
        def update_postprocess
         
        - Public Member Functions inherited from Base_fg
        def __init__
         
        def det_mask (self)
         
        - Public Member Functions inherited from Base
        def __init__
         
        def det_mask (self)
         
        def draw_layer (self, img=None, raw_detect=False, ax=None)
         
        def get_mask (self)
        Params_Residual  params = Params_Residual()  params 
        callable  postprocessor 
        -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
        Inheritance graph
        -<<<<<<< HEAD -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
        [legend]
        Collaboration diagram for Params:
        Collaboration graph
        -<<<<<<< HEAD -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
        [legend]
        -<<<<<<< HEAD -======= - - - - - - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d

        Public Member Functions

        def __post_init__ (self)
         
        - Public Member Functions inherited from Params
        def __post_init__ (self)
         
        - Public Member Functions inherited from Params
        def __post_init__ (self)
         
        @@ -157,30 +121,19 @@

        -<<<<<<< HEAD

        Reimplemented from Params.


        The documentation for this class was generated from the following file:
        • /home/mary/python/Surveillance/Surveillance/layers/robot_seg.py
        • -======= - - -
          The documentation for this class was generated from the following file:
            -
          • /home/pvela/python/Surveillance/Surveillance/layers/robot_seg.py
          • ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
          diff --git a/docs/classSurveillance_1_1layers_1_1robot__seg_1_1Params__coll__graph.map b/docs/classSurveillance_1_1layers_1_1robot__seg_1_1Params__coll__graph.map index b28018a9..d863e18b 100644 --- a/docs/classSurveillance_1_1layers_1_1robot__seg_1_1Params__coll__graph.map +++ b/docs/classSurveillance_1_1layers_1_1robot__seg_1_1Params__coll__graph.map @@ -1,6 +1,3 @@ -<<<<<<< HEAD -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d diff --git a/docs/classSurveillance_1_1layers_1_1robot__seg_1_1Params__coll__graph.md5 b/docs/classSurveillance_1_1layers_1_1robot__seg_1_1Params__coll__graph.md5 index 459a2e30..4566e02c 100644 --- a/docs/classSurveillance_1_1layers_1_1robot__seg_1_1Params__coll__graph.md5 +++ b/docs/classSurveillance_1_1layers_1_1robot__seg_1_1Params__coll__graph.md5 @@ -1,5 +1 @@ -<<<<<<< HEAD -2f3eb0acf1777274cf319a1a4d488eab -======= -9fc219a45c81ec00c132c0fea3597823 ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d +2f3eb0acf1777274cf319a1a4d488eab \ No newline at end of file diff --git a/docs/classSurveillance_1_1layers_1_1robot__seg_1_1Params__inherit__graph.map b/docs/classSurveillance_1_1layers_1_1robot__seg_1_1Params__inherit__graph.map index b28018a9..d863e18b 100644 --- a/docs/classSurveillance_1_1layers_1_1robot__seg_1_1Params__inherit__graph.map +++ b/docs/classSurveillance_1_1layers_1_1robot__seg_1_1Params__inherit__graph.map @@ -1,6 +1,3 @@ -<<<<<<< HEAD -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d diff --git a/docs/classSurveillance_1_1layers_1_1robot__seg_1_1Params__inherit__graph.md5 b/docs/classSurveillance_1_1layers_1_1robot__seg_1_1Params__inherit__graph.md5 index 15b3c718..b9c6ced9 100644 --- a/docs/classSurveillance_1_1layers_1_1robot__seg_1_1Params__inherit__graph.md5 +++ b/docs/classSurveillance_1_1layers_1_1robot__seg_1_1Params__inherit__graph.md5 @@ -1,5 +1 @@ -<<<<<<< HEAD -ce7ebb976c0ed66b83bf8375e7a360fe -======= -fa865de2ad2c5f00fe33e8e8f6326814 ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d +ce7ebb976c0ed66b83bf8375e7a360fe \ No newline at end of file diff --git a/docs/classSurveillance_1_1layers_1_1robot__seg_1_1robot__inRange-members.html b/docs/classSurveillance_1_1layers_1_1robot__seg_1_1robot__inRange-members.html index dbcc8620..a8da70fe 100644 --- a/docs/classSurveillance_1_1layers_1_1robot__seg_1_1robot__inRange-members.html +++ b/docs/classSurveillance_1_1layers_1_1robot__seg_1_1robot__inRange-members.html @@ -1,17 +1,9 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d IVALab Python Libraries: Member List @@ -38,34 +30,21 @@

        Additional Inherited Members

        -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
        This is the complete list of members for robot_inRange, including all inherited members.

        -<<<<<<< HEAD @@ -108,30 +86,12 @@ -======= - - - - - - - - - - - - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
        __init__(self, low_th, high_th, tracker=None, trackFilter=None, Params params=Params())robot_inRange
        Surveillance::layers::base_fg::Base_fg.__init__(self, theDetector, theTracker, trackFilter, Params params)Base_fg
        Surveillance::layers::base::Base.__init__(self, theDetector, theTracker, trackFilter, Params params)Base
        measure(self, I)Base
        paramsBase
        update_params(self, name, val)Base
        __init__robot_inRange
        Surveillance::layers::base_fg::Base_fg.__init__Base_fg
        det_mask(self)robot_inRange
        draw_layer(self, img=None, raw_detect=False, ax=None)Base
        get_mask(self)Base
        get_state(self)Base
        layer_maskBase
        layer_mask_detBase
        layer_stateBase
        measure(self, I)Base
        paramsBase
        update_params(self, name, val)Base
        diff --git a/docs/classSurveillance_1_1layers_1_1robot__seg_1_1robot__inRange.html b/docs/classSurveillance_1_1layers_1_1robot__seg_1_1robot__inRange.html index 90511b95..1d964dbe 100644 --- a/docs/classSurveillance_1_1layers_1_1robot__seg_1_1robot__inRange.html +++ b/docs/classSurveillance_1_1layers_1_1robot__seg_1_1robot__inRange.html @@ -1,17 +1,9 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d IVALab Python Libraries: robot_inRange Class Reference @@ -38,34 +30,21 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
        Inheritance graph
        -<<<<<<< HEAD -======= - - - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
        [legend]
        @@ -117,21 +90,15 @@
        Collaboration graph
        -<<<<<<< HEAD -======= - - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
        [legend]
        -<<<<<<< HEAD @@ -142,22 +109,6 @@ -======= - - - - - - - - - - - - - - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d @@ -182,13 +133,8 @@

        Public Member Functions

        def __init__ (self, low_th, high_th, tracker=None, trackFilter=None, Params params=Params())
         
        def det_mask (self)
        - Public Member Functions inherited from Base
        def __init__ (self, theDetector, theTracker, trackFilter, Params params)
         
        def __init__
         
        def det_mask (self)
         
        - Public Member Functions inherited from Base_fg
        def __init__
         
        def det_mask (self)
         
        - Public Member Functions inherited from Base
        def __init__
         
        def det_mask (self)
         
        def draw_layer (self, img=None, raw_detect=False, ax=None)
         
        def get_mask (self)
         

        Constructor & Destructor Documentation

        -<<<<<<< HEAD

        ◆ __init__()

        -======= - -

        ◆ __init__()

        ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d

        Member Function Documentation

        @@ -274,30 +211,19 @@

        Base_fg.


        The documentation for this class was generated from the following file:
        • /home/mary/python/Surveillance/Surveillance/layers/robot_seg.py
        • -======= - - -
          The documentation for this class was generated from the following file:
            -
          • /home/pvela/python/Surveillance/Surveillance/layers/robot_seg.py
          • ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
          diff --git a/docs/classSurveillance_1_1layers_1_1robot__seg_1_1robot__inRange__Height-members.html b/docs/classSurveillance_1_1layers_1_1robot__seg_1_1robot__inRange__Height-members.html index 8c36476e..252d1d46 100644 --- a/docs/classSurveillance_1_1layers_1_1robot__seg_1_1robot__inRange__Height-members.html +++ b/docs/classSurveillance_1_1layers_1_1robot__seg_1_1robot__inRange__Height-members.html @@ -1,17 +1,9 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d IVALab Python Libraries: Member List @@ -38,34 +30,21 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
          This is the complete list of members for robot_inRange_Height, including all inherited members.

          -<<<<<<< HEAD @@ -115,37 +93,12 @@ -======= - - - - - - - - - - - - - - - - - - - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
          __init__(self, low_th, high_th, HeightEstimator theHeightEstimator=None, tracker=None, trackFilter=None, Params params=Params())robot_inRange_Height
          Surveillance::layers::robot_seg::robot_inRange.__init__(self, low_th, high_th, tracker=None, trackFilter=None, Params params=Params())robot_inRange
          Surveillance::layers::base_fg::Base_fg.__init__(self, theDetector, theTracker, trackFilter, Params params)Base_fg
          process_depth(self, depth)robot_inRange_Height
          update_height_map(self, height_map)robot_inRange_Height
          update_params(self, name, val)Base
          __init__robot_inRange_Height
          Surveillance::layers::robot_seg::robot_inRange.__init__robot_inRange
          Surveillance::layers::base_fg::Base_fg.__init__Base_fg
          det_mask(self)robot_inRange
          draw_layer(self, img=None, raw_detect=False, ax=None)Base
          get_mask(self)Base
          get_state(self)Base
          height_estimatorrobot_inRange_Height
          height_maprobot_inRange_Height
          layer_maskBase
          layer_mask_detBase
          layer_stateBase
          measure(self, I)Base
          paramsBase
          post_process(self, det_mask)robot_inRange_Height
          post_process_customrobot_inRange_Height
          process_depth(self, depth)robot_inRange_Height
          update_height_map(self, height_map)robot_inRange_Height
          update_params(self, name, val)Base
          diff --git a/docs/classSurveillance_1_1layers_1_1robot__seg_1_1robot__inRange__Height.html b/docs/classSurveillance_1_1layers_1_1robot__seg_1_1robot__inRange__Height.html index f3896308..7627c708 100644 --- a/docs/classSurveillance_1_1layers_1_1robot__seg_1_1robot__inRange__Height.html +++ b/docs/classSurveillance_1_1layers_1_1robot__seg_1_1robot__inRange__Height.html @@ -1,17 +1,9 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d IVALab Python Libraries: robot_inRange_Height Class Reference @@ -38,34 +30,21 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
          Inheritance graph
          -<<<<<<< HEAD -======= - - - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
          [legend]
          @@ -118,29 +91,18 @@
          Collaboration graph
          -<<<<<<< HEAD -======= - - - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
          [legend]
          -<<<<<<< HEAD -======= - - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d @@ -148,7 +110,6 @@ -<<<<<<< HEAD @@ -159,22 +120,6 @@ -======= - - - - - - - - - - - - - - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d @@ -226,13 +171,8 @@ height from the depth. If None, then requires set the depth before processing each frame.

          Constructor & Destructor Documentation

          -<<<<<<< HEAD

          ◆ __init__()

          -======= - -

          ◆ __init__()

          ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
          @@ -258,7 +198,6 @@

          -<<<<<<< HEAD @@ -279,10 +218,6 @@

          Params 

          -======= - - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d @@ -431,22 +366,14 @@

          robot_seg.py -======= -
        • /home/pvela/python/Surveillance/Surveillance/layers/robot_seg.py
        • ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d diff --git a/docs/classSurveillance_1_1layers_1_1robot__seg_1_1robot__inRange__Height__coll__graph.map b/docs/classSurveillance_1_1layers_1_1robot__seg_1_1robot__inRange__Height__coll__graph.map index aec0661d..7888f276 100644 --- a/docs/classSurveillance_1_1layers_1_1robot__seg_1_1robot__inRange__Height__coll__graph.map +++ b/docs/classSurveillance_1_1layers_1_1robot__seg_1_1robot__inRange__Height__coll__graph.map @@ -1,13 +1,7 @@ -<<<<<<< HEAD -======= - - - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d diff --git a/docs/classSurveillance_1_1layers_1_1robot__seg_1_1robot__inRange__Height__coll__graph.md5 b/docs/classSurveillance_1_1layers_1_1robot__seg_1_1robot__inRange__Height__coll__graph.md5 index e57cbf83..f9e6ae9e 100644 --- a/docs/classSurveillance_1_1layers_1_1robot__seg_1_1robot__inRange__Height__coll__graph.md5 +++ b/docs/classSurveillance_1_1layers_1_1robot__seg_1_1robot__inRange__Height__coll__graph.md5 @@ -1,5 +1 @@ -<<<<<<< HEAD -18b4565162c78d00c00a655a0e147904 -======= -c745860241f2b4908689e4887bec80ef ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d +18b4565162c78d00c00a655a0e147904 \ No newline at end of file diff --git a/docs/classSurveillance_1_1layers_1_1robot__seg_1_1robot__inRange__Height__inherit__graph.map b/docs/classSurveillance_1_1layers_1_1robot__seg_1_1robot__inRange__Height__inherit__graph.map index aec0661d..7888f276 100644 --- a/docs/classSurveillance_1_1layers_1_1robot__seg_1_1robot__inRange__Height__inherit__graph.map +++ b/docs/classSurveillance_1_1layers_1_1robot__seg_1_1robot__inRange__Height__inherit__graph.map @@ -1,13 +1,7 @@ -<<<<<<< HEAD -======= - - - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d diff --git a/docs/classSurveillance_1_1layers_1_1robot__seg_1_1robot__inRange__Height__inherit__graph.md5 b/docs/classSurveillance_1_1layers_1_1robot__seg_1_1robot__inRange__Height__inherit__graph.md5 index 9021809d..f9e6ae9e 100644 --- a/docs/classSurveillance_1_1layers_1_1robot__seg_1_1robot__inRange__Height__inherit__graph.md5 +++ b/docs/classSurveillance_1_1layers_1_1robot__seg_1_1robot__inRange__Height__inherit__graph.md5 @@ -1,5 +1 @@ -<<<<<<< HEAD -18b4565162c78d00c00a655a0e147904 -======= -389fc1df83edf5f8561081069e80c109 ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d +18b4565162c78d00c00a655a0e147904 \ No newline at end of file diff --git a/docs/classSurveillance_1_1layers_1_1robot__seg_1_1robot__inRange__coll__graph.map b/docs/classSurveillance_1_1layers_1_1robot__seg_1_1robot__inRange__coll__graph.map index fd3adf4c..4f9bde0f 100644 --- a/docs/classSurveillance_1_1layers_1_1robot__seg_1_1robot__inRange__coll__graph.map +++ b/docs/classSurveillance_1_1layers_1_1robot__seg_1_1robot__inRange__coll__graph.map @@ -1,11 +1,6 @@ -<<<<<<< HEAD -======= - - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d diff --git a/docs/classSurveillance_1_1layers_1_1robot__seg_1_1robot__inRange__coll__graph.md5 b/docs/classSurveillance_1_1layers_1_1robot__seg_1_1robot__inRange__coll__graph.md5 index bbf15519..fd0e07b3 100644 --- a/docs/classSurveillance_1_1layers_1_1robot__seg_1_1robot__inRange__coll__graph.md5 +++ b/docs/classSurveillance_1_1layers_1_1robot__seg_1_1robot__inRange__coll__graph.md5 @@ -1,5 +1 @@ -<<<<<<< HEAD -7581209d12425ab86487f3b3f551d968 -======= -009b19fb0f58cf10840521d6072f68b3 ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d +7581209d12425ab86487f3b3f551d968 \ No newline at end of file diff --git a/docs/classSurveillance_1_1layers_1_1robot__seg_1_1robot__inRange__inherit__graph.map b/docs/classSurveillance_1_1layers_1_1robot__seg_1_1robot__inRange__inherit__graph.map index d0f7fa06..4c5d9951 100644 --- a/docs/classSurveillance_1_1layers_1_1robot__seg_1_1robot__inRange__inherit__graph.map +++ b/docs/classSurveillance_1_1layers_1_1robot__seg_1_1robot__inRange__inherit__graph.map @@ -1,13 +1,7 @@ -<<<<<<< HEAD -======= - - - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d diff --git a/docs/classSurveillance_1_1layers_1_1robot__seg_1_1robot__inRange__inherit__graph.md5 b/docs/classSurveillance_1_1layers_1_1robot__seg_1_1robot__inRange__inherit__graph.md5 index 343b2eb6..81d4d29f 100644 --- a/docs/classSurveillance_1_1layers_1_1robot__seg_1_1robot__inRange__inherit__graph.md5 +++ b/docs/classSurveillance_1_1layers_1_1robot__seg_1_1robot__inRange__inherit__graph.md5 @@ -1,5 +1 @@ -<<<<<<< HEAD -030504f6e0261d3a8121108ea4e3080a -======= -ec992b20c259d2cc6e568bb1308fc609 ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d +030504f6e0261d3a8121108ea4e3080a \ No newline at end of file diff --git a/docs/classSurveillance_1_1layers_1_1scene_1_1Params-members.html b/docs/classSurveillance_1_1layers_1_1scene_1_1Params-members.html index e3d02ad4..0fdb7b44 100644 --- a/docs/classSurveillance_1_1layers_1_1scene_1_1Params-members.html +++ b/docs/classSurveillance_1_1layers_1_1scene_1_1Params-members.html @@ -1,17 +1,9 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d IVALab Python Libraries: Member List @@ -38,34 +30,21 @@

          Public Member Functions

          def __init__ (self, low_th, high_th, HeightEstimator theHeightEstimator=None, tracker=None, trackFilter=None, Params params=Params())
           
          def __init__
           
          def post_process (self, det_mask)
           
          def process_depth (self, depth)
          def update_height_map (self, height_map)
           
          - Public Member Functions inherited from robot_inRange
          def __init__ (self, low_th, high_th, tracker=None, trackFilter=None, Params params=Params())
           
          def det_mask (self)
          - Public Member Functions inherited from Base
          def __init__ (self, theDetector, theTracker, trackFilter, Params params)
           
          def __init__
           
          def det_mask (self)
           
          - Public Member Functions inherited from Base_fg
          def __init__
           
          def det_mask (self)
           
          - Public Member Functions inherited from Base
          def __init__
           
          def det_mask (self)
           
          def draw_layer (self, img=None, raw_detect=False, ax=None)
           
          def get_mask (self)
          HeightEstimator  theHeightEstimator = None,
          params = Params()  theHeightEstimator 
          -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
          scene.py -======= -
        • /home/pvela/python/Surveillance/Surveillance/layers/scene.py
        • ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
        diff --git a/docs/classSurveillance_1_1layers_1_1scene_1_1SceneInterpreterV1-members.html b/docs/classSurveillance_1_1layers_1_1scene_1_1SceneInterpreterV1-members.html index 8968686c..4662cdf3 100644 --- a/docs/classSurveillance_1_1layers_1_1scene_1_1SceneInterpreterV1-members.html +++ b/docs/classSurveillance_1_1layers_1_1scene_1_1SceneInterpreterV1-members.html @@ -1,17 +1,9 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d IVALab Python Libraries: Member List @@ -38,34 +30,21 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
        This is the complete list of members for SceneInterpreterV1, including all inherited members.

        -<<<<<<< HEAD @@ -117,97 +95,10 @@ -======= - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD @@ -217,46 +108,12 @@ -======= - - - - - - - - - - - - - - - - - - - - - - - - - - - - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
        __init__(self, hSeg.Human_ColorSG_HeightInRange human_seg, rSeg.robot_inRange_Height robot_seg, tSeg.tabletop_GMM bg_seg, pSeg.Puzzle_Residual puzzle_seg, HeightEstimator heightEstimator, Params params, np.ndarray nonROI_init=None)SceneInterpreterV1
        adapt(self)SceneInterpreterV1
        BEV_sizeSceneInterpreterV1
        nonROI_initSceneInterpreterV1
        nonROI_maskSceneInterpreterV1
        paramsSceneInterpreterV1
        __init__SceneInterpreterV1
        activateSceneInterpreterV1static
        adapt(self)SceneInterpreterV1
        allow_pickleSceneInterpreterV1static
        axSceneInterpreterV1static
        ax1SceneInterpreterV1static
        ax2SceneInterpreterV1static
        ax3SceneInterpreterV1static
        ax4SceneInterpreterV1static
        ax5SceneInterpreterV1static
        axesSceneInterpreterV1static
        axisSceneInterpreterV1static
        bagSceneInterpreterV1static
        before_scaleSceneInterpreterV1static
        BEV_sizeSceneInterpreterV1
        bg_handSceneInterpreterV1static
        bg_maskSceneInterpreterV1
        BG_maskSceneInterpreterV1static
        bg_segSceneInterpreterV1static
        buildFromRosbagSceneInterpreterV1static
        buildFromSourceDirSceneInterpreterV1static
        buildFromSourcePubSceneInterpreterV1static
        calibrateSceneInterpreterV1static
        color_typeSceneInterpreterV1static
        completeSceneInterpreterV1static
        correct(self)SceneInterpreterV1
        cv_bridgeSceneInterpreterV1static
        depSceneInterpreterV1static
        dep_bsSceneInterpreterV1static
        depthSceneInterpreterV1static
        depth_clipSceneInterpreterV1static
        depth_dtypeSceneInterpreterV1static
        depth_scaleSceneInterpreterV1static
        dirnameSceneInterpreterV1static
        dtypeSceneInterpreterV1static
        empty_table_depSceneInterpreterV1static
        empty_table_dep_bsSceneInterpreterV1static
        empty_table_dep_pathSceneInterpreterV1static
        empty_table_dep_pubSceneInterpreterV1static
        empty_table_heightSceneInterpreterV1static
        empty_table_nameSceneInterpreterV1static
        empty_table_rgbSceneInterpreterV1static
        empty_table_rgb_pathSceneInterpreterV1static
        empty_table_rgb_pubSceneInterpreterV1static
        fgMaskSceneInterpreterV1static
        fhSceneInterpreterV1static
        figsizeSceneInterpreterV1static
        frame_nameSceneInterpreterV1static
        frame_saverSceneInterpreterV1static
        get_layer(self, layer_name, mask_only=False, BEV_rectify=False)SceneInterpreterV1
        get_nonROI(self)SceneInterpreterV1
        get_trackers(self, layer_name, BEV_rectify=False)SceneInterpreterV1
        glove_depSceneInterpreterV1static
        glove_dep_pathSceneInterpreterV1static
        glove_nameSceneInterpreterV1static
        glove_rgbSceneInterpreterV1static
        glove_rgb_pathSceneInterpreterV1static
        glove_rgb_pubSceneInterpreterV1static
        HSceneInterpreterV1static
        hand_wave_vid_nameSceneInterpreterV1static
        hand_wave_vid_pathSceneInterpreterV1static
        height_estimatorSceneInterpreterV1static
        height_mapSceneInterpreterV1static
        high_thSceneInterpreterV1static
        hTrackerSceneInterpreterV1static
        human_maskSceneInterpreterV1
        human_segSceneInterpreterV1static
        human_track_stateSceneInterpreterV1
        human_wave_dep_pubSceneInterpreterV1static
        human_wave_rgb_pubSceneInterpreterV1static
        imgSourceSceneInterpreterV1static
        instructionSceneInterpreterV1static
        intrinsicSceneInterpreterV1static
        kernel_erodeSceneInterpreterV1static
        kernel_refineSceneInterpreterV1static
        low_thSceneInterpreterV1static
        mask_proc1SceneInterpreterV1static
        mask_proc2SceneInterpreterV1static
        measure(self, img)SceneInterpreterV1
        nonROI_initSceneInterpreterV1static
        nonROI_maskSceneInterpreterV1
        opKeySceneInterpreterV1static
        paramsSceneInterpreterV1static
        path_idx_modeSceneInterpreterV1static
        predict(self)SceneInterpreterV1
        process(self, img)SceneInterpreterV1
        process_depth(self, depth)SceneInterpreterV1
        puzzle_maskSceneInterpreterV1
        puzzle_segSceneInterpreterV1
        puzzle_track_stateSceneInterpreterV1
        rgb_imgSceneInterpreterV1
        vis_layer(self, layer_name, bool mask_only=False, bool BEV_rectify=False, plt.Axes ax=None)SceneInterpreterV1
        vis_puzzles(self, mask_only=False, BEV_rectify=True, fh=None)SceneInterpreterV1
        vis_scene(self, List[bool] mask_only=[False, False, False, False], List[bool] BEV_rectify=[False, False, False, True], fh=None)SceneInterpreterV1
        puzzle_segSceneInterpreterV1static
        puzzle_track_stateSceneInterpreterV1
        ratioSceneInterpreterV1static
        readySceneInterpreterV1static
        retSceneInterpreterV1static
        rgbSceneInterpreterV1static
        rgb_imgSceneInterpreterV1
        rgb_trainSceneInterpreterV1static
        robot_maskSceneInterpreterV1
        robot_segSceneInterpreterV1static
        robot_track_stateSceneInterpreterV1
        ROI_mask1SceneInterpreterV1static
        ROI_mask2SceneInterpreterV1static
        ROI_mask3SceneInterpreterV1static
        save_depthSceneInterpreterV1static
        save_modeSceneInterpreterV1static
        scene_interpreterSceneInterpreterV1static
        theTrackerSceneInterpreterV1static
        topicsSceneInterpreterV1static
        trackerSceneInterpreterV1static
        vid_writerSceneInterpreterV1static
        vidnameSceneInterpreterV1static
        vis_layerSceneInterpreterV1
        vis_puzzles(self, mask_only=False, BEV_rectify=True, fh=None)SceneInterpreterV1
        vis_sceneSceneInterpreterV1
        WSceneInterpreterV1static
        wait_timeSceneInterpreterV1static
        window_nameSceneInterpreterV1static
        diff --git a/docs/classSurveillance_1_1layers_1_1scene_1_1SceneInterpreterV1.html b/docs/classSurveillance_1_1layers_1_1scene_1_1SceneInterpreterV1.html index 89b16377..23da0803 100644 --- a/docs/classSurveillance_1_1layers_1_1scene_1_1SceneInterpreterV1.html +++ b/docs/classSurveillance_1_1layers_1_1scene_1_1SceneInterpreterV1.html @@ -1,17 +1,9 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d IVALab Python Libraries: SceneInterpreterV1 Class Reference @@ -38,34 +30,21 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
        Public Member Functions | Static Public Member Functions | Public Attributes | -<<<<<<< HEAD -======= -Static Public Attributes | ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d List of all members
        SceneInterpreterV1 Class Reference
        @@ -103,13 +78,8 @@ -<<<<<<< HEAD -======= - - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d @@ -128,7 +98,6 @@ -<<<<<<< HEAD @@ -144,23 +113,6 @@ -======= - - - - - - -

        Public Member Functions

        def __init__ (self, hSeg.Human_ColorSG_HeightInRange human_seg, rSeg.robot_inRange_Height robot_seg, tSeg.tabletop_GMM bg_seg, pSeg.Puzzle_Residual puzzle_seg, HeightEstimator heightEstimator, Params params, np.ndarray nonROI_init=None)
         
        def __init__
         
        def adapt (self)
         
        def correct (self)
         
        def process_depth (self, depth)
         
        def vis_layer (self, layer_name, bool mask_only=False, bool BEV_rectify=False, plt.Axes ax=None)
         
        def vis_puzzles (self, mask_only=False, BEV_rectify=True, fh=None)
         
        def buildFromSourcePub (Base cam_runner, rTh_high=1.0, rTh_low=0.02, hTracker=None, pTracker=None, rTracker=None, hSeg.Params hParams=hSeg.Params(), rSeg.Params rParams=rSeg.Params(), pSeg.Params_Residual pParams=pSeg.Params_Residual(), tSeg.Params_GMM bgParams=tSeg.Params_GMM(), bool ros_pub=True, str empty_table_rgb_topic="empty_table_rgb", str empty_table_dep_topic="empty_table_dep", str glove_rgb_topic="glove_rgb", str human_wave_rgb_topic="human_wave_rgb", str human_wave_dep_topic="human_wave_dep", nonROI_region=None, Params() params=Params())
         
        def vis_layer
         
        def vis_puzzles (self, mask_only=False, BEV_rectify=True, fh=None)
         
        def vis_scene
         
        - - - - - - - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d

        -Static Public Member Functions

        def buildFromRosbag
         
        def buildFromSourceDir
         
        def buildFromSourcePub
         
        @@ -168,137 +120,14 @@ -<<<<<<< HEAD - - - - -======= - - - - - - - - - - - - - - - - -

        Public Attributes

         
         bg_mask
         
         bg_seg
         
         depth
         
         human_mask
         
         human_track_state
         
         nonROI_mask
         
         puzzle_mask
         
         puzzle_track_state
         
         rgb_img
         
         robot_mask
         
         robot_track_state
         
        - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD @@ -325,84 +154,6 @@ -======= - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d

        -Static Public Attributes

         activate
         
         allow_pickle
         
         ax = axes[idx]
         
         ax1
         
         ax2
         
         ax3
         
         ax4
         
         ax5
         
         axes
         
         axis
         
         bag
         
         before_scale
         
         bg_hand
         
         BG_mask
         
         bg_seg
         
         calibrate
         
         color_type
         
         complete
         
         cv_bridge
         
         dep
         
         dep_bs
         
         depth
         
         depth_clip
         
         depth_dtype
         
         depth_scale
         
         dirname
         
         dtype
         
         empty_table_dep
         
         empty_table_dep_bs
         
         empty_table_dep_path
         
         empty_table_dep_pub
         
         empty_table_height
         
         empty_table_name
         
         empty_table_rgb
         
         empty_table_rgb_path
         
         empty_table_rgb_pub
         
         fgMask
         
         fh
         
         figsize
         
         frame_name
         
         frame_saver
         
         glove_dep
         
         glove_dep_path
         
         glove_name
         
         glove_rgb
         
         glove_rgb_path
         
         glove_rgb_pub
         
         H
         
         hand_wave_vid_name
         
         hand_wave_vid_path
         
         height_estimator
         
         height_map
         
         human_mask
         
         human_seg
         
         robot_track_state
         
         high_th
         
         hTracker
         
         human_seg
         
         human_wave_dep_pub
         
         human_wave_rgb_pub
         
         imgSource
         
         instruction
         
         intrinsic
         
         kernel_erode
         
         kernel_refine
         
         low_th
         
         mask_proc1
         
         mask_proc2
         
         nonROI_init
         
         opKey
         
         params
         
         path_idx_mode
         
         puzzle_seg
         
         ratio
         
         ready
         
         ret
         
         rgb
         
         rgb_train
         
         robot_seg
         
         ROI_mask1
         
         ROI_mask2
         
         ROI_mask3
         
         save_depth
         
         save_mode
         
         scene_interpreter
         
         theTracker
         
         topics
         
         tracker
         
         vid_writer
         
         vidname
         
         W
         
         wait_time
         
         window_name
         

        Detailed Description

        The scene interpreter will split the scene into three four layers:
        @@ -422,13 +173,8 @@
         @param[in]  params              Other parameters
         @param[in]  nonROI_init         A mask of initial nonROI region, which will be always treated as the background
         

        Constructor & Destructor Documentation

        -<<<<<<< HEAD

        ◆ __init__()

        -======= - -

        ◆ __init__()

        ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
        @@ -442,7 +188,6 @@

        -<<<<<<< HEAD hSeg.Human_ColorSG_HeightInRange  human_seg, @@ -481,10 +226,6 @@

        np.ndarray   nonROI_init = None  -======= -   - human_seg  ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d @@ -515,13 +256,8 @@

        ◆ buildFromRosbag()

        -======= - -

        ◆ buildFromRosbag()

        ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
        @@ -568,7 +304,6 @@

        -<<<<<<< HEAD hSeg.Params   hParams = hSeg.Params(), @@ -661,10 +396,6 @@

        Params()   params = Params()  -======= -   - hParams  ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d @@ -681,13 +412,8 @@

        ◆ buildFromSourceDir()

        -======= - -

        ◆ buildFromSourceDir()

        ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d - -

        ◆ buildFromSourcePub()

        ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d - -

        ◆ correct()

        - -
        -
        - - - - - - - - -
        def correct ( self)
        -
        - -
        -
        - -

        ◆ get_layer()

        - -
        -
        - - - - - - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD @@ -1115,15 +770,6 @@

          -

        - - - - - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
        def get_layer ( self,
        hSeg.Params   hParams = hSeg.Params(),  layer_name,
        rSeg.Params   rParams = rSeg.Params(),  mask_only = False,
        pSeg.Params_Residual   pParams = pSeg.Params_Residual(),
        BEV_rectify = False 
        )
        @@ -1310,13 +956,8 @@

        ◆ vis_layer()

        -======= - -

        ◆ vis_layer()

        ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
        @@ -1336,7 +977,6 @@

        -<<<<<<< HEAD bool  mask_only = False, @@ -1351,10 +991,6 @@

        plt.Axes  ax = None  -======= -   - mask_only  ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d @@ -1363,7 +999,6 @@

        -<<<<<<< HEAD
        Visualize the layer
         
         @param[in]  layer_name          The name of the layer mask to visualize
        @@ -1373,9 +1008,6 @@ 

        @@ -1427,13 +1059,8 @@

        ◆ vis_scene()

        -======= - -

        ◆ vis_scene()

        ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -

        Member Data Documentation

        -
        -

        ◆ activate

        - -
        -
        - - - - - -
        - - - - -
        activate
        -
        -static
        ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
        -<<<<<<< HEAD

        ◆ bg_mask

        @@ -1552,53 +1148,10 @@

        bg_seg -======= - -

        ◆ allow_pickle

        - -
        -
        - - - - - -
        - - - - -
        allow_pickle
        -
        -static
        -
        - -
        -
        - -

        ◆ ax

        - -
        -
        - - - - - -
        - - - - -
        ax = axes[idx]
        -
        -static
        ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
        -<<<<<<< HEAD

        ◆ depth

        @@ -1626,53 +1179,10 @@

        height_estimator -======= - -

        ◆ ax1

        - -
        -
        - - - - - -
        - - - - -
        ax1
        -
        -static
        -
        - -
        -
        - -

        ◆ ax2

        - -
        -
        - - - - - -
        - - - - -
        ax2
        -
        -static
        ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
        -<<<<<<< HEAD

        ◆ height_map

        @@ -1700,53 +1210,10 @@

        human_mask -======= - -

        ◆ ax3

        - -
        -
        - - - - - -
        - - - - -
        ax3
        -
        -static
        -
        - -
        -
        - -

        ◆ ax4

        - -
        -
        - - - - - -
        - - - - -
        ax4
        -
        -static
        ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
        -<<<<<<< HEAD

        ◆ human_seg

        @@ -1757,31 +1224,10 @@

        human_seg -======= - -

        ◆ ax5

        - -
        -
        - - - - - -
        - - - - -
        ax5
        -
        -static
        ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
        -<<<<<<< HEAD

        ◆ human_track_state

        @@ -1792,31 +1238,10 @@

        human_track_state -======= - -

        ◆ axes

        - -
        -
        - - - - - -
        - - - - -
        axes
        -
        -static
        ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
        -<<<<<<< HEAD

        ◆ nonROI_init

        @@ -1861,98 +1286,24 @@

        params -======= - -

        ◆ axis

        - -
        -
        - - - - - -
        - - - - -
        axis
        -
        -static
        -
        - -
        -
        - -

        ◆ bag

        - -
        -
        - - - - - -
        - - - - -
        bag
        -
        -static
        -
        +
        - -

        ◆ before_scale

        - -
        -
        - - - - - -
        - - - - -
        before_scale
        -
        -static
        ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -
        - -
        -
        -<<<<<<< HEAD

        ◆ puzzle_mask

        -======= - -

        ◆ BEV_size

        ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
        -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
        puzzle_maskBEV_size
        -<<<<<<< HEAD

        ◆ puzzle_seg

        @@ -1963,43 +1314,17 @@

        puzzle_seg -======= - -

        ◆ bg_hand

        - -
        -
        - - - - - -
        - - - - -
        bg_hand
        -
        -static
        ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
        -<<<<<<< HEAD

        ◆ puzzle_track_state

        -======= - -

        ◆ bg_mask

        ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
        -<<<<<<< HEAD
        puzzle_track_state
        @@ -2034,85 +1359,10 @@

        robot_mask -======= - bg_mask - - -

        -
        - -

        ◆ BG_mask

        - -
        -
        - - - - - -
        - - - - -
        BG_mask
        -
        -static
        -
        - -
        -
        - -

        ◆ bg_seg

        - -
        -
        - - - - - -
        - - - - -
        bg_seg
        -
        -static
        -
        - -
        -
        - -

        ◆ calibrate

        - -
        -
        - - - - - -
        - - - - -
        calibrate
        -
        -static
        ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
        -<<<<<<< HEAD

        ◆ robot_seg

        @@ -2123,31 +1373,10 @@

        robot_seg -======= - -

        ◆ color_type

        - -
        -
        - - - - - -
        - - - - -
        color_type
        -
        -static
        ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
        -<<<<<<< HEAD

        ◆ robot_track_state

        @@ -2161,1762 +1390,19 @@

        • Trust the human mask and the bg mask more
        • -======= -
          -

          ◆ complete

          - -
          -
          - - - - - -
          - - - - -
          complete
          -
          -static
          -
          - -
          -
          - -

          ◆ cv_bridge

          - -
          -
          - - - - - -
          - - - - -
          cv_bridge
          -
          -static
          -
          - -
          -
          - -

          ◆ dep

          - -
          -
          - - - - - -
          - - - - -
          dep
          -
          -static
          -
          - -
          -
          - -

          ◆ dep_bs

          - -
          -
          - - - - - -
          - - - - -
          dep_bs
          -
          -static
          -
          - -
          -
          - -

          ◆ depth

          - -
          -
          - - - - - -
          - - - - -
          depth
          -
          -static
          -
          -
            -
          • The depth map that is lastly processed
          • ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
          -<<<<<<< HEAD
          The documentation for this class was generated from the following file:
          • /home/mary/python/Surveillance/Surveillance/layers/scene.py
          • -======= - -

            ◆ depth_clip

            - -
            -
            - - - - - -
            - - - - -
            depth_clip
            -
            -static
            -
            - -
            -
            - -

            ◆ depth_dtype

            - -
            -
            - - - - - -
            - - - - -
            depth_dtype
            -
            -static
            -
            - -
            -
            - -

            ◆ depth_scale

            - -
            -
            - - - - - -
            - - - - -
            depth_scale
            -
            -static
            -
            - -
            -
            - -

            ◆ dirname

            - -
            -
            - - - - - -
            - - - - -
            dirname
            -
            -static
            -
            - -
            -
            - -

            ◆ dtype

            - -
            -
            - - - - - -
            - - - - -
            dtype
            -
            -static
            -
            - -
            -
            - -

            ◆ empty_table_dep

            - -
            -
            - - - - - -
            - - - - -
            empty_table_dep
            -
            -static
            -
            - -
            -
            - -

            ◆ empty_table_dep_bs

            - -
            -
            - - - - - -
            - - - - -
            empty_table_dep_bs
            -
            -static
            -
            - -
            -
            - -

            ◆ empty_table_dep_path

            - -
            -
            - - - - - -
            - - - - -
            empty_table_dep_path
            -
            -static
            -
            - -
            -
            - -

            ◆ empty_table_dep_pub

            - -
            -
            - - - - - -
            - - - - -
            empty_table_dep_pub
            -
            -static
            -
            - -
            -
            - -

            ◆ empty_table_height

            - -
            -
            - - - - - -
            - - - - -
            empty_table_height
            -
            -static
            -
            - -
            -
            - -

            ◆ empty_table_name

            - -
            -
            - - - - - -
            - - - - -
            empty_table_name
            -
            -static
            -
            - -
            -
            - -

            ◆ empty_table_rgb

            - -
            -
            - - - - - -
            - - - - -
            empty_table_rgb
            -
            -static
            -
            - -
            -
            - -

            ◆ empty_table_rgb_path

            - -
            -
            - - - - - -
            - - - - -
            empty_table_rgb_path
            -
            -static
            -
            - -
            -
            - -

            ◆ empty_table_rgb_pub

            - -
            -
            - - - - - -
            - - - - -
            empty_table_rgb_pub
            -
            -static
            -
            - -
            -
            - -

            ◆ fgMask

            - -
            -
            - - - - - -
            - - - - -
            fgMask
            -
            -static
            -
            - -
            -
            - -

            ◆ fh

            - -
            -
            - - - - - -
            - - - - -
            fh
            -
            -static
            -
            - -
            -
            - -

            ◆ figsize

            - -
            -
            - - - - - -
            - - - - -
            figsize
            -
            -static
            -
            - -
            -
            - -

            ◆ frame_name

            - -
            -
            - - - - - -
            - - - - -
            frame_name
            -
            -static
            -
            - -
            -
            - -

            ◆ frame_saver

            - -
            -
            - - - - - -
            - - - - -
            frame_saver
            -
            -static
            -
            - -
            -
            - -

            ◆ glove_dep

            - -
            -
            - - - - - -
            - - - - -
            glove_dep
            -
            -static
            -
            - -
            -
            - -

            ◆ glove_dep_path

            - -
            -
            - - - - - -
            - - - - -
            glove_dep_path
            -
            -static
            -
            - -
            -
            - -

            ◆ glove_name

            - -
            -
            - - - - - -
            - - - - -
            glove_name
            -
            -static
            -
            - -
            -
            - -

            ◆ glove_rgb

            - -
            -
            - - - - - -
            - - - - -
            glove_rgb
            -
            -static
            -
            - -
            -
            - -

            ◆ glove_rgb_path

            - -
            -
            - - - - - -
            - - - - -
            glove_rgb_path
            -
            -static
            -
            - -
            -
            - -

            ◆ glove_rgb_pub

            - -
            -
            - - - - - -
            - - - - -
            glove_rgb_pub
            -
            -static
            -
            - -
            -
            - -

            ◆ H

            - -
            -
            - - - - - -
            - - - - -
            H
            -
            -static
            -
            - -
            -
            - -

            ◆ hand_wave_vid_name

            - -
            -
            - - - - - -
            - - - - -
            hand_wave_vid_name
            -
            -static
            -
            - -
            -
            - -

            ◆ hand_wave_vid_path

            - -
            -
            - - - - - -
            - - - - -
            hand_wave_vid_path
            -
            -static
            -
            - -
            -
            - -

            ◆ height_estimator

            - -
            -
            - - - - - -
            - - - - -
            height_estimator
            -
            -static
            -
            - -
            -
            - -

            ◆ height_map

            - -
            -
            - - - - - -
            - - - - -
            height_map
            -
            -static
            -
            -
              -
            • The height map that is lastly processed
            • -
            - -
            -
            - -

            ◆ high_th

            - -
            -
            - - - - - -
            - - - - -
            high_th
            -
            -static
            -
            - -
            -
            - -

            ◆ hTracker

            - -
            -
            - - - - - -
            - - - - -
            hTracker
            -
            -static
            -
            - -
            -
            - -

            ◆ human_mask

            - -
            -
            - - - - -
            human_mask
            -
            - -
            -
            - -

            ◆ human_seg

            - -
            -
            - - - - - -
            - - - - -
            human_seg
            -
            -static
            -
            - -
            -
            - -

            ◆ human_track_state

            - -
            -
            - - - - -
            human_track_state
            -
            - -
            -
            - -

            ◆ human_wave_dep_pub

            - -
            -
            - - - - - -
            - - - - -
            human_wave_dep_pub
            -
            -static
            -
            - -
            -
            - -

            ◆ human_wave_rgb_pub

            - -
            -
            - - - - - -
            - - - - -
            human_wave_rgb_pub
            -
            -static
            -
            - -
            -
            - -

            ◆ imgSource

            - -
            -
            - - - - - -
            - - - - -
            imgSource
            -
            -static
            -
            - -
            -
            - -

            ◆ instruction

            - -
            -
            - - - - - -
            - - - - -
            instruction
            -
            -static
            -
            - -
            -
            - -

            ◆ intrinsic

            - -
            -
            - - - - - -
            - - - - -
            intrinsic
            -
            -static
            -
            - -
            -
            - -

            ◆ kernel_erode

            - -
            -
            - - - - - -
            - - - - -
            kernel_erode
            -
            -static
            -
            - -
            -
            - -

            ◆ kernel_refine

            - -
            -
            - - - - - -
            - - - - -
            kernel_refine
            -
            -static
            -
            - -
            -
            - -

            ◆ low_th

            - -
            -
            - - - - - -
            - - - - -
            low_th
            -
            -static
            -
            - -
            -
            - -

            ◆ mask_proc1

            - -
            -
            - - - - - -
            - - - - -
            mask_proc1
            -
            -static
            -
            - -
            -
            - -

            ◆ mask_proc2

            - -
            -
            - - - - - -
            - - - - -
            mask_proc2
            -
            -static
            -
            - -
            -
            - -

            ◆ nonROI_init

            - -
            -
            - - - - - -
            - - - - -
            nonROI_init
            -
            -static
            -
            -
              -
            • The prior nonROI region
            • -
            - -
            -
            - -

            ◆ nonROI_mask

            - -
            -
            - - - - -
            nonROI_mask
            -
            -
              -
            • The nonROI for each frame, which is the prior + pixels without necessary information. (e.g. The depth is missing)
            • -
            - -
            -
            - -

            ◆ opKey

            - -
            -
            - - - - - -
            - - - - -
            opKey
            -
            -static
            -
            - -
            -
            - -

            ◆ params

            - -
            -
            - - - - - -
            - - - - -
            params
            -
            -static
            -
            - -
            -
            - -

            ◆ path_idx_mode

            - -
            -
            - - - - - -
            - - - - -
            path_idx_mode
            -
            -static
            -
            - -
            -
            - -

            ◆ puzzle_mask

            - -
            -
            - - - - -
            puzzle_mask
            -
            - -
            -
            - -

            ◆ puzzle_seg

            - -
            -
            - - - - - -
            - - - - -
            puzzle_seg
            -
            -static
            -
            - -
            -
            - -

            ◆ puzzle_track_state

            - -
            -
            - - - - -
            puzzle_track_state
            -
            - -
            -
            - -

            ◆ ratio

            - -
            -
            - - - - - -
            - - - - -
            ratio
            -
            -static
            -
            - -
            -
            - -

            ◆ ready

            - -
            -
            - - - - - -
            - - - - -
            ready
            -
            -static
            -
            - -
            -
            - -

            ◆ ret

            - -
            -
            - - - - - -
            - - - - -
            ret
            -
            -static
            -
            - -
            -
            - -

            ◆ rgb

            - -
            -
            - - - - - -
            - - - - -
            rgb
            -
            -static
            -
            - -
            -
            - -

            ◆ rgb_img

            - -
            -
            - - - - -
            rgb_img
            -
            -
              -
            • The image that is lastly processed
            • -
            - -
            -
            - -

            ◆ rgb_train

            - -
            -
            - - - - - -
            - - - - -
            rgb_train
            -
            -static
            -
            - -
            -
            - -

            ◆ robot_mask

            - -
            -
            - - - - -
            robot_mask
            -
            - -
            -
            - -

            ◆ robot_seg

            - -
            -
            - - - - - -
            - - - - -
            robot_seg
            -
            -static
            -
            - -
            -
            - -

            ◆ robot_track_state

            - -
            -
            - - - - -
            robot_track_state
            -
            -
              -
            • Trust the human mask and the bg mask more
            • -
            - -
            -
            - -

            ◆ ROI_mask1

            - -
            -
            - - - - - -
            - - - - -
            ROI_mask1
            -
            -static
            -
            - -
            -
            - -

            ◆ ROI_mask2

            - -
            -
            - - - - - -
            - - - - -
            ROI_mask2
            -
            -static
            -
            - -
            -
            - -

            ◆ ROI_mask3

            - -
            -
            - - - - - -
            - - - - -
            ROI_mask3
            -
            -static
            -
            - -
            -
            - -

            ◆ save_depth

            - -
            -
            - - - - - -
            - - - - -
            save_depth
            -
            -static
            -
            - -
            -
            - -

            ◆ save_mode

            - -
            -
            - - - - - -
            - - - - -
            save_mode
            -
            -static
            -
            - -
            -
            - -

            ◆ scene_interpreter

            - -
            -
            - - - - - -
            - - - - -
            scene_interpreter
            -
            -static
            -
            - -
            -
            - -

            ◆ theTracker

            - -
            -
            - - - - - -
            - - - - -
            theTracker
            -
            -static
            -
            - -
            -
            - -

            ◆ topics

            - -
            -
            - - - - - -
            - - - - -
            topics
            -
            -static
            -
            - -
            -
            - -

            ◆ tracker

            - -
            -
            - - - - - -
            - - - - -
            tracker
            -
            -static
            -
            - -
            -
            - -

            ◆ vid_writer

            - -
            -
            - - - - - -
            - - - - -
            vid_writer
            -
            -static
            -
            - -
            -
            - -

            ◆ vidname

            - -
            -
            - - - - - -
            - - - - -
            vidname
            -
            -static
            -
            - -
            -
            - -

            ◆ W

            - -
            -
            - - - - - -
            - - - - -
            W
            -
            -static
            -
            - -
            -
            - -

            ◆ wait_time

            - -
            -
            - - - - - -
            - - - - -
            wait_time
            -
            -static
            -
            - -
            -
            - -

            ◆ window_name

            - -
            -
            - - - - - -
            - - - - -
            window_name
            -
            -static
            -
            - -
            -
            -
            The documentation for this class was generated from the following file:
              -
            • /home/pvela/python/Surveillance/Surveillance/layers/scene.py
            • ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d

        diff --git a/docs/classSurveillance_1_1layers_1_1tabletop__seg_1_1Params__GMM-members.html b/docs/classSurveillance_1_1layers_1_1tabletop__seg_1_1Params__GMM-members.html index f1fd80be..f1dab1c9 100644 --- a/docs/classSurveillance_1_1layers_1_1tabletop__seg_1_1Params__GMM-members.html +++ b/docs/classSurveillance_1_1layers_1_1tabletop__seg_1_1Params__GMM-members.html @@ -1,17 +1,9 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d IVALab Python Libraries: Member List @@ -38,34 +30,21 @@
        -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
        Inheritance graph
        -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
        [legend]
        @@ -113,13 +88,9 @@
        Collaboration graph
        -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
        [legend]
        @@ -127,15 +98,6 @@ Public Member Functions -<<<<<<< HEAD -======= - - - - - - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
        def __post_init__ (self)
         
        - Public Member Functions inherited from Params
        def __post_init__ (self)
         
        - Public Member Functions inherited from Params
        def __post_init__ (self)
         
        @@ -163,30 +125,19 @@

        -<<<<<<< HEAD

        Reimplemented from Params.


        The documentation for this class was generated from the following file:
        • /home/mary/python/Surveillance/Surveillance/layers/tabletop_seg.py
        • -======= - - -
          The documentation for this class was generated from the following file:
            -
          • /home/pvela/python/Surveillance/Surveillance/layers/tabletop_seg.py
          • ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
          diff --git a/docs/classSurveillance_1_1layers_1_1tabletop__seg_1_1Params__GMM__coll__graph.map b/docs/classSurveillance_1_1layers_1_1tabletop__seg_1_1Params__GMM__coll__graph.map index 7e3714aa..2e7307c3 100644 --- a/docs/classSurveillance_1_1layers_1_1tabletop__seg_1_1Params__GMM__coll__graph.map +++ b/docs/classSurveillance_1_1layers_1_1tabletop__seg_1_1Params__GMM__coll__graph.map @@ -1,9 +1,5 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d diff --git a/docs/classSurveillance_1_1layers_1_1tabletop__seg_1_1Params__GMM__coll__graph.md5 b/docs/classSurveillance_1_1layers_1_1tabletop__seg_1_1Params__GMM__coll__graph.md5 index 11f84335..d7ed63db 100644 --- a/docs/classSurveillance_1_1layers_1_1tabletop__seg_1_1Params__GMM__coll__graph.md5 +++ b/docs/classSurveillance_1_1layers_1_1tabletop__seg_1_1Params__GMM__coll__graph.md5 @@ -1,5 +1 @@ -<<<<<<< HEAD -e32d98a58855fcdb7bf81b5a1d726403 -======= -78c798dd38eb9939583351d0363f626f ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d +e32d98a58855fcdb7bf81b5a1d726403 \ No newline at end of file diff --git a/docs/classSurveillance_1_1layers_1_1tabletop__seg_1_1Params__GMM__inherit__graph.map b/docs/classSurveillance_1_1layers_1_1tabletop__seg_1_1Params__GMM__inherit__graph.map index 7e3714aa..2e7307c3 100644 --- a/docs/classSurveillance_1_1layers_1_1tabletop__seg_1_1Params__GMM__inherit__graph.map +++ b/docs/classSurveillance_1_1layers_1_1tabletop__seg_1_1Params__GMM__inherit__graph.map @@ -1,9 +1,5 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d diff --git a/docs/classSurveillance_1_1layers_1_1tabletop__seg_1_1Params__GMM__inherit__graph.md5 b/docs/classSurveillance_1_1layers_1_1tabletop__seg_1_1Params__GMM__inherit__graph.md5 index d40b3f7c..d7ed63db 100644 --- a/docs/classSurveillance_1_1layers_1_1tabletop__seg_1_1Params__GMM__inherit__graph.md5 +++ b/docs/classSurveillance_1_1layers_1_1tabletop__seg_1_1Params__GMM__inherit__graph.md5 @@ -1,5 +1 @@ -<<<<<<< HEAD -e32d98a58855fcdb7bf81b5a1d726403 -======= -ed770f1114fe63d2361f2287e7b21a9d ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d +e32d98a58855fcdb7bf81b5a1d726403 \ No newline at end of file diff --git a/docs/classSurveillance_1_1layers_1_1tabletop__seg_1_1tabletop__GMM-members.html b/docs/classSurveillance_1_1layers_1_1tabletop__seg_1_1tabletop__GMM-members.html index 8b3f1d58..47afbc8d 100644 --- a/docs/classSurveillance_1_1layers_1_1tabletop__seg_1_1tabletop__GMM-members.html +++ b/docs/classSurveillance_1_1layers_1_1tabletop__seg_1_1tabletop__GMM-members.html @@ -1,17 +1,9 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d IVALab Python Libraries: Member List @@ -38,34 +30,21 @@

        Additional Inherited Members

        -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
        This is the complete list of members for tabletop_GMM, including all inherited members.

        -<<<<<<< HEAD @@ -110,32 +88,12 @@ -======= - - - - - - - - - - - - - - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
        __init__(self, bgmodelGMM.bgmodelGMM_cv theDetector, Params_GMM params)tabletop_GMM
        Surveillance::layers::base_bg::Base_bg.__init__(self, theDetector, theTracker, trackFilter, Params params)Base_bg
        Surveillance::layers::base::Base.__init__(self, theDetector, theTracker, trackFilter, Params params)Base
        measure(self, I)Base
        paramsBase
        update_params(self, name, val)Base
        __init__tabletop_GMM
        Surveillance::layers::base_bg::Base_bg.__init__Base_bg
        buildtabletop_GMMstatic
        calibrate(self, I)tabletop_GMM
        det_mask(self)Base_bg
        draw_layer(self, img=None, raw_detect=False, ax=None)Base
        get_mask(self)Base
        get_state(self)Base
        layer_maskBase
        layer_mask_detBase
        layer_stateBase
        measure(self, I)Base
        paramsBase
        update_params(self, name, val)Base
        diff --git a/docs/classSurveillance_1_1layers_1_1tabletop__seg_1_1tabletop__GMM.html b/docs/classSurveillance_1_1layers_1_1tabletop__seg_1_1tabletop__GMM.html index 8f899fd1..d44f25dd 100644 --- a/docs/classSurveillance_1_1layers_1_1tabletop__seg_1_1tabletop__GMM.html +++ b/docs/classSurveillance_1_1layers_1_1tabletop__seg_1_1tabletop__GMM.html @@ -1,17 +1,9 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d IVALab Python Libraries: tabletop_GMM Class Reference @@ -38,34 +30,21 @@
        -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
        Inheritance graph
        -<<<<<<< HEAD -======= - - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
        [legend]
        @@ -116,21 +90,15 @@
        Collaboration graph
        -<<<<<<< HEAD -======= - - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
        [legend]
        -<<<<<<< HEAD @@ -143,22 +111,6 @@ -======= - - - - - - - - - - - - - - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d @@ -172,13 +124,8 @@

        Public Member Functions

        None __init__ (self, bgmodelGMM.bgmodelGMM_cv theDetector, Params_GMM params)
         
        def calibrate (self, I)
        - Public Member Functions inherited from Base
        def __init__ (self, theDetector, theTracker, trackFilter, Params params)
         
        def __init__
         
        def calibrate (self, I)
         
        - Public Member Functions inherited from Base_bg
        def __init__
         
        def det_mask (self)
         
        - Public Member Functions inherited from Base
        def __init__
         
        def det_mask (self)
         
        def draw_layer (self, img=None, raw_detect=False, ax=None)
         
        def get_mask (self)
        -<<<<<<< HEAD -======= - - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d

        Static Public Member Functions

        def build (bgmodelGMM.Params_cv mParams, Params_GMM() params)
         
        def build
         
        @@ -199,23 +146,14 @@ @param[in] params tabletop_seg.Params_GMM instance. The parameters related to the segmenter, including the preprocessor, postprocess, etc.

        Constructor & Destructor Documentation

        -<<<<<<< HEAD

        ◆ __init__()

        -======= - -

        ◆ __init__()

        ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d

        Additional Inherited Members

        -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d @@ -223,7 +161,6 @@

        -<<<<<<< HEAD @@ -232,10 +169,6 @@

        Params_GMM 

        -======= - - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d @@ -248,13 +181,8 @@

        Member Function Documentation

        -<<<<<<< HEAD

        ◆ build()

        -======= - -

        ◆ build()

        ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
        @@ -265,7 +193,6 @@

        def build

        -<<<<<<< HEAD @@ -279,11 +206,6 @@

          -

        - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
        None __init__ def __init__ (   self, bgmodelGMM.bgmodelGMM_cv  theDetector,
        params  theDetector 
        (bgmodelGMM.Params_cv  mParams,
        mParams)
        @@ -292,14 +214,10 @@

        -<<<<<<< HEAD
        Build a tabletop_GMM instance
         
         @param[in]  mParams         The model parameters related to the Gaussian Mixture Model
         
        -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d

        @@ -332,22 +250,14 @@

        tabletop_seg.py -======= -
      • /home/pvela/python/Surveillance/Surveillance/layers/tabletop_seg.py
      • ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d

      diff --git a/docs/classSurveillance_1_1layers_1_1tabletop__seg_1_1tabletop__GMM__coll__graph.map b/docs/classSurveillance_1_1layers_1_1tabletop__seg_1_1tabletop__GMM__coll__graph.map index c47ea939..725e1d45 100644 --- a/docs/classSurveillance_1_1layers_1_1tabletop__seg_1_1tabletop__GMM__coll__graph.map +++ b/docs/classSurveillance_1_1layers_1_1tabletop__seg_1_1tabletop__GMM__coll__graph.map @@ -1,11 +1,6 @@ -<<<<<<< HEAD -======= - - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d diff --git a/docs/classSurveillance_1_1layers_1_1tabletop__seg_1_1tabletop__GMM__coll__graph.md5 b/docs/classSurveillance_1_1layers_1_1tabletop__seg_1_1tabletop__GMM__coll__graph.md5 index 09ad7111..799866f8 100644 --- a/docs/classSurveillance_1_1layers_1_1tabletop__seg_1_1tabletop__GMM__coll__graph.md5 +++ b/docs/classSurveillance_1_1layers_1_1tabletop__seg_1_1tabletop__GMM__coll__graph.md5 @@ -1,5 +1 @@ -<<<<<<< HEAD -617a1e7ac3b5c3014b260420524f4b89 -======= -22287e39af4e03cba7615a4a0642d635 ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d +617a1e7ac3b5c3014b260420524f4b89 \ No newline at end of file diff --git a/docs/classSurveillance_1_1layers_1_1tabletop__seg_1_1tabletop__GMM__inherit__graph.map b/docs/classSurveillance_1_1layers_1_1tabletop__seg_1_1tabletop__GMM__inherit__graph.map index c47ea939..725e1d45 100644 --- a/docs/classSurveillance_1_1layers_1_1tabletop__seg_1_1tabletop__GMM__inherit__graph.map +++ b/docs/classSurveillance_1_1layers_1_1tabletop__seg_1_1tabletop__GMM__inherit__graph.map @@ -1,11 +1,6 @@ -<<<<<<< HEAD -======= - - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d diff --git a/docs/classSurveillance_1_1layers_1_1tabletop__seg_1_1tabletop__GMM__inherit__graph.md5 b/docs/classSurveillance_1_1layers_1_1tabletop__seg_1_1tabletop__GMM__inherit__graph.md5 index 76718989..799866f8 100644 --- a/docs/classSurveillance_1_1layers_1_1tabletop__seg_1_1tabletop__GMM__inherit__graph.md5 +++ b/docs/classSurveillance_1_1layers_1_1tabletop__seg_1_1tabletop__GMM__inherit__graph.md5 @@ -1,5 +1 @@ -<<<<<<< HEAD -617a1e7ac3b5c3014b260420524f4b89 -======= -2cc3a7bf6cc5b49a610d9f432e8101f1 ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d +617a1e7ac3b5c3014b260420524f4b89 \ No newline at end of file diff --git a/docs/classSurveillance_1_1utils_1_1configs_1_1CfgNode-members.html b/docs/classSurveillance_1_1utils_1_1configs_1_1CfgNode-members.html index 22df7abb..e71b16b7 100644 --- a/docs/classSurveillance_1_1utils_1_1configs_1_1CfgNode-members.html +++ b/docs/classSurveillance_1_1utils_1_1configs_1_1CfgNode-members.html @@ -1,17 +1,9 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d IVALab Python Libraries: Member List @@ -38,34 +30,21 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
      Inheritance graph
      -<<<<<<< HEAD -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
      [legend]
      Collaboration diagram for CfgNode:
      Collaboration graph
      -<<<<<<< HEAD -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
      [legend]

      @@ -203,22 +176,14 @@

      configs.py -======= -
    • /home/pvela/python/Surveillance/Surveillance/utils/configs.py
    • ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d diff --git a/docs/classSurveillance_1_1utils_1_1configs_1_1CfgNode__coll__graph.map b/docs/classSurveillance_1_1utils_1_1configs_1_1CfgNode__coll__graph.map index 49911367..804e3c5c 100644 --- a/docs/classSurveillance_1_1utils_1_1configs_1_1CfgNode__coll__graph.map +++ b/docs/classSurveillance_1_1utils_1_1configs_1_1CfgNode__coll__graph.map @@ -1,7 +1,4 @@ -<<<<<<< HEAD -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d diff --git a/docs/classSurveillance_1_1utils_1_1configs_1_1CfgNode__coll__graph.md5 b/docs/classSurveillance_1_1utils_1_1configs_1_1CfgNode__coll__graph.md5 index d0981257..53eab3e1 100644 --- a/docs/classSurveillance_1_1utils_1_1configs_1_1CfgNode__coll__graph.md5 +++ b/docs/classSurveillance_1_1utils_1_1configs_1_1CfgNode__coll__graph.md5 @@ -1,5 +1 @@ -<<<<<<< HEAD -2f26dbeda5c6c8ba124b1594d70b57d6 -======= -a206f6bd5376e042ace8986984b62de7 ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d +2f26dbeda5c6c8ba124b1594d70b57d6 \ No newline at end of file diff --git a/docs/classSurveillance_1_1utils_1_1configs_1_1CfgNode__inherit__graph.map b/docs/classSurveillance_1_1utils_1_1configs_1_1CfgNode__inherit__graph.map index 49911367..804e3c5c 100644 --- a/docs/classSurveillance_1_1utils_1_1configs_1_1CfgNode__inherit__graph.map +++ b/docs/classSurveillance_1_1utils_1_1configs_1_1CfgNode__inherit__graph.map @@ -1,7 +1,4 @@ -<<<<<<< HEAD -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d diff --git a/docs/classSurveillance_1_1utils_1_1configs_1_1CfgNode__inherit__graph.md5 b/docs/classSurveillance_1_1utils_1_1configs_1_1CfgNode__inherit__graph.md5 index 946f4363..53eab3e1 100644 --- a/docs/classSurveillance_1_1utils_1_1configs_1_1CfgNode__inherit__graph.md5 +++ b/docs/classSurveillance_1_1utils_1_1configs_1_1CfgNode__inherit__graph.md5 @@ -1,5 +1 @@ -<<<<<<< HEAD -2f26dbeda5c6c8ba124b1594d70b57d6 -======= -c2051406c1c7090a60c5839747967114 ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d +2f26dbeda5c6c8ba124b1594d70b57d6 \ No newline at end of file diff --git a/docs/classSurveillance_1_1utils_1_1height__estimate_1_1HeightEstimator-members.html b/docs/classSurveillance_1_1utils_1_1height__estimate_1_1HeightEstimator-members.html index eff5b398..e7bcac20 100644 --- a/docs/classSurveillance_1_1utils_1_1height__estimate_1_1HeightEstimator-members.html +++ b/docs/classSurveillance_1_1utils_1_1height__estimate_1_1HeightEstimator-members.html @@ -1,17 +1,9 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d IVALab Python Libraries: Member List @@ -38,34 +30,21 @@

      -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
      height_estimate.py -======= -
    • /home/pvela/python/Surveillance/Surveillance/utils/height_estimate.py
    • ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d

    diff --git a/docs/classSurveillance_1_1utils_1_1region__grow_1_1MaskGrower-members.html b/docs/classSurveillance_1_1utils_1_1region__grow_1_1MaskGrower-members.html index a482c8d5..56cd0067 100644 --- a/docs/classSurveillance_1_1utils_1_1region__grow_1_1MaskGrower-members.html +++ b/docs/classSurveillance_1_1utils_1_1region__grow_1_1MaskGrower-members.html @@ -1,17 +1,9 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d IVALab Python Libraries: Member List @@ -38,34 +30,21 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
    This is the complete list of members for MaskGrower, including all inherited members.

    -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d @@ -117,11 +92,7 @@ diff --git a/docs/classSurveillance_1_1utils_1_1region__grow_1_1MaskGrower.html b/docs/classSurveillance_1_1utils_1_1region__grow_1_1MaskGrower.html index 0adef04b..27b29a8e 100644 --- a/docs/classSurveillance_1_1utils_1_1region__grow_1_1MaskGrower.html +++ b/docs/classSurveillance_1_1utils_1_1region__grow_1_1MaskGrower.html @@ -1,17 +1,9 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d IVALab Python Libraries: MaskGrower Class Reference @@ -38,34 +30,21 @@
    __init__(self, RG_Params params)MaskGrower
    __init__MaskGrower
    cache_imgRegionGrower_base
    cache_mapRegionGrower_base
    display_results(self)RegionGrower_base
    -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
    Inheritance graph
    -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
    [legend]
    @@ -112,28 +87,16 @@
    Collaboration graph
    -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
    [legend]
    -<<<<<<< HEAD -======= - - - - - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d @@ -170,13 +133,8 @@ The criteria is logical true in the mask

    Constructor & Destructor Documentation

    -<<<<<<< HEAD

    ◆ __init__()

    -======= - -

    ◆ __init__()

    ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
    @@ -190,11 +148,7 @@

    -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d @@ -205,30 +159,19 @@

    -<<<<<<< HEAD

    Reimplemented from RegionGrower_base.


    The documentation for this class was generated from the following file:
    • /home/mary/python/Surveillance/Surveillance/utils/region_grow.py
    • -======= - - -
      The documentation for this class was generated from the following file:
        -
      • /home/pvela/python/Surveillance/Surveillance/utils/region_grow.py
      • ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
      diff --git a/docs/classSurveillance_1_1utils_1_1region__grow_1_1MaskGrower__coll__graph.map b/docs/classSurveillance_1_1utils_1_1region__grow_1_1MaskGrower__coll__graph.map index 7a76448f..57ce37b1 100644 --- a/docs/classSurveillance_1_1utils_1_1region__grow_1_1MaskGrower__coll__graph.map +++ b/docs/classSurveillance_1_1utils_1_1region__grow_1_1MaskGrower__coll__graph.map @@ -1,8 +1,4 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d diff --git a/docs/classSurveillance_1_1utils_1_1region__grow_1_1MaskGrower__coll__graph.md5 b/docs/classSurveillance_1_1utils_1_1region__grow_1_1MaskGrower__coll__graph.md5 index 913538f3..f68dbfe2 100644 --- a/docs/classSurveillance_1_1utils_1_1region__grow_1_1MaskGrower__coll__graph.md5 +++ b/docs/classSurveillance_1_1utils_1_1region__grow_1_1MaskGrower__coll__graph.md5 @@ -1,5 +1 @@ -<<<<<<< HEAD -c2dc25594ca8512bd45b516ec89aa9ae -======= -c1520a10f144ccf73c09913634f2baee ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d +c2dc25594ca8512bd45b516ec89aa9ae \ No newline at end of file diff --git a/docs/classSurveillance_1_1utils_1_1region__grow_1_1MaskGrower__inherit__graph.map b/docs/classSurveillance_1_1utils_1_1region__grow_1_1MaskGrower__inherit__graph.map index 7a76448f..57ce37b1 100644 --- a/docs/classSurveillance_1_1utils_1_1region__grow_1_1MaskGrower__inherit__graph.map +++ b/docs/classSurveillance_1_1utils_1_1region__grow_1_1MaskGrower__inherit__graph.map @@ -1,8 +1,4 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d diff --git a/docs/classSurveillance_1_1utils_1_1region__grow_1_1MaskGrower__inherit__graph.md5 b/docs/classSurveillance_1_1utils_1_1region__grow_1_1MaskGrower__inherit__graph.md5 index 897b6d77..f68dbfe2 100644 --- a/docs/classSurveillance_1_1utils_1_1region__grow_1_1MaskGrower__inherit__graph.md5 +++ b/docs/classSurveillance_1_1utils_1_1region__grow_1_1MaskGrower__inherit__graph.md5 @@ -1,5 +1 @@ -<<<<<<< HEAD -c2dc25594ca8512bd45b516ec89aa9ae -======= -910a30e88bb75f8ad07a883b82380ebe ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d +c2dc25594ca8512bd45b516ec89aa9ae \ No newline at end of file diff --git a/docs/classSurveillance_1_1utils_1_1region__grow_1_1RG__Params-members.html b/docs/classSurveillance_1_1utils_1_1region__grow_1_1RG__Params-members.html index a8eae484..b6c5ed9f 100644 --- a/docs/classSurveillance_1_1utils_1_1region__grow_1_1RG__Params-members.html +++ b/docs/classSurveillance_1_1utils_1_1region__grow_1_1RG__Params-members.html @@ -1,17 +1,9 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d IVALab Python Libraries: Member List @@ -38,34 +30,21 @@

    Public Member Functions

    def __init__ (self, RG_Params params)
     
    - Public Member Functions inherited from RegionGrower_base
    def __init__
     
    - Public Member Functions inherited from RegionGrower_base
    def __init__
     
    def display_results (self)
     
    def get_final_mask (self)
    RG_Params  params 
    -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
    region_grow.py -======= -
  • /home/pvela/python/Surveillance/Surveillance/utils/region_grow.py
  • ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
    diff --git a/docs/classSurveillance_1_1utils_1_1region__grow_1_1RegionGrower__ValDiff-members.html b/docs/classSurveillance_1_1utils_1_1region__grow_1_1RegionGrower__ValDiff-members.html index 1f3be3b1..a6f7e6a1 100644 --- a/docs/classSurveillance_1_1utils_1_1region__grow_1_1RegionGrower__ValDiff-members.html +++ b/docs/classSurveillance_1_1utils_1_1region__grow_1_1RegionGrower__ValDiff-members.html @@ -1,17 +1,9 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d IVALab Python Libraries: Member List @@ -38,34 +30,21 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
    This is the complete list of members for RegionGrower_ValDiff, including all inherited members.

    -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d @@ -119,11 +94,7 @@ diff --git a/docs/classSurveillance_1_1utils_1_1region__grow_1_1RegionGrower__ValDiff.html b/docs/classSurveillance_1_1utils_1_1region__grow_1_1RegionGrower__ValDiff.html index 6f084bec..a7bda037 100644 --- a/docs/classSurveillance_1_1utils_1_1region__grow_1_1RegionGrower__ValDiff.html +++ b/docs/classSurveillance_1_1utils_1_1region__grow_1_1RegionGrower__ValDiff.html @@ -1,17 +1,9 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d IVALab Python Libraries: RegionGrower_ValDiff Class Reference @@ -38,34 +30,21 @@
    __init__(self, RG_Params params)RegionGrower_ValDiff
    __init__RegionGrower_ValDiff
    cache_imgRegionGrower_base
    cache_mapRegionGrower_base
    display_results(self)RegionGrower_base
    -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
    Inheritance graph
    -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
    [legend]
    @@ -113,28 +88,16 @@
    Collaboration graph
    -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
    [legend]
    -<<<<<<< HEAD -======= - - - - - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d @@ -175,13 +138,8 @@ The criteria is thresholding the difference between new candidate seed value and the avarage seed value

    Constructor & Destructor Documentation

    -<<<<<<< HEAD

    ◆ __init__()

    -======= - -

    ◆ __init__()

    ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
    @@ -195,11 +153,7 @@

    -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d @@ -210,11 +164,8 @@

    -<<<<<<< HEAD

    Reimplemented from RegionGrower_base.

    -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d

    Member Data Documentation

    @@ -247,22 +198,14 @@

    region_grow.py -======= -
  • /home/pvela/python/Surveillance/Surveillance/utils/region_grow.py
  • ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d diff --git a/docs/classSurveillance_1_1utils_1_1region__grow_1_1RegionGrower__ValDiff__coll__graph.map b/docs/classSurveillance_1_1utils_1_1region__grow_1_1RegionGrower__ValDiff__coll__graph.map index 3beaaa84..c9227eb4 100644 --- a/docs/classSurveillance_1_1utils_1_1region__grow_1_1RegionGrower__ValDiff__coll__graph.map +++ b/docs/classSurveillance_1_1utils_1_1region__grow_1_1RegionGrower__ValDiff__coll__graph.map @@ -1,8 +1,4 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d diff --git a/docs/classSurveillance_1_1utils_1_1region__grow_1_1RegionGrower__ValDiff__coll__graph.md5 b/docs/classSurveillance_1_1utils_1_1region__grow_1_1RegionGrower__ValDiff__coll__graph.md5 index a6f8c399..c0024564 100644 --- a/docs/classSurveillance_1_1utils_1_1region__grow_1_1RegionGrower__ValDiff__coll__graph.md5 +++ b/docs/classSurveillance_1_1utils_1_1region__grow_1_1RegionGrower__ValDiff__coll__graph.md5 @@ -1,5 +1 @@ -<<<<<<< HEAD -ed1e7a8af448c6c6a7db55d963926a8b -======= -dbd12fddfbe0ad5d2588254972d54738 ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d +ed1e7a8af448c6c6a7db55d963926a8b \ No newline at end of file diff --git a/docs/classSurveillance_1_1utils_1_1region__grow_1_1RegionGrower__ValDiff__inherit__graph.map b/docs/classSurveillance_1_1utils_1_1region__grow_1_1RegionGrower__ValDiff__inherit__graph.map index 3beaaa84..c9227eb4 100644 --- a/docs/classSurveillance_1_1utils_1_1region__grow_1_1RegionGrower__ValDiff__inherit__graph.map +++ b/docs/classSurveillance_1_1utils_1_1region__grow_1_1RegionGrower__ValDiff__inherit__graph.map @@ -1,8 +1,4 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d diff --git a/docs/classSurveillance_1_1utils_1_1region__grow_1_1RegionGrower__ValDiff__inherit__graph.md5 b/docs/classSurveillance_1_1utils_1_1region__grow_1_1RegionGrower__ValDiff__inherit__graph.md5 index 5e05aaed..c0024564 100644 --- a/docs/classSurveillance_1_1utils_1_1region__grow_1_1RegionGrower__ValDiff__inherit__graph.md5 +++ b/docs/classSurveillance_1_1utils_1_1region__grow_1_1RegionGrower__ValDiff__inherit__graph.md5 @@ -1,5 +1 @@ -<<<<<<< HEAD -ed1e7a8af448c6c6a7db55d963926a8b -======= -ed7947c9205ed0b51f9baeb60f079a38 ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d +ed1e7a8af448c6c6a7db55d963926a8b \ No newline at end of file diff --git a/docs/classSurveillance_1_1utils_1_1region__grow_1_1RegionGrower__base-members.html b/docs/classSurveillance_1_1utils_1_1region__grow_1_1RegionGrower__base-members.html index 879b6fb3..fa697857 100644 --- a/docs/classSurveillance_1_1utils_1_1region__grow_1_1RegionGrower__base-members.html +++ b/docs/classSurveillance_1_1utils_1_1region__grow_1_1RegionGrower__base-members.html @@ -1,17 +1,9 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d IVALab Python Libraries: Member List @@ -38,34 +30,21 @@

    Public Member Functions

    def __init__ (self, RG_Params params)
     
    - Public Member Functions inherited from RegionGrower_base
    def __init__
     
    - Public Member Functions inherited from RegionGrower_base
    def __init__
     
    def display_results (self)
     
    def get_final_mask (self)
    RG_Params  params 
    -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
    This is the complete list of members for RegionGrower_base, including all inherited members.

    -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d @@ -117,11 +92,7 @@ diff --git a/docs/classSurveillance_1_1utils_1_1region__grow_1_1RegionGrower__base.html b/docs/classSurveillance_1_1utils_1_1region__grow_1_1RegionGrower__base.html index 730f61f5..aa05473b 100644 --- a/docs/classSurveillance_1_1utils_1_1region__grow_1_1RegionGrower__base.html +++ b/docs/classSurveillance_1_1utils_1_1region__grow_1_1RegionGrower__base.html @@ -1,17 +1,9 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d IVALab Python Libraries: RegionGrower_base Class Reference @@ -38,34 +30,21 @@
    __init__(self, RG_Params params)RegionGrower_base
    __init__RegionGrower_base
    cache_imgRegionGrower_base
    cache_mapRegionGrower_base
    display_results(self)RegionGrower_base
    -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
    Inheritance graph
    -<<<<<<< HEAD -======= - - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
    [legend]
    -<<<<<<< HEAD -======= - - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d @@ -166,13 +135,8 @@ 2.2 for each neighbor, if it is out of bounadry, or already been marked as accepted or discarded, then pass 2.3 for each neighbor, if it can pass some criteria, then mark as accepted and add to the seed list else mark as discarded and continue

    Constructor & Destructor Documentation

    -<<<<<<< HEAD

    ◆ __init__()

    -======= - -

    ◆ __init__()

    ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
    @@ -186,11 +150,7 @@

    -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d @@ -201,11 +161,8 @@

    -<<<<<<< HEAD

    Reimplemented in MaskGrower, and RegionGrower_ValDiff.

    -======= ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d

    Member Function Documentation

    @@ -466,22 +423,14 @@

    region_grow.py -======= -
  • /home/pvela/python/Surveillance/Surveillance/utils/region_grow.py
  • ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d diff --git a/docs/classSurveillance_1_1utils_1_1region__grow_1_1RegionGrower__base__inherit__graph.map b/docs/classSurveillance_1_1utils_1_1region__grow_1_1RegionGrower__base__inherit__graph.map index 3074c6b8..e93a86f5 100644 --- a/docs/classSurveillance_1_1utils_1_1region__grow_1_1RegionGrower__base__inherit__graph.map +++ b/docs/classSurveillance_1_1utils_1_1region__grow_1_1RegionGrower__base__inherit__graph.map @@ -1,10 +1,5 @@ -<<<<<<< HEAD -======= - - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d diff --git a/docs/classSurveillance_1_1utils_1_1region__grow_1_1RegionGrower__base__inherit__graph.md5 b/docs/classSurveillance_1_1utils_1_1region__grow_1_1RegionGrower__base__inherit__graph.md5 index 2840dcb5..4bfad287 100644 --- a/docs/classSurveillance_1_1utils_1_1region__grow_1_1RegionGrower__base__inherit__graph.md5 +++ b/docs/classSurveillance_1_1utils_1_1region__grow_1_1RegionGrower__base__inherit__graph.md5 @@ -1,5 +1 @@ -<<<<<<< HEAD -0f06ba7112067947d1006ed4ad537020 -======= -1007d2aa381a194f73f43b26afaceeb2 ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d +0f06ba7112067947d1006ed4ad537020 \ No newline at end of file diff --git a/docs/classSurveillance_1_1utils_1_1specifications_1_1dict2struct-members.html b/docs/classSurveillance_1_1utils_1_1specifications_1_1dict2struct-members.html index b12c4b4c..e2885c67 100644 --- a/docs/classSurveillance_1_1utils_1_1specifications_1_1dict2struct-members.html +++ b/docs/classSurveillance_1_1utils_1_1specifications_1_1dict2struct-members.html @@ -1,17 +1,9 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d IVALab Python Libraries: Member List @@ -38,34 +30,21 @@

    Public Member Functions

    def __init__ (self, RG_Params params)
     
    def __init__
     
    def display_results (self)
     
    def get_final_mask (self)
    RG_Params  params 
    -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
    This is the complete list of members for dict2struct, including all inherited members.

    -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
    __contains__(self, att_name)dict2struct
    __init__(self, **entries)dict2struct
    __init__(self, entries)dict2struct
    diff --git a/docs/classSurveillance_1_1utils_1_1specifications_1_1dict2struct.html b/docs/classSurveillance_1_1utils_1_1specifications_1_1dict2struct.html index 7f69358c..0e6123d0 100644 --- a/docs/classSurveillance_1_1utils_1_1specifications_1_1dict2struct.html +++ b/docs/classSurveillance_1_1utils_1_1specifications_1_1dict2struct.html @@ -1,17 +1,9 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d IVALab Python Libraries: dict2struct Class Reference @@ -38,34 +30,21 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
    def __contains__ (self, att_name)   -<<<<<<< HEAD def __init__ (self, **entries)  

    Constructor & Destructor Documentation

    ◆ __init__()

    -======= -def __init__ (self, entries) -  - -

    Constructor & Destructor Documentation

    - -

    ◆ __init__()

    ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
    @@ -127,11 +97,7 @@

    -<<<<<<< HEAD **  -======= -   ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d entries  @@ -174,22 +140,14 @@

    specifications.py -======= -
  • /home/pvela/python/Surveillance/Surveillance/utils/specifications.py
  • ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d

    diff --git a/docs/classSurveillance_1_1utils_1_1specifications_1_1specifications-members.html b/docs/classSurveillance_1_1utils_1_1specifications_1_1specifications-members.html index 6d3888d1..71ca6090 100644 --- a/docs/classSurveillance_1_1utils_1_1specifications_1_1specifications-members.html +++ b/docs/classSurveillance_1_1utils_1_1specifications_1_1specifications-members.html @@ -1,17 +1,9 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d IVALab Python Libraries: Member List @@ -38,34 +30,21 @@
    -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
    specifications.py -======= -
  • /home/pvela/python/Surveillance/Surveillance/utils/specifications.py
  • ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
    diff --git a/docs/classSurveillance_1_1utils_1_1transform_1_1frameTransformer-members.html b/docs/classSurveillance_1_1utils_1_1transform_1_1frameTransformer-members.html index 557ec39c..49bdd0da 100644 --- a/docs/classSurveillance_1_1utils_1_1transform_1_1frameTransformer-members.html +++ b/docs/classSurveillance_1_1utils_1_1transform_1_1frameTransformer-members.html @@ -1,17 +1,9 @@ -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d IVALab Python Libraries: Member List @@ -38,34 +30,21 @@
    -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d -<<<<<<< HEAD -======= - ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
    transform.py -======= -
  • /home/pvela/python/Surveillance/Surveillance/utils/transform.py
  • ->>>>>>> fb8ea61c5563ccee8dddf076a835728d8989570d
    diff --git a/docs/classbyMotion_1_1CfgMoving.html b/docs/classbyMotion_1_1CfgMoving.html index d866a0fa..da434768 100644 --- a/docs/classbyMotion_1_1CfgMoving.html +++ b/docs/classbyMotion_1_1CfgMoving.html @@ -219,7 +219,7 @@

    byMotion.py +
  • /home/mary/python/detector/detector/activity/byMotion.py
  • diff --git a/docs/classbyMotion_1_1MoveState.html b/docs/classbyMotion_1_1MoveState.html index 5f493d3a..406d2255 100644 --- a/docs/classbyMotion_1_1MoveState.html +++ b/docs/classbyMotion_1_1MoveState.html @@ -145,7 +145,7 @@

    byMotion.py +
  • /home/mary/python/detector/detector/activity/byMotion.py
  • diff --git a/docs/classbyMotion_1_1TrackState.html b/docs/classbyMotion_1_1TrackState.html index 69b8026d..019f8213 100644 --- a/docs/classbyMotion_1_1TrackState.html +++ b/docs/classbyMotion_1_1TrackState.html @@ -169,7 +169,7 @@

    byMotion.py +
  • /home/mary/python/detector/detector/activity/byMotion.py
  • diff --git a/docs/classbyMotion_1_1detector.html b/docs/classbyMotion_1_1detector.html index 34cc2864..35697c0d 100644 --- a/docs/classbyMotion_1_1detector.html +++ b/docs/classbyMotion_1_1detector.html @@ -89,7 +89,7 @@
    [legend]

    The documentation for this class was generated from the following file:
      -
    • /home/pvela/python/detector/detector/activity/byMotion.py
    • +
    • /home/mary/python/detector/detector/activity/byMotion.py
    diff --git a/docs/classbyRegion_1_1Planar.html b/docs/classbyRegion_1_1Planar.html index 4dc427e6..c41599a2 100644 --- a/docs/classbyRegion_1_1Planar.html +++ b/docs/classbyRegion_1_1Planar.html @@ -331,7 +331,7 @@

    byRegion.py +
  • /home/mary/python/detector/detector/activity/byRegion.py
  • diff --git a/docs/classbyRegion_1_1imageOccupancy.html b/docs/classbyRegion_1_1imageOccupancy.html index 240c7a50..58827788 100644 --- a/docs/classbyRegion_1_1imageOccupancy.html +++ b/docs/classbyRegion_1_1imageOccupancy.html @@ -954,7 +954,7 @@

    byRegion.py +
  • /home/mary/python/detector/detector/activity/byRegion.py
  • diff --git a/docs/classbyRegion_1_1imageRegions.html b/docs/classbyRegion_1_1imageRegions.html index 4bd7c7b9..5d66ff6c 100644 --- a/docs/classbyRegion_1_1imageRegions.html +++ b/docs/classbyRegion_1_1imageRegions.html @@ -949,7 +949,7 @@

    byRegion.py +
  • /home/mary/python/detector/detector/activity/byRegion.py
  • diff --git a/docs/classcamera_1_1base_1_1Base.html b/docs/classcamera_1_1base_1_1Base.html index 1e1f94b9..ff3b4121 100644 --- a/docs/classcamera_1_1base_1_1Base.html +++ b/docs/classcamera_1_1base_1_1Base.html @@ -407,7 +407,7 @@

    base.py +
  • /home/mary/python/camera/camera/base.py
  • diff --git a/docs/classcamera_1_1base_1_1CfgCamera.html b/docs/classcamera_1_1base_1_1CfgCamera.html index b2e2f57a..15cd597e 100644 --- a/docs/classcamera_1_1base_1_1CfgCamera.html +++ b/docs/classcamera_1_1base_1_1CfgCamera.html @@ -153,7 +153,7 @@

    base.py +
  • /home/mary/python/camera/camera/base.py
  • diff --git a/docs/classcamera_1_1base_1_1Color.html b/docs/classcamera_1_1base_1_1Color.html index 057f1fb8..d8515d79 100644 --- a/docs/classcamera_1_1base_1_1Color.html +++ b/docs/classcamera_1_1base_1_1Color.html @@ -189,7 +189,7 @@

    base.py +
  • /home/mary/python/camera/camera/base.py
  • diff --git a/docs/classcamera_1_1base_1_1Grayscale.html b/docs/classcamera_1_1base_1_1Grayscale.html index 4cedca1c..2252d867 100644 --- a/docs/classcamera_1_1base_1_1Grayscale.html +++ b/docs/classcamera_1_1base_1_1Grayscale.html @@ -169,7 +169,7 @@

    base.py +
  • /home/mary/python/camera/camera/base.py
  • diff --git a/docs/classcamera_1_1base_1_1ImageRGBD.html b/docs/classcamera_1_1base_1_1ImageRGBD.html index 505421b9..ba8f2171 100644 --- a/docs/classcamera_1_1base_1_1ImageRGBD.html +++ b/docs/classcamera_1_1base_1_1ImageRGBD.html @@ -103,7 +103,7 @@

    base.py +
  • /home/mary/python/camera/camera/base.py
  • diff --git a/docs/classcamera_1_1base_1_1ReplayColor.html b/docs/classcamera_1_1base_1_1ReplayColor.html index a4ac7cd9..4d1f4d1d 100644 --- a/docs/classcamera_1_1base_1_1ReplayColor.html +++ b/docs/classcamera_1_1base_1_1ReplayColor.html @@ -231,7 +231,7 @@

    base.py +
  • /home/mary/python/camera/camera/base.py
  • diff --git a/docs/classcamera_1_1cv2cam_1_1CfgColor.html b/docs/classcamera_1_1cv2cam_1_1CfgColor.html index b4b6e4d1..3c2dc52e 100644 --- a/docs/classcamera_1_1cv2cam_1_1CfgColor.html +++ b/docs/classcamera_1_1cv2cam_1_1CfgColor.html @@ -225,7 +225,7 @@

    cv2cam.py +
  • /home/mary/python/camera/camera/cv2cam.py
  • diff --git a/docs/classcamera_1_1cv2cam_1_1Color.html b/docs/classcamera_1_1cv2cam_1_1Color.html index 62ebbcb2..a5775964 100644 --- a/docs/classcamera_1_1cv2cam_1_1Color.html +++ b/docs/classcamera_1_1cv2cam_1_1Color.html @@ -423,7 +423,7 @@

    cv2cam.py +
  • /home/mary/python/camera/camera/cv2cam.py
  • diff --git a/docs/classcamera_1_1d435_1_1recorders_1_1D435RecBase.html b/docs/classcamera_1_1d435_1_1recorders_1_1D435RecBase.html index 2f8fa214..a5b82c66 100644 --- a/docs/classcamera_1_1d435_1_1recorders_1_1D435RecBase.html +++ b/docs/classcamera_1_1d435_1_1recorders_1_1D435RecBase.html @@ -420,7 +420,7 @@

    recorders.py +
  • /home/mary/python/camera/camera/d435/recorders.py
  • diff --git a/docs/classcamera_1_1d435_1_1recorders_1_1D435RecRosbag.html b/docs/classcamera_1_1d435_1_1recorders_1_1D435RecRosbag.html index 015ff56d..2eb75944 100644 --- a/docs/classcamera_1_1d435_1_1recorders_1_1D435RecRosbag.html +++ b/docs/classcamera_1_1d435_1_1recorders_1_1D435RecRosbag.html @@ -323,7 +323,7 @@

    recorders.py +
  • /home/mary/python/camera/camera/d435/recorders.py
  • diff --git a/docs/classcamera_1_1d435_1_1runner2_1_1CfgD435.html b/docs/classcamera_1_1d435_1_1runner2_1_1CfgD435.html index e91010d8..47db9ca6 100644 --- a/docs/classcamera_1_1d435_1_1runner2_1_1CfgD435.html +++ b/docs/classcamera_1_1d435_1_1runner2_1_1CfgD435.html @@ -215,7 +215,7 @@

    runner2.py +
  • /home/mary/python/camera/camera/d435/runner2.py
  • diff --git a/docs/classcamera_1_1d435_1_1runner2_1_1D435__Runner.html b/docs/classcamera_1_1d435_1_1runner2_1_1D435__Runner.html index de54e359..ea54abb8 100644 --- a/docs/classcamera_1_1d435_1_1runner2_1_1D435__Runner.html +++ b/docs/classcamera_1_1d435_1_1runner2_1_1D435__Runner.html @@ -633,7 +633,7 @@

    runner2.py +
  • /home/mary/python/camera/camera/d435/runner2.py
  • diff --git a/docs/classcamera_1_1d435_1_1runner2_1_1Replay-members.html b/docs/classcamera_1_1d435_1_1runner2_1_1Replay-members.html index 191ac9c9..731d97c9 100644 --- a/docs/classcamera_1_1d435_1_1runner2_1_1Replay-members.html +++ b/docs/classcamera_1_1d435_1_1runner2_1_1Replay-members.html @@ -104,7 +104,6 @@ set_intrinsic(self, K)Base start(self)Replay stop(self)D435_Runner - timestampReplay

    @@ -565,7 +581,7 @@

    board.py +
  • /home/mary/python/puzzle_solver/puzzle/board.py
  • diff --git a/docs/classpuzzle_1_1builder_1_1adjacent_1_1Adjacent.html b/docs/classpuzzle_1_1builder_1_1adjacent_1_1Adjacent.html index 2a1e580f..22b3af02 100644 --- a/docs/classpuzzle_1_1builder_1_1adjacent_1_1Adjacent.html +++ b/docs/classpuzzle_1_1builder_1_1adjacent_1_1Adjacent.html @@ -605,7 +605,7 @@

    adjacent.py +
  • /home/mary/python/puzzle_solver/puzzle/builder/adjacent.py
  • diff --git a/docs/classpuzzle_1_1builder_1_1adjacent_1_1CfgAdjacent.html b/docs/classpuzzle_1_1builder_1_1adjacent_1_1CfgAdjacent.html index 44128cb9..1202d32e 100644 --- a/docs/classpuzzle_1_1builder_1_1adjacent_1_1CfgAdjacent.html +++ b/docs/classpuzzle_1_1builder_1_1adjacent_1_1CfgAdjacent.html @@ -226,7 +226,7 @@

    adjacent.py +
  • /home/mary/python/puzzle_solver/puzzle/builder/adjacent.py
  • diff --git a/docs/classpuzzle_1_1builder_1_1arrangement_1_1Arrangement.html b/docs/classpuzzle_1_1builder_1_1arrangement_1_1Arrangement.html index 4b199416..58bcff29 100644 --- a/docs/classpuzzle_1_1builder_1_1arrangement_1_1Arrangement.html +++ b/docs/classpuzzle_1_1builder_1_1arrangement_1_1Arrangement.html @@ -285,8 +285,15 @@

    Parameters
    + + + + +
    [in]theImageThe puzzle image data.
    [in]theMaskThe puzzle mask data.
    [in]theParamsThe params.
    +
    +

    +
    Returns
    thePuzzle The arrangement puzzle board instance.

    Reimplemented in Interlocking, Adjacent, and Gridded.

    @@ -748,7 +755,7 @@

    arrangement.py +
  • /home/mary/python/puzzle_solver/puzzle/builder/arrangement.py
  • diff --git a/docs/classpuzzle_1_1builder_1_1arrangement_1_1CfgArrangement.html b/docs/classpuzzle_1_1builder_1_1arrangement_1_1CfgArrangement.html index 3268fec8..151847c0 100644 --- a/docs/classpuzzle_1_1builder_1_1arrangement_1_1CfgArrangement.html +++ b/docs/classpuzzle_1_1builder_1_1arrangement_1_1CfgArrangement.html @@ -225,7 +225,7 @@

    arrangement.py +
  • /home/mary/python/puzzle_solver/puzzle/builder/arrangement.py
  • diff --git a/docs/classpuzzle_1_1builder_1_1gridded_1_1CfgGridded.html b/docs/classpuzzle_1_1builder_1_1gridded_1_1CfgGridded.html index 2849accd..11eb5fc8 100644 --- a/docs/classpuzzle_1_1builder_1_1gridded_1_1CfgGridded.html +++ b/docs/classpuzzle_1_1builder_1_1gridded_1_1CfgGridded.html @@ -224,7 +224,7 @@

    gridded.py +
  • /home/mary/python/puzzle_solver/puzzle/builder/gridded.py
  • diff --git a/docs/classpuzzle_1_1builder_1_1gridded_1_1Gridded.html b/docs/classpuzzle_1_1builder_1_1gridded_1_1Gridded.html index da726d18..bf093939 100644 --- a/docs/classpuzzle_1_1builder_1_1gridded_1_1Gridded.html +++ b/docs/classpuzzle_1_1builder_1_1gridded_1_1Gridded.html @@ -826,7 +826,7 @@

    gridded.py +
  • /home/mary/python/puzzle_solver/puzzle/builder/gridded.py
  • diff --git a/docs/classpuzzle_1_1builder_1_1interlocking_1_1CfgInterlocking.html b/docs/classpuzzle_1_1builder_1_1interlocking_1_1CfgInterlocking.html index 5e47bb35..e3d50d22 100644 --- a/docs/classpuzzle_1_1builder_1_1interlocking_1_1CfgInterlocking.html +++ b/docs/classpuzzle_1_1builder_1_1interlocking_1_1CfgInterlocking.html @@ -227,7 +227,7 @@

    interlocking.py +
  • /home/mary/python/puzzle_solver/puzzle/builder/interlocking.py
  • diff --git a/docs/classpuzzle_1_1builder_1_1interlocking_1_1Interlocking.html b/docs/classpuzzle_1_1builder_1_1interlocking_1_1Interlocking.html index d285be40..fa854410 100644 --- a/docs/classpuzzle_1_1builder_1_1interlocking_1_1Interlocking.html +++ b/docs/classpuzzle_1_1builder_1_1interlocking_1_1Interlocking.html @@ -612,7 +612,7 @@

    interlocking.py +
  • /home/mary/python/puzzle_solver/puzzle/builder/interlocking.py
  • diff --git a/docs/classpuzzle_1_1clusters_1_1byColor_1_1ByColor.html b/docs/classpuzzle_1_1clusters_1_1byColor_1_1ByColor.html index eede1bd0..760c8589 100644 --- a/docs/classpuzzle_1_1clusters_1_1byColor_1_1ByColor.html +++ b/docs/classpuzzle_1_1clusters_1_1byColor_1_1ByColor.html @@ -368,7 +368,7 @@

    byColor.py +
  • /home/mary/python/puzzle_solver/puzzle/clusters/byColor.py
  • diff --git a/docs/classpuzzle_1_1clusters_1_1byColor_1_1ParamColorCluster.html b/docs/classpuzzle_1_1clusters_1_1byColor_1_1ParamColorCluster.html index b0dc364b..8ad8cff8 100644 --- a/docs/classpuzzle_1_1clusters_1_1byColor_1_1ParamColorCluster.html +++ b/docs/classpuzzle_1_1clusters_1_1byColor_1_1ParamColorCluster.html @@ -157,7 +157,7 @@

    byColor.py +
  • /home/mary/python/puzzle_solver/puzzle/clusters/byColor.py
  • diff --git a/docs/classpuzzle_1_1clusters_1_1byShape_1_1ByShape.html b/docs/classpuzzle_1_1clusters_1_1byShape_1_1ByShape.html index 49dc9674..3a09ca4c 100644 --- a/docs/classpuzzle_1_1clusters_1_1byShape_1_1ByShape.html +++ b/docs/classpuzzle_1_1clusters_1_1byShape_1_1ByShape.html @@ -293,7 +293,7 @@

    byShape.py +
  • /home/mary/python/puzzle_solver/puzzle/clusters/byShape.py
  • diff --git a/docs/classpuzzle_1_1clusters_1_1byShape_1_1ParamShapeCluster.html b/docs/classpuzzle_1_1clusters_1_1byShape_1_1ParamShapeCluster.html index 05b8d837..e0665536 100644 --- a/docs/classpuzzle_1_1clusters_1_1byShape_1_1ParamShapeCluster.html +++ b/docs/classpuzzle_1_1clusters_1_1byShape_1_1ParamShapeCluster.html @@ -103,7 +103,7 @@

    byShape.py +
  • /home/mary/python/puzzle_solver/puzzle/clusters/byShape.py
  • diff --git a/docs/classpuzzle_1_1manager_1_1Manager.html b/docs/classpuzzle_1_1manager_1_1Manager.html index 35f3c70d..08b7c49d 100644 --- a/docs/classpuzzle_1_1manager_1_1Manager.html +++ b/docs/classpuzzle_1_1manager_1_1Manager.html @@ -480,7 +480,7 @@

    manager.py +
  • /home/mary/python/puzzle_solver/puzzle/manager.py
  • diff --git a/docs/classpuzzle_1_1manager_1_1ManagerParms.html b/docs/classpuzzle_1_1manager_1_1ManagerParms.html index 9f999f8d..4d5fa8f9 100644 --- a/docs/classpuzzle_1_1manager_1_1ManagerParms.html +++ b/docs/classpuzzle_1_1manager_1_1ManagerParms.html @@ -103,7 +103,7 @@

    manager.py +
  • /home/mary/python/puzzle_solver/puzzle/manager.py
  • diff --git a/docs/classpuzzle_1_1parse_1_1fromLayer_1_1FromLayer.html b/docs/classpuzzle_1_1parse_1_1fromLayer_1_1FromLayer.html index 8684ab17..9418b6c2 100644 --- a/docs/classpuzzle_1_1parse_1_1fromLayer_1_1FromLayer.html +++ b/docs/classpuzzle_1_1parse_1_1fromLayer_1_1FromLayer.html @@ -439,7 +439,7 @@

    fromLayer.py +
  • /home/mary/python/puzzle_solver/puzzle/parse/fromLayer.py
  • diff --git a/docs/classpuzzle_1_1parse_1_1fromLayer_1_1ParamPuzzle.html b/docs/classpuzzle_1_1parse_1_1fromLayer_1_1ParamPuzzle.html index 2f7508a2..f7d7bb5e 100644 --- a/docs/classpuzzle_1_1parse_1_1fromLayer_1_1ParamPuzzle.html +++ b/docs/classpuzzle_1_1parse_1_1fromLayer_1_1ParamPuzzle.html @@ -175,7 +175,7 @@

    fromLayer.py +
  • /home/mary/python/puzzle_solver/puzzle/parse/fromLayer.py
  • diff --git a/docs/classpuzzle_1_1parse_1_1fromSketch_1_1FromSketch.html b/docs/classpuzzle_1_1parse_1_1fromSketch_1_1FromSketch.html index 9785048d..579d8a66 100644 --- a/docs/classpuzzle_1_1parse_1_1fromSketch_1_1FromSketch.html +++ b/docs/classpuzzle_1_1parse_1_1fromSketch_1_1FromSketch.html @@ -327,7 +327,7 @@

    fromSketch.py +
  • /home/mary/python/puzzle_solver/puzzle/parse/fromSketch.py
  • diff --git a/docs/classpuzzle_1_1parse_1_1simple_1_1Simple.html b/docs/classpuzzle_1_1parse_1_1simple_1_1Simple.html index 089bab85..c0a4a440 100644 --- a/docs/classpuzzle_1_1parse_1_1simple_1_1Simple.html +++ b/docs/classpuzzle_1_1parse_1_1simple_1_1Simple.html @@ -372,7 +372,7 @@

    simple.py +
  • /home/mary/python/puzzle_solver/puzzle/parse/simple.py
  • diff --git a/docs/classpuzzle_1_1parser_1_1CfgBoardMeasure.html b/docs/classpuzzle_1_1parser_1_1CfgBoardMeasure.html index 7511ccfa..68946165 100644 --- a/docs/classpuzzle_1_1parser_1_1CfgBoardMeasure.html +++ b/docs/classpuzzle_1_1parser_1_1CfgBoardMeasure.html @@ -240,7 +240,7 @@

    parser.py +
  • /home/mary/python/puzzle_solver/puzzle/parser.py
  • diff --git a/docs/classpuzzle_1_1parser_1_1boardMeasure.html b/docs/classpuzzle_1_1parser_1_1boardMeasure.html index 39d97003..3339a1dd 100644 --- a/docs/classpuzzle_1_1parser_1_1boardMeasure.html +++ b/docs/classpuzzle_1_1parser_1_1boardMeasure.html @@ -526,7 +526,7 @@

    parser.py +
  • /home/mary/python/puzzle_solver/puzzle/parser.py
  • diff --git a/docs/classpuzzle_1_1parser_1_1boardPerceive.html b/docs/classpuzzle_1_1parser_1_1boardPerceive.html index a96fa296..680bde98 100644 --- a/docs/classpuzzle_1_1parser_1_1boardPerceive.html +++ b/docs/classpuzzle_1_1parser_1_1boardPerceive.html @@ -377,7 +377,7 @@

    parser.py +
  • /home/mary/python/puzzle_solver/puzzle/parser.py
  • diff --git a/docs/classpuzzle_1_1piece_1_1EdgeDes.html b/docs/classpuzzle_1_1piece_1_1EdgeDes.html index f5a73e26..bb03fd76 100644 --- a/docs/classpuzzle_1_1piece_1_1EdgeDes.html +++ b/docs/classpuzzle_1_1piece_1_1EdgeDes.html @@ -127,7 +127,7 @@

    piece.py +
  • /home/mary/python/puzzle_solver/puzzle/piece.py
  • diff --git a/docs/classpuzzle_1_1piece_1_1EdgeDirection.html b/docs/classpuzzle_1_1piece_1_1EdgeDirection.html index 4b85d8b5..c6d5b11d 100644 --- a/docs/classpuzzle_1_1piece_1_1EdgeDirection.html +++ b/docs/classpuzzle_1_1piece_1_1EdgeDirection.html @@ -198,7 +198,7 @@

    piece.py +
  • /home/mary/python/puzzle_solver/puzzle/piece.py
  • diff --git a/docs/classpuzzle_1_1piece_1_1EdgeType.html b/docs/classpuzzle_1_1piece_1_1EdgeType.html index e0de95fd..1655fe01 100644 --- a/docs/classpuzzle_1_1piece_1_1EdgeType.html +++ b/docs/classpuzzle_1_1piece_1_1EdgeType.html @@ -198,7 +198,7 @@

    piece.py +
  • /home/mary/python/puzzle_solver/puzzle/piece.py
  • diff --git a/docs/classpuzzle_1_1piece_1_1Piece.html b/docs/classpuzzle_1_1piece_1_1Piece.html index a2415d99..7117bbfd 100644 --- a/docs/classpuzzle_1_1piece_1_1Piece.html +++ b/docs/classpuzzle_1_1piece_1_1Piece.html @@ -106,7 +106,7 @@

    piece.py +
  • /home/mary/python/puzzle_solver/puzzle/piece.py
  • diff --git a/docs/classpuzzle_1_1piece_1_1PieceStatus.html b/docs/classpuzzle_1_1piece_1_1PieceStatus.html index 36ed856a..db57fe8f 100644 --- a/docs/classpuzzle_1_1piece_1_1PieceStatus.html +++ b/docs/classpuzzle_1_1piece_1_1PieceStatus.html @@ -246,7 +246,7 @@

    piece.py +
  • /home/mary/python/puzzle_solver/puzzle/piece.py
  • diff --git a/docs/classpuzzle_1_1piece_1_1PuzzleTemplate.html b/docs/classpuzzle_1_1piece_1_1PuzzleTemplate.html index d85aee70..361faaf9 100644 --- a/docs/classpuzzle_1_1piece_1_1PuzzleTemplate.html +++ b/docs/classpuzzle_1_1piece_1_1PuzzleTemplate.html @@ -132,7 +132,7 @@

    piece.py +
  • /home/mary/python/puzzle_solver/puzzle/piece.py
  • diff --git a/docs/classpuzzle_1_1piece_1_1Regular.html b/docs/classpuzzle_1_1piece_1_1Regular.html index 4346e956..af0f8724 100644 --- a/docs/classpuzzle_1_1piece_1_1Regular.html +++ b/docs/classpuzzle_1_1piece_1_1Regular.html @@ -555,7 +555,7 @@

    piece.py +
  • /home/mary/python/puzzle_solver/puzzle/piece.py
  • diff --git a/docs/classpuzzle_1_1piece_1_1Template.html b/docs/classpuzzle_1_1piece_1_1Template.html index 5d17b509..1e466861 100644 --- a/docs/classpuzzle_1_1piece_1_1Template.html +++ b/docs/classpuzzle_1_1piece_1_1Template.html @@ -114,7 +114,7 @@  Insert the puzzle piece into the image at the given location. More...
      def rotatePiece (self, theta) - Rotate the puzzle template instance by the given angle. More...
    + Create copy of puzzle piece instance rotated by the given angle. More...
      def setPlacement (self, r, isOffset=False, isCenter=False)  Provide pixel placement location information. More...
    @@ -740,9 +740,14 @@

    -

    Rotate the puzzle template instance by the given angle.

    -

    Args: theta: The rotated angle.

    -

    Returns: thePiece: A new puzzle template instance.

    +

    Create copy of puzzle piece instance rotated by the given angle.

    +
    Parameters
    + + +
    [in]thetaRotation angle.
    +
    +
    +
    Returns
    thePiece Rotated puzzle template instance.

    Reimplemented in Regular.

    @@ -1019,7 +1024,7 @@

    piece.py +
  • /home/mary/python/puzzle_solver/puzzle/piece.py
  • diff --git a/docs/classpuzzle_1_1pieces_1_1edge_1_1Edge.html b/docs/classpuzzle_1_1pieces_1_1edge_1_1Edge.html index 974c7edd..3dc64c55 100644 --- a/docs/classpuzzle_1_1pieces_1_1edge_1_1Edge.html +++ b/docs/classpuzzle_1_1pieces_1_1edge_1_1Edge.html @@ -449,7 +449,7 @@

    edge.py +
  • /home/mary/python/puzzle_solver/puzzle/pieces/edge.py
  • diff --git a/docs/classpuzzle_1_1pieces_1_1matchDifferent_1_1CfgDistance.html b/docs/classpuzzle_1_1pieces_1_1matchDifferent_1_1CfgDistance.html index 535f9263..e1526093 100644 --- a/docs/classpuzzle_1_1pieces_1_1matchDifferent_1_1CfgDistance.html +++ b/docs/classpuzzle_1_1pieces_1_1matchDifferent_1_1CfgDistance.html @@ -209,7 +209,7 @@

    matchDifferent.py +
  • /home/mary/python/puzzle_solver/puzzle/pieces/matchDifferent.py
  • diff --git a/docs/classpuzzle_1_1pieces_1_1matchDifferent_1_1CfgHistogramCV.html b/docs/classpuzzle_1_1pieces_1_1matchDifferent_1_1CfgHistogramCV.html index 6904c00d..62045c19 100644 --- a/docs/classpuzzle_1_1pieces_1_1matchDifferent_1_1CfgHistogramCV.html +++ b/docs/classpuzzle_1_1pieces_1_1matchDifferent_1_1CfgHistogramCV.html @@ -244,7 +244,7 @@

    matchDifferent.py +
  • /home/mary/python/puzzle_solver/puzzle/pieces/matchDifferent.py
  • diff --git a/docs/classpuzzle_1_1pieces_1_1matchDifferent_1_1CfgMoments.html b/docs/classpuzzle_1_1pieces_1_1matchDifferent_1_1CfgMoments.html index 702dbdfc..4da30646 100644 --- a/docs/classpuzzle_1_1pieces_1_1matchDifferent_1_1CfgMoments.html +++ b/docs/classpuzzle_1_1pieces_1_1matchDifferent_1_1CfgMoments.html @@ -207,7 +207,7 @@

    matchDifferent.py +
  • /home/mary/python/puzzle_solver/puzzle/pieces/matchDifferent.py
  • diff --git a/docs/classpuzzle_1_1pieces_1_1matchDifferent_1_1CfgPCA.html b/docs/classpuzzle_1_1pieces_1_1matchDifferent_1_1CfgPCA.html index bc61ceb5..8425c5a1 100644 --- a/docs/classpuzzle_1_1pieces_1_1matchDifferent_1_1CfgPCA.html +++ b/docs/classpuzzle_1_1pieces_1_1matchDifferent_1_1CfgPCA.html @@ -207,7 +207,7 @@

    matchDifferent.py +
  • /home/mary/python/puzzle_solver/puzzle/pieces/matchDifferent.py
  • diff --git a/docs/classpuzzle_1_1pieces_1_1matchDifferent_1_1Distance.html b/docs/classpuzzle_1_1pieces_1_1matchDifferent_1_1Distance.html index 633edffb..127ade88 100644 --- a/docs/classpuzzle_1_1pieces_1_1matchDifferent_1_1Distance.html +++ b/docs/classpuzzle_1_1pieces_1_1matchDifferent_1_1Distance.html @@ -229,7 +229,7 @@

    matchDifferent.py +
  • /home/mary/python/puzzle_solver/puzzle/pieces/matchDifferent.py
  • diff --git a/docs/classpuzzle_1_1pieces_1_1matchDifferent_1_1HistogramCV.html b/docs/classpuzzle_1_1pieces_1_1matchDifferent_1_1HistogramCV.html index f8457d39..6be891c8 100644 --- a/docs/classpuzzle_1_1pieces_1_1matchDifferent_1_1HistogramCV.html +++ b/docs/classpuzzle_1_1pieces_1_1matchDifferent_1_1HistogramCV.html @@ -232,7 +232,7 @@

    matchDifferent.py +
  • /home/mary/python/puzzle_solver/puzzle/pieces/matchDifferent.py
  • diff --git a/docs/classpuzzle_1_1pieces_1_1matchDifferent_1_1Moments.html b/docs/classpuzzle_1_1pieces_1_1matchDifferent_1_1Moments.html index 0d2a88f8..a8e70f67 100644 --- a/docs/classpuzzle_1_1pieces_1_1matchDifferent_1_1Moments.html +++ b/docs/classpuzzle_1_1pieces_1_1matchDifferent_1_1Moments.html @@ -239,7 +239,7 @@

    matchDifferent.py +
  • /home/mary/python/puzzle_solver/puzzle/pieces/matchDifferent.py
  • diff --git a/docs/classpuzzle_1_1pieces_1_1matchDifferent_1_1PCA.html b/docs/classpuzzle_1_1pieces_1_1matchDifferent_1_1PCA.html index cef3eca4..5c6e96dc 100644 --- a/docs/classpuzzle_1_1pieces_1_1matchDifferent_1_1PCA.html +++ b/docs/classpuzzle_1_1pieces_1_1matchDifferent_1_1PCA.html @@ -278,7 +278,7 @@

    matchDifferent.py +
  • /home/mary/python/puzzle_solver/puzzle/pieces/matchDifferent.py
  • diff --git a/docs/classpuzzle_1_1pieces_1_1matchSimilar_1_1CfgSIFTCV.html b/docs/classpuzzle_1_1pieces_1_1matchSimilar_1_1CfgSIFTCV.html index 4f44cf75..6389d678 100644 --- a/docs/classpuzzle_1_1pieces_1_1matchSimilar_1_1CfgSIFTCV.html +++ b/docs/classpuzzle_1_1pieces_1_1matchSimilar_1_1CfgSIFTCV.html @@ -209,7 +209,7 @@

    matchSimilar.py +
  • /home/mary/python/puzzle_solver/puzzle/pieces/matchSimilar.py
  • diff --git a/docs/classpuzzle_1_1pieces_1_1matchSimilar_1_1SIFTCV.html b/docs/classpuzzle_1_1pieces_1_1matchSimilar_1_1SIFTCV.html index 0e2855f9..a3329c4f 100644 --- a/docs/classpuzzle_1_1pieces_1_1matchSimilar_1_1SIFTCV.html +++ b/docs/classpuzzle_1_1pieces_1_1matchSimilar_1_1SIFTCV.html @@ -293,7 +293,7 @@

    matchSimilar.py +
  • /home/mary/python/puzzle_solver/puzzle/pieces/matchSimilar.py
  • diff --git a/docs/classpuzzle_1_1pieces_1_1matcher_1_1CfgDifferent.html b/docs/classpuzzle_1_1pieces_1_1matcher_1_1CfgDifferent.html index af0f7caf..4980175c 100644 --- a/docs/classpuzzle_1_1pieces_1_1matcher_1_1CfgDifferent.html +++ b/docs/classpuzzle_1_1pieces_1_1matcher_1_1CfgDifferent.html @@ -215,7 +215,7 @@

    matcher.py +
  • /home/mary/python/puzzle_solver/puzzle/pieces/matcher.py
  • diff --git a/docs/classpuzzle_1_1pieces_1_1matcher_1_1CfgMatcher.html b/docs/classpuzzle_1_1pieces_1_1matcher_1_1CfgMatcher.html index e5ed65df..022b4f6d 100644 --- a/docs/classpuzzle_1_1pieces_1_1matcher_1_1CfgMatcher.html +++ b/docs/classpuzzle_1_1pieces_1_1matcher_1_1CfgMatcher.html @@ -214,7 +214,7 @@

    matcher.py +
  • /home/mary/python/puzzle_solver/puzzle/pieces/matcher.py
  • diff --git a/docs/classpuzzle_1_1pieces_1_1matcher_1_1CfgSimilar.html b/docs/classpuzzle_1_1pieces_1_1matcher_1_1CfgSimilar.html index ccaad99a..12f5891b 100644 --- a/docs/classpuzzle_1_1pieces_1_1matcher_1_1CfgSimilar.html +++ b/docs/classpuzzle_1_1pieces_1_1matcher_1_1CfgSimilar.html @@ -212,7 +212,7 @@

    matcher.py +
  • /home/mary/python/puzzle_solver/puzzle/pieces/matcher.py
  • diff --git a/docs/classpuzzle_1_1pieces_1_1matcher_1_1MatchDifferent.html b/docs/classpuzzle_1_1pieces_1_1matcher_1_1MatchDifferent.html index 527991e6..b8046c48 100644 --- a/docs/classpuzzle_1_1pieces_1_1matcher_1_1MatchDifferent.html +++ b/docs/classpuzzle_1_1pieces_1_1matcher_1_1MatchDifferent.html @@ -213,7 +213,7 @@

    matcher.py +
  • /home/mary/python/puzzle_solver/puzzle/pieces/matcher.py
  • diff --git a/docs/classpuzzle_1_1pieces_1_1matcher_1_1MatchSimilar.html b/docs/classpuzzle_1_1pieces_1_1matcher_1_1MatchSimilar.html index 49d8d522..40fefaf1 100644 --- a/docs/classpuzzle_1_1pieces_1_1matcher_1_1MatchSimilar.html +++ b/docs/classpuzzle_1_1pieces_1_1matcher_1_1MatchSimilar.html @@ -201,7 +201,7 @@

    matcher.py +
  • /home/mary/python/puzzle_solver/puzzle/pieces/matcher.py
  • diff --git a/docs/classpuzzle_1_1pieces_1_1matcher_1_1Matcher.html b/docs/classpuzzle_1_1pieces_1_1matcher_1_1Matcher.html index 6464a49d..4907bf41 100644 --- a/docs/classpuzzle_1_1pieces_1_1matcher_1_1Matcher.html +++ b/docs/classpuzzle_1_1pieces_1_1matcher_1_1Matcher.html @@ -306,7 +306,7 @@

    matcher.py +
  • /home/mary/python/puzzle_solver/puzzle/pieces/matcher.py
  • diff --git a/docs/classpuzzle_1_1pieces_1_1sift_1_1Sift-members.html b/docs/classpuzzle_1_1pieces_1_1sift_1_1Sift-members.html index 658e07ed..3f543979 100644 --- a/docs/classpuzzle_1_1pieces_1_1sift_1_1Sift-members.html +++ b/docs/classpuzzle_1_1pieces_1_1sift_1_1Sift-members.html @@ -81,7 +81,8 @@ paramsMatcher process(self, piece)Sift score(self, yA, yB)Sift - theThreshMatchSift + tauSift + theThreshMatchSift