diff options
| -rw-r--r-- | src/kicadtoNgspice/Analysis.py | 22 | ||||
| -rw-r--r-- | src/kicadtoNgspice/Analysis.pyc | bin | 4527 -> 7363 bytes | |||
| -rw-r--r-- | src/kicadtoNgspice/Convert.py | 11 | ||||
| -rw-r--r-- | src/kicadtoNgspice/KicadtoNgspice.py | 14 | ||||
| -rw-r--r-- | src/kicadtoNgspice/KicadtoNgspice.pyc | bin | 3961 -> 3987 bytes | |||
| -rw-r--r-- | src/kicadtoNgspice/Model.py | 9 | ||||
| -rw-r--r-- | src/kicadtoNgspice/Source.py | 2 | ||||
| -rw-r--r-- | src/kicadtoNgspice/TrackWidget.py | 4 |
8 files changed, 33 insertions, 29 deletions
diff --git a/src/kicadtoNgspice/Analysis.py b/src/kicadtoNgspice/Analysis.py index 4ab5291b..d16b5494 100644 --- a/src/kicadtoNgspice/Analysis.py +++ b/src/kicadtoNgspice/Analysis.py @@ -1,8 +1,6 @@ -from PyQt4 import QtGui,QtCore -from numpy import partition -from PyQt4.Qt import QRect -#import GroupBox +from PyQt4 import QtGui + class Analysis(QtGui.QWidget): def __init__(self): @@ -162,15 +160,7 @@ class Analysis(QtGui.QWidget): self.dcbox = QtGui.QGroupBox() self.dcbox.setTitle("DC Analysis") self.dcgrid = QtGui.QGridLayout() - #self.dcgrid.setGeometry(self, QRect) - #self.partition= QtGui.QHBoxLayout() - #self.dcgrid.addWidget(partition,0,0) - #self.dcgrid.setHorizontalSpacing(60) - - #self.btn3 = QtGui.QRadioButton("Radio button 3") - #self.simulation_button = QtGui.QPushButton("Add Simulation Data") - #self.dcgrid.addWidget(self.btn3,0,0) - #self.dcgrid.addWidget(self.btn4,0,1) + self.dcbox.setDisabled(True) self.dcbox.setLayout(self.dcgrid) @@ -247,11 +237,7 @@ class Analysis(QtGui.QWidget): self.trbox = QtGui.QGroupBox() self.trbox.setTitle("Transient Analysis") self.trgrid = QtGui.QGridLayout() - - #self.btn5 = QtGui.QRadioButton("Radio button 5") - #self.btn6 = QtGui.QRadioButton("Radio button 6") - #self.trgrid.addWidget(self.btn5,0,0) - #self.trgrid.addWidget(self.btn6,0,1) + self.trbox.setDisabled(True) self.trbox.setLayout(self.trgrid) diff --git a/src/kicadtoNgspice/Analysis.pyc b/src/kicadtoNgspice/Analysis.pyc Binary files differindex 77f4d3ff..d5883762 100644 --- a/src/kicadtoNgspice/Analysis.pyc +++ b/src/kicadtoNgspice/Analysis.pyc diff --git a/src/kicadtoNgspice/Convert.py b/src/kicadtoNgspice/Convert.py index 92bc2945..3d45f94a 100644 --- a/src/kicadtoNgspice/Convert.py +++ b/src/kicadtoNgspice/Convert.py @@ -1,13 +1,15 @@ class Convert: - def __init__(self,sourcelisttrack,entry_var,schematicInfo): + def __init__(self,sourcelisttrack,source_entry_var,schematicInfo): print "Start Conversion" self.sourcelisttrack = sourcelisttrack self.schematicInfo = schematicInfo - self.entry_var = entry_var + self.entry_var = source_entry_var self.sourcelistvalue = [] + self.analysisInserter() + def addSourceParameter(self): print "Adding Source parameter" print "SourceListTrack : ",self.sourcelisttrack @@ -103,4 +105,7 @@ class Convert: del self.schematicInfo[item[0]] self.schematicInfo.insert(item[0],item[1]) - return self.schematicInfo
\ No newline at end of file + return self.schematicInfo + + def analysisInserter(self): + print "Adding Analysis"
\ No newline at end of file diff --git a/src/kicadtoNgspice/KicadtoNgspice.py b/src/kicadtoNgspice/KicadtoNgspice.py index 4af345fc..ecf951cd 100644 --- a/src/kicadtoNgspice/KicadtoNgspice.py +++ b/src/kicadtoNgspice/KicadtoNgspice.py @@ -21,10 +21,12 @@ from PyQt4 import QtGui,QtCore from Processing import PrcocessNetlist import Analysis import Source +import Model import Convert import TrackWidget + class MainWindow(QtGui.QWidget): def __init__(self): QtGui.QWidget.__init__(self) @@ -51,20 +53,19 @@ class MainWindow(QtGui.QWidget): def createcreateConvertWidget(self): self.convertWindow = QtGui.QWidget() - self.analysisTab = QtGui.QScrollArea() self.analysisTab.setWidget(Analysis.Analysis()) - self.analysisTabLayout = QtGui.QVBoxLayout(self.analysisTab.widget()) + #self.analysisTabLayout = QtGui.QVBoxLayout(self.analysisTab.widget()) self.analysisTab.setWidgetResizable(True) self.sourceTab = QtGui.QScrollArea() self.sourceTab.setWidget(Source.Source(sourcelist,sourcelisttrack)) - self.sourceTabLayout = QtGui.QVBoxLayout(self.sourceTab.widget()) + #self.sourceTabLayout = QtGui.QVBoxLayout(self.sourceTab.widget()) self.sourceTab.setWidgetResizable(True) self.modelTab = QtGui.QScrollArea() - self.modelTab.setWidget(QtGui.QWidget()) - self.modelTabLayout = QtGui.QVBoxLayout(self.modelTab.widget()) + self.modelTab.setWidget(Model.Model()) + #self.modelTabLayout = QtGui.QVBoxLayout(self.modelTab.widget()) self.modelTab.setWidgetResizable(True) self.tabWidget = QtGui.QTabWidget() @@ -86,12 +87,13 @@ class MainWindow(QtGui.QWidget): """ global schematicInfo self.obj_convert = Convert.Convert(self.obj_track.sourcelisttrack["ITEMS"], - self.obj_track.entry_var["ITEMS"], + self.obj_track.source_entry_var["ITEMS"], schematicInfo) #Adding Source Value to Schematic Info schematicInfo = self.obj_convert.addSourceParameter() + diff --git a/src/kicadtoNgspice/KicadtoNgspice.pyc b/src/kicadtoNgspice/KicadtoNgspice.pyc Binary files differindex 8e4cf3eb..ece6486f 100644 --- a/src/kicadtoNgspice/KicadtoNgspice.pyc +++ b/src/kicadtoNgspice/KicadtoNgspice.pyc diff --git a/src/kicadtoNgspice/Model.py b/src/kicadtoNgspice/Model.py new file mode 100644 index 00000000..4e2f7865 --- /dev/null +++ b/src/kicadtoNgspice/Model.py @@ -0,0 +1,9 @@ + +from PyQt4 import QtGui + +class Model(QtGui.QWidget): + + def __init__(self): + QtGui.QWidget.__init__(self) + print "Start Ngspice Modelling" + diff --git a/src/kicadtoNgspice/Source.py b/src/kicadtoNgspice/Source.py index f37ccb56..657a980c 100644 --- a/src/kicadtoNgspice/Source.py +++ b/src/kicadtoNgspice/Source.py @@ -138,7 +138,7 @@ class Source(QtGui.QWidget): self.obj_track.sourcelisttrack["ITEMS"] = sourcelisttrack - self.obj_track.entry_var["ITEMS"] = self.entry_var + self.obj_track.source_entry_var["ITEMS"] = self.entry_var self.show() diff --git a/src/kicadtoNgspice/TrackWidget.py b/src/kicadtoNgspice/TrackWidget.py index 37785a0a..0b11d938 100644 --- a/src/kicadtoNgspice/TrackWidget.py +++ b/src/kicadtoNgspice/TrackWidget.py @@ -4,4 +4,6 @@ class TrackWidget: module in the form of list """ sourcelisttrack = {"ITEMS":"None"} - entry_var = {"ITEMS":"None"}
\ No newline at end of file + source_entry_var = {"ITEMS":"None"} + analysis_entry_var = {"ITEMS":"NONE"} + analysis_type = {"ITEMS":"NONE"}
\ No newline at end of file |