From 08d6dd18ef220deadb7d926593b4e114b30c0c6e Mon Sep 17 00:00:00 2001 From: Andrews Sobral Date: Thu, 16 Jul 2015 04:10:41 +0200 Subject: [PATCH] Small fix Return the background model from Temporal Median and Adaptive Median --- .gitattributes | 3 --- .gitignore | 4 +++- package_bgs/dp/DPAdaptiveMedianBGS.cpp | 13 +++++++++++-- package_bgs/dp/DPPratiMediodBGS.cpp | 8 ++++++-- vs2010mfc/src/bgslibrary_vs2010_mfc.rc | Bin 8709 -> 17930 bytes vs2010mfc/src/res/bgslibrary_vs2010_mfc.rc2 | Bin 402 -> 826 bytes 6 files changed, 20 insertions(+), 8 deletions(-) diff --git a/.gitattributes b/.gitattributes index f415166..1a677ab 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,6 +1,3 @@ -*.rc eol=crlf -*.rc2 eol=crlf *.vcproj eol=crlf *.bat eol=crlf *.sln eol=crlf -*.ico -text \ No newline at end of file diff --git a/.gitignore b/.gitignore index 1767fc4..905cdaf 100644 --- a/.gitignore +++ b/.gitignore @@ -9,4 +9,6 @@ qt_gui/ fet/etc/ *.exe *.pdb -vs2010mfc/src/bgslibrary_vs2010_mfc.aps \ No newline at end of file +vs2010mfc/src/bgslibrary_vs2010_mfc.aps +*.suo +vs2010mfc/src/bgslibrary_vs2010_mfc.v12.suo \ No newline at end of file diff --git a/package_bgs/dp/DPAdaptiveMedianBGS.cpp b/package_bgs/dp/DPAdaptiveMedianBGS.cpp index e9ef4fe..0ae68fe 100644 --- a/package_bgs/dp/DPAdaptiveMedianBGS.cpp +++ b/package_bgs/dp/DPAdaptiveMedianBGS.cpp @@ -61,6 +61,11 @@ void DPAdaptiveMedianBGS::process(const cv::Mat &img_input, cv::Mat &img_output, bgs.Initalize(params); bgs.InitModel(frame_data); + + std::cout << "threshold: " << threshold << std::endl; + std::cout << "samplingRate: " << samplingRate << std::endl; + std::cout << "learningFrames: " << learningFrames << std::endl; + std::cout << "showOutput: " << showOutput << std::endl; } bgs.Subtract(frameNumber, frame_data, lowThresholdMask, highThresholdMask); @@ -68,11 +73,15 @@ void DPAdaptiveMedianBGS::process(const cv::Mat &img_input, cv::Mat &img_output, bgs.Update(frameNumber, frame_data, lowThresholdMask); cv::Mat foreground(highThresholdMask.Ptr()); + cv::Mat background(bgs.Background()->Ptr()); - if(showOutput) - cv::imshow("Adaptive Median (McFarlane&Schofield)", foreground); + if(showOutput){ + cv::imshow("Adaptive Median FG (McFarlane&Schofield)", foreground); + cv::imshow("Adaptive Median BG (McFarlane&Schofield)", background); + } foreground.copyTo(img_output); + background.copyTo(img_bgmodel); delete frame; firstTime = false; diff --git a/package_bgs/dp/DPPratiMediodBGS.cpp b/package_bgs/dp/DPPratiMediodBGS.cpp index 65c3ef3..ba1d6be 100644 --- a/package_bgs/dp/DPPratiMediodBGS.cpp +++ b/package_bgs/dp/DPPratiMediodBGS.cpp @@ -69,11 +69,15 @@ void DPPratiMediodBGS::process(const cv::Mat &img_input, cv::Mat &img_output, cv bgs.Update(frameNumber, frame_data, lowThresholdMask); cv::Mat foreground(highThresholdMask.Ptr()); + cv::Mat background(bgs.Background()->Ptr()); - if(showOutput) - cv::imshow("Temporal Median (Cucchiara&Calderara)", foreground); + if(showOutput){ + cv::imshow("Temporal Median FG (Cucchiara&Calderara)", foreground); + cv::imshow("Temporal Median BG (Cucchiara&Calderara)", background); + } foreground.copyTo(img_output); + background.copyTo(img_bgmodel); delete frame; firstTime = false; diff --git a/vs2010mfc/src/bgslibrary_vs2010_mfc.rc b/vs2010mfc/src/bgslibrary_vs2010_mfc.rc index a5c55ee59739b14d6bed0fe26c5ae16b963b01ed..7251658acf1cfb47e9ec6c5f95ae0d54e0237ed3 100644 GIT binary patch literal 17930 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 Ar~m)} diff --git a/vs2010mfc/src/res/bgslibrary_vs2010_mfc.rc2 b/vs2010mfc/src/res/bgslibrary_vs2010_mfc.rc2 index bfac6f89e0e07bded3d8651aca58403a1c237f40..e327fa85913f2210efffc3a01eb0194aadda29e2 100644 GIT binary patch literal 826 zcmdUtO-lno42GYx;C~qKD0bCN`{3^qq3di8|$lhKdn)oa;>-sU5YLHLqG#wiDOB zQh8qIn})5pCw&`Hr8$!Ehe~2DCgKw-t-#g#+HA!huUDRyvKhF>9(v$?Bf54?oN>!N z4?J?gn2Bu1+?aL36_@(@h}su}S7*eQMdp-@Z_QBa3ywdzl=h^*pUGqQ`i7jVTvM=& uUhl$ms4?(=Q-WbIi_XuL%mJDTS0!pPiwaD;~~s_FvpGzG(b)?(=wM9^TW7V0g50GtkWD6_Y*2dZ z0Tp>r#MpQ<1gH=ZX@wfn-Qjr3m)ml=DYmOcE+S;M48A1?nhZkNA3{}!yB_{}g~wiz i1}T4#A{dT1uTD~>psV_j(+ux$sJ^;rkui?rv3;LQ)@@?|