use Qt Signals & Slots for progress tracking

[mussa.git] / py / mussa.cpp

diff --git a/py/mussa.cpp b/py/mussa.cpp
index e8bcfb8a2ebcfc86a2f4836dd6ad17cd55b2468e..aecf2b146f928376e7c3073c8f045fbaa2b6fe45 100644 (file)
--- a/py/mussa.cpp
+++ b/py/mussa.cpp
@@ -1,6 +1,5 @@
 #include <boost/python.hpp>
-
-using namespace boost::python;
+namespace py = boost::python;
 
 #include "alg/mussa.hpp"
 
@@ -8,7 +7,7 @@ void export_mussa()
 {
   void (Mussa::*load_mupa_string)(std::string) = &Mussa::load_mupa_file;
 
-  class_<Mussa>("Mussa")
+  py::class_<Mussa>("Mussa")
     .def("save", &Mussa::save)
     .def("load", &Mussa::load, "Load previous run analysis")
     .def("load_mupa", load_mupa_string, "Load mussa parameter file")
@@ -25,11 +24,12 @@ void export_mussa()
                                    &Mussa::set_analysis_mode)
     .add_property("analysisModeName", &Mussa::get_analysis_mode_name)
     .def("analyze", &Mussa::analyze, "Run the analysis")
-    .def("paths", &Mussa::paths, return_internal_reference<>())
+    .def("paths", &Mussa::paths, py::return_internal_reference<>())
     //.def("sequences", &Mussa::sequences)
-    .def("addSequence", &Mussa::add_a_seq)  ;
+    .def("addSequence", &Mussa::add_a_seq)  
+  ;
 
-  enum_<Mussa::analysis_modes>("analysis_modes")
+  py::enum_<Mussa::analysis_modes>("analysis_modes")
     .value("TransitiveNway", Mussa::TransitiveNway )
     .value("RadialNway", Mussa::RadialNway )
     .value("EntropyNway", Mussa::EntropyNway )