MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

matplotlib available in console

Browse Source 
PY-26371 For Python console, the SciView is empty
This commit is contained in:
Ekaterina Tuzova
2017-10-06 13:41:30 +03:00
parent 0687a35ddf
commit fd18e9d9fa
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/src/com/jetbrains/python/run/PythonCommandLineState.java
+6 -6
View File
@@ -325,7 +325,10 @@ public abstract class PythonCommandLineState extends CommandLineState {
if (myConfig.getEnvs() != null) {
env.putAll(myConfig.getEnvs());
}
if (PySciProjectComponent.getInstance(project).matplotlibInToolwindow() &&
PySciProjectComponent.getInstance(project).getPort() != -1) {
env.put("PYCHARM_MATPLOTLIB_PORT", String.valueOf(PySciProjectComponent.getInstance(project).getPort()));
}
addCommonEnvironmentVariables(getInterpreterPath(project, myConfig), env);
setupVirtualEnvVariables(myConfig, env, myConfig.getSdkHome());
@@ -372,10 +375,6 @@ public abstract class PythonCommandLineState extends CommandLineState {
}
public void customizeEnvironmentVars(Map<String, String> envs, boolean passParentEnvs) {
if (PySciProjectComponent.getInstance(myConfig.getProject()).matplotlibInToolwindow() &&
PySciProjectComponent.getInstance(myConfig.getProject()).getPort() != -1) {
envs.put("PYCHARM_MATPLOTLIB_PORT", String.valueOf(PySciProjectComponent.getInstance(myConfig.getProject()).getPort()));
}
}
private static void setupEncodingEnvs(Map<String, String> envs, Charset charset) {
@@ -386,7 +385,8 @@ public abstract class PythonCommandLineState extends CommandLineState {
Sdk pythonSdk = PythonSdkType.findSdkByPath(config.getSdkHome());
if (pythonSdk != null) {
List<String> pathList = Lists.newArrayList();
if (PySciProjectComponent.getInstance(project).matplotlibInToolwindow()) {
if (PySciProjectComponent.getInstance(project).matplotlibInToolwindow() &&
PySciProjectComponent.getInstance(project).getPort() != -1) {
pathList.add(PythonHelpersLocator.getHelperPath("pycharm_matplotlib_backend"));
}
pathList.addAll(getAddedPaths(pythonSdk));