diff options
author | Fahim | 2016-02-17 17:00:35 +0530 |
---|---|---|
committer | Fahim | 2016-02-17 17:00:35 +0530 |
commit | d634304de8022c499b1a4a23c85aa5f124539d93 (patch) | |
tree | 9ec07da28a569b4ebc54c69eba778809457f451d /src/ngspiceSimulation | |
parent | 9b6b022edb89e14fa83c3c1d6ebf0a9f96500b1a (diff) | |
parent | 8a6f29decb7793e678aa8492f4f8d899087f2f68 (diff) | |
download | eSim-d634304de8022c499b1a4a23c85aa5f124539d93.tar.gz eSim-d634304de8022c499b1a4a23c85aa5f124539d93.tar.bz2 eSim-d634304de8022c499b1a4a23c85aa5f124539d93.zip |
Merge branch 'develop'
Conflicts:
kicadSchematicLibrary/kicad.pro
src/ngspicetoModelica/__init__.py
Diffstat (limited to 'src/ngspiceSimulation')
-rw-r--r-- | src/ngspiceSimulation/NgspiceWidget.py | 5 | ||||
-rw-r--r-- | src/ngspiceSimulation/pythonPlotting.py | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/src/ngspiceSimulation/NgspiceWidget.py b/src/ngspiceSimulation/NgspiceWidget.py index f2ad973f..402c20e3 100644 --- a/src/ngspiceSimulation/NgspiceWidget.py +++ b/src/ngspiceSimulation/NgspiceWidget.py @@ -15,11 +15,14 @@ class NgspiceWidget(QtGui.QWidget): self.layout = QtGui.QVBoxLayout(self) self.layout.addWidget(self.terminal) print"command-------->", command + if platform.system() == 'Linux': self.command = "cd "+projPath+";ngspice "+command #Creating argument for process - self.args = ['-into', str(self.terminal.winId()),'-hold','-e', self.command] + #self.args = ['-into', str(self.terminal.winId()),'-hold','-e', self.command] + self.args = ['-hold','-e', self.command] self.process.start('xterm', self.args) + self.obj_appconfig.process_obj.append(self.process) elif platform.system() == 'Windows': tempdir= os.getcwd() diff --git a/src/ngspiceSimulation/pythonPlotting.py b/src/ngspiceSimulation/pythonPlotting.py index 7d37623d..d93ba235 100644 --- a/src/ngspiceSimulation/pythonPlotting.py +++ b/src/ngspiceSimulation/pythonPlotting.py @@ -3,7 +3,7 @@ import os from PyQt4 import QtGui, QtCore from decimal import Decimal from matplotlib.backends.backend_qt4agg import FigureCanvasQTAgg as FigureCanvas -from matplotlib.backends.backend_qt4agg import NavigationToolbar2QTAgg as NavigationToolbar +from matplotlib.backends.backend_qt4agg import NavigationToolbar2QT as NavigationToolbar from matplotlib.figure import Figure from configuration.Appconfig import Appconfig @@ -687,4 +687,4 @@ class DataExtraction: -
\ No newline at end of file + |