summaryrefslogtreecommitdiff
path: root/src/subcircuit
diff options
context:
space:
mode:
Diffstat (limited to 'src/subcircuit')
-rw-r--r--src/subcircuit/Subcircuit.py4
-rw-r--r--src/subcircuit/convertSub.py15
2 files changed, 5 insertions, 14 deletions
diff --git a/src/subcircuit/Subcircuit.py b/src/subcircuit/Subcircuit.py
index e161d6f3..76587f26 100644
--- a/src/subcircuit/Subcircuit.py
+++ b/src/subcircuit/Subcircuit.py
@@ -50,8 +50,8 @@ class Subcircuit(QtGui.QWidget):
self.subcircuit.createSubcircuit(self.schematic_name)
else:
- print "No subcircuit created"
-
+ print "Sub circuit creation cancelled"
+
def editsch(self):
self.obj_opensubcircuit = openSub()
diff --git a/src/subcircuit/convertSub.py b/src/subcircuit/convertSub.py
index 6744b35d..358028ed 100644
--- a/src/subcircuit/convertSub.py
+++ b/src/subcircuit/convertSub.py
@@ -1,6 +1,5 @@
-from PyQt4 import QtGui,QtCore
+from PyQt4 import QtGui
from projManagement.Validation import Validation
-from projManagement import Worker
from configuration.Appconfig import Appconfig
import os
@@ -19,31 +18,23 @@ class convertSub(QtGui.QWidget):
"""
This function create command to call kicad to Ngspice converter.
"""
- print "Open Kicad to Ngspice Conversion"
+ print "Openinig Kicad-to-Ngspice converter from Subcircuit Module"
self.projDir = self.obj_appconfig.current_subcircuit["SubcircuitName"]
#Validating if current project is available or not
if self.obj_validation.validateKicad(self.projDir):
- #print "Project is present"
#Checking if project has .cir file or not
if self.obj_validation.validateCir(self.projDir):
#print "CIR file present"
self.projName = os.path.basename(self.projDir)
self.project = os.path.join(self.projDir,self.projName)
-
- #Creating a command to run
- #self.cmd = "python ../kicadtoNgspice/KicadtoNgspice.py "+self.project+".cir "+"sub"
- #os.system(self.cmd)
-
+
var1=self.project+".cir"
var2="sub"
self.obj_dockarea.kicadToNgspiceEditor(var1,var2)
-# self.obj_workThread = Worker.WorkerThread(self.cmd)
-# self.obj_workThread.start()
else:
self.msg = QtGui.QErrorMessage(None)
self.msg.showMessage('The subcircuit does not contain any Kicad netlist file 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')