Merge branch 'datasheet_gen' into dev

This commit is contained in:
Jesse Cirimelli-Low 2019-02-22 11:41:03 -08:00
commit 8c9c910855
2 changed files with 7 additions and 7 deletions

View File

@ -61,8 +61,8 @@ class datasheet():
# check if analytical model is being used # check if analytical model is being used
self.html += '<p style="font-size: 26px;font-family: Trebuchet MS, Arial, Helvetica, sans-serif;">Timing Data</p>' self.html += '<p style="font-size: 26px;font-family: Trebuchet MS, Arial, Helvetica, sans-serif;">Timing Data</p>'
model = '' model = ''
if self.ANALYTICAL_MODEL: if self.ANALYTICAL_MODEL == 'True':
model = "analytical model: results may not be percise" model = "analytical model: results may not be precise"
else: else:
model = "spice characterizer" model = "spice characterizer"
# display timing data # display timing data

View File

@ -106,15 +106,15 @@ def parse_characterizer_csv(f, pages):
DATETIME = row[col] DATETIME = row[col]
col += 1 col += 1
ANALYTICAL_MODEL = row[col]
col += 1
DRC = row[col] DRC = row[col]
col += 1 col += 1
LVS = row[col] LVS = row[col]
col += 1 col += 1
ANALYTICAL_MODEL = row[col]
col += 1
AREA = row[col] AREA = row[col]
col += 1 col += 1
@ -615,7 +615,7 @@ def parse_characterizer_csv(f, pages):
new_sheet.io_table.add_row(['NUM_R_PORTS', NUM_R_PORTS]) new_sheet.io_table.add_row(['NUM_R_PORTS', NUM_R_PORTS])
new_sheet.io_table.add_row(['NUM_W_PORTS', NUM_W_PORTS]) new_sheet.io_table.add_row(['NUM_W_PORTS', NUM_W_PORTS])
new_sheet.io_table.add_row( new_sheet.io_table.add_row(
['Area (&microm<sup>2</sup>)', AREA]) ['Area (&microm<sup>2</sup>)', str(round(float(AREA)))])
class datasheet_gen(): class datasheet_gen():