Merge branch 'fix-0.6'

Subaru-PFS · May 10, 2019 · 9533248 · 9533248
2 parents 289010b + 71b5e3b
commit 9533248
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 1 deletion.
diff --git a/RedshiftLibrary/RedshiftLibrary/processflow/parameterstore.h b/RedshiftLibrary/RedshiftLibrary/processflow/parameterstore.h
@@ -41,6 +41,7 @@ class CParameterStore
 
     void Save( const std::string& path ) const;
     void Load( const std::string& path );
+    void FromString(const std::string& json);
 
 private:
 

diff --git a/RedshiftLibrary/src/lib/processflow/parameterstore.cpp b/RedshiftLibrary/src/lib/processflow/parameterstore.cpp
@@ -292,3 +292,9 @@ void CParameterStore::Load( const std::string& path )
 {
     bpt::json_parser::read_json( path, m_PropertyTree );
 }
+
+void CParameterStore::FromString(const std::string& json)
+{
+    std::istringstream jsonstream(json);
+    bpt::json_parser::read_json(jsonstream, m_PropertyTree);
+}
diff --git a/pyamazed/redshift.i b/pyamazed/redshift.i
@@ -127,6 +127,7 @@ class CParameterStore {
 public:
   CParameterStore();
   void Load( const std::string& path );
+  void FromString(const std::string & json);
   void Save( const std::string& path ) const;
   void Get( const std::string& name, std::string& out_str, std::string defaultValue = "" );
   void Get( const std::string& name, Int64& out_int, Int64 defaultValue = 0 );

diff --git a/setup.py b/setup.py
@@ -4,7 +4,7 @@
 
 setup(
     name="pyamazed",
-    version="0.6.0",
+    version="0.6.1",
     author="LAM - Laboratoire d'Astrophysique de Marseille",
     author_email="[email protected]",
     description=("AMAZED python client."),

diff --git a/test.txt b/test.txt
@@ -0,0 +1 @@
+hello