From 7298a5662fa1ca4dd421fad111d11c5d0f172302 Mon Sep 17 00:00:00 2001 From: "Salvador E. Tropea" Date: Thu, 6 Aug 2020 09:02:39 -0300 Subject: [PATCH] Give more priority to user defined 'Description' field. Only using the one from libs if the user didn't define it. --- kiplot/bom/bom.py | 3 ++- kiplot/bom/columnlist.py | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/kiplot/bom/bom.py b/kiplot/bom/bom.py index 195c380e..a35c55ba 100644 --- a/kiplot/bom/bom.py +++ b/kiplot/bom/bom.py @@ -260,7 +260,8 @@ class ComponentGroup(object): self.fields[ColumnList.COL_FP_L] = comp.footprint self.fields[ColumnList.COL_FP_LIB_L] = comp.footprint_lib self.fields[ColumnList.COL_SHEETPATH_L] = comp.sheet_path_h - self.fields[ColumnList.COL_DESCRIPTION_L] = comp.desc + if not self.fields[ColumnList.COL_DESCRIPTION_L]: + self.fields[ColumnList.COL_DESCRIPTION_L] = comp.desc def get_row(self, columns): """ Return a dict of the KiCad data based on the supplied columns """ diff --git a/kiplot/bom/columnlist.py b/kiplot/bom/columnlist.py index cb174557..6cfc3a08 100644 --- a/kiplot/bom/columnlist.py +++ b/kiplot/bom/columnlist.py @@ -71,7 +71,7 @@ class ColumnList: COL_VALUE_L: 1, COL_PART_L: 1, COL_PART_LIB_L: 1, - COL_DESCRIPTION_L: 1, + #COL_DESCRIPTION_L: 1, COL_DATASHEET_L: 1, COL_SHEETPATH_L: 1, COL_FP_L: 1,