summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRahul P2019-12-11 10:43:58 +0530
committerGitHub2019-12-11 10:43:58 +0530
commit266c2a96269bb93673be0741a17e634d7c2b4dee (patch)
tree20065152c1cc8ad9284d69e523e667595c568233
parent83d93769478a1805083666479d4ff83b875ba955 (diff)
parentd56abe8121a813f200e2fdb9330057e2ad178cef (diff)
downloadeSim-266c2a96269bb93673be0741a17e634d7c2b4dee.tar.gz
eSim-266c2a96269bb93673be0741a17e634d7c2b4dee.tar.bz2
eSim-266c2a96269bb93673be0741a17e634d7c2b4dee.zip
Merge pull request #1 from aamirthekiya/fellowship2019-python3
merge windows and linux src.
-rw-r--r--src/frontEnd/Application.py45
-rw-r--r--src/frontEnd/ProjectExplorer.py2
2 files changed, 47 insertions, 0 deletions
diff --git a/src/frontEnd/Application.py b/src/frontEnd/Application.py
index 4f77a321..fdb374ee 100644
--- a/src/frontEnd/Application.py
+++ b/src/frontEnd/Application.py
@@ -437,6 +437,51 @@ class Application(QtGui.QMainWindow):
self.modelicaNetlist = os.path.join(
self.projDir, self.projName + ".mo")
+ """
+ try:
+ # Creating a command for Ngspice to Modelica converter
+ self.cmd1 = "
+ python3 ../ngspicetoModelica/NgspicetoModelica.py "\
+ +self.ngspiceNetlist
+ self.obj_workThread1 = Worker.WorkerThread(self.cmd1)
+ self.obj_workThread1.start()
+
+
+ if self.obj_validation.validateTool("OMEdit"):
+ # Creating command to run OMEdit
+ self.cmd2 = "OMEdit "+self.modelicaNetlist
+ self.obj_workThread2 = Worker.WorkerThread(self.cmd2)
+ self.obj_workThread2.start()
+ else:
+ self.msg = QtGui.QMessageBox()
+ self.msgContent = "There was an error while
+ opening OMEdit.<br/>\
+ Please make sure OpenModelica is installed in your\
+ system. <br/>\
+ To install it on Linux : Go to\
+ <a href=https://www.openmodelica.org/download/\
+ download-linux>OpenModelica Linux</a> and \
+ install nigthly build release.<br/>\
+ To install it on Windows : Go to\
+ <a href=https://www.openmodelica.org/download/\
+ download-windows>OpenModelica Windows</a>\
+ and install latest version.<br/>"
+ self.msg.setTextFormat(QtCore.Qt.RichText)
+ self.msg.setText(self.msgContent)
+ self.msg.setWindowTitle("Missing OpenModelica")
+ self.obj_appconfig.print_info(self.msgContent)
+ self.msg.exec_()
+
+ except Exception as e:
+ self.msg = QtGui.QErrorMessage()
+ self.msg.showMessage(
+ 'Unable to convert NgSpice netlist to\
+ Modelica netlist :'+str(e))
+ self.msg.setWindowTitle(
+ "Ngspice to Modelica conversion error")
+ self.obj_appconfig.print_error(str(e))
+ """
+
self.obj_Mainview.obj_dockarea.modelicaEditor(self.projDir)
else:
diff --git a/src/frontEnd/ProjectExplorer.py b/src/frontEnd/ProjectExplorer.py
index 4627d294..09e756af 100644
--- a/src/frontEnd/ProjectExplorer.py
+++ b/src/frontEnd/ProjectExplorer.py
@@ -101,6 +101,8 @@ class ProjectExplorer(QtGui.QWidget):
menu = QtGui.QMenu()
if level == 0:
+ renameProject = menu.addAction(self.tr("Rename Project"))
+ renameProject.triggered.connect(self.renameProject)
deleteproject = menu.addAction(self.tr("Remove Project"))
deleteproject.triggered.connect(self.removeProject)
refreshproject = menu.addAction(self.tr("Refresh"))