diff options
| -rw-r--r-- | src/frontEnd/ProjectExplorer.py | 2 | ||||
| -rw-r--r-- | src/projManagement/newProject.py | 12 | ||||
| -rw-r--r-- | src/subcircuit/Subcircuit.py.orig | 79 |
3 files changed, 6 insertions, 87 deletions
diff --git a/src/frontEnd/ProjectExplorer.py b/src/frontEnd/ProjectExplorer.py index 3adde8b5..1273a545 100644 --- a/src/frontEnd/ProjectExplorer.py +++ b/src/frontEnd/ProjectExplorer.py @@ -2,7 +2,6 @@ from PyQt4 import QtGui, QtCore import os import json from configuration.Appconfig import Appconfig -from projManagement.newProject import NewProjectInfo from projManagement.Validation import Validation @@ -244,7 +243,6 @@ class ProjectExplorer(QtGui.QWidget): self, 'Rename Project', 'Project Name:', QtGui.QLineEdit.Normal, self.baseFileName ) - if ok and newBaseFileName: print("=================") print(newBaseFileName) diff --git a/src/projManagement/newProject.py b/src/projManagement/newProject.py index 6af72e0b..6f8de2b9 100644 --- a/src/projManagement/newProject.py +++ b/src/projManagement/newProject.py @@ -43,12 +43,12 @@ class NewProjectInfo(QtGui.QWidget): - CHECKEXIST - CHECKNAME - NONE - - @params - :projName => name of the project created passed from - frontEnd/Application new_project() - @return - :dirs => The directories 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 @params diff --git a/src/subcircuit/Subcircuit.py.orig b/src/subcircuit/Subcircuit.py.orig deleted file mode 100644 index 50ec38ef..00000000 --- a/src/subcircuit/Subcircuit.py.orig +++ /dev/null @@ -1,79 +0,0 @@ -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() |