Differential D2459 Diff 6129 src/backends/julia/juliaexpression.cpp

Changeset View

Standalone View

View Options

src/backends/julia/juliaexpression.cpp

Context not available.
19 */ 19​ */
20#include "juliaexpression.h" 20​#include "juliaexpression.h"
21 21​
22​#include <QDir>
23​#include <QUuid>
24​
25​#include "settings.h"
22#include "juliasession.h" 26​#include "juliasession.h"
27​#include "juliakeywords.h"
23#include "textresult.h" 28​#include "textresult.h"
29​#include "imageresult.h"
24 30​
25JuliaExpression::JuliaExpression(Cantor::Session *session) 31​JuliaExpression::JuliaExpression(Cantor::Session *session)
26 : Cantor::Expression(session) 32​ : Cantor::Expression(session)
Context not available.
30void JuliaExpression::evaluate() 36​void JuliaExpression::evaluate()
31{ 37​{
32 setStatus(Cantor::Expression::Computing); 38​ setStatus(Cantor::Expression::Computing);
33 dynamic_cast<JuliaSession *>(session())->runExpression(this); 39​ auto juliaSession = dynamic_cast<JuliaSession *>(session());
40​
41​ m_plot_filename.clear();
42​ if (juliaSession->integratePlots() and checkPlotShowingCommands()) {
43​ QStringList inlinePlotFormats;
44​ inlinePlotFormats << QLatin1String("svg");
filipesaraivaUnsubmitted
Done

I don't know what is the problem but here in my computer only .svg files could be loaded in the worksheet. So, please change it to .svg and we will give a look here and in other backends to select a common image format for this feature in the future.

filipesaraiva: I don't know what is the problem but here in my computer only .svg files could be loaded in the…
45​ inlinePlotFormats << QLatin1String("eps");
46​ inlinePlotFormats << QLatin1String("png");
47​
48​ auto inlinePlotFormat =
49​ inlinePlotFormats[JuliaSettings::inlinePlotFormat()];
50​ m_plot_filename = QDir::tempPath() +
51​ QString::fromLatin1("/cantor-julia-export-%1.%2")
52​ .arg(QUuid::createUuid().toString()).arg(inlinePlotFormat);
53​
54​ QString saveFigCommand =
55​ QString::fromLatin1("\nGR.savefig(\"%1\")\n").arg(m_plot_filename);
56​
57​ setCommand(command().append(saveFigCommand));
58​ }
59​
60​ juliaSession->runExpression(this);
34} 61​}
35 62​
36void JuliaExpression::finalize() 63​void JuliaExpression::finalize()
Context not available.
44 setResult(new Cantor::TextResult(juliaSession->getOutput())); 71​ setResult(new Cantor::TextResult(juliaSession->getOutput()));
45 setStatus(Cantor::Expression::Error); 72​ setStatus(Cantor::Expression::Error);
46 } else { 73​ } else {
47 setResult(new Cantor::TextResult(juliaSession->getOutput())); 74​ if (not m_plot_filename.isEmpty()
75​ and QFileInfo(m_plot_filename).exists()) {
76​ setResult(
77​ new Cantor::ImageResult(QUrl::fromLocalFile(m_plot_filename)));
78​ QDir().remove(m_plot_filename);
79​ } else {
80​ setResult(new Cantor::TextResult(juliaSession->getOutput()));
81​ }
48 setStatus(Cantor::Expression::Done); 82​ setStatus(Cantor::Expression::Done);
49 } 83​ }
50} 84​}
Context not available.
54 setStatus(Cantor::Expression::Interrupted); 88​ setStatus(Cantor::Expression::Interrupted);
55} 89​}
56 90​
91​bool JuliaExpression::checkPlotShowingCommands()
92​{
93​ for (auto showingCommand :
94​ JuliaKeywords::instance()->plotShowingCommands()) {
95​ if (command().contains(showingCommand + QLatin1String("("))) {
96​ return true;
97​ }
98​ }
99​ return false;
100​}
101​
57#include "juliaexpression.moc" 102​#include "juliaexpression.moc"
Context not available.