diff --git a/doxygen.log b/doxygen.log index 43d515ff..89ff98ff 100644 --- a/doxygen.log +++ b/doxygen.log @@ -1166,5 +1166,5 @@ Generating file index... Generating file member index... Generating example index... finalizing index lists... -lookup cache used 4720/65536 hits=35700 misses=5051 +lookup cache used 4724/65536 hits=35763 misses=5055 finished... diff --git a/html/camera_parameter_estimation_8hpp.html b/html/camera_parameter_estimation_8hpp.html index 816437ac..ebfb586d 100644 --- a/html/camera_parameter_estimation_8hpp.html +++ b/html/camera_parameter_estimation_8hpp.html @@ -123,6 +123,10 @@ Namespaces Functions OP_API void op::estimateAndSaveIntrinsics (const Point< int > &gridInnerCorners, const float gridSquareSizeMm, const int flags, const std::string &outputParameterFolder, const std::string &imagesFolder, const std::string &serialNumber, const bool saveImagesWithCorners=false)   +OP_API void op::estimateAndSaveExtrinsics (const std::string &intrinsicsFolder, const std::string &extrinsicsImagesFolder, const Point< int > &gridInnerCorners, const float gridSquareSizeMm, const int index0, const int index1, const bool imagesAreUndistorted, const bool combineCam0Extrinsics) +  +OP_API void op::estimateAndSaveSiftFile (const Point< int > &gridInnerCorners, const std::string &imagesFolder, const int numberCameras, const bool saveImagesWithCorners=false) +  diff --git a/html/camera_parameter_estimation_8hpp.js b/html/camera_parameter_estimation_8hpp.js index 8f2a9d18..96e071dc 100644 --- a/html/camera_parameter_estimation_8hpp.js +++ b/html/camera_parameter_estimation_8hpp.js @@ -1,4 +1,6 @@ var camera_parameter_estimation_8hpp = [ - [ "estimateAndSaveIntrinsics", "camera_parameter_estimation_8hpp.html#a8817a682e5cf7bbc4b86660f1e0adba9", null ] + [ "estimateAndSaveExtrinsics", "camera_parameter_estimation_8hpp.html#a475c365d287eafbc3d0d8977ea7c11c0", null ], + [ "estimateAndSaveIntrinsics", "camera_parameter_estimation_8hpp.html#a8817a682e5cf7bbc4b86660f1e0adba9", null ], + [ "estimateAndSaveSiftFile", "camera_parameter_estimation_8hpp.html#a3762897ab245335916f08bb5ba32f203", null ] ]; \ No newline at end of file diff --git a/html/camera_parameter_estimation_8hpp_source.html b/html/camera_parameter_estimation_8hpp_source.html index 9fcfa938..81b974da 100644 --- a/html/camera_parameter_estimation_8hpp_source.html +++ b/html/camera_parameter_estimation_8hpp_source.html @@ -121,12 +121,28 @@ $(document).ready(function(){initNavTree('camera_parameter_estimation_8hpp_sourc
20  const std::string& imagesFolder,
21  const std::string& serialNumber,
22  const bool saveImagesWithCorners = false);
-
23 }
-
24 
-
25 #endif // OPENPOSE_CALIBRATION_CAMERA_PARAMETER_ESTIMATION_HPP
+
23 
+
24  OP_API void estimateAndSaveExtrinsics(const std::string& intrinsicsFolder,
+
25  const std::string& extrinsicsImagesFolder,
+
26  const Point<int>& gridInnerCorners,
+
27  const float gridSquareSizeMm,
+
28  const int index0,
+
29  const int index1,
+
30  const bool imagesAreUndistorted,
+
31  const bool combineCam0Extrinsics);
+
32 
+
33  OP_API void estimateAndSaveSiftFile(const Point<int>& gridInnerCorners,
+
34  const std::string& imagesFolder,
+
35  const int numberCameras,
+
36  const bool saveImagesWithCorners = false);
+
37 }
+
38 
+
39 #endif // OPENPOSE_CALIBRATION_CAMERA_PARAMETER_ESTIMATION_HPP
common.hpp
+
op::estimateAndSaveExtrinsics
OP_API void estimateAndSaveExtrinsics(const std::string &intrinsicsFolder, const std::string &extrinsicsImagesFolder, const Point< int > &gridInnerCorners, const float gridSquareSizeMm, const int index0, const int index1, const bool imagesAreUndistorted, const bool combineCam0Extrinsics)
op::estimateAndSaveIntrinsics
OP_API void estimateAndSaveIntrinsics(const Point< int > &gridInnerCorners, const float gridSquareSizeMm, const int flags, const std::string &outputParameterFolder, const std::string &imagesFolder, const std::string &serialNumber, const bool saveImagesWithCorners=false)
OP_API
#define OP_API
Definition: macros.hpp:16
+
op::estimateAndSaveSiftFile
OP_API void estimateAndSaveSiftFile(const Point< int > &gridInnerCorners, const std::string &imagesFolder, const int numberCameras, const bool saveImagesWithCorners=false)
cl::string
std::string string
Definition: cl2.hpp:574
diff --git a/html/camera_parameter_reader_8hpp_source.html b/html/camera_parameter_reader_8hpp_source.html index 21456ce8..d537a74b 100644 --- a/html/camera_parameter_reader_8hpp_source.html +++ b/html/camera_parameter_reader_8hpp_source.html @@ -126,34 +126,38 @@ $(document).ready(function(){initNavTree('camera_parameter_reader_8hpp_source.ht
17  const cv::Mat& cameraDistortion,
18  const cv::Mat& cameraExtrinsics = cv::Mat());
19 
-
20  void readParameters(const std::string& cameraParameterPath,
-
21  const std::vector<std::string>& serialNumbers);
-
22 
-
23  void writeParameters(const std::string& cameraParameterPath) const;
+
20  // serialNumbers is optional. If empty, it will load all the XML files available in the
+
21  // cameraParameterPath folder
+
22  void readParameters(const std::string& cameraParameterPath,
+
23  const std::vector<std::string>& serialNumbers = {});
24 
-
25  unsigned long long getNumberCameras() const;
+
25  void writeParameters(const std::string& cameraParameterPath) const;
26 
-
27  const std::vector<cv::Mat>& getCameraMatrices() const;
+
27  unsigned long long getNumberCameras() const;
28 
-
29  const std::vector<cv::Mat>& getCameraExtrinsics() const;
+
29  const std::vector<std::string>& getCameraSerialNumbers() const;
30 
-
31  const std::vector<cv::Mat>& getCameraIntrinsics() const;
+
31  const std::vector<cv::Mat>& getCameraMatrices() const;
32 
-
33  const std::vector<cv::Mat>& getCameraDistortions() const;
+
33  const std::vector<cv::Mat>& getCameraExtrinsics() const;
34 
-
35  private:
-
36  std::vector<std::string> mSerialNumbers;
-
37  unsigned long long mNumberCameras;
-
38  std::vector<cv::Mat> mCameraMatrices;
-
39  std::vector<cv::Mat> mCameraExtrinsics;
-
40  std::vector<cv::Mat> mCameraIntrinsics;
-
41  std::vector<cv::Mat> mCameraDistortions;
-
42 
-
43  DELETE_COPY(CameraParameterReader);
-
44  };
-
45 }
+
35  const std::vector<cv::Mat>& getCameraIntrinsics() const;
+
36 
+
37  const std::vector<cv::Mat>& getCameraDistortions() const;
+
38 
+
39  private:
+
40  std::vector<std::string> mSerialNumbers;
+
41  unsigned long long mNumberCameras;
+
42  std::vector<cv::Mat> mCameraMatrices;
+
43  std::vector<cv::Mat> mCameraExtrinsics;
+
44  std::vector<cv::Mat> mCameraIntrinsics;
+
45  std::vector<cv::Mat> mCameraDistortions;
46 
-
47 #endif // OPENPOSE_3D_CAMERA_PARAMETER_READER_HPP
+
47  DELETE_COPY(CameraParameterReader);
+
48  };
+
49 }
+
50 
+
51 #endif // OPENPOSE_3D_CAMERA_PARAMETER_READER_HPP
DELETE_COPY
#define DELETE_COPY(className)
Definition: macros.hpp:31
common.hpp
op::CameraParameterReader
Definition: cameraParameterReader.hpp:9
diff --git a/html/classop_1_1_camera_parameter_reader-members.html b/html/classop_1_1_camera_parameter_reader-members.html index 12270d9c..6caffe88 100644 --- a/html/classop_1_1_camera_parameter_reader-members.html +++ b/html/classop_1_1_camera_parameter_reader-members.html @@ -118,9 +118,10 @@ $(document).ready(function(){initNavTree('classop_1_1_camera_parameter_reader.ht getCameraExtrinsics() const op::CameraParameterReader getCameraIntrinsics() const op::CameraParameterReader getCameraMatrices() const op::CameraParameterReader - getNumberCameras() const op::CameraParameterReader - readParameters(const std::string &cameraParameterPath, const std::vector< std::string > &serialNumbers)op::CameraParameterReader - writeParameters(const std::string &cameraParameterPath) const op::CameraParameterReader + getCameraSerialNumbers() const op::CameraParameterReader + getNumberCameras() const op::CameraParameterReader + readParameters(const std::string &cameraParameterPath, const std::vector< std::string > &serialNumbers={})op::CameraParameterReader + writeParameters(const std::string &cameraParameterPath) const op::CameraParameterReader diff --git a/html/classop_1_1_camera_parameter_reader.html b/html/classop_1_1_camera_parameter_reader.html index 67bf264c..c36531ff 100644 --- a/html/classop_1_1_camera_parameter_reader.html +++ b/html/classop_1_1_camera_parameter_reader.html @@ -121,12 +121,14 @@ Public Member Functions    CameraParameterReader (const std::string &serialNumber, const cv::Mat &cameraIntrinsics, const cv::Mat &cameraDistortion, const cv::Mat &cameraExtrinsics=cv::Mat())   -void readParameters (const std::string &cameraParameterPath, const std::vector< std::string > &serialNumbers) -  +void readParameters (const std::string &cameraParameterPath, const std::vector< std::string > &serialNumbers={}) +  void writeParameters (const std::string &cameraParameterPath) const   unsigned long long getNumberCameras () const   +const std::vector< std::string > & getCameraSerialNumbers () const +  const std::vector< cv::Mat > & getCameraMatrices () const   const std::vector< cv::Mat > & getCameraExtrinsics () const @@ -265,6 +267,21 @@ Public Member Functions
+
+ + +
+
+ + + + + + + +
const std::vector<std::string>& op::CameraParameterReader::getCameraSerialNumbers () const
+
+
@@ -282,7 +299,7 @@ Public Member Functions - +
@@ -296,7 +313,7 @@ Public Member Functions - + diff --git a/html/classop_1_1_camera_parameter_reader.js b/html/classop_1_1_camera_parameter_reader.js index 50523a5f..c106d74b 100644 --- a/html/classop_1_1_camera_parameter_reader.js +++ b/html/classop_1_1_camera_parameter_reader.js @@ -6,7 +6,8 @@ var classop_1_1_camera_parameter_reader = [ "getCameraExtrinsics", "classop_1_1_camera_parameter_reader.html#ade743d816f255e3278bb72c761d82ba6", null ], [ "getCameraIntrinsics", "classop_1_1_camera_parameter_reader.html#adf7ad0ef26603129a251fdc166ffa548", null ], [ "getCameraMatrices", "classop_1_1_camera_parameter_reader.html#aa33845298440b7eefd3f57b80d3c41db", null ], + [ "getCameraSerialNumbers", "classop_1_1_camera_parameter_reader.html#abfae5f8fd11a86f433c63cafefe9fa6b", null ], [ "getNumberCameras", "classop_1_1_camera_parameter_reader.html#acfd1caf98782ae3f8f83c85ba17bc4e0", null ], - [ "readParameters", "classop_1_1_camera_parameter_reader.html#abcdd68271d8e8d050df198af0f6fd83b", null ], + [ "readParameters", "classop_1_1_camera_parameter_reader.html#a906fd316f09d901280a5fe10a4a54541", null ], [ "writeParameters", "classop_1_1_camera_parameter_reader.html#adab774b8052cb0be9404269bc4ba240d", null ] ]; \ No newline at end of file diff --git a/html/functions_func_g.html b/html/functions_func_g.html index e67a182d..3abd474b 100644 --- a/html/functions_func_g.html +++ b/html/functions_func_g.html @@ -208,6 +208,9 @@ $(document).ready(function(){initNavTree('functions_func_g.html','');}); , op::VideoReader , op::WebcamReader +
  • getCameraSerialNumbers() +: op::CameraParameterReader +
  • getCandidatesCopy() : op::PoseExtractor , op::PoseExtractorNet @@ -281,13 +284,13 @@ $(document).ready(function(){initNavTree('functions_func_g.html','');}); , cl::Context , cl::Device , cl::DeviceCommandQueue -, cl::Event +, cl::Event , cl::Kernel , cl::Memory -, cl::Pipe +, cl::Pipe , cl::Platform -, cl::Program -, cl::Sampler +, cl::Program +, cl::Sampler
  • getIsRunningSharedPtr() : op::ThreadManager< TDatums, TWorker, TQueue > @@ -397,7 +400,7 @@ $(document).ready(function(){initNavTree('functions_func_g.html','');}); : op::Producer
  • getVolume() -: op::Array< T > +: op::Array< T >
  • getWorkGroupInfo() : cl::Kernel diff --git a/html/functions_func_r.html b/html/functions_func_r.html index d6c75246..9d2e77a0 100644 --- a/html/functions_func_r.html +++ b/html/functions_func_r.html @@ -147,7 +147,7 @@ $(document).ready(function(){initNavTree('functions_func_r.html','');});

    - r -

    • - - + +
    const std::vector< std::string > & serialNumbers serialNumbers = {} 
     
    OP_API void op::reorderPoints (std::vector< cv::Point2f > &points2DVector, const cv::Size &gridInnerCorners, const Points2DOrigin points2DOriginDesired)
     
    OP_API void op::plotGridCorners (const cv::Size &gridInnerCorners, const std::vector< cv::Point2f > &points2DVector, const bool gridIsMirrored, const std::string &imagePath, const cv::Mat &image)
     
    OP_API void op::plotGridCorners (const cv::Size &gridInnerCorners, const std::vector< cv::Point2f > &points2DVector, const std::string &imagePath, const cv::Mat &image)
     
    diff --git a/html/grid_pattern_functions_8hpp.js b/html/grid_pattern_functions_8hpp.js index 730898eb..1530c4cd 100644 --- a/html/grid_pattern_functions_8hpp.js +++ b/html/grid_pattern_functions_8hpp.js @@ -10,6 +10,6 @@ var grid_pattern_functions_8hpp = [ "findAccurateGridCorners", "grid_pattern_functions_8hpp.html#a133c08ba217983ac48281a5f1456a7de", null ], [ "getObjects3DVector", "grid_pattern_functions_8hpp.html#a3eac494df764905a18e976f6af303855", null ], [ "getOutterCornerIndices", "grid_pattern_functions_8hpp.html#a7fbb758fb8268964611914305f185afe", null ], - [ "plotGridCorners", "grid_pattern_functions_8hpp.html#a8bdb833dbb457d36d31c4aa3fdb2d889", null ], + [ "plotGridCorners", "grid_pattern_functions_8hpp.html#a99f8e5818b5006929abdc879d82f175b", null ], [ "reorderPoints", "grid_pattern_functions_8hpp.html#aae9e55fbfd40138158ff04dc81bd0227", null ] ]; \ No newline at end of file diff --git a/html/grid_pattern_functions_8hpp_source.html b/html/grid_pattern_functions_8hpp_source.html index 177960e0..e9b620c2 100644 --- a/html/grid_pattern_functions_8hpp_source.html +++ b/html/grid_pattern_functions_8hpp_source.html @@ -139,14 +139,13 @@ $(document).ready(function(){initNavTree('grid_pattern_functions_8hpp_source.htm
    30  const cv::Size& gridInnerCorners,
    31  const Points2DOrigin points2DOriginDesired);
    32 
    -
    33  OP_API void plotGridCorners(const cv::Size& gridInnerCorners,
    +
    33  OP_API void plotGridCorners(const cv::Size& gridInnerCorners,
    34  const std::vector<cv::Point2f>& points2DVector,
    -
    35  const bool gridIsMirrored,
    -
    36  const std::string& imagePath,
    -
    37  const cv::Mat& image);
    -
    38 }
    -
    39 
    -
    40 #endif // OPENPOSE_CALIBRATION_GRID_PATTERN_FUNCTIONS_HPP
    +
    35  const std::string& imagePath,
    +
    36  const cv::Mat& image);
    +
    37 }
    +
    38 
    +
    39 #endif // OPENPOSE_CALIBRATION_GRID_PATTERN_FUNCTIONS_HPP
    op::Points2DOrigin::TopRight
    op::GpuMode::Size
    op::Points2DOrigin::BottomRight
    @@ -156,10 +155,10 @@ $(document).ready(function(){initNavTree('grid_pattern_functions_8hpp_source.htm
    op::Points2DOrigin
    Points2DOrigin
    Definition: gridPatternFunctions.hpp:9
    op::findAccurateGridCorners
    OP_API std::pair< bool, std::vector< cv::Point2f > > findAccurateGridCorners(const cv::Mat &image, const cv::Size &gridInnerCorners)
    op::drawGridCorners
    OP_API void drawGridCorners(cv::Mat &image, const cv::Size &gridInnerCorners, const std::vector< cv::Point2f > &points2DVector)
    -
    op::plotGridCorners
    OP_API void plotGridCorners(const cv::Size &gridInnerCorners, const std::vector< cv::Point2f > &points2DVector, const bool gridIsMirrored, const std::string &imagePath, const cv::Mat &image)
    OP_API
    #define OP_API
    Definition: macros.hpp:16
    op::Points2DOrigin::TopLeft
    op::Points2DOrigin::BottomLeft
    +
    op::plotGridCorners
    OP_API void plotGridCorners(const cv::Size &gridInnerCorners, const std::vector< cv::Point2f > &points2DVector, const std::string &imagePath, const cv::Mat &image)
    op::getOutterCornerIndices
    OP_API std::array< unsigned int, 4 > getOutterCornerIndices(const std::vector< cv::Point2f > &points2DVector, const cv::Size &gridInnerCorners)
    cl::string
    std::string string
    Definition: cl2.hpp:574
    diff --git a/html/namespacemembers_e.html b/html/namespacemembers_e.html index 41d2ee1f..e310ab54 100644 --- a/html/namespacemembers_e.html +++ b/html/namespacemembers_e.html @@ -196,9 +196,15 @@ $(document).ready(function(){initNavTree('namespacemembers_e.html','');});
  • ErrorMode : op
    • +
  • estimateAndSaveExtrinsics() +: op +
  • estimateAndSaveIntrinsics() : op
    • +
  • estimateAndSaveSiftFile() +: op +
  • existDirectory() : op
    • diff --git a/html/namespacemembers_func_e.html b/html/namespacemembers_func_e.html index 2195d84c..a2d4a6b6 100644 --- a/html/namespacemembers_func_e.html +++ b/html/namespacemembers_func_e.html @@ -172,7 +172,7 @@ $(document).ready(function(){initNavTree('namespacemembers_func_e.html','');}); : cl
  • enqueueUnmapSVM() -: cl +: cl
  • enqueueWriteBuffer() : cl @@ -186,9 +186,15 @@ $(document).ready(function(){initNavTree('namespacemembers_func_e.html','');});
  • error() : op
    • +
  • estimateAndSaveExtrinsics() +: op +
  • estimateAndSaveIntrinsics() : op
    • +
  • estimateAndSaveSiftFile() +: op +
  • existDirectory() : op
    • diff --git a/html/namespacemembers_func_p.html b/html/namespacemembers_func_p.html index bf93ccb2..ddaa127a 100644 --- a/html/namespacemembers_func_p.html +++ b/html/namespacemembers_func_p.html @@ -139,7 +139,7 @@ $(document).ready(function(){initNavTree('namespacemembers_func_p.html','');});

    - p -