GUI changes for Dock Area, added FOSSEE logo

6 files changed, 28 insertions, 15 deletions

diff --git a/images/fosseeLogo.png b/images/fosseeLogo.png
new file mode 100644
index 00000000..3a64d09a
--- /dev/null
+++ b/images/fosseeLogo.png
diff --git a/src/SubcircuitLibrary/lm555n/lm555n_Previous_Values.xml b/src/SubcircuitLibrary/lm555n/lm555n_Previous_Values.xml
index 7d81146a..09c35028 100644
--- a/src/SubcircuitLibrary/lm555n/lm555n_Previous_Values.xml
+++ b/src/SubcircuitLibrary/lm555n/lm555n_Previous_Values.xml
@@ -1 +1 @@
-<KicadtoNgspice><analysis><ac><field1 name="Lin">true</field1><field2 name="Dec">false</field2><field3 name="Oct">false</field3><field4 name="Start Frequency" /><field5 name="Stop Frequency" /><field6 name="No. of points" /><field7 name="Start Fre Combo">Hz</field7><field8 name="Stop Fre Combo">Hz</field8></ac><dc><field1 name="Source Name" /><field2 name="Start" /><field3 name="Increment" /><field4 name="Stop" /><field5 name="Operating Point">False</field5><field6 name="Start Combo">Volts or Amperes</field6><field7 name="Increment Combo">Volts or Amperes</field7><field8 name="Stop Combo">Volts or Amperes</field8></dc><tran><field1 name="Start Time" /><field2 name="Step Time" /><field3 name="Stop Time" /><field4 name="Start Combo">Sec</field4><field5 name="Step Combo">Sec</field5><field6 name="Stop Combo">Sec</field6></tran></analysis><source /><model><u5 name="type">d_inverter<field1 name="Enter Fall Delay (default=1.0e-9)" /><field2 name="Enter Input Load (default=1.0e-12)" /><field3 name="Enter Rise Delay (default=1.0e-9)" /></u5><u6 name="type">d_srlatch<field4 name="Enter IC (default=0)" /><field5 name="Enter value for SR Load (default=1.0e-12)" /><field6 name="Enter Set Delay (default=1.0e-9)" /><field7 name="Enter value for Set Load (default=1.0e-12)" /><field8 name="Enter SR Delay (default=1.0e-9)" /><field9 name="Enter Enable Delay (default=1.0e-9)" /><field10 name="Enter Reset Delay (default=1.0)" /><field11 name="Enter Rise Delay (default=1.0e-9)" /><field12 name="Enter Fall Delay (default=1.0e-9)" /><field13 name="Enter value for Reset Load (default=1.0e-12)" /><field14 name="Enter value for Enable Load (default=1.0e-12)" /></u6></model><devicemodel><q1><field /></q1></devicemodel></KicadtoNgspice>
\ No newline at end of file
+<KicadtoNgspice><source /><model><u5 name="type">d_inverter<field1 name="Enter Fall Delay (default=1.0e-9)" /><field2 name="Enter Input Load (default=1.0e-12)" /><field3 name="Enter Rise Delay (default=1.0e-9)" /></u5><u6 name="type">d_srlatch<field4 name="Enter IC (default=0)" /><field5 name="Enter value for SR Load (default=1.0e-12)" /><field6 name="Enter Set Delay (default=1.0e-9)" /><field7 name="Enter value for Set Load (default=1.0e-12)" /><field8 name="Enter SR Delay (default=1.0e-9)" /><field9 name="Enter Enable Delay (default=1.0e-9)" /><field10 name="Enter Reset Delay (default=1.0)" /><field11 name="Enter Rise Delay (default=1.0e-9)" /><field12 name="Enter Fall Delay (default=1.0e-9)" /><field13 name="Enter value for Reset Load (default=1.0e-12)" /><field14 name="Enter value for Enable Load (default=1.0e-12)" /></u6></model><devicemodel><q1><field /></q1></devicemodel><analysis><ac><field1 name="Lin">true</field1><field2 name="Dec">false</field2><field3 name="Oct">false</field3><field4 name="Start Frequency" /><field5 name="Stop Frequency" /><field6 name="No. of points" /><field7 name="Start Fre Combo">Hz</field7><field8 name="Stop Fre Combo">Hz</field8></ac><dc><field1 name="Source Name" /><field2 name="Start" /><field3 name="Increment" /><field4 name="Stop" /><field5 name="Operating Point">False</field5><field6 name="Start Combo">Volts or Amperes</field6><field7 name="Increment Combo">Volts or Amperes</field7><field8 name="Stop Combo">Volts or Amperes</field8></dc><tran><field1 name="Start Time" /><field2 name="Step Time" /><field3 name="Stop Time" /><field4 name="Start Combo">Sec</field4><field5 name="Step Combo">Sec</field5><field6 name="Stop Combo">Sec</field6></tran></analysis></KicadtoNgspice>
\ No newline at end of file
diff --git a/src/frontEnd/Application.py b/src/frontEnd/Application.py
index 9fce17b0..a90dd1a7 100755
--- a/src/frontEnd/Application.py
+++ b/src/frontEnd/Application.py
@@ -89,7 +89,16 @@ class Application(QtGui.QMainWindow):
         self.topToolbar.addAction(self.openproj)
         self.topToolbar.addAction(self.exitproj)
         self.topToolbar.addAction(self.helpfile)
-                
+        
+        self.spacer = QtGui.QWidget()
+        self.spacer.setSizePolicy(QtGui.QSizePolicy.Expanding,QtGui.QSizePolicy.Expanding)
+        self.topToolbar.addWidget(self.spacer)
+        self.logo = QtGui.QLabel()
+        self.logopic = QtGui.QPixmap(os.path.join(os.path.abspath('../..'),'images','fosseeLogo.png'))
+        self.logopic = self.logopic.scaled(QSize(150,150),QtCore.Qt.KeepAspectRatio)
+        self.logo.setPixmap(self.logopic)
+        self.topToolbar.addWidget(self.logo)
+             
         #Left Tool bar Action Widget 
         self.kicad = QtGui.QAction(QtGui.QIcon('../../images/kicad.png'),'<b>Open Schematic</b>',self)
         self.kicad.triggered.connect(self.obj_kicad.openSchematic)
@@ -246,8 +255,8 @@ class MainView(QtGui.QWidget):
         self.obj_appconfig.noteArea['Note'].append('        eSim Started......')
         self.obj_appconfig.noteArea['Note'].append('Project Selected : None')
         self.obj_appconfig.noteArea['Note'].append('\n')
-        #CSS
         
+        #CSS
         self.noteArea.setStyleSheet(" \
         QWidget { border-radius: 15px; border: 1px solid gray; padding: 5px; } \
         ")
diff --git a/src/frontEnd/DockArea.py b/src/frontEnd/DockArea.py
index e87fea99..fcaf1f0f 100644
--- a/src/frontEnd/DockArea.py
+++ b/src/frontEnd/DockArea.py
@@ -51,7 +51,7 @@ class DockArea(QtGui.QMainWindow):
         """
         #CSS
         dock['Tips-'+str(count)].setStyleSheet(" \
-        QWidget { border-radius: 15px; border: 1px solid gray; padding: 5px; width: 200px; height: 150px;  } \
+        .QWidget { border-radius: 15px; border: 1px solid gray; padding: 5px; width: 200px; height: 150px;  } \
         ")
         """
         
@@ -86,7 +86,7 @@ class DockArea(QtGui.QMainWindow):
         """
         #CSS
         dock['Plotting-'+str(count)].setStyleSheet(" \
-        QWidget { border-radius: 15px; border: 1px solid gray; padding: 5px; width: 200px; height: 150px;  } \
+        .QWidget { border-radius: 15px; border: 1px solid gray; padding: 5px; width: 200px; height: 150px;  } \
         ")
         """
         dock['Plotting-'+str(count)].setVisible(True)
@@ -119,13 +119,12 @@ class DockArea(QtGui.QMainWindow):
         dock['NgSpice-'+str(count)].setWidget(self.ngspiceWidget)
         self.addDockWidget(QtCore.Qt.TopDockWidgetArea, dock['NgSpice-'+str(count)])  
         self.tabifyDockWidget(dock['Welcome'],dock['NgSpice-'+str(count)])
-        
-        """
+
         #CSS
         dock['NgSpice-'+str(count)].setStyleSheet(" \
-        QWidget { border-radius: 15px; border: 1px solid gray; padding: 0px; width: 200px; height: 150px;  } \
+        .QWidget { border-radius: 15px; border: 1px solid gray; padding: 0px; width: 200px; height: 150px;  } \
         ")
-        """
+        
         dock['NgSpice-'+str(count)].setVisible(True)
         dock['NgSpice-'+str(count)].setFocus()
         dock['NgSpice-'+str(count)].raise_()
@@ -148,6 +147,11 @@ class DockArea(QtGui.QMainWindow):
             self.addDockWidget(QtCore.Qt.TopDockWidgetArea, dock['Model Editor-'+str(count)])  
             self.tabifyDockWidget(dock['Welcome'],dock['Model Editor-'+str(count)])
             
+            #CSS
+            dock['Model Editor-'+str(count)].setStyleSheet(" \
+            .QWidget { border-radius: 15px; border: 1px solid gray; padding: 5px; width: 200px; height: 150px;  } \
+            ")
+            
             dock['Model Editor-'+str(count)].setVisible(True)
             dock['Model Editor-'+str(count)].setFocus()
             dock['Model Editor-'+str(count)].raise_()
@@ -169,12 +173,12 @@ class DockArea(QtGui.QMainWindow):
         dock['Subcircuit-'+str(count)].setWidget(self.subcktWidget)
         self.addDockWidget(QtCore.Qt.TopDockWidgetArea, dock['Subcircuit-'+str(count)])  
         self.tabifyDockWidget(dock['Welcome'],dock['Subcircuit-'+str(count)])
-        """
+        
         #CSS
-        dock['Plotting-'+str(count)].setStyleSheet(" \
-        QWidget { border-radius: 15px; border: 1px solid gray; padding: 5px; width: 200px; height: 150px;  } \
+        dock['Subcircuit-'+str(count)].setStyleSheet(" \
+        .QWidget { border-radius: 15px; border: 1px solid gray; padding: 5px; width: 200px; height: 150px;  } \
         ")
-        """
+        
         dock['Subcircuit-'+str(count)].setVisible(True)
         dock['Subcircuit-'+str(count)].setFocus()
         dock['Subcircuit-'+str(count)].raise_()
diff --git a/src/kicadtoNgspice/KicadtoNgspice.py b/src/kicadtoNgspice/KicadtoNgspice.py
index c9b5ac02..c3e9d637 100644
--- a/src/kicadtoNgspice/KicadtoNgspice.py
+++ b/src/kicadtoNgspice/KicadtoNgspice.py
@@ -544,7 +544,7 @@ class MainWindow(QtGui.QWidget):
             try:
                 f = open(self.project+".cir.out")
             except :
-                print("Error in opening circuit file.")
+                print("Error in opening .cir.out file.")
         else:
             print self.projName + ".cir.out does not exist. Please create a spice netlist."
           
diff --git a/src/ngspiceSimulation/NgspiceWidget.py b/src/ngspiceSimulation/NgspiceWidget.py
index f2ad973f..2dcb4f89 100644
--- a/src/ngspiceSimulation/NgspiceWidget.py
+++ b/src/ngspiceSimulation/NgspiceWidget.py
@@ -18,7 +18,7 @@ class NgspiceWidget(QtGui.QWidget):
         if platform.system() == 'Linux':
             self.command = "cd "+projPath+";ngspice "+command
             #Creating argument for process
-            self.args = ['-into', str(self.terminal.winId()),'-hold','-e', self.command]
+            self.args = ['-geometry','200x200','-into', str(self.terminal.winId()),'-hold','-e', self.command]
             self.process.start('xterm', self.args)
                      
         elif platform.system() == 'Windows':