Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Education
Cantor
Commits
f375f608
Commit
f375f608
authored
Dec 27, 2021
by
Alexander Semke
Browse files
[octave] removed the usage of EPS and libspectre.
parent
9653be87
Pipeline
#114800
passed with stage
in 18 minutes and 21 seconds
Changes
4
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
src/backends/octave/CMakeLists.txt
View file @
f375f608
...
...
@@ -14,13 +14,8 @@ set( OctaveBackend_SRCS
add_subdirectory
(
scripts
)
if
(
WITH_EPS
)
set
(
DEFAULT_PLOT_FORMAT
"eps"
)
set
(
EPS_PLOT_FORMAT_CHOICE
"<choice name=
\"
eps
\"
/>"
)
file
(
READ with_eps_ui_part.txt EPS_PLOT_FORMAT_UI_ELEMENT
)
else
(
WITH_EPS
)
set
(
DEFAULT_PLOT_FORMAT
"png"
)
endif
(
WITH_EPS
)
set
(
DEFAULT_PLOT_FORMAT
"png"
)
configure_file
(
octavebackend.kcfg.in
${
CMAKE_CURRENT_BINARY_DIR
}
/octavebackend.kcfg
)
kconfig_add_kcfg_files
(
OctaveBackend_SRCS settings.kcfgc
)
...
...
@@ -52,5 +47,4 @@ endif()
install
(
FILES cantor_octave.knsrc DESTINATION
${
KDE_INSTALL_KNSRCDIR
}
)
install
(
FILES graphic_packages.xml DESTINATION
${
KDE_INSTALL_DATADIR
}
/cantor/octave
)
src/backends/octave/octavebackend.kcfg.in
View file @
f375f608
...
...
@@ -31,7 +31,6 @@
</entry>
<entry
name=
"inlinePlotFormat"
type=
"Enum"
>
<choices>
@EPS_PLOT_FORMAT_CHOICE@
<choice
name=
"png"
/>
<choice
name=
"svg"
/>
<choice
name=
"jpeg"
/>
...
...
src/backends/octave/octaveexpression.cpp
View file @
f375f608
...
...
@@ -9,7 +9,6 @@
#include
"defaultvariablemodel.h"
#include
"textresult.h"
#include
"epsresult.h"
#include
"imageresult.h"
#include
<QDebug>
...
...
@@ -22,12 +21,8 @@
#include
"settings.h"
static
const
QString
printCommandTemplate
=
QString
::
fromLatin1
(
"cantor_print('%1', '%2');"
);
const
QStringList
OctaveExpression
::
plotExtensions
({
#ifdef WITH_EPS
QLatin1String
(
"eps"
),
#endif
QLatin1String
(
"png"
),
QLatin1String
(
"svg"
),
QLatin1String
(
"jpeg"
)
...
...
@@ -183,11 +178,7 @@ void OctaveExpression::imageChanged()
return
;
const
QUrl
&
url
=
QUrl
::
fromLocalFile
(
m_plotFilename
);
Cantor
::
Result
*
newResult
;
if
(
m_plotFilename
.
endsWith
(
QLatin1String
(
".eps"
)))
newResult
=
new
Cantor
::
EpsResult
(
url
);
else
newResult
=
new
Cantor
::
ImageResult
(
url
);
auto
*
newResult
=
new
Cantor
::
ImageResult
(
url
);
bool
found
=
false
;
for
(
int
i
=
0
;
i
<
results
().
size
();
i
++
)
...
...
src/backends/octave/with_eps_ui_part.txt
deleted
100644 → 0
View file @
9653be87
<item>
<property name="text">
<string notr="true">eps</string>
</property>
</item>
\ No newline at end of file
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment