개정판 4077103a
issue #481: table for error item fix, and 000 fix line no check string and plz check Configs.py line 70
Change-Id: I988405954d46e0eba3994e5fae70a69c69be373a
| DTI_PID/DTI_PID/Configs.py | ||
|---|---|---|
| 75 | 75 |
return (False,) |
| 76 | 76 |
elif lineProp[0].Length: |
| 77 | 77 |
if len(_text) >= lineProp[0].Length: |
| 78 |
res.append(_text[:lineProp[0].Length]) |
|
| 78 | 79 |
_text = _text[lineProp[0].Length:len(_text)] |
| 79 |
res.append(_text[lineProp[0].Length]) |
|
| 80 | 80 |
else: |
| 81 | 81 |
return (False,) |
| 82 | 82 |
else: |
| DTI_PID/DTI_PID/ItemPropertyTableWidget.py | ||
|---|---|---|
| 25 | 25 |
from EngineeringTextItem import QEngineeringTextItem |
| 26 | 26 |
from UserInputAttribute import UserInputAttribute |
| 27 | 27 |
from EngineeringSpecBreakItem import QEngineeringSpecBreakItem |
| 28 |
from EngineeringErrorItem import QEngineeringErrorItem |
|
| 28 | 29 |
from AppDocData import * |
| 29 | 30 |
from Drawing import Drawing |
| 30 | 31 |
from enum import Enum |
| ... | ... | |
| 231 | 232 |
if type(item) is QEngineeringSpecBreakItem: |
| 232 | 233 |
self.setRowCount(7) |
| 233 | 234 |
self.setItem(6, 0, QTableWidgetItem("Set Specs"))
|
| 235 |
if type(item) is QEngineeringErrorItem: |
|
| 236 |
self.setRowCount(7) |
|
| 237 |
self.setItem(6, 0, QTableWidgetItem("Message"))
|
|
| 234 | 238 |
elif type(item) is QEngineeringNoteItem: |
| 235 | 239 |
self.setRowCount(1) |
| 236 | 240 |
self.setItem(0, 0, QTableWidgetItem("노트번호"))
|
| ... | ... | |
| 306 | 310 |
self.setItem(2, 1, QTableWidgetItem(self.symData.type)) |
| 307 | 311 |
self.setItem(3, 1, QTableWidgetItem(str(round(math.degrees(self.symData.angle))))) |
| 308 | 312 |
self.setItem(4, 1, QTableWidgetItem(str(self.symData.origin))) |
| 309 |
owner_item = QTableWidgetItem('{}'.format(self.symData.owner))
|
|
| 313 |
owner_item = QTableWidgetItem('{}'.format('None' if self.symData.owner is None else item.owner.uid))
|
|
| 310 | 314 |
icon = QtGui.QIcon() |
| 311 | 315 |
icon.addPixmap(QtGui.QPixmap(":/newPrefix/doubleclick.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
|
| 312 | 316 |
owner_item.setIcon(icon) |
| ... | ... | |
| 320 | 324 |
setSpecsItem.setFlags(Qt.ItemIsEnabled|Qt.ItemIsSelectable) |
| 321 | 325 |
self.setItem(6, 1, setSpecsItem) |
| 322 | 326 |
|
| 327 |
if type(self.symData) is QEngineeringErrorItem: |
|
| 328 |
errType = 'None' |
|
| 329 |
if type(self.symData.parent) is QEngineeringLineItem: |
|
| 330 |
errType = 'line' |
|
| 331 |
elif issubclass(type(self.symData.parent), SymbolSvgItem): |
|
| 332 |
errType = 'symbol' |
|
| 333 |
self.setItem(2, 1, QTableWidgetItem(errType)) |
|
| 334 |
self.setItem(5, 1, QTableWidgetItem(self.symData.parent.uid)) |
|
| 335 |
self.setItem(6, 1, QTableWidgetItem(self.symData.msg)) |
|
| 336 |
|
|
| 323 | 337 |
row = self.rowCount() |
| 324 | 338 |
attrs = self.symData.getAttributes() |
| 325 | 339 |
self.setRowCount(row + len(attrs) + len(self.symData.connectors)) |
| DTI_PID/DTI_PID/MainWindow.py | ||
|---|---|---|
| 272 | 272 |
self.tableWidgetInconsistency.setColumnCount(2) |
| 273 | 273 |
self.tableWidgetInconsistency.setHorizontalHeaderLabels(['Owner', 'Message']) |
| 274 | 274 |
self.tableWidgetInconsistency.itemClicked.connect(self.inconsistencyItemClickEvent) |
| 275 |
#self.tableWidgetInconsistency.keyPressEvent.connect(self.inconsistencyTableKeyPressEvent) |
|
| 275 | 276 |
|
| 276 | 277 |
def eventFilter(self, source, event): |
| 277 | 278 |
""" |
| ... | ... | |
| 283 | 284 |
|
| 284 | 285 |
return QWidget.eventFilter(self, source, event) |
| 285 | 286 |
|
| 287 |
def inconsistencyTableKeyPressEvent(self, event): |
|
| 288 |
try: |
|
| 289 |
if event.key() == Qt.Key_Escape: |
|
| 290 |
pass |
|
| 291 |
except: |
|
| 292 |
pass |
|
| 293 |
|
|
| 286 | 294 |
def onValidation(self): |
| 287 | 295 |
""" |
| 288 | 296 |
@brief validation check |
| ... | ... | |
| 1919 | 1927 |
docData = AppDocData.instance() |
| 1920 | 1928 |
project = docData.getCurrentProject() |
| 1921 | 1929 |
windowSize = docData.getSlidingWindowSize() |
| 1922 |
|
|
| 1930 |
|
|
| 1923 | 1931 |
thickness = int(windowSize[1]) |
| 1924 | 1932 |
|
| 1925 | 1933 |
if docData.needReOpening is not None: |
내보내기 Unified diff
