From 7f66d9e5dd9f67407ca83cab1815dc9b969a842d Mon Sep 17 00:00:00 2001
From: athulappadan
Date: Mon, 17 Aug 2015 17:04:09 +0530
Subject: LICENSE made appear in the terminal properly
---
src/ngspice_ghdl.py | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
(limited to 'src/ngspice_ghdl.py')
diff --git a/src/ngspice_ghdl.py b/src/ngspice_ghdl.py
index 6791cc1..905d7fc 100755
--- a/src/ngspice_ghdl.py
+++ b/src/ngspice_ghdl.py
@@ -19,13 +19,10 @@ class Mainwindow(QtGui.QWidget):
#super(Mainwindow, self).__init__()
QtGui.QMainWindow.__init__(self)
print "Initializing.........."
- cwd = os.getcwd()
- path, file = os.path.split(cwd)
- print "cwd n path------ >", cwd, path
- licensefile = os.path.join(path, "LICENSE")
+ self.home = os.path.expanduser("~")
+ licensefile = os.path.join(self.home+'/.FreeEDA/', "LICENSE")
fileopen = open(licensefile, 'r')
print fileopen.read()
- self.home = os.path.expanduser("~")
self.parser = SafeConfigParser()
self.parser.read(self.home+'/.FreeEDA/config.ini')
self.file_list = [] #to keep the supporting files
--
cgit
From 826672e71e2f2f3320d72fd81146b234ffe7ce0c Mon Sep 17 00:00:00 2001
From: athulappadan
Date: Wed, 26 Aug 2015 11:40:29 +0530
Subject: Bug fixed: nghdl window is now running on first try
---
src/ngspice_ghdl.py | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
(limited to 'src/ngspice_ghdl.py')
diff --git a/src/ngspice_ghdl.py b/src/ngspice_ghdl.py
index 311ec4d..9a73d26 100755
--- a/src/ngspice_ghdl.py
+++ b/src/ngspice_ghdl.py
@@ -68,7 +68,7 @@ class Mainwindow(QtGui.QWidget):
def closeWindow(self):
try:
- self.process.kill()
+ self.process.close()
except:
pass
print "Close button clicked"
@@ -212,8 +212,10 @@ class Mainwindow(QtGui.QWidget):
path = os.getcwd()
#subprocess.call(cmd,shell=True)
command = "cd "+path +";"+cmd +";"+"make install"
+ #command = "cd "+path +";"+cmd
self.args = ['-into', str(self.terminal.winId()),'-hold','+s','-e', command]
self.process.start('xterm', self.args)
+
print "pid ------ >",self.process.pid()
#stdouterr = os.popen4(cmd)[1].read()
@@ -239,11 +241,12 @@ class Mainwindow(QtGui.QWidget):
except:
print "There is error during in 'make install' "
quit()
+
def uploadModle(self):
print "Upload button clicked"
try:
- self.process.kill()
+ self.process.close()
except:
pass
try:
@@ -258,7 +261,7 @@ class Mainwindow(QtGui.QWidget):
self.addingModelInModpath()
self.createModelFiles()
self.runMake()
- self.runMakeInstall()
+ #self.runMakeInstall()
else:
QtGui.QMessageBox.about(self,'Message','''Important Message.
This accepts only .vhdl file ''')
except:
--
cgit
From efb29dd4732f93c1b6a87e90909dcb576640e3bc Mon Sep 17 00:00:00 2001
From: Fahim
Date: Fri, 4 Sep 2015 17:44:27 +0530
Subject: Subject: Added Appconfig.py. And changed .FreeEDA to .esim-nghdl
Description: Added Appconfig.py. And changed .FreeEDA to .esim-nghdl
---
src/ngspice_ghdl.py | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
(limited to 'src/ngspice_ghdl.py')
diff --git a/src/ngspice_ghdl.py b/src/ngspice_ghdl.py
index 9a73d26..3f4990b 100755
--- a/src/ngspice_ghdl.py
+++ b/src/ngspice_ghdl.py
@@ -12,7 +12,7 @@ import subprocess
from PyQt4 import QtGui
from PyQt4 import QtCore
from ConfigParser import SafeConfigParser
-
+from Appconfig import nghdl_src_loc
class Mainwindow(QtGui.QWidget):
def __init__(self):
@@ -20,11 +20,11 @@ class Mainwindow(QtGui.QWidget):
QtGui.QMainWindow.__init__(self)
print "Initializing.........."
self.home = os.path.expanduser("~")
- licensefile = os.path.join(self.home+'/.FreeEDA/', "LICENSE")
+ licensefile = os.path.join(os.path.join(self.home,nghdl_src_loc), "LICENSE")
fileopen = open(licensefile, 'r')
print fileopen.read()
self.parser = SafeConfigParser()
- self.parser.read(self.home+'/.FreeEDA/config.ini')
+ self.parser.read(os.path.join(self.home,nghdl_src_loc+'/config.ini'))
self.file_list = [] #to keep the supporting files
self.initUI()
@@ -160,7 +160,7 @@ class Mainwindow(QtGui.QWidget):
print "Create Model Files Called"
os.chdir(self.cur_dir)
print "Current Working directory changed to ",self.cur_dir
- cmd = "python ~/.FreeEDA/model_generation.py "+str(self.ledit.text())
+ cmd = "python ~/"+nghdl_src_loc+"/model_generation.py "+str(self.ledit.text())
stdouterr = os.popen4(cmd)[1].read()
print stdouterr
#Moving file to model directory
@@ -176,12 +176,12 @@ class Mainwindow(QtGui.QWidget):
shutil.move(self.modelname+"_tb.vhdl",path+"/DUTghdl/")
shutil.copy(str(self.filename),path+"/DUTghdl/")
- shutil.copy(self.home+"/.FreeEDA/ghdlserver/compile.sh",path+"/DUTghdl/")
- shutil.copy(self.home+"/.FreeEDA/ghdlserver/uthash.h",path+"/DUTghdl/")
- shutil.copy(self.home+"/.FreeEDA/ghdlserver/ghdlserver.c",path+"/DUTghdl/")
- shutil.copy(self.home+"/.FreeEDA/ghdlserver/ghdlserver.h",path+"/DUTghdl/")
- shutil.copy(self.home+"/.FreeEDA/ghdlserver/Utility_Package.vhdl",path+"/DUTghdl/")
- shutil.copy(self.home+"/.FreeEDA/ghdlserver/Vhpi_Package.vhdl",path+"/DUTghdl/")
+ shutil.copy(os.path.join(self.home,nghdl_src_loc)+"/ghdlserver/compile.sh",path+"/DUTghdl/")
+ shutil.copy(os.path.join(self.home,nghdl_src_loc)+"/ghdlserver/uthash.h",path+"/DUTghdl/")
+ shutil.copy(os.path.join(self.home,nghdl_src_loc)+"/ghdlserver/ghdlserver.c",path+"/DUTghdl/")
+ shutil.copy(os.path.join(self.home,nghdl_src_loc)+"/ghdlserver/ghdlserver.h",path+"/DUTghdl/")
+ shutil.copy(os.path.join(self.home,nghdl_src_loc)+"/ghdlserver/Utility_Package.vhdl",path+"/DUTghdl/")
+ shutil.copy(os.path.join(self.home,nghdl_src_loc)+"/ghdlserver/Vhpi_Package.vhdl",path+"/DUTghdl/")
for file in self.file_list:
shutil.copy(str(file), path+"/DUTghdl/")
--
cgit