Merge branch 'mute-objcryst-info'

* add helper class MuteObjCrystUserInfo
* mute console info output from SetPowderPatternObs

Resolve #17.

Author: pavoljuhas

src/extensions/helpers.cpp

@@ -32,6 +32,36 @@
 
 namespace bp = boost::python;
 
+namespace {
+
+void black_hole_info(const std::string& s)  { }
+
+}   // namespace
+
+// class MuteObjCrystUserInfo ------------------------------------------------
+
+MuteObjCrystUserInfo::MuteObjCrystUserInfo() :
+    msave_info_func(ObjCryst::fpObjCrystInformUser)
+{
+    ObjCryst::fpObjCrystInformUser = black_hole_info;
+}
+
+
+MuteObjCrystUserInfo::~MuteObjCrystUserInfo()
+{
+    this->release();
+}
+
+
+void MuteObjCrystUserInfo::release()
+{
+    using ObjCryst::fpObjCrystInformUser;
+    if (msave_info_func)  fpObjCrystInformUser = msave_info_func;
+    msave_info_func = NULL;
+}
+
+// free functions ------------------------------------------------------------
+
 void swapstdout(std::ostream& buf)
 {
     // Switch the stream buffer with std::cout, which is used by Print.

src/extensions/helpers.hpp

@@ -34,6 +34,21 @@ namespace bp = boost::python;
 
 typedef std::numeric_limits<double> doublelim;
 
+class MuteObjCrystUserInfo
+{
+    public:
+
+        MuteObjCrystUserInfo();
+        ~MuteObjCrystUserInfo();
+        void release();
+
+    private:
+
+        // pointer to the previous info function
+        void (*msave_info_func)(const std::string &);
+};
+
+
 // Switch stdout with another stream. To get things back the right way, just
 // switch again with the same stream.
 void swapstdout(std::ostream& buf);

src/extensions/powderpattern_ext.cpp

@@ -101,6 +101,7 @@ void setpowderpatternobs (PowderPattern& pp, bp::object x)
 {
     CrystVector_REAL cvx;
     assignCrystVector(cvx, x);
+    MuteObjCrystUserInfo muzzle;
     pp.SetPowderPatternObs(cvx);
 }