add SolARDescriptorsExtratorFromImage component

Author: BCOM\nduong

SolARModuleOpenCV.pri

@@ -1,5 +1,5 @@
 HEADERS += interfaces/SolAR2D3DcorrespondencesFinderOpencv.h \
-    $$PWD/interfaces/SolARImageFilterWallisOpencv.h \
+    interfaces/SolARImageFilterWallisOpencv.h \
     interfaces/SolAR2DOverlayOpencv.h \
     interfaces/SolAR3DOverlayBoxOpencv.h \
     interfaces/SolARBaseCameraOpencv.h \
@@ -18,6 +18,7 @@ HEADERS += interfaces/SolAR2D3DcorrespondencesFinderOpencv.h \
     interfaces/SolARDescriptorsExtractorORBOpencv.h \
     interfaces/SolARDescriptorsExtractorSBPatternOpencv.h \
     interfaces/SolARDescriptorsExtractorSIFTOpencv.h \
+    interfaces/SolARDescriptorsExtractorFromImageOpencv.h \
     interfaces/SolARDeviceDataLoader.h \
     interfaces/SolARFiducialMarkerLoaderOpencv.h \
     interfaces/SolARFundamentalMatrixEstimationOpencv.h \
@@ -49,7 +50,7 @@ HEADERS += interfaces/SolAR2D3DcorrespondencesFinderOpencv.h \
     interfaces/SolARPoseEstimationSACPnpOpencv.h \
     interfaces/SolARPoseFinderFrom2D2DOpencv.h \
     interfaces/SolARProjectOpencv.h \
-	interfaces/SolARStereo2DPointsRectificationOpencv.h \
+    interfaces/SolARStereo2DPointsRectificationOpencv.h \
     interfaces/SolARStereoCalibrationOpencv.h \
     interfaces/SolARStereoDescriptorMatcherOpencv.h \
     interfaces/SolARStereoImageRectificationOpencv.h \
@@ -90,6 +91,7 @@ SOURCES +=  src/AKAZE2/akaze.cpp \
     src/SolARDescriptorsExtractorORBOpencv.cpp \
     src/SolARDescriptorsExtractorSBPatternOpencv.cpp \
     src/SolARDescriptorsExtractorSIFTOpencv.cpp \
+    src/SolARDescriptorsExtractorFromImageOpencv.cpp \
     src/SolARDeviceDataLoader.cpp \
     src/SolARFiducialMarkerLoaderOpencv.cpp \
     src/SolARFundamentalMatrixEstimationOpencv.cpp \
@@ -119,7 +121,7 @@ SOURCES +=  src/AKAZE2/akaze.cpp \
     src/SolARPoseEstimationSACPnpOpencv.cpp \
     src/SolARPoseFinderFrom2D2DOpencv.cpp \
     src/SolARProjectOpencv.cpp \
-	src/SolARStereo2DPointsRectificationOpencv.cpp \
+    src/SolARStereo2DPointsRectificationOpencv.cpp \
     src/SolARStereoCalibrationOpencv.cpp \
     src/SolARStereoDescriptorMatcherOpencv.cpp \
     src/SolARStereoImageRectificationOpencv.cpp \

interfaces/SolARDescriptorsExtractorFromImageOpencv.h

@@ -0,0 +1,77 @@
+/**
+ * @copyright Copyright (c) 2017 B-com http://www.b-com.com/
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef SOLARDESCRIPTORSEXTRACTORFROMIMAGEOPENCV_H
+#define SOLARDESCRIPTORSEXTRACTORFROMIMAGEOPENCV_H
+#include "api/features/IDescriptorsExtractorFromImage.h"
+#include "SolAROpencvAPI.h"
+#include "xpcf/component/ConfigurableBase.h"
+#include "api/features/IKeypointDetector.h"
+#include "api/features/IDescriptorsExtractor.h"
+
+namespace SolAR {
+namespace MODULES {
+namespace OPENCV {
+
+/**
+ * @class SolARDescriptorsExtractorFromImageOpencv
+ * @brief <B>Detect keypoints and compute the descriptors from an image.</B>
+ * <TT>UUID: cf2721f2-0dc9-4442-ad1e-90c0ab12b0ff</TT>
+ *
+ * @SolARComponentInjectablesBegin
+ * @SolARComponentInjectable{SolAR::api::features::IKeypointDetector}
+ * @SolARComponentInjectable{SolAR::api::features::IDescriptorsExtractor}
+ * @SolARComponentInjectablesEnd
+ *
+ */
+
+class SOLAROPENCV_EXPORT_API SolARDescriptorsExtractorFromImageOpencv : public org::bcom::xpcf::ConfigurableBase,
+    public api::features::IDescriptorsExtractorFromImage
+{
+public:
+    ///@brief SolARDescriptorsExtractorFromImageOpencv constructor;
+    SolARDescriptorsExtractorFromImageOpencv();
+    ///@brief SolARDescriptorsExtractorFromImageOpencv destructor;
+    ~SolARDescriptorsExtractorFromImageOpencv();
+
+    org::bcom::xpcf::XPCFErrorCode onConfigured() override final;
+
+    /// @brief getType
+    /// @return a string describing the type of descriptor used during extraction.
+    std::string getTypeString() override;
+
+    /// @brief detect keypoints and compute the descriptors.
+    /// @param[in] image image on which the keypoint and their descriptor will be detected and extracted.
+    /// @param[out] keypoints The keypoints detected in the input image.
+    /// @param[out] descriptors The descriptors of keypoints of the input image.
+    /// @return FrameworkReturnCode::_SUCCESS_ if images are well matched, else FrameworkReturnCode::_ERROR
+    FrameworkReturnCode extract(const SRef<SolAR::datastructure::Image> image,
+                                std::vector<SolAR::datastructure::Keypoint> &keypoints,
+                                SRef<SolAR::datastructure::DescriptorBuffer> & descriptors) override;
+
+    void unloadComponent () override final;
+
+private:
+    SRef<SolAR::api::features::IKeypointDetector>       m_detector;
+    SRef<SolAR::api::features::IDescriptorsExtractor>   m_extractor;
+};
+
+}
+}
+}
+
+
+#endif // SOLARDESCRIPTORSEXTRACTORFROMIMAGEOPENCV_H

interfaces/SolARModuleOpencv_traits.h

@@ -44,6 +44,7 @@ class SolARDescriptorsExtractorAKAZE2Opencv;
 class SolARDescriptorsExtractorAKAZEOpencv;
 class SolARDescriptorsExtractorORBOpencv;
 class SolARDescriptorsExtractorSBPatternOpencv;
+class SolARDescriptorsExtractorFromImageOpencv;
 class SolARFiducialMarkerLoaderOpencv;
 class SolARFundamentalMatrixEstimationOpencv;
 class SolARGeometricMatchesFilterOpencv;
@@ -174,6 +175,11 @@ XPCF_DEFINE_COMPONENT_TRAITS(SolAR::MODULES::OPENCV::SolARDescriptorsExtractorSB
                              "SolARDescriptorsExtractorSBPatternOpencv",
                              "Extracts the descriptor corresponding to a squared binary marker pattern.")
 
+XPCF_DEFINE_COMPONENT_TRAITS(SolAR::MODULES::OPENCV::SolARDescriptorsExtractorFromImageOpencv,
+                             "cf2721f2-0dc9-4442-ad1e-90c0ab12b0ff",
+                             "SolARDescriptorsExtractorFromImageOpencv",
+                             "Detect keypoints and compute the descriptors from an image.")
+
 XPCF_DEFINE_COMPONENT_TRAITS(SolAR::MODULES::OPENCV::SolARFiducialMarkerLoaderOpencv,
                              "d0116ed2-45d7-455d-8011-57959da1b0fa",
                              "SolARFiducialMarkerLoaderOpencv",

src/SolARDescriptorsExtractorFromImageOpencv.cpp

@@ -0,0 +1,68 @@
+/**
+ * @copyright Copyright (c) 2017 B-com http://www.b-com.com/
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+#include "SolARDescriptorsExtractorFromImageOpencv.h"
+#include "core/Log.h"
+
+XPCF_DEFINE_FACTORY_CREATE_INSTANCE(SolAR::MODULES::OPENCV::SolARDescriptorsExtractorFromImageOpencv);
+
+namespace xpcf  = org::bcom::xpcf;
+
+namespace SolAR {
+using namespace datastructure;
+namespace MODULES {
+namespace OPENCV {
+
+SolARDescriptorsExtractorFromImageOpencv::SolARDescriptorsExtractorFromImageOpencv():ConfigurableBase(xpcf::toUUID<SolARDescriptorsExtractorFromImageOpencv>())
+{
+    addInterface<api::features::IDescriptorsExtractorFromImage>(this);
+    declareInjectable<api::features::IKeypointDetector>(m_detector);
+    declareInjectable<api::features::IDescriptorsExtractor>(m_extractor);
+    LOG_DEBUG(" SolARDescriptorsExtractorFromImageOpencv constructor");
+}
+
+SolARDescriptorsExtractorFromImageOpencv::~SolARDescriptorsExtractorFromImageOpencv(){
+    LOG_DEBUG(" SolARDescriptorsExtractorFromImageOpencv deconstructor");
+}
+
+xpcf::XPCFErrorCode SolARDescriptorsExtractorFromImageOpencv::onConfigured()
+{
+    return xpcf::XPCFErrorCode::_SUCCESS;
+}
+
+std::string SolARDescriptorsExtractorFromImageOpencv::getTypeString()
+{
+    return m_extractor->getTypeString();
+}
+
+FrameworkReturnCode SolARDescriptorsExtractorFromImageOpencv::extract(const SRef<datastructure::Image> image,
+                                                                      std::vector<datastructure::Keypoint> & keypoints,
+                                                                      SRef<SolAR::datastructure::DescriptorBuffer> & descriptors )
+{
+    m_detector->detect(image, keypoints);
+    if (keypoints.size() == 0){
+        LOG_WARNING("No keypoints detected");
+        return FrameworkReturnCode::_ERROR_;
+    }
+    m_extractor->extract(image, keypoints, descriptors);
+    return FrameworkReturnCode::_SUCCESS;
+}
+
+
+}
+}
+}

src/SolARModuleOpencv.cpp

@@ -32,6 +32,7 @@
 #include "SolARDescriptorsExtractorAKAZE2Opencv.h"
 #include "SolARDescriptorsExtractorORBOpencv.h"
 #include "SolARDescriptorsExtractorSBPatternOpencv.h"
+#include "SolARDescriptorsExtractorFromImageOpencv.h"
 #include "SolARFiducialMarkerLoaderOpencv.h"
 #include "SolARFundamentalMatrixEstimationOpencv.h"
 #include "SolARGeometricMatchesFilterOpencv.h"
@@ -142,6 +143,10 @@ extern "C" XPCF_MODULEHOOKS_API xpcf::XPCFErrorCode XPCF_getComponent(const boos
         errCode = xpcf::tryCreateComponent<SolAR::MODULES::OPENCV::SolARDescriptorsExtractorSBPatternOpencv>(componentUUID,interfaceRef);
     }
     if (errCode != xpcf::XPCFErrorCode::_SUCCESS)
+    {
+        errCode = xpcf::tryCreateComponent<SolAR::MODULES::OPENCV::SolARDescriptorsExtractorFromImageOpencv>(componentUUID,interfaceRef);
+    }
+    if (errCode != xpcf::XPCFErrorCode::_SUCCESS)
     {
         errCode = xpcf::tryCreateComponent<SolAR::MODULES::OPENCV::SolARFiducialMarkerLoaderOpencv>(componentUUID,interfaceRef);
     }
@@ -321,6 +326,7 @@ XPCF_ADD_COMPONENT(SolAR::MODULES::OPENCV::SolARDescriptorsExtractorAKAZE2Opencv
 XPCF_ADD_COMPONENT(SolAR::MODULES::OPENCV::SolARDescriptorsExtractorAKAZEOpencv)
 XPCF_ADD_COMPONENT(SolAR::MODULES::OPENCV::SolARDescriptorsExtractorORBOpencv)
 XPCF_ADD_COMPONENT(SolAR::MODULES::OPENCV::SolARDescriptorsExtractorSBPatternOpencv)
+XPCF_ADD_COMPONENT(SolAR::MODULES::OPENCV::SolARDescriptorsExtractorFromImageOpencv)
 XPCF_ADD_COMPONENT(SolAR::MODULES::OPENCV::SolARFiducialMarkerLoaderOpencv)
 XPCF_ADD_COMPONENT(SolAR::MODULES::OPENCV::SolARFundamentalMatrixEstimationOpencv)
 XPCF_ADD_COMPONENT(SolAR::MODULES::OPENCV::SolARGeometricMatchesFilterOpencv)