[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [cantor] src/backends/maxima: Maxima backend: rename psfile to ps_file
From:       Alexander Rieder <alexanderrieder () gmail ! com>
Date:       2014-03-19 22:49:27
Message-ID: E1WQPId-0000al-7A () scm ! kde ! org
[Download RAW message or body]

Git commit 40af34aaed9dfee7120281581c6001acaa37e2af by Alexander Rieder.
Committed on 19/03/2014 at 22:42.
Pushed by arieder into branch 'master'.

Maxima backend: rename psfile to ps_file

it looks like psfile was renamed to ps_file upstream.

Patch by Maximiliano Curia, thanks.

REVIEW: 116632
(cherry picked from commit 9a92d50b4d635ad3744261b1988ecc9b105c2495)

M  +2    -2    src/backends/maxima/maximaexpression.cpp

http://commits.kde.org/cantor/40af34aaed9dfee7120281581c6001acaa37e2af

diff --git a/src/backends/maxima/maximaexpression.cpp \
b/src/backends/maxima/maximaexpression.cpp index db44e3b..e725b2a 100644
--- a/src/backends/maxima/maximaexpression.cpp
+++ b/src/backends/maxima/maximaexpression.cpp
@@ -68,7 +68,7 @@ void MaximaExpression::evaluate()
     if(command().startsWith('?')||command().startsWith(QLatin1String("describe("))||command().startsWith(QLatin1String("example(")))
  m_isHelpRequest=true;
 
-    if(command().contains(QRegExp("(?:plot2d|plot3d)\\s*\\([^\\)]")) && \
MaximaSettings::self()->integratePlots() && !command().contains("psfile")) +    \
if(command().contains(QRegExp("(?:plot2d|plot3d)\\s*\\([^\\)]")) && \
MaximaSettings::self()->integratePlots() && !command().contains("ps_file"))  {
         m_isPlot=true;
         m_tempFile=new KTemporaryFile();
@@ -160,7 +160,7 @@ QString MaximaExpression::internalCommand()
 
 #ifdef WITH_EPS
         const QString psParam="[gnuplot_ps_term_command, \"set size 1.0,  1.0; set \
                term postscript eps color solid \"]";
-        const QString plotParameters = "[psfile, \""+ fileName+"\"],"+psParam;
+        const QString plotParameters = "[ps_file, \""+ fileName+"\"],"+psParam;
 #else
         const QString plotParameters = "[gnuplot_term, \"png size 500,340\"], \
[gnuplot_out_file, \""+fileName+"\"]";  


[prev in list] [next in list] [prev in thread] [next in thread]