#ifdef USE_PYTHON
#include "py/python.hpp"
extern "C" void initmussa();
-extern "C" void initmussaqui();
+//extern "C" void initmussaqui();
#endif
#include "qui/MussaWindow.hpp"
#endif
//opts.doc_dir = get_doc_dir();
QApplication app(argc, argv, opts.useGUI);
- Q_INIT_RESOURCE(icons);
- const QIcon mussa_icon(":/icons/mussa.png");
- app.setWindowIcon(mussa_icon);
initialize_mussa(opts, argc, argv);
if (opts.analysis == 0) {
return 1;
}
-
- ThreadManager &thread = ThreadManagerFactory();
+
try {
#ifdef USE_PYTHON
if (opts.runAsPythonInterpeter) {
+ ThreadManager &thread = ThreadManagerFactory();
// allow the user to keep the interpreter open even after
// closing all the windows
app.setQuitOnLastWindowClosed(false);
std::cerr << "Unable to initialize interpeter thread" << std::endl;
return 1;
}
- MussaPython *py = interp->get_py();
+ MussaPython *py = interp->get_py_ptr();
if (!py) {
std::cerr << "Unable to initialize python interpreter" << std::endl;
return 1;
}
py->add_module("mussa", &initmussa);
- py->add_module("mussaqui", &initmussaqui);
+ //py->add_module("mussaqui", &initmussaqui);
// quit when the interpreter exits
QObject::connect(interp, SIGNAL(finished()),
&app, SLOT(quit()));
} else
#endif /* USE_PYTHON */
if (opts.useGUI) {
- MussaWindow win(opts.analysis);
- win.show();
+ MussaWindow *win = new MussaWindow(opts.analysis);
+ win->show();
app.exec();
}
return 0;