diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/frontEnd/ProjectExplorer.py | 30 | ||||
| -rw-r--r-- | src/projManagement/newProject.py | 10 | ||||
| -rw-r--r-- | src/subcircuit/Subcircuit.py.orig | 79 | ||||
| -rw-r--r-- | src/subcircuit/convertSub.py | 4 |
4 files changed, 105 insertions, 18 deletions
diff --git a/src/frontEnd/ProjectExplorer.py b/src/frontEnd/ProjectExplorer.py index 7f631c83..3adde8b5 100644 --- a/src/frontEnd/ProjectExplorer.py +++ b/src/frontEnd/ProjectExplorer.py @@ -241,18 +241,18 @@ class ProjectExplorer(QtGui.QWidget): self.indexItem = self.treewidget.currentIndex() self.baseFileName = str(self.indexItem.data()) newBaseFileName, ok = QtGui.QInputDialog.getText( - self, - 'Rename Project', - 'Project Name:', - QtGui.QLineEdit.Normal, - self.baseFileName - ) + self, 'Rename Project', 'Project Name:', QtGui.QLineEdit.Normal, + self.baseFileName + ) + if ok and newBaseFileName: print("=================") print(newBaseFileName) print("=================") newBaseFileName = str(newBaseFileName) - projectPath, projectFiles = list(self.obj_appconfig.project_explorer.items())[self.indexItem.row()] + projectPath, projectFiles = list( + self.obj_appconfig.project_explorer.items())[ + self.indexItem.row()] updatedProjectFiles = [] self.workspace = self.obj_appconfig.default_workspace['workspace'] @@ -285,10 +285,9 @@ class ProjectExplorer(QtGui.QWidget): oldFilePath = os.path.join(projectPath, projectFile) projectFile = projectFile.replace( - self.baseFileName, - newBaseFileName, - 1) - newFilePath = os.path.join(projectPath, projectFile) + self.baseFileNam, newBaseFileName, 1) + newFilePath = os.path.join( + projectPath, projectFile) print(oldFilePath) print("==================") print(newFilePath) @@ -300,7 +299,8 @@ class ProjectExplorer(QtGui.QWidget): updatedProjectFiles.append(projectFile) # rename project folder - updatedProjectPath = newBaseFileName.join(projectPath.rsplit(self.baseFileName, 1)) + updatedProjectPath = newBaseFileName.join( + projectPath.rsplit(self.baseFileName, 1)) print ("Renaming " + projectPath + " to " @@ -309,7 +309,8 @@ class ProjectExplorer(QtGui.QWidget): # update project_explorer dictionary del self.obj_appconfig.project_explorer[projectPath] - self.obj_appconfig.project_explorer[updatedProjectPath] = updatedProjectFiles + self.obj_appconfig.project_explorer[updatedProjectPath] = \ + updatedProjectFiles # save project_explorer dictionary on disk json.dump(self.obj_appconfig.project_explorer, open( @@ -317,7 +318,8 @@ class ProjectExplorer(QtGui.QWidget): # recreate project explorer tree self.treewidget.clear() - for parent, children in self.obj_appconfig.project_explorer.items(): + for parent, children in \ + self.obj_appconfig.project_explorer.items(): self.addTreeNode(parent, children) elif reply == "CHECKEXIST": diff --git a/src/projManagement/newProject.py b/src/projManagement/newProject.py index e7f5247e..6af72e0b 100644 --- a/src/projManagement/newProject.py +++ b/src/projManagement/newProject.py @@ -1,4 +1,3 @@ - # ========================================================================= # # FILE: newProject.py @@ -52,6 +51,13 @@ class NewProjectInfo(QtGui.QWidget): :dirs => The directories inside the project folder :filelist => The files inside the project folder + @params + :projName => name of the project created passed from + frontEnd/Application new_project() + @return + :dirs => The directories inside the project folder + :filelist => The files inside the project folder + """ # print "Create Project Called" self.projName = projName @@ -82,7 +88,7 @@ class NewProjectInfo(QtGui.QWidget): self.msg = QtGui.QErrorMessage(self) self.msg.showMessage( 'Unable to create project. Please make sure you have' - + 'write permission on ' + + ' write permission on ' + self.workspace) self.msg.setWindowTitle("Error Message") f.write("schematicFile " + self.projName + ".sch\n") diff --git a/src/subcircuit/Subcircuit.py.orig b/src/subcircuit/Subcircuit.py.orig new file mode 100644 index 00000000..50ec38ef --- /dev/null +++ b/src/subcircuit/Subcircuit.py.orig @@ -0,0 +1,79 @@ +from PyQt4 import QtCore, QtGui +from configuration.Appconfig import Appconfig +from projManagement.Validation import Validation +from subcircuit.newSub import NewSub +from subcircuit.openSub import openSub +from subcircuit.convertSub import convertSub + + +# This class creates Subcircuit GUI. +class Subcircuit(QtGui.QWidget): + """ + Creates buttons for New project, Edit existing project and + Kicad Netlist to Ngspice Netlist converter and link them with the + methods defined for it in other files. + + - New Project(NewSub method of newSub). + - Open Project(openSub method of openSub). + - Kicad to Ngspice convertor(convertSub of convertSub). + """ + + def __init__(self, parent=None): + super(Subcircuit, self).__init__() + QtGui.QWidget.__init__(self) + self.obj_appconfig = Appconfig() + self.obj_validation = Validation() + self.obj_dockarea = parent + self.layout = QtGui.QVBoxLayout() + self.splitter = QtGui.QSplitter() + self.splitter.setOrientation(QtCore.Qt.Vertical) + + self.newbtn = QtGui.QPushButton('New Subcircuit Schematic') + self.newbtn.setToolTip('<b>To create new Subcircuit Schematic</b>') + self.newbtn.setFixedSize(200, 40) + self.newbtn.clicked.connect(self.newsch) + self.editbtn = QtGui.QPushButton('Edit Subcircuit Schematic') + self.editbtn.setToolTip('<b>To edit existing Subcircuit Schematic</b>') + self.editbtn.setFixedSize(200, 40) + self.editbtn.clicked.connect(self.editsch) + self.convertbtn = QtGui.QPushButton('Convert Kicad to Ngspice') + self.convertbtn.setToolTip( + '<b>To convert Subcircuit Kicad Netlist to Ngspice Netlist</b>') + self.convertbtn.setFixedSize(200, 40) + self.convertbtn.clicked.connect(self.convertsch) +<<<<<<< HEAD + +======= + +>>>>>>> c6df3169a2016174514d5b3b4961024918e23ea2 + self.hbox = QtGui.QHBoxLayout() + self.hbox.addWidget(self.newbtn) + self.hbox.addWidget(self.editbtn) + self.hbox.addWidget(self.convertbtn) + self.hbox.addStretch(1) + + self.vbox = QtGui.QVBoxLayout() + self.vbox.addLayout(self.hbox) + self.vbox.addStretch(1) + + self.setLayout(self.vbox) + self.show() + + def newsch(self): + text, ok = QtGui.QInputDialog.getText( + self, 'New Schematic', 'Enter Schematic Name:') + if ok: + self.schematic_name = (str(text)) + self.subcircuit = NewSub() + self.subcircuit.createSubcircuit(self.schematic_name) + + else: + print("Sub circuit creation cancelled") + + def editsch(self): + self.obj_opensubcircuit = openSub() + self.obj_opensubcircuit.body() + + def convertsch(self): + self.obj_convertsubcircuit = convertSub(self.obj_dockarea) + self.obj_convertsubcircuit.createSub() diff --git a/src/subcircuit/convertSub.py b/src/subcircuit/convertSub.py index 3e32f9b2..7bdccfb2 100644 --- a/src/subcircuit/convertSub.py +++ b/src/subcircuit/convertSub.py @@ -45,11 +45,11 @@ class convertSub(QtGui.QWidget): self.msg = QtGui.QErrorMessage(None) self.msg.showMessage( 'The subcircuit does not contain any Kicad netlist file' - + 'for conversion.') + + ' for conversion.') self.msg.setWindowTitle("Error Message") else: self.msg = QtGui.QErrorMessage(None) self.msg.showMessage( 'Please select the subcircuit first. You can either create' - + 'new subcircuit or open existing subcircuit') + + ' new subcircuit or open existing subcircuit') self.msg.setWindowTitle("Error Message") |