From 0555a258b54367f401789cff17191dd58d0c1f45 Mon Sep 17 00:00:00 2001
From: athulappadan
Date: Thu, 10 Sep 2015 14:39:43 +0530
Subject: Nghdl icon added
---
src/frontEnd/Application.py | 21 +++++++++++++++++++++
1 file changed, 21 insertions(+)
(limited to 'src/frontEnd/Application.py')
diff --git a/src/frontEnd/Application.py b/src/frontEnd/Application.py
index 2aa7c649..ffa4ccda 100755
--- a/src/frontEnd/Application.py
+++ b/src/frontEnd/Application.py
@@ -28,6 +28,7 @@ from configuration.Appconfig import Appconfig
from projManagement.openProject import OpenProjectInfo
from projManagement.newProject import NewProjectInfo
from projManagement.Kicad import Kicad
+from projManagement import Worker
from frontEnd import ProjectExplorer
from frontEnd import Workspace
from frontEnd import DockArea
@@ -126,6 +127,9 @@ class Application(QtGui.QMainWindow):
self.subcircuit=QtGui.QAction(QtGui.QIcon('../../images/subckt.png'),'Subcircuit',self)
self.subcircuit.triggered.connect(self.open_subcircuit)
+
+ self.nghdl = QtGui.QAction(QtGui.QIcon('../../images/nghdl.png'), '', self)
+ self.nghdl.triggered.connect(self.open_nghdl)
#Adding Action Widget to tool bar
self.lefttoolbar = QtGui.QToolBar('Left ToolBar')
@@ -137,6 +141,7 @@ class Application(QtGui.QMainWindow):
self.lefttoolbar.addAction(self.pcb)
self.lefttoolbar.addAction(self.model)
self.lefttoolbar.addAction(self.subcircuit)
+ self.lefttoolbar.addAction(self.nghdl)
self.lefttoolbar.setOrientation(QtCore.Qt.Vertical)
self.lefttoolbar.setIconSize(QSize(40,40))
@@ -203,6 +208,22 @@ class Application(QtGui.QMainWindow):
print "Subcircuit editor is called"
self.obj_appconfig.print_info('Subcircuit editor is called')
self.obj_Mainview.obj_dockarea.subcircuiteditor()
+
+ def open_nghdl(self):
+ print "Nghdl is called"
+ self.obj_appconfig.print_info('Nghdl is called')
+
+ try:
+ self.cmd = 'nghdl'
+ self.obj_workThread = Worker.WorkerThread(self.cmd)
+ self.obj_workThread.start()
+
+ except Exception as e:
+ self.msg = QtGui.QErrorMessage(None)
+ self.msg.showMessage('Error while opening nghdl' + str(e))
+ self.obj_appconfig.print_error('Error while opening nghdl' + str(e))
+ self.msg.setWindowTitle("Error Message")
+
def exit_project(self):
--
cgit
From bcc0d1b98380f33b9d0c389f5322dc1e880af9e5 Mon Sep 17 00:00:00 2001
From: Fahim
Date: Tue, 22 Sep 2015 13:00:38 +0530
Subject: Subject: Integrated OpemModelica Changes into develop branch
Description: Integrated OpemModelica Changes into develop branch
---
src/frontEnd/Application.py | 69 +++++++++++++++++++++++++++++++++++++++++----
1 file changed, 63 insertions(+), 6 deletions(-)
(limited to 'src/frontEnd/Application.py')
diff --git a/src/frontEnd/Application.py b/src/frontEnd/Application.py
index ffa4ccda..ce6dfff7 100755
--- a/src/frontEnd/Application.py
+++ b/src/frontEnd/Application.py
@@ -28,6 +28,7 @@ from configuration.Appconfig import Appconfig
from projManagement.openProject import OpenProjectInfo
from projManagement.newProject import NewProjectInfo
from projManagement.Kicad import Kicad
+from projManagement.Validation import Validation
from projManagement import Worker
from frontEnd import ProjectExplorer
from frontEnd import Workspace
@@ -53,7 +54,7 @@ class Application(QtGui.QMainWindow):
self.obj_Mainview = MainView()
self.obj_kicad = Kicad(self.obj_Mainview.obj_dockarea)
self.obj_appconfig = Appconfig()
-
+ self.obj_validation = Validation()
#Initialize all widget
self.setCentralWidget(self.obj_Mainview)
self.initToolBar()
@@ -131,6 +132,12 @@ class Application(QtGui.QMainWindow):
self.nghdl = QtGui.QAction(QtGui.QIcon('../../images/nghdl.png'), '', self)
self.nghdl.triggered.connect(self.open_nghdl)
+ self.omedit = QtGui.QAction(QtGui.QIcon('../../images/omedit.png'),'Modelica Converter',self)
+ self.omedit.triggered.connect(self.open_OMedit)
+
+ self.omoptim=QtGui.QAction(QtGui.QIcon('../../images/omoptim.png'),'OM Optimisation',self)
+ self.omoptim.triggered.connect(self.open_OMoptim)
+
#Adding Action Widget to tool bar
self.lefttoolbar = QtGui.QToolBar('Left ToolBar')
self.addToolBar(QtCore.Qt.LeftToolBarArea, self.lefttoolbar)
@@ -142,6 +149,8 @@ class Application(QtGui.QMainWindow):
self.lefttoolbar.addAction(self.model)
self.lefttoolbar.addAction(self.subcircuit)
self.lefttoolbar.addAction(self.nghdl)
+ self.lefttoolbar.addAction(self.omedit)
+ self.lefttoolbar.addAction(self.omoptim)
self.lefttoolbar.setOrientation(QtCore.Qt.Vertical)
self.lefttoolbar.setIconSize(QSize(40,40))
@@ -252,13 +261,61 @@ class Application(QtGui.QMainWindow):
print "model editor is called"
self.obj_appconfig.print_info('model editor is called')
self.obj_Mainview.obj_dockarea.modelEditor()
- """
- def open_kicadToNgspice(self):
- print "kicadToNgspice is called"
- self.obj_appconfig.print_info('kicadToNgspice is called')
- self.obj_Mainview.obj_dockarea.kicadToNgspiceEditor()"""
+
+
+ def open_OMedit(self):
+ """
+ This function call ngspice to OM edit converter and then launch OM edit.
+ """
+ self.obj_appconfig.print_info('OM edit is called')
+ self.projDir = self.obj_appconfig.current_project["ProjectName"]
+ if self.projDir != None:
+ if self.obj_validation.validateCirOut(self.projDir):
+ self.projName = os.path.basename(self.projDir)
+ self.ngspiceNetlist = os.path.join(self.projDir,self.projName+".cir.out")
+ self.modelicaNetlist = os.path.join(self.projDir,self.projName+".mo")
+
+ try:
+ #Creating a command for Ngspice to Modelica converter
+ self.cmd1 = "python ../ngspicetoModelica/NgspicetoModelica.py "+self.ngspiceNetlist
+ self.obj_workThread1 = Worker.WorkerThread(self.cmd1)
+ self.obj_workThread1.start()
+
+ try:
+ #Creating command to run OMEdit
+ self.cmd2 = "OMEdit "+self.modelicaNetlist
+ self.obj_workThread2 = Worker.WorkerThread(self.cmd2)
+ self.obj_workThread2.start()
+ except Exception as e:
+ self.msg = QtGui.QErrorMessage()
+ self.msg.showMessage('There was error while opening OMEdit :'+str(e))
+ self.msg.setWindowTitle("Error Message")
+ self.obj_appconfig.print_error(str(e))
+
+ 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))
+
+ else:
+ self.msg = QtGui.QErrorMessage()
+ self.msg.showMessage('Current project does not contain any ngspice file. Please create ngspice file with extension .cir.out')
+ self.msg.setWindowTitle("Missing Ngspice netlist")
+ else:
+ self.msg = QtGui.QErrorMessage()
+ self.msg.showMessage('Please select the project first. You can either create new project or open existing project')
+ self.msg.setWindowTitle("Error Message")
+
+ def open_OMoptim(self):
+ print "OM Optim is called"
+ self.obj_appconfig.print_info('OM Optim is called')
+ #Creating a command to run
+ self.cmd = "OMOptim"
+ self.obj_workThread = Worker.WorkerThread(self.cmd)
+ self.obj_workThread.start()
def testing(self):
print "Success hit kicad button"
--
cgit
From 193d284f377ccf963bbd762bdb03f3daae2fa1af Mon Sep 17 00:00:00 2001
From: komalsheth236
Date: Tue, 22 Sep 2015 14:31:02 +0530
Subject: Nghdl Processes Terminated
---
src/frontEnd/Application.py | 9 +++++++++
1 file changed, 9 insertions(+)
(limited to 'src/frontEnd/Application.py')
diff --git a/src/frontEnd/Application.py b/src/frontEnd/Application.py
index ce6dfff7..c72422c1 100755
--- a/src/frontEnd/Application.py
+++ b/src/frontEnd/Application.py
@@ -242,6 +242,15 @@ class Application(QtGui.QMainWindow):
proc.terminate()
except:
pass
+
+ try :
+ for process_object in self.obj_appconfig.process_obj:
+ try:
+ process_object.close()
+ except:
+ pass
+ except:
+ pass
##Just checking if open and New window is open. If yes just close it when application is closed
try:
self.project.close()
--
cgit
From 61ceb24d4b98e4aa719baddcfaedbcdee239f867 Mon Sep 17 00:00:00 2001
From: Fahim
Date: Thu, 1 Oct 2015 14:41:09 +0530
Subject: Subject: Changes in Application.py,Validation.py and
NgspicetoModelica.py
Description: In Application.py rewrite the error message for
openModelica if it is not installed.Simillarly for nghdl.
In Validation.py a new function ValidateTool is added which will check
if any tool like openModelica or nghdl is installed.
---
src/frontEnd/Application.py | 52 +++++++++++++++++++++++++++++----------------
1 file changed, 34 insertions(+), 18 deletions(-)
(limited to 'src/frontEnd/Application.py')
diff --git a/src/frontEnd/Application.py b/src/frontEnd/Application.py
index c72422c1..58f5e46b 100755
--- a/src/frontEnd/Application.py
+++ b/src/frontEnd/Application.py
@@ -222,16 +222,16 @@ class Application(QtGui.QMainWindow):
print "Nghdl is called"
self.obj_appconfig.print_info('Nghdl is called')
- try:
+ if self.obj_validation.validateTool('nghdl'):
self.cmd = 'nghdl'
self.obj_workThread = Worker.WorkerThread(self.cmd)
self.obj_workThread.start()
- except Exception as e:
+ else:
self.msg = QtGui.QErrorMessage(None)
- self.msg.showMessage('Error while opening nghdl' + str(e))
- self.obj_appconfig.print_error('Error while opening nghdl' + str(e))
- self.msg.setWindowTitle("Error Message")
+ self.msg.showMessage('Error while opening nghdl. Please make sure nghdl is installed')
+ self.obj_appconfig.print_error('Error while opening nghdl. Please make sure nghdl is installed')
+ self.msg.setWindowTitle('nghdl Error Message')
@@ -291,16 +291,23 @@ class Application(QtGui.QMainWindow):
self.obj_workThread1 = Worker.WorkerThread(self.cmd1)
self.obj_workThread1.start()
- try:
+
+ 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()
- except Exception as e:
- self.msg = QtGui.QErrorMessage()
- self.msg.showMessage('There was error while opening OMEdit :'+str(e))
+ else:
+ self.msg = QtGui.QMessageBox()
+ self.msgContent = "There was an error while opening OMEdit.
\
+ Please make sure OpenModelica is installed in your system.
\
+ To install it on Linux : Go to OpenModelica Linux and install nigthly build release.
\
+ To install it on Windows : Go to OpenModelica Windows and install latest version.
"
+ self.msg.setTextFormat(QtCore.Qt.RichText)
+ self.msg.setText(self.msgContent)
self.msg.setWindowTitle("Error Message")
- self.obj_appconfig.print_error(str(e))
+ self.obj_appconfig.print_info(self.msgContent)
+ self.msg.exec_()
except Exception as e:
self.msg = QtGui.QErrorMessage()
@@ -321,14 +328,23 @@ class Application(QtGui.QMainWindow):
def open_OMoptim(self):
print "OM Optim is called"
self.obj_appconfig.print_info('OM Optim is called')
- #Creating a command to run
- self.cmd = "OMOptim"
- self.obj_workThread = Worker.WorkerThread(self.cmd)
- self.obj_workThread.start()
-
- def testing(self):
- print "Success hit kicad button"
-
+ #Check if OMOptim is installed
+ if self.obj_validation.validateTool("OMOptim"):
+ #Creating a command to run
+ self.cmd = "OMOptim"
+ self.obj_workThread = Worker.WorkerThread(self.cmd)
+ self.obj_workThread.start()
+ else:
+ self.msg = QtGui.QMessageBox()
+ self.msgContent = "There was an error while opening OMOptim.
\
+ Please make sure OpenModelica is installed in your system.
\
+ To install it on Linux : Go to OpenModelica Linux and install nigthly build release.
\
+ To install it on Windows : Go to OpenModelica Windows and install latest version.
"
+ self.msg.setTextFormat(QtCore.Qt.RichText)
+ self.msg.setText(self.msgContent)
+ self.msg.setWindowTitle("Error Message")
+ self.obj_appconfig.print_info(self.msgContent)
+ self.msg.exec_()
class MainView(QtGui.QWidget):
"""
--
cgit
From fd280da9612ddf77e6e066315728c609b96608e1 Mon Sep 17 00:00:00 2001
From: Fahim
Date: Thu, 15 Oct 2015 13:05:18 +0530
Subject: Subject: Changes to include PSPICE to Kicad parser
Description: Changes to include PSPICE to Kicad parser
---
src/frontEnd/Application.py | 91 ++++++++++++++++++++++++++++++---------------
1 file changed, 61 insertions(+), 30 deletions(-)
(limited to 'src/frontEnd/Application.py')
diff --git a/src/frontEnd/Application.py b/src/frontEnd/Application.py
index 58f5e46b..82990713 100755
--- a/src/frontEnd/Application.py
+++ b/src/frontEnd/Application.py
@@ -33,6 +33,7 @@ from projManagement import Worker
from frontEnd import ProjectExplorer
from frontEnd import Workspace
from frontEnd import DockArea
+from pspicetoKicad.ImportPspice import ImportPspiceLibrary,ConvertPspiceKicad
import time
from PyQt4.Qt import QSize
@@ -87,6 +88,14 @@ class Application(QtGui.QMainWindow):
self.exitproj.setShortcut('Ctrl+X')
self.exitproj.triggered.connect(self.exit_project)
+ self.importPspiceLib = QtGui.QAction(QtGui.QIcon('../../images/import_icon.png'),'Import PSPICE Library',self)
+ self.importPspiceLib.setShortcut('Ctrl+X')
+ self.importPspiceLib.triggered.connect(self.import_pspice_lib)
+
+ self.convertPspiceKicad = QtGui.QAction(QtGui.QIcon('../../images/Ps2Ki.png'),'Convert PSPICE to KICAD',self)
+ self.convertPspiceKicad.setShortcut('Ctrl+X')
+ self.convertPspiceKicad.triggered.connect(self.convert_pspice_kicad)
+
self.helpfile = QtGui.QAction(QtGui.QIcon('../../images/helpProject.png'),'Help',self)
self.helpfile.setShortcut('Ctrl+H')
self.helpfile.triggered.connect(self.help_project)
@@ -95,6 +104,8 @@ class Application(QtGui.QMainWindow):
self.topToolbar.addAction(self.newproj)
self.topToolbar.addAction(self.openproj)
self.topToolbar.addAction(self.exitproj)
+ self.topToolbar.addAction(self.importPspiceLib)
+ self.topToolbar.addAction(self.convertPspiceKicad)
self.topToolbar.addAction(self.helpfile)
self.spacer = QtGui.QWidget()
@@ -174,6 +185,7 @@ class Application(QtGui.QMainWindow):
self.obj_appconfig.print_info('Current project is : ' + self.obj_appconfig.current_project["ProjectName"])
except:
pass
+
def open_project(self):
"""
This project call Open Project Info class
@@ -187,6 +199,53 @@ class Application(QtGui.QMainWindow):
except:
pass
+ def exit_project(self):
+ print "Exit Project called"
+ for proc in self.obj_appconfig.procThread_list:
+ try:
+ proc.terminate()
+ except:
+ pass
+
+ try :
+ for process_object in self.obj_appconfig.process_obj:
+ try:
+ process_object.close()
+ except:
+ pass
+ except:
+ pass
+ ##Just checking if open and New window is open. If yes just close it when application is closed
+ try:
+ self.project.close()
+ except:
+ pass
+
+ self.close()
+
+ def import_pspice_lib(self):
+ print "Import Pspice Library is called"
+ self.obj_appconfig.print_info('Import Pspice Library is called')
+
+ self.obj_import_pspice = ImportPspiceLibrary()
+
+ self.obj_import_pspice.imortLib()
+
+ def convert_pspice_kicad(self):
+ print "PSPICE to KICAD converter is called"
+ self.obj_appconfig.print_info('PSPICE to KICAD converter is called')
+
+ self.obj_run_converter = ConvertPspiceKicad()
+
+ self.obj_run_converter.runConverter()
+
+ def help_project(self):
+ print "Help is called"
+ self.obj_appconfig.print_info('Help is called')
+ print "Current Project : ",self.obj_appconfig.current_project
+ self.obj_Mainview.obj_dockarea.usermanual()
+
+
def open_ngspice(self):
"""
This Function execute ngspice on current project
@@ -235,35 +294,7 @@ class Application(QtGui.QMainWindow):
- def exit_project(self):
- print "Exit Project called"
- for proc in self.obj_appconfig.procThread_list:
- try:
- proc.terminate()
- except:
- pass
-
- try :
- for process_object in self.obj_appconfig.process_obj:
- try:
- process_object.close()
- except:
- pass
- except:
- pass
- ##Just checking if open and New window is open. If yes just close it when application is closed
- try:
- self.project.close()
- except:
- pass
-
- self.close()
-
- def help_project(self):
- print "Help is called"
- self.obj_appconfig.print_info('Help is called')
- print "Current Project : ",self.obj_appconfig.current_project
- self.obj_Mainview.obj_dockarea.usermanual()
+
def open_modelEditor(self):
@@ -305,7 +336,7 @@ class Application(QtGui.QMainWindow):
To install it on Windows : Go to OpenModelica Windows and install latest version.
"
self.msg.setTextFormat(QtCore.Qt.RichText)
self.msg.setText(self.msgContent)
- self.msg.setWindowTitle("Error Message")
+ self.msg.setWindowTitle("Missing OpenModelica")
self.obj_appconfig.print_info(self.msgContent)
self.msg.exec_()
--
cgit
From 5fcc64653e76166b5385086d9fbd2e7974845760 Mon Sep 17 00:00:00 2001
From: Fahim
Date: Thu, 15 Oct 2015 16:07:14 +0530
Subject: Modify the calling method of nghdl
---
src/frontEnd/Application.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'src/frontEnd/Application.py')
diff --git a/src/frontEnd/Application.py b/src/frontEnd/Application.py
index 82990713..ef66f484 100755
--- a/src/frontEnd/Application.py
+++ b/src/frontEnd/Application.py
@@ -282,7 +282,7 @@ class Application(QtGui.QMainWindow):
self.obj_appconfig.print_info('Nghdl is called')
if self.obj_validation.validateTool('nghdl'):
- self.cmd = 'nghdl'
+ self.cmd = 'nghdl -e'
self.obj_workThread = Worker.WorkerThread(self.cmd)
self.obj_workThread.start()
--
cgit
From c5a5c9eda015f8855c5e8481834a740fc5b625b4 Mon Sep 17 00:00:00 2001
From: Fahim
Date: Thu, 15 Oct 2015 17:26:17 +0530
Subject: Added XML for Nghdl
---
src/frontEnd/Application.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'src/frontEnd/Application.py')
diff --git a/src/frontEnd/Application.py b/src/frontEnd/Application.py
index ef66f484..b1f8ca30 100755
--- a/src/frontEnd/Application.py
+++ b/src/frontEnd/Application.py
@@ -140,7 +140,7 @@ class Application(QtGui.QMainWindow):
self.subcircuit=QtGui.QAction(QtGui.QIcon('../../images/subckt.png'),'Subcircuit',self)
self.subcircuit.triggered.connect(self.open_subcircuit)
- self.nghdl = QtGui.QAction(QtGui.QIcon('../../images/nghdl.png'), '', self)
+ self.nghdl = QtGui.QAction(QtGui.QIcon('../../images/nghdl.png'), 'Nghdl', self)
self.nghdl.triggered.connect(self.open_nghdl)
self.omedit = QtGui.QAction(QtGui.QIcon('../../images/omedit.png'),'Modelica Converter',self)
--
cgit
From 5122bdf3700de9479fb18b95e30eecb98e4caf77 Mon Sep 17 00:00:00 2001
From: Fahim
Date: Fri, 16 Oct 2015 17:39:40 +0530
Subject: Subject: Modification for Pspice to Kicad converter
Description: Modification for Pspice to Kicad converter.
---
src/frontEnd/Application.py | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
(limited to 'src/frontEnd/Application.py')
diff --git a/src/frontEnd/Application.py b/src/frontEnd/Application.py
index b1f8ca30..9106cd0a 100755
--- a/src/frontEnd/Application.py
+++ b/src/frontEnd/Application.py
@@ -83,11 +83,7 @@ class Application(QtGui.QMainWindow):
self.openproj = QtGui.QAction(QtGui.QIcon('../../images/openProject.png'),'Open Project',self)
self.openproj.setShortcut('Ctrl+O')
self.openproj.triggered.connect(self.open_project)
-
- self.exitproj = QtGui.QAction(QtGui.QIcon('../../images/closeProject.png'),'Exit',self)
- self.exitproj.setShortcut('Ctrl+X')
- self.exitproj.triggered.connect(self.exit_project)
-
+
self.importPspiceLib = QtGui.QAction(QtGui.QIcon('../../images/import_icon.png'),'Import PSPICE Library',self)
self.importPspiceLib.setShortcut('Ctrl+X')
self.importPspiceLib.triggered.connect(self.import_pspice_lib)
@@ -96,6 +92,10 @@ class Application(QtGui.QMainWindow):
self.convertPspiceKicad.setShortcut('Ctrl+X')
self.convertPspiceKicad.triggered.connect(self.convert_pspice_kicad)
+ self.exitproj = QtGui.QAction(QtGui.QIcon('../../images/closeProject.png'),'Exit',self)
+ self.exitproj.setShortcut('Ctrl+X')
+ self.exitproj.triggered.connect(self.exit_project)
+
self.helpfile = QtGui.QAction(QtGui.QIcon('../../images/helpProject.png'),'Help',self)
self.helpfile.setShortcut('Ctrl+H')
self.helpfile.triggered.connect(self.help_project)
@@ -103,9 +103,9 @@ class Application(QtGui.QMainWindow):
self.topToolbar = self.addToolBar('Top Tool Bar')
self.topToolbar.addAction(self.newproj)
self.topToolbar.addAction(self.openproj)
- self.topToolbar.addAction(self.exitproj)
self.topToolbar.addAction(self.importPspiceLib)
self.topToolbar.addAction(self.convertPspiceKicad)
+ self.topToolbar.addAction(self.exitproj)
self.topToolbar.addAction(self.helpfile)
self.spacer = QtGui.QWidget()
--
cgit
From 664ba991489f9e7370ab17af944a9c730c57f0cf Mon Sep 17 00:00:00 2001
From: Fahim
Date: Mon, 19 Oct 2015 17:57:21 +0530
Subject: Subject: Modified Kicad import Library code
Description: Handle exception if error occurs while converting schematic.
Added condition for cancel button.
---
src/frontEnd/Application.py | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
(limited to 'src/frontEnd/Application.py')
diff --git a/src/frontEnd/Application.py b/src/frontEnd/Application.py
index 9106cd0a..6bfbf97e 100755
--- a/src/frontEnd/Application.py
+++ b/src/frontEnd/Application.py
@@ -292,11 +292,7 @@ class Application(QtGui.QMainWindow):
self.obj_appconfig.print_error('Error while opening nghdl. Please make sure nghdl is installed')
self.msg.setWindowTitle('nghdl Error Message')
-
-
-
-
-
+
def open_modelEditor(self):
print "model editor is called"
self.obj_appconfig.print_info('model editor is called')
--
cgit
From 4366a4d375e0a942c8bc37aeeb0dabbc8849b86a Mon Sep 17 00:00:00 2001
From: Fahim
Date: Fri, 22 Jan 2016 15:02:10 +0530
Subject: Commented PCB and Footprint editor related code as it will open
directly from eeschema Modified install-linux.sh to add PPA for Kicad-4
---
src/frontEnd/Application.py | 5 +++++
1 file changed, 5 insertions(+)
(limited to 'src/frontEnd/Application.py')
diff --git a/src/frontEnd/Application.py b/src/frontEnd/Application.py
index 6bfbf97e..55c36fb6 100755
--- a/src/frontEnd/Application.py
+++ b/src/frontEnd/Application.py
@@ -128,11 +128,14 @@ class Application(QtGui.QMainWindow):
self.ngspice = QtGui.QAction(QtGui.QIcon('../../images/ngspice.png'), 'Simulation', self)
self.ngspice.triggered.connect(self.open_ngspice)
+ """
+ #Removing PCB and Footprint Editor as it will start from eeschema
self.footprint = QtGui.QAction(QtGui.QIcon('../../images/footprint.png'),'Footprint Editor',self)
self.footprint.triggered.connect(self.obj_kicad.openFootprint)
self.pcb = QtGui.QAction(QtGui.QIcon('../../images/pcb.png'),'PCB Layout',self)
self.pcb.triggered.connect(self.obj_kicad.openLayout)
+ """
self.model = QtGui.QAction(QtGui.QIcon('../../images/model.png'),'Model Editor',self)
self.model.triggered.connect(self.open_modelEditor)
@@ -155,8 +158,10 @@ class Application(QtGui.QMainWindow):
self.lefttoolbar.addAction(self.kicad)
self.lefttoolbar.addAction(self.conversion)
self.lefttoolbar.addAction(self.ngspice)
+ """
self.lefttoolbar.addAction(self.footprint)
self.lefttoolbar.addAction(self.pcb)
+ """
self.lefttoolbar.addAction(self.model)
self.lefttoolbar.addAction(self.subcircuit)
self.lefttoolbar.addAction(self.nghdl)
--
cgit
From 60c46f180d10cfc1eef68422f603b6ef528db7c3 Mon Sep 17 00:00:00 2001
From: Fahim
Date: Thu, 11 Feb 2016 11:55:04 +0530
Subject: Subject: Remove Pspice to Kicad Converter Code.
Description: Remove Pspice to Kicad Converter Code.
---
src/frontEnd/Application.py | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
(limited to 'src/frontEnd/Application.py')
diff --git a/src/frontEnd/Application.py b/src/frontEnd/Application.py
index 55c36fb6..6e94cbd7 100755
--- a/src/frontEnd/Application.py
+++ b/src/frontEnd/Application.py
@@ -33,7 +33,7 @@ from projManagement import Worker
from frontEnd import ProjectExplorer
from frontEnd import Workspace
from frontEnd import DockArea
-from pspicetoKicad.ImportPspice import ImportPspiceLibrary,ConvertPspiceKicad
+#from pspicetoKicad.ImportPspice import ImportPspiceLibrary,ConvertPspiceKicad
import time
from PyQt4.Qt import QSize
@@ -83,7 +83,8 @@ class Application(QtGui.QMainWindow):
self.openproj = QtGui.QAction(QtGui.QIcon('../../images/openProject.png'),'Open Project',self)
self.openproj.setShortcut('Ctrl+O')
self.openproj.triggered.connect(self.open_project)
-
+ '''
+ #Removing as it no longer required
self.importPspiceLib = QtGui.QAction(QtGui.QIcon('../../images/import_icon.png'),'Import PSPICE Library',self)
self.importPspiceLib.setShortcut('Ctrl+X')
self.importPspiceLib.triggered.connect(self.import_pspice_lib)
@@ -91,7 +92,7 @@ class Application(QtGui.QMainWindow):
self.convertPspiceKicad = QtGui.QAction(QtGui.QIcon('../../images/Ps2Ki.png'),'Convert PSPICE to KICAD',self)
self.convertPspiceKicad.setShortcut('Ctrl+X')
self.convertPspiceKicad.triggered.connect(self.convert_pspice_kicad)
-
+ '''
self.exitproj = QtGui.QAction(QtGui.QIcon('../../images/closeProject.png'),'Exit',self)
self.exitproj.setShortcut('Ctrl+X')
self.exitproj.triggered.connect(self.exit_project)
@@ -103,8 +104,11 @@ class Application(QtGui.QMainWindow):
self.topToolbar = self.addToolBar('Top Tool Bar')
self.topToolbar.addAction(self.newproj)
self.topToolbar.addAction(self.openproj)
+ '''
+ #Removing as it is no longer require
self.topToolbar.addAction(self.importPspiceLib)
self.topToolbar.addAction(self.convertPspiceKicad)
+ '''
self.topToolbar.addAction(self.exitproj)
self.topToolbar.addAction(self.helpfile)
@@ -227,6 +231,8 @@ class Application(QtGui.QMainWindow):
pass
self.close()
+
+ '''
def import_pspice_lib(self):
print "Import Pspice Library is called"
@@ -243,7 +249,7 @@ class Application(QtGui.QMainWindow):
self.obj_run_converter = ConvertPspiceKicad()
self.obj_run_converter.runConverter()
-
+ '''
def help_project(self):
print "Help is called"
self.obj_appconfig.print_info('Help is called')
--
cgit