개정판 f99ef290
bm setting fix
Change-Id: I0a7fa36e85016e6ea80751ae94b93573b50dfbed
| DTI_PID/DTI_PID/BMSettingDialog.py | ||
|---|---|---|
| 113 | 113 | |
| 114 | 114 | |
| 115 | 115 |
class BMSettingDialog(QDialog): |
| 116 |
def __init__(self, parent, columListAll, columnOrder):
|
|
| 116 |
def __init__(self, parent, columListAll): |
|
| 117 | 117 |
QDialog.__init__(self, parent) |
| 118 | 118 | |
| 119 | 119 |
self.ui = BMSetting_UI.Ui_BMSettingDialog() |
| 120 | 120 |
self.ui.setupUi(self) |
| 121 | 121 | |
| 122 |
self.delimiter = '!-!' |
|
| 123 |
self.delimiterCombine = '!@!' |
|
| 124 | ||
| 122 | 125 |
self.isAccepted = False |
| 123 | 126 |
self.symbol_mapping = {}
|
| 124 | 127 |
self.attributes = [] |
| 125 | 128 |
self.columListAll = columListAll |
| 126 |
self.columnOrder = columnOrder |
|
| 127 | 129 | |
| 128 | 130 |
self.symbolListModel = SymbolListModel() |
| 129 | 131 |
self.ui.tableViewSymbolList.setModel(self.symbolListModel) |
| ... | ... | |
| 169 | 171 |
for config in configs: |
| 170 | 172 |
self.symbol_mapping[config.key] = config.value.split(',')
|
| 171 | 173 | |
| 172 |
configs = app_doc_data.getConfigs(section='BM Attribute')
|
|
| 174 |
configs = app_doc_data.getConfigs(section='Order', key='BM_LIST')
|
|
| 173 | 175 |
if configs and len(configs) == 1: |
| 174 |
self.attributes = configs[0].value.split(',')
|
|
| 176 |
self.attributes = [attr.split(self.delimiterCombine)[0] for attr in configs[0].value.split(self.delimiter)]
|
|
| 175 | 177 | |
| 176 | 178 |
for row in range(self.attributeListModel.rowCount()): |
| 177 | 179 |
index = self.attributeListModel.index(row, 1) |
| ... | ... | |
| 236 | 238 | |
| 237 | 239 |
matches = [key for key, value in self.symbol_mapping.items() if key != id2_symbol_item.text() and id2_symbol_uid in value] |
| 238 | 240 |
if matches: |
| 239 |
checkBox.setEnabled(False)
|
|
| 241 |
checkBox.setEnabled(False) |
|
| 240 | 242 | |
| 241 | 243 |
def reject(self): |
| 242 | 244 |
QDialog.reject(self) |
| ... | ... | |
| 250 | 252 |
if value: |
| 251 | 253 |
configs.append(Config('BM Symbol', key, ','.join(value)))
|
| 252 | 254 | |
| 253 |
configs.append(Config('BM Attribute', 'BM Attribute', ','.join(self.attributes)))
|
|
| 255 |
#self.attributes = ['UID', 'ITEM_NO', 'Quantity'] + self.attributes |
|
| 256 |
configs.append(Config('Order', 'BM_LIST', self.delimiter.join([attr + self.delimiterCombine + attr for attr in self.attributes])))
|
|
| 254 | 257 | |
| 255 | 258 |
app_doc_data.deleteConfigs(section='BM Symbol') |
| 256 |
app_doc_data.deleteConfigs(section='BM Attribute')
|
|
| 259 |
app_doc_data.deleteConfigs(section='Order', key='BM_LIST')
|
|
| 257 | 260 | |
| 258 | 261 |
app_doc_data.saveConfigs(configs) |
| 259 | 262 | |
| DTI_PID/DTI_PID/ItemDataExportDialog.py | ||
|---|---|---|
| 849 | 849 | |
| 850 | 850 |
from BMSettingDialog import BMSettingDialog |
| 851 | 851 | |
| 852 |
dlg = BMSettingDialog(self, self.columnListAll[QItemDataExportDialog.DATA_LIST[6]], self.columnOrder[QItemDataExportDialog.DATA_LIST[6]])
|
|
| 852 |
dlg = BMSettingDialog(self, self.columnListAll[QItemDataExportDialog.DATA_LIST[6]][3:])
|
|
| 853 | 853 |
dlg.showDialog() |
| 854 | 854 | |
| 855 | 855 |
def query_engineering_list(self, text): |
내보내기 Unified diff