Merge pull request opencv#9247 from paroj:wrap_alog_rw

alalek · alalek · commit abad8977b6b6 · 2017-11-28T10:35:33.000Z
diff --git a/modules/core/include/opencv2/core.hpp b/modules/core/include/opencv2/core.hpp
@@ -3093,13 +3093,18 @@ class CV_EXPORTS_W Algorithm
     */
     virtual void write(FileStorage& fs) const { (void)fs; }
 
+    /** @brief simplified API for language bindings
+     * @overload
+     */
+    CV_WRAP void write(const Ptr<FileStorage>& fs, const String& name = String()) const;
+
     /** @brief Reads algorithm parameters from a file storage
     */
-    virtual void read(const FileNode& fn) { (void)fn; }
+    CV_WRAP virtual void read(const FileNode& fn) { (void)fn; }
 
     /** @brief Returns true if the Algorithm is empty (e.g. in the very beginning or after unsuccessful read
      */
-    virtual bool empty() const { return false; }
+    CV_WRAP virtual bool empty() const { return false; }
 
     /** @brief Reads algorithm from the file node
 
diff --git a/modules/core/src/algorithm.cpp b/modules/core/src/algorithm.cpp
@@ -55,6 +55,19 @@ Algorithm::~Algorithm()
     CV_TRACE_FUNCTION();
 }
 
+void Algorithm::write(const Ptr<FileStorage>& fs, const String& name) const
+{
+    CV_TRACE_FUNCTION();
+    if(name.empty())
+    {
+        write(*fs);
+        return;
+    }
+    *fs << name << "{";
+    write(*fs);
+    *fs << "}";
+}
+
 void Algorithm::save(const String& filename) const
 {
     CV_TRACE_FUNCTION();
diff --git a/modules/features2d/include/opencv2/features2d.hpp b/modules/features2d/include/opencv2/features2d.hpp
@@ -210,11 +210,15 @@ class CV_EXPORTS_W Feature2D : public virtual Algorithm
 
     virtual void write( FileStorage&) const;
 
-    virtual void read( const FileNode&);
+    // see corresponding cv::Algorithm method
+    CV_WRAP virtual void read( const FileNode&);
 
     //! Return true if detector object is empty
     CV_WRAP virtual bool empty() const;
     CV_WRAP virtual String getDefaultName() const;
+
+    // see corresponding cv::Algorithm method
+    CV_WRAP inline void write(const Ptr<FileStorage>& fs, const String& name = String()) const { Algorithm::write(fs, name); }
 };
 
 /** Feature detectors in OpenCV have wrappers with a common interface that enables you to easily switch
@@ -985,7 +989,8 @@ class CV_EXPORTS_W DescriptorMatcher : public Algorithm
         read(fs.root());
     }
     // Reads matcher object from a file node
-    virtual void read( const FileNode& );
+    // see corresponding cv::Algorithm method
+    CV_WRAP virtual void read( const FileNode& );
     // Writes matcher object to a file storage
     virtual void write( FileStorage& ) const;
 
@@ -1012,6 +1017,10 @@ class CV_EXPORTS_W DescriptorMatcher : public Algorithm
 
     CV_WRAP static Ptr<DescriptorMatcher> create( int matcherType );
 
+
+    // see corresponding cv::Algorithm method
+    CV_WRAP inline void write(const Ptr<FileStorage>& fs, const String& name = String()) const { Algorithm::write(fs, name); }
+
 protected:
     /**
      * Class to work with descriptors from several images as with one merged matrix.
diff --git a/modules/python/test/test_algorithm_rw.py b/modules/python/test/test_algorithm_rw.py
@@ -0,0 +1,23 @@
+#!/usr/bin/env python
+
+'''
+Algorithm serializaion test
+'''
+import cv2
+
+from tests_common import NewOpenCVTests
+
+class algorithm_rw_test(NewOpenCVTests):
+    def test_algorithm_rw(self):
+        # some arbitrary non-default parameters
+        gold = cv2.AKAZE_create(descriptor_size=1, descriptor_channels=2, nOctaves=3, threshold=4.0)
+        gold.write(cv2.FileStorage("params.yml", 1), "AKAZE")
+
+        fs = cv2.FileStorage("params.yml", 0)
+        algorithm = cv2.AKAZE_create()
+        algorithm.read(fs.getNode("AKAZE"))
+
+        self.assertEqual(algorithm.getDescriptorSize(), 1)
+        self.assertEqual(algorithm.getDescriptorChannels(), 2)
+        self.assertEqual(algorithm.getNOctaves(), 3)
+        self.assertEqual(algorithm.getThreshold(), 4.0)
