Commit dc15e100 authored by Sylvain Thery's avatar Sylvain Thery

patch for reading py script under windows

parent c62ae17a
...@@ -367,7 +367,7 @@ void SCHNApps::registerPluginsDirectory(const QString& path) ...@@ -367,7 +367,7 @@ void SCHNApps::registerPluginsDirectory(const QString& path)
#ifdef WIN32 #ifdef WIN32
#ifdef _DEBUG #ifdef _DEBUG
QDir directory(path+QString("Debug/"); QDir directory(path+QString("Debug/"));
#else #else
QDir directory(path + QString("Release/")); QDir directory(path + QString("Release/"));
#endif #endif
...@@ -811,9 +811,30 @@ void SCHNApps::showHidePythonDock() ...@@ -811,9 +811,30 @@ void SCHNApps::showHidePythonDock()
void SCHNApps::loadPythonScriptFromFile(const QString& fileName) void SCHNApps::loadPythonScriptFromFile(const QString& fileName)
{ {
#ifdef WIN32
// NOT VERY NICE BUT ONLY WAY ON WINDOWS TO LOAD SCRIPT FILES
QFile file(fileName);
if (!file.open(QIODevice::ReadOnly | QIODevice::Text))
return;
QTextStream in(&file);
while (!in.atEnd())
{
QString line = in.readLine();
if (line.size() >= 2)
{
int j = 0;
while (line[j] == ' ') ++j;
QString spaces(4 - j, QChar(' ')); // need 4 spaces at begin of line
line.replace(QChar('\\'), QChar('/')); // replace \ by / in win path
m_pythonConsole.consoleMessage(spaces + line);
m_pythonConsole.executeLine(false);
}
}
#else
QFileInfo fi(fileName); QFileInfo fi(fileName);
if(fi.exists()) if(fi.exists())
m_pythonContext.evalFile(fi.filePath()); m_pythonContext.evalFile(fi.filePath());
#endif
} }
void SCHNApps::loadPythonScriptFromFileDialog() void SCHNApps::loadPythonScriptFromFileDialog()
...@@ -829,7 +850,7 @@ void SCHNApps::closeEvent(QCloseEvent *event) ...@@ -829,7 +850,7 @@ void SCHNApps::closeEvent(QCloseEvent *event)
v->closeDialogs(); v->closeDialogs();
} }
emit(appsFinished()); emit(appsFinished());
QMainWindow::closeEvent(event); QMainWindow::closeEvent(event);
} }
......
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