Merge pull request #54 from FOSSEE/release

Release --> Modification

2 files changed, 56 insertions, 44 deletions

diff --git a/kicadSchematicLibrary/kicad.pro b/kicadSchematicLibrary/kicad.pro
index afdcf2d3..e9ac7b18 100644
--- a/kicadSchematicLibrary/kicad.pro
+++ b/kicadSchematicLibrary/kicad.pro
@@ -31,41 +31,42 @@ NetIExt=net
 version=1
 LibDir=
 [eeschema/libraries]
-LibName1=eSim_Analog
-LibName2=eSim_Devices
-LibName3=eSim_Digital
-LibName4=eSim_Hybrid
-LibName5=eSim_Miscellaneous
-LibName6=eSim_Power
-LibName7=eSim_Sources
-LibName8=eSim_Subckt
-LibName9=eSim_User
-LibName10=eSim_Plot
-LibName11=adc-dac
-LibName12=memory
-LibName13=xilinx
-LibName14=microcontrollers
-LibName15=dsp
-LibName16=microchip
-LibName17=analog_switches
-LibName18=motorola
-LibName19=texas
-LibName20=intel
-LibName21=audio
-LibName22=interface
-LibName23=digital-audio
-LibName24=philips
-LibName25=display
-LibName26=cypress
-LibName27=siliconi
-LibName28=opto
-LibName29=atmel
-LibName30=contrib
-LibName31=power
-LibName32=device
-LibName33=transistors
-LibName34=conn
-LibName35=linear
-LibName36=regul
-LibName37=74xx
-LibName38=cmos4000
+LibName1=adc-dac
+LibName2=memory
+LibName3=xilinx
+LibName4=microcontrollers
+LibName5=dsp
+LibName6=microchip
+LibName7=analog_switches
+LibName8=motorola
+LibName9=texas
+LibName10=intel
+LibName11=audio
+LibName12=interface
+LibName13=digital-audio
+LibName14=philips
+LibName15=display
+LibName16=cypress
+LibName17=siliconi
+LibName18=opto
+LibName19=atmel
+LibName20=contrib
+LibName21=power
+LibName22=device
+LibName23=transistors
+LibName24=conn
+LibName25=linear
+LibName26=regul
+LibName27=74xx
+LibName28=cmos4000
+LibName29=eSim_Analog
+LibName30=eSim_Devices
+LibName31=eSim_Digital
+LibName32=eSim_Hybrid
+LibName33=eSim_Miscellaneous
+LibName34=eSim_Power
+LibName35=eSim_Sources
+LibName36=eSim_Subckt
+LibName37=eSim_User
+LibName38=eSim_Plot
+
diff --git a/src/ngspiceSimulation/pythonPlotting.py b/src/ngspiceSimulation/pythonPlotting.py
index 77171b0f..a3fd09fb 100644
--- a/src/ngspiceSimulation/pythonPlotting.py
+++ b/src/ngspiceSimulation/pythonPlotting.py
@@ -401,12 +401,17 @@ class plotWindow(QtGui.QMainWindow):
         boxCheck = 0
         loc_x = 300
         loc_y = 300
+        
         for i,j in zip(self.chkbox,range(len(self.chkbox))):
             if i.isChecked():
                 print "Check box",self.obj_dataext.NBList[j]
                 boxCheck += 1
+                if self.obj_dataext.NBList[j] in self.obj_dataext.NBIList:
+                    voltFlag = False
+                else:
+                    voltFlag = True
                 #Initializing Multimeter
-                self.obj[j] = MultimeterWidgetClass(self.obj_dataext.NBList[j],self.getRMSValue(self.obj_dataext.y[j]),loc_x,loc_y)
+                self.obj[j] = MultimeterWidgetClass(self.obj_dataext.NBList[j],self.getRMSValue(self.obj_dataext.y[j]),loc_x,loc_y,voltFlag)
                 loc_x += 50
                 loc_y += 50
                        
@@ -419,15 +424,20 @@ class plotWindow(QtGui.QMainWindow):
         return np.sqrt(np.mean(np.square(dataPoints)))
     
 class MultimeterWidgetClass(QtGui.QWidget):
-    def __init__(self,node_branch,rmsValue,loc_x,loc_y):
+    def __init__(self,node_branch,rmsValue,loc_x,loc_y,voltFlag):
         QtGui.QWidget.__init__(self)
         
         self.multimeter = QtGui.QWidget(self)
-        self.node_branchLabel = QtGui.QLabel("Node/Branch")
-        self.rmsLabel = QtGui.QLabel("RMS Value (Volts/Amperes)")
-        
+        if voltFlag:
+            self.node_branchLabel = QtGui.QLabel("Node")
+            self.rmsValue = QtGui.QLabel(str(rmsValue)+" Volts")
+        else:
+            self.node_branchLabel = QtGui.QLabel("Branch")
+            self.rmsValue = QtGui.QLabel(str(rmsValue)+" Amp")
+                
+        self.rmsLabel = QtGui.QLabel("RMS Value")
         self.nodeBranchValue = QtGui.QLabel(str(node_branch))
-        self.rmsValue = QtGui.QLabel(str(rmsValue))
+        
         
         self.layout = QtGui.QGridLayout(self)
         self.layout.addWidget(self.node_branchLabel,0,0)
@@ -436,6 +446,7 @@ class MultimeterWidgetClass(QtGui.QWidget):
         self.layout.addWidget(self.rmsValue,1,1)
         
         self.multimeter.setLayout(self.layout)
+        self.setGeometry(loc_x,loc_y,200,100)
         self.setGeometry(loc_x,loc_y,300,100)
         self.setWindowTitle("MultiMeter")
         self.setWindowFlags(QtCore.Qt.WindowStaysOnTopHint)