Merge branch 'changes' of github.com:TeledyneLeCroy/SignalIntegrity

Doc/SignalIntegrityLinux

@@ -38,7 +38,7 @@ PROJECT_NAME           = SignalIntegrity
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = 1.1.2
+PROJECT_NUMBER         = 1.1.3
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a

Doc/SignalIntegrityWindows

@@ -38,7 +38,7 @@ PROJECT_NAME           = SignalIntegrity
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = 1.1.2
+PROJECT_NUMBER         = 1.1.3
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a

SignalIntegrity/App/CalculationPropertiesProject.py

@@ -285,10 +285,17 @@ def __init__(self,parent,project,top,title):
         self.tk.call('wm', 'iconphoto', self._w, img)
         self.protocol("WM_DELETE_WINDOW", self.destroy)
         self.project=project
-        self.propertyListFrame = tk.Frame(self)
+        self.propertyListFrame = tk.Frame(self,relief=tk.RIDGE, borderwidth=5)
         self.propertyListFrame.pack(side=tk.TOP,fill=tk.X,expand=tk.NO)
+
     def Finish(self):
-        (x,y)=(self.top.root.winfo_x()+self.top.root.winfo_width()/2-self.winfo_width()/2,
-            self.top.root.winfo_y()+self.top.root.winfo_height()/2-self.winfo_height()/2)
-        self.geometry("%+d%+d" % (x,y))
+#         (x,y)=(self.top.root.winfo_x()+self.top.root.winfo_width()/2-self.winfo_width()/2,
+#             self.top.root.winfo_y()+self.top.root.winfo_height()/2-self.winfo_height()/2)
+#         self.geometry("%+d%+d" % (x,y))
         self.deiconify()
+    def onClosing(self):
+        self.withdraw()
+        self.destroy()
+    def destroy(self):
+        tk.Toplevel.withdraw(self)
+        tk.Toplevel.destroy(self)

SignalIntegrity/App/Device.py

@@ -100,6 +100,13 @@ def Waveform(self):
                 startTime=float(self['t0'].GetValue())
                 pulseWidth=float(self['w'].GetValue())
                 waveform = si.td.wf.PulseWaveform(self.WaveformTimeDescriptor(),amplitude,startTime,pulseWidth)
+            elif wfType == 'prbs':
+                polynomial=int(self['prbs'].GetValue())
+                bitrate=float(self['br'].GetValue())
+                risetime=float(self['rt'].GetValue())
+                amplitude=float(self['a'].GetValue())
+                delay=float(self['t0'].GetValue())
+                waveform = si.prbs.PseudoRandomWaveform(polynomial,bitrate,amplitude,risetime,delay,self.WaveformTimeDescriptor())
             elif wfType == 'sine':
                 amplitude=float(self['a'].GetValue())
                 frequency=float(self['f'].GetValue())
@@ -231,6 +238,12 @@ def __init__(self,propertiesList,partPicture):
         Device.__init__(self,netlist,[PartPropertyCategory('Generators'),PartPropertyPartName('Voltage Pulse Generator'),PartPropertyDefaultReferenceDesignator('VG?'),
         PartPropertyHorizontalOffset(),PartPropertyDuration(),PartPropertyStartTime(),PartPropertyPulseWidth(),PartPropertySampleRate(),PartPropertyVoltageAmplitude(),PartPropertyWaveformType('pulse')]+propertiesList,partPicture)
 
+class DeviceVoltagePRBSGenerator(Device):
+    def __init__(self,propertiesList,partPicture):
+        netlist=DeviceNetListLine(devicename='voltagesource')
+        Device.__init__(self,netlist,[PartPropertyCategory('Generators'),PartPropertyPartName('Voltage PRBS Generator'),PartPropertyDefaultReferenceDesignator('VG?'),
+        PartPropertyHorizontalOffset(),PartPropertyDuration(),PartPropertyStartTime(),PartPropertyBitRate(),PartPropertyRisetime(),PartPropertyPRBSPolynomial(),PartPropertySampleRate(),PartPropertyVoltageAmplitude(),PartPropertyWaveformType('prbs')]+propertiesList,partPicture)
+
 class DeviceVoltageSineGenerator(Device):
     def __init__(self,propertiesList,partPicture):
         netlist=DeviceNetListLine(devicename='voltagesource')
@@ -459,6 +472,8 @@ def __init__(self,propertiesList):
               DeviceVoltageStepGenerator([PartPropertyDescription('Two Port Voltage Step Generator'),PartPropertyPorts(2)],PartPictureVariableVoltageSourceStepGeneratorTwoPort()),
               DeviceVoltagePulseGenerator([PartPropertyDescription('One Port Voltage Pulse Generator'),PartPropertyPorts(1)],PartPictureVariableVoltageSourcePulseGeneratorOnePort()),
               DeviceVoltagePulseGenerator([PartPropertyDescription('Two Port Voltage Pulse Generator'),PartPropertyPorts(2)],PartPictureVariableVoltageSourcePulseGeneratorTwoPort()),
+              DeviceVoltagePRBSGenerator([PartPropertyDescription('One Port Voltage PRBS Generator'),PartPropertyPorts(1)],PartPictureVariableVoltageSourcePRBSGeneratorOnePort()),
+              DeviceVoltagePRBSGenerator([PartPropertyDescription('Two Port Voltage PRBS Generator'),PartPropertyPorts(2)],PartPictureVariableVoltageSourcePRBSGeneratorTwoPort()),
               DeviceVoltageSineGenerator([PartPropertyDescription('One Port Voltage Sine Generator'),PartPropertyPorts(1)],PartPictureVariableVoltageSourceSineGeneratorOnePort()),
               DeviceVoltageSineGenerator([PartPropertyDescription('Two Port Voltage Sine Generator'),PartPropertyPorts(2)],PartPictureVariableVoltageSourceSineGeneratorTwoPort()),
               DeviceCurrentSource([PartPropertyDescription('One Port Current Source'),PartPropertyPorts(1)],PartPictureVariableCurrentSourceOnePort()),

SignalIntegrity/App/DeviceNetListLine.py

@@ -54,7 +54,7 @@ def NetListLine(self,device):
                 returnstring=returnstring+' '
             if kwc['ShowKeyword']:
                 returnstring=returnstring+kwc['Keyword']+' '
-            valueString=device[kwc['Keyword']].PropertyString(stype='raw')
+            valueString=device[kwc['Keyword']].PropertyString(stype='netlist')
             if valueString is None:
                 valueString='None'
             returnstring=returnstring+valueString