Commit a4b2f5d8 authored by Yuri Chornoivan's avatar Yuri Chornoivan
Browse files

Fix EBN issues

parent 1d42eee5
......@@ -64,7 +64,7 @@ class RSession : public Cantor::Session
org::kde::Cantor::R* m_rServer;
QList<RExpression*> m_expressionQueue;
/* Available variables and functions, TODO make full classes and type infos */
/* Available variables and functions, TODO make full classes and type info */
QStringList m_variables;
QStringList m_functions;
};
......
......@@ -74,7 +74,7 @@ void OctaveCompletionObject::fetchIdentifierType()
if (m_expression)
return;
qDebug() << "Fetching type of " << identifier();
// The ouput should look like
// The output should look like
// sin is a built-in function
// __cantor_tmp2__ = 5
QString expr = QString::fromLatin1("__cantor_internal1__ = ans; type(\"%1\"); __cantor_internal2__ = ans; ans = __cantor_internal1__; __cantor_internal2__")
......
......@@ -21,4 +21,4 @@ target_link_libraries(cantor_pythonbackend
install(TARGETS cantor_pythonbackend DESTINATION ${INSTALL_TARGETS_DEFAULT_ARGS})
#install(FILES keywords.xml DESTINATION ${DATA_INSTALL_DIR}/cantor/pythonbackend)
#install(DIRECTORY . DESTINATION ${DATA_INSTALL_DIR}/cantor/pythonbackend FILES_MATCHING PATTERN "*.py")
\ No newline at end of file
#install(DIRECTORY . DESTINATION ${DATA_INSTALL_DIR}/cantor/pythonbackend FILES_MATCHING PATTERN "*.py")
import numpy
import scipy
import matplotlib
\ No newline at end of file
import matplotlib
......@@ -9,4 +9,4 @@ class CatchOutPythonBackend:
outputPythonBackend = CatchOutPythonBackend()
errorPythonBackend = CatchOutPythonBackend()
sys.stdout = outputPythonBackend
sys.stderr = errorPythonBackend
\ No newline at end of file
sys.stderr = errorPythonBackend
......@@ -31,7 +31,6 @@
#include "pythonsession.h"
#include "settings.h"
#include "imageresult.h"
#include <QDir>
typedef Cantor::ImageResult PythonPlotResult;
......
......@@ -30,4 +30,4 @@ inline QString fromSource(const QString& resourceName)
return QString::fromAscii(text.readAll());
}
#endif
\ No newline at end of file
#endif
......@@ -3,4 +3,4 @@ for keyPythonBackend in dir():
and (not '__' in keyPythonBackend):
del(globals()[keyPythonBackend])
del(keyPythonBackend)
\ No newline at end of file
del(keyPythonBackend)
......@@ -6,4 +6,4 @@ for keyPythonBackend in shelvePythonBackend:
shelvePythonBackend.close()
del(shelve)
del(shelvePythonBackend)
del(keyPythonBackend)
\ No newline at end of file
del(keyPythonBackend)
......@@ -28,4 +28,4 @@ add_test(NAME testpython2 COMMAND testpython2)
install(FILES cantor_python2.knsrc DESTINATION ${CONFIG_INSTALL_DIR})
install(FILES python2backend.desktop DESTINATION ${SERVICES_INSTALL_DIR}/cantor)
install(TARGETS cantor_python2backend DESTINATION ${PLUGIN_INSTALL_DIR})
install(FILES python2backend.kcfg DESTINATION ${KCFG_INSTALL_DIR})
\ No newline at end of file
install(FILES python2backend.kcfg DESTINATION ${KCFG_INSTALL_DIR})
......@@ -67,4 +67,4 @@ KConfigSkeleton* Python2Backend::config() const
K_EXPORT_CANTOR_PLUGIN(python2backend, Python2Backend)
#include "python2backend.moc"
\ No newline at end of file
#include "python2backend.moc"
......@@ -38,4 +38,4 @@ class Python2Backend : public PythonBackend
KConfigSkeleton* config() const;
};
#endif
\ No newline at end of file
#endif
......@@ -71,4 +71,4 @@ bool Python2Session::integratePlots() const
QStringList Python2Session::autorunScripts() const
{
return PythonSettings::autorunScripts();
}
\ No newline at end of file
}
......@@ -47,4 +47,4 @@ class Python2Session : public PythonSession
PyObject *m_pModule;
};
#endif
\ No newline at end of file
#endif
......@@ -17,4 +17,4 @@ install(TARGETS cantor_python3backend DESTINATION ${PLUGIN_INSTALL_DIR})
install(FILES python3backend.kcfg DESTINATION ${KCFG_INSTALL_DIR})
add_subdirectory(python3server)
add_subdirectory(tests)
\ No newline at end of file
add_subdirectory(tests)
......@@ -60,4 +60,4 @@ KConfigSkeleton* Python3Backend::config() const
K_EXPORT_CANTOR_PLUGIN(python3backend, Python3Backend)
#include "python3backend.moc"
\ No newline at end of file
#include "python3backend.moc"
......@@ -37,4 +37,4 @@ class Python3Backend : public PythonBackend
KConfigSkeleton* config() const;
};
#endif
\ No newline at end of file
#endif
......@@ -12,4 +12,4 @@ target_link_libraries(cantor_python3server
${PYTHONLIBS3_LIBRARIES}
Qt5::DBus)
install(TARGETS cantor_python3server ${INSTALL_TARGETS_DEFAULT_ARGS})
\ No newline at end of file
install(TARGETS cantor_python3server ${INSTALL_TARGETS_DEFAULT_ARGS})
......@@ -51,4 +51,4 @@ int main(int argc, char *argv[])
QTextStream(stdout) << "ready" << endl;
return app.exec();
}
\ No newline at end of file
}
......@@ -45,4 +45,4 @@ class Python3Server : public QObject
PyObject* m_pModule;
};
#endif
\ No newline at end of file
#endif
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment