Subject: openNgspice function completed

Description: openNgspice function completed

6 files changed, 17 insertions, 10 deletions

diff --git a/src/frontEnd/Application.py b/src/frontEnd/Application.py
index 879c841f..f7e5034d 100755
--- a/src/frontEnd/Application.py
+++ b/src/frontEnd/Application.py
@@ -98,6 +98,7 @@ class Application(QtGui.QMainWindow):
         self.conversion.triggered.connect(self.obj_kicad.openKicadToNgspice)
                
         self.ngspice = QtGui.QAction(QtGui.QIcon('../images/default.png'), '<b>Simulation</b>', self)
+        self.ngspice.triggered.connect(self.obj_kicad.openNgspice)
         
         self.footprint = QtGui.QAction(QtGui.QIcon('../images/default.png'),'<b>Footprint Editor</b>',self)
         self.footprint.triggered.connect(self.obj_kicad.openFootprint)
@@ -213,6 +214,8 @@ class MainView(QtGui.QWidget):
         
         #Adding to main Layout
         self.mainLayout.addWidget(self.leftSplit)
+        self.leftSplit.setSizes([self.width()/4.5,self.height()])
+        self.middleSplit.setSizes([self.width(),self.height()/2])
         self.setLayout(self.mainLayout)
      
 
diff --git a/src/frontEnd/DockArea.py b/src/frontEnd/DockArea.py
index e9755302..70af5384 100644
--- a/src/frontEnd/DockArea.py
+++ b/src/frontEnd/DockArea.py
@@ -1,7 +1,7 @@
 from PyQt4 import QtGui,QtCore
 from ngspiceSimulation.pythonPlotting import plotWindow
-#from configuration.Appconfig import Appconfig
-
+from configuration.Appconfig import Appconfig
+import os
 
 dockList = ['Blank']
 count = 1 
@@ -12,7 +12,8 @@ class DockArea(QtGui.QMainWindow):
     
     def __init__(self):
         QtGui.QMainWindow.__init__(self)
-        
+        self.obj_appconfig = Appconfig()
+                
         for dockName in dockList:
             dock[dockName] = QtGui.QDockWidget(dockName)
             dock[dockName].setWidget(QtGui.QTextEdit())
@@ -51,14 +52,16 @@ class DockArea(QtGui.QMainWindow):
         """
         This function create widget for Library Editor
         """
-        global count
-        self.plottingWidget = QtGui.QWidget()
-        #self.plottingArea = QtGui.QTextEdit()
+        self.projDir = self.obj_appconfig.current_project["ProjectName"]
+        self.projName = os.path.basename(self.projDir)
+        self.project = os.path.join(self.projDir,self.projName)
         
         
+        global count
+        self.plottingWidget = QtGui.QWidget()
+                
         self.plottingLayout = QtGui.QVBoxLayout()
-        #self.plottingLayout.addWidget(self.plottingArea)
-        self.plottingLayout.addWidget(plotWindow())
+        self.plottingLayout.addWidget(plotWindow(self.project,self.projName))
         
         #Adding to main Layout
         self.plottingWidget.setLayout(self.plottingLayout)
diff --git a/src/frontEnd/ProjectExplorer.py b/src/frontEnd/ProjectExplorer.py
index d1c76bbf..921d0594 100644
--- a/src/frontEnd/ProjectExplorer.py
+++ b/src/frontEnd/ProjectExplorer.py
@@ -63,9 +63,10 @@ class ProjectExplorer(QtGui.QWidget):
         
         self.textwindow = QtGui.QWidget()
         self.textwindow.setMinimumSize(600, 500)
+        self.textwindow.setGeometry(QtCore.QRect(400,150,400,400))
         self.textwindow.setWindowTitle(filename)
+        
         self.text = QtGui.QTextEdit()
-        #self.text.setMaximumSize(580, 450)
         self.save = QtGui.QPushButton('Save and Exit')
         self.save.setDisabled(True)
         self.windowgrid = QtGui.QGridLayout()
diff --git a/src/frontEnd/ProjectExplorer.pyc b/src/frontEnd/ProjectExplorer.pyc
index 4be2d8b1..87ff05a8 100644
--- a/src/frontEnd/ProjectExplorer.pyc
+++ b/src/frontEnd/ProjectExplorer.pyc
diff --git a/src/frontEnd/Workspace.py b/src/frontEnd/Workspace.py
index 8ba6c60f..9dd97f1a 100644
--- a/src/frontEnd/Workspace.py
+++ b/src/frontEnd/Workspace.py
@@ -65,7 +65,7 @@ class Workspace(QtGui.QWidget):
         self.grid.addWidget(self.okbtn, 4,13)
         self.grid.addWidget(self.cancelbtn, 4,14)
     
-        self.setGeometry(QtCore.QRect(400,200,400,400))
+        self.setGeometry(QtCore.QRect(500,250,400,400))
         self.setMaximumSize(4000, 200)
         self.setWindowTitle("Workspace Launcher")
         #self.setWindowIcon(QtGui.QIcon('logo.png'))
diff --git a/src/frontEnd/Workspace.pyc b/src/frontEnd/Workspace.pyc
index b5484f93..038bc7e3 100644
--- a/src/frontEnd/Workspace.pyc
+++ b/src/frontEnd/Workspace.pyc