Merge remote-tracking branch 'origin/V3.2_191' into ploty2

src/controllers/dif/common/Module.xml

 <module name="dif_s">
 	<controller class="dif_s::DirectCamera"/>
 	<include path="$(NOMAD_HOME)/../NomadModules/src"/>
+  <link path="/opt/baumer-gapi-sdk/lib" lib="bgapi2_genicam"/>
+  <link lib="opencv_core"/>
+  <link lib="opencv_calib3d"/>
+  <link lib="opencv_highgui"/>
+  <link lib="opencv_core"/>
+  <link lib="opencv_calib3d"/>
+  <link lib="opencv_highgui"/>
+  <include path="/opt/baumer-gapi-sdk/include/bgapi2_genicam"/>
 </module>

src/drivers/gigecam/genericcam/GenericCamDriver.cpp

@@ -35,7 +35,12 @@ const std::string GenericCamDriver:: MODE[4] = {"Standard", "Average","Summation
 
 /*
  * Constructor
- */
+ */				//                    std::cout << "number of captured images: " << camera_control->number_of_captured_images_ << std::endl;
+//                    std::cout << "number of incomplete frames: " << buffer_info->number_of_incomplete_images << std::endl;
+//                   std::cout << "resend requests: " << buffer_info->resend_requests
+//                       << " single: " << buffer_info->resend_requests_single
+//                       << " range: " << buffer_info->resend_requests_range << std::endl;
+
 GenericCamDriver::GenericCamDriver(const string& name):
 						acquisition::NoTofAcquisitionCommon(name),acquisition::KineticAcquisitionCommon(name),
 						acquisition::TimeGateCommon(name),

src/drivers/gigecam/genericcam/Module.xml

@@ -4,10 +4,10 @@
   <link lib="opencv_core"/>
   <link lib="opencv_calib3d"/>
   <link lib="opencv_highgui"/>
-  <link path="/opt/pylon/lib" lib="GenApi_gcc_v3_1_Basler_pylon"/>
-  <link path="/opt/pylon/lib" lib="pylonbase" />
-  <link path="/opt/pylon/lib" lib="GCBase_gcc_v3_1_Basler_pylon"/>
-  <link path="/opt/pylon/lib" lib="pylonutility"/>
+<!--   <link path="/opt/pylon/lib" lib="GenApi_gcc_v3_1_Basler_pylon"/> -->
+<!--   <link path="/opt/pylon/lib" lib="pylonbase" /> -->
+<!--   <link path="/opt/pylon/lib" lib="GCBase_gcc_v3_1_Basler_pylon"/> -->
+<!--   <link path="/opt/pylon/lib" lib="pylonutility"/> -->
   <link lib="opencv_core"/>
   <link lib="opencv_calib3d"/>
   <link lib="opencv_highgui"/>

src/drivers/gigecam/genericcam/RealGenericCamDriver.h

@@ -30,7 +30,7 @@
 #include "DoubleBufferHandler.h"
 #include "GenericCamDef.h"
 #include "GenericCamState.h"
-#include </opt/pylon/include/pylon/PylonIncludes.h>
+//#include </opt/pylon/include/pylon/PylonIncludes.h>
 
 namespace genericcam {
 
@@ -248,7 +248,7 @@ private:
 
 	Counter m_TimeCounter;
 
-	Pylon::CInstantCamera *camera = nullptr;
+//	Pylon::CInstantCamera *camera = nullptr;
 
 	int64 cameraNum_ = 1;     //��ǰ������������ܸ���