From 709b19e1d8ccdb8f3d96c09dbce6b18e3024935e Mon Sep 17 00:00:00 2001 From: yatenglg <767624851@qq.com> Date: Sun, 14 May 2023 18:32:45 +0800 Subject: [PATCH] update --- tools/fromCOCO.py | 6 +++--- tools/toCOCO.py | 4 ++-- tools/toVOC.py | 4 ++-- ui/COCO_to_ISAT_dialog.py | 12 ++++++------ ui/COCO_to_ISAT_dialog.ui | 4 ++-- ui/ISAT_to_COCO_dialog.py | 14 +++++++------- ui/ISAT_to_COCO_dialog.ui | 6 +++--- ui/ISAT_to_VOC_dialog.py | 12 ++++++------ ui/ISAT_to_VOC_dialog.ui | 4 ++-- ui/category_choice.py | 14 +++++++------- ui/category_choice.ui | 10 +++++----- ui/setting_dialog.py | 12 ++++++------ ui/setting_dialog.ui | 4 ++-- ui/zh_CN.qm | Bin 10388 -> 10390 bytes ui/zh_CN.ts | 4 ++-- widgets/COCO_to_ISAT_dialog.py | 8 ++++---- widgets/ISAT_to_COCO_dialog.py | 8 ++++---- widgets/ISAT_to_VOC_dialog.py | 8 ++++---- widgets/canvas.py | 2 -- widgets/category_choice_dialog.py | 8 ++++---- widgets/category_edit_dialog.py | 8 ++++---- widgets/process_dialog.py | 11 ----------- widgets/setting_dialog.py | 4 ++-- 23 files changed, 77 insertions(+), 90 deletions(-) delete mode 100644 widgets/process_dialog.py diff --git a/tools/fromCOCO.py b/tools/fromCOCO.py index ef0c887..7be18c8 100644 --- a/tools/fromCOCO.py +++ b/tools/fromCOCO.py @@ -19,7 +19,7 @@ class FROMCOCO(QThread): self.to_root:str = None self.keep_crowd = False - self.cache = False + self.cancel = False def run(self): assert self.coco_json_path.endswith('.json') @@ -45,7 +45,7 @@ class FROMCOCO(QThread): self.message.emit(None, None, 'Loading annotations...') for index, annotation in enumerate(annotations): - if self.cache: + if self.cancel: return self.message.emit(index+1, len(annotations), None) @@ -129,7 +129,7 @@ class FROMCOCO(QThread): self.message.emit(None, None, 'Start convert to ISAT json...') for index, (image_id, values) in enumerate(annos.items()): - if self.cache: + if self.cancel: return image_path = images[image_id].get('file_name') folder, name = os.path.split(image_path) diff --git a/tools/toCOCO.py b/tools/toCOCO.py index a01061c..3dc4f87 100644 --- a/tools/toCOCO.py +++ b/tools/toCOCO.py @@ -14,7 +14,7 @@ class TOCOCO(QThread): super(TOCOCO, self).__init__() self.isat_json_root:str = None self.to_path:str = None - self.cache = False + self.cancel = False def run(self): coco_anno = {} @@ -45,7 +45,7 @@ class TOCOCO(QThread): num_jsons = len(jsons) self.message.emit(None, None, 'Loading ISAT jsons...') for file_index, json in enumerate(jsons): - if self.cache: + if self.cancel: return self.message.emit(file_index+1, num_jsons, '{:>8d}/{:<8d} | Loading ISAT json: {}'.format(file_index+1, num_jsons, json)) try: diff --git a/tools/toVOC.py b/tools/toVOC.py index fbe57b4..f047df4 100644 --- a/tools/toVOC.py +++ b/tools/toVOC.py @@ -20,7 +20,7 @@ class TOVOC(QThread): self.to_root = None self.is_instance = False self.keep_crowd = False - self.cache = False + self.cancel = False def run(self): labels = self.cfg.get('label', []) @@ -48,7 +48,7 @@ class TOVOC(QThread): for index, json in enumerate(jsons): - if self.cache: + if self.cancel: return from_path = os.path.join(self.from_root, json) self.message.emit(index+1, num_jsons, '{:>8d}/{:<8d} | Loading json:{}'.format(index+1, num_jsons, json)) diff --git a/ui/COCO_to_ISAT_dialog.py b/ui/COCO_to_ISAT_dialog.py index b7cc883..418c15b 100644 --- a/ui/COCO_to_ISAT_dialog.py +++ b/ui/COCO_to_ISAT_dialog.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Form implementation generated from reading ui file '/home/super/PycharmProjects/ISAT_with_segment_anything/ui/COCO_to_ISAT_dialog.ui' +# Form implementation generated from reading ui file 'COCO_to_ISAT_dialog.ui' # # Created by: PyQt5 UI code generator 5.15.7 # @@ -85,12 +85,12 @@ class Ui_Dialog(object): self.horizontalLayout.addWidget(self.label) spacerItem1 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) self.horizontalLayout.addItem(spacerItem1) - self.pushButton_cache = QtWidgets.QPushButton(self.widget_2) + self.pushButton_cancel = QtWidgets.QPushButton(self.widget_2) icon = QtGui.QIcon() icon.addPixmap(QtGui.QPixmap(":/icons/icons/关闭_close-one.svg"), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.pushButton_cache.setIcon(icon) - self.pushButton_cache.setObjectName("pushButton_cache") - self.horizontalLayout.addWidget(self.pushButton_cache) + self.pushButton_cancel.setIcon(icon) + self.pushButton_cancel.setObjectName("pushButton_cancel") + self.horizontalLayout.addWidget(self.pushButton_cancel) self.pushButton_apply = QtWidgets.QPushButton(self.widget_2) icon1 = QtGui.QIcon() icon1.addPixmap(QtGui.QPixmap(":/icons/icons/校验_check-one.svg"), QtGui.QIcon.Normal, QtGui.QIcon.Off) @@ -111,6 +111,6 @@ class Ui_Dialog(object): self.lineEdit_label_path.setPlaceholderText(_translate("Dialog", "COCO json path")) self.checkBox_keepcrowd.setText(_translate("Dialog", "Keep crowd")) self.label.setText(_translate("Dialog", "Convert COCO json to ISAT jsons.All layer attr is 1.")) - self.pushButton_cache.setText(_translate("Dialog", "cache")) + self.pushButton_cancel.setText(_translate("Dialog", "cancel")) self.pushButton_apply.setText(_translate("Dialog", "convert")) import icons_rc diff --git a/ui/COCO_to_ISAT_dialog.ui b/ui/COCO_to_ISAT_dialog.ui index 7a00b23..71eaaee 100644 --- a/ui/COCO_to_ISAT_dialog.ui +++ b/ui/COCO_to_ISAT_dialog.ui @@ -201,9 +201,9 @@ - + - cache + cancel diff --git a/ui/ISAT_to_COCO_dialog.py b/ui/ISAT_to_COCO_dialog.py index 1dc53f6..be5c5e4 100644 --- a/ui/ISAT_to_COCO_dialog.py +++ b/ui/ISAT_to_COCO_dialog.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Form implementation generated from reading ui file '/home/super/PycharmProjects/ISAT_with_segment_anything/ui/ISAT_to_COCO_dialog.ui' +# Form implementation generated from reading ui file 'ISAT_to_COCO_dialog.ui' # # Created by: PyQt5 UI code generator 5.15.7 # @@ -15,7 +15,7 @@ class Ui_Dialog(object): def setupUi(self, Dialog): Dialog.setObjectName("Dialog") Dialog.setWindowModality(QtCore.Qt.NonModal) - Dialog.resize(600, 226) + Dialog.resize(600, 227) font = QtGui.QFont() font.setFamily("Times New Roman") font.setPointSize(12) @@ -74,12 +74,12 @@ class Ui_Dialog(object): self.horizontalLayout.addWidget(self.label) spacerItem = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) self.horizontalLayout.addItem(spacerItem) - self.pushButton_cache = QtWidgets.QPushButton(self.widget_2) + self.pushButton_cancel = QtWidgets.QPushButton(self.widget_2) icon = QtGui.QIcon() icon.addPixmap(QtGui.QPixmap(":/icons/icons/关闭_close-one.svg"), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.pushButton_cache.setIcon(icon) - self.pushButton_cache.setObjectName("pushButton_cache") - self.horizontalLayout.addWidget(self.pushButton_cache) + self.pushButton_cancel.setIcon(icon) + self.pushButton_cancel.setObjectName("pushButton_cancel") + self.horizontalLayout.addWidget(self.pushButton_cancel) self.pushButton_apply = QtWidgets.QPushButton(self.widget_2) icon1 = QtGui.QIcon() icon1.addPixmap(QtGui.QPixmap(":/icons/icons/校验_check-one.svg"), QtGui.QIcon.Normal, QtGui.QIcon.Off) @@ -104,6 +104,6 @@ class Ui_Dialog(object): "\n" "


")) self.label.setText(_translate("Dialog", "Convert ISAT jsons to COCO json.The layer attr will be lost.")) - self.pushButton_cache.setText(_translate("Dialog", "cache")) + self.pushButton_cancel.setText(_translate("Dialog", "cancel")) self.pushButton_apply.setText(_translate("Dialog", "convert")) import icons_rc diff --git a/ui/ISAT_to_COCO_dialog.ui b/ui/ISAT_to_COCO_dialog.ui index 0543a03..e069eeb 100644 --- a/ui/ISAT_to_COCO_dialog.ui +++ b/ui/ISAT_to_COCO_dialog.ui @@ -10,7 +10,7 @@ 0 0 600 - 226 + 227 @@ -170,9 +170,9 @@ p, li { white-space: pre-wrap; } - + - cache + cancel diff --git a/ui/ISAT_to_VOC_dialog.py b/ui/ISAT_to_VOC_dialog.py index 28c75f4..60c0359 100644 --- a/ui/ISAT_to_VOC_dialog.py +++ b/ui/ISAT_to_VOC_dialog.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Form implementation generated from reading ui file '/home/super/PycharmProjects/ISAT_with_segment_anything/ui/ISAT_to_VOC_dialog.ui' +# Form implementation generated from reading ui file 'ISAT_to_VOC_dialog.ui' # # Created by: PyQt5 UI code generator 5.15.7 # @@ -86,12 +86,12 @@ class Ui_Dialog(object): self.horizontalLayout.addWidget(self.label) spacerItem1 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) self.horizontalLayout.addItem(spacerItem1) - self.pushButton_cache = QtWidgets.QPushButton(self.widget_2) + self.pushButton_cancel = QtWidgets.QPushButton(self.widget_2) icon = QtGui.QIcon() icon.addPixmap(QtGui.QPixmap(":/icons/icons/关闭_close-one.svg"), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.pushButton_cache.setIcon(icon) - self.pushButton_cache.setObjectName("pushButton_cache") - self.horizontalLayout.addWidget(self.pushButton_cache) + self.pushButton_cancel.setIcon(icon) + self.pushButton_cancel.setObjectName("pushButton_cancel") + self.horizontalLayout.addWidget(self.pushButton_cancel) self.pushButton_apply = QtWidgets.QPushButton(self.widget_2) icon1 = QtGui.QIcon() icon1.addPixmap(QtGui.QPixmap(":/icons/icons/校验_check-one.svg"), QtGui.QIcon.Normal, QtGui.QIcon.Off) @@ -118,6 +118,6 @@ class Ui_Dialog(object): "\n" "


")) self.label.setText(_translate("Dialog", "Convert ISAT annotations to VOC png.")) - self.pushButton_cache.setText(_translate("Dialog", "cache")) + self.pushButton_cancel.setText(_translate("Dialog", "cancel")) self.pushButton_apply.setText(_translate("Dialog", "convert")) import icons_rc diff --git a/ui/ISAT_to_VOC_dialog.ui b/ui/ISAT_to_VOC_dialog.ui index d4b9b84..a88752c 100644 --- a/ui/ISAT_to_VOC_dialog.ui +++ b/ui/ISAT_to_VOC_dialog.ui @@ -207,9 +207,9 @@ p, li { white-space: pre-wrap; } - + - cache + cancel diff --git a/ui/category_choice.py b/ui/category_choice.py index 0b20779..a9a71e0 100644 --- a/ui/category_choice.py +++ b/ui/category_choice.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Form implementation generated from reading ui file '/home/super/PycharmProjects/ISAT_with_segment_anything/ui/category_choice.ui' +# Form implementation generated from reading ui file 'category_choice.ui' # # Created by: PyQt5 UI code generator 5.15.7 # @@ -14,7 +14,7 @@ from PyQt5 import QtCore, QtGui, QtWidgets class Ui_Dialog(object): def setupUi(self, Dialog): Dialog.setObjectName("Dialog") - Dialog.resize(350, 400) + Dialog.resize(350, 399) font = QtGui.QFont() font.setFamily("Times New Roman") font.setPointSize(12) @@ -97,12 +97,12 @@ class Ui_Dialog(object): self.horizontalLayout_2.addWidget(self.checkBox_iscrowded) spacerItem = QtWidgets.QSpacerItem(97, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) self.horizontalLayout_2.addItem(spacerItem) - self.pushButton_cache = QtWidgets.QPushButton(self.widget_2) + self.pushButton_cancel = QtWidgets.QPushButton(self.widget_2) icon = QtGui.QIcon() icon.addPixmap(QtGui.QPixmap(":/icons/icons/关闭_close-one.svg"), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.pushButton_cache.setIcon(icon) - self.pushButton_cache.setObjectName("pushButton_cache") - self.horizontalLayout_2.addWidget(self.pushButton_cache) + self.pushButton_cancel.setIcon(icon) + self.pushButton_cancel.setObjectName("pushButton_cancel") + self.horizontalLayout_2.addWidget(self.pushButton_cancel) self.pushButton_apply = QtWidgets.QPushButton(self.widget_2) icon1 = QtGui.QIcon() icon1.addPixmap(QtGui.QPixmap(":/icons/icons/校验_check-one.svg"), QtGui.QIcon.Normal, QtGui.QIcon.Off) @@ -123,6 +123,6 @@ class Ui_Dialog(object): self.lineEdit_note.setPlaceholderText(_translate("Dialog", "add extra note here")) self.label_4.setText(_translate("Dialog", "layer:")) self.checkBox_iscrowded.setText(_translate("Dialog", "is crowded")) - self.pushButton_cache.setText(_translate("Dialog", "cache")) + self.pushButton_cancel.setText(_translate("Dialog", "cancel")) self.pushButton_apply.setText(_translate("Dialog", "apply")) import icons_rc diff --git a/ui/category_choice.ui b/ui/category_choice.ui index a43af56..581e0d4 100644 --- a/ui/category_choice.ui +++ b/ui/category_choice.ui @@ -7,7 +7,7 @@ 0 0 350 - 400 + 399 @@ -259,12 +259,12 @@ - + - cache + cancel - + :/icons/icons/关闭_close-one.svg:/icons/icons/关闭_close-one.svg @@ -275,7 +275,7 @@ apply - + :/icons/icons/校验_check-one.svg:/icons/icons/校验_check-one.svg diff --git a/ui/setting_dialog.py b/ui/setting_dialog.py index f5c186c..b59132b 100644 --- a/ui/setting_dialog.py +++ b/ui/setting_dialog.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Form implementation generated from reading ui file '/home/super/PycharmProjects/ISAT_with_segment_anything/ui/setting_dialog.ui' +# Form implementation generated from reading ui file 'setting_dialog.ui' # # Created by: PyQt5 UI code generator 5.15.7 # @@ -81,12 +81,12 @@ class Ui_Dialog(object): self.horizontalLayout_2.addWidget(self.pushButton_export) spacerItem = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) self.horizontalLayout_2.addItem(spacerItem) - self.cache_button = QtWidgets.QPushButton(self.widget) + self.cancel_button = QtWidgets.QPushButton(self.widget) icon3 = QtGui.QIcon() icon3.addPixmap(QtGui.QPixmap(":/icons/icons/关闭_close-one.svg"), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.cache_button.setIcon(icon3) - self.cache_button.setObjectName("cache_button") - self.horizontalLayout_2.addWidget(self.cache_button) + self.cancel_button.setIcon(icon3) + self.cancel_button.setObjectName("cancel_button") + self.horizontalLayout_2.addWidget(self.cancel_button) self.apply_button = QtWidgets.QPushButton(self.widget) icon4 = QtGui.QIcon() icon4.addPixmap(QtGui.QPixmap(":/icons/icons/校验_check-one.svg"), QtGui.QIcon.Normal, QtGui.QIcon.Off) @@ -106,6 +106,6 @@ class Ui_Dialog(object): self.add_button.setText(_translate("Dialog", "Add new label")) self.pushButton_import.setText(_translate("Dialog", "Import")) self.pushButton_export.setText(_translate("Dialog", "Export")) - self.cache_button.setText(_translate("Dialog", "Cache")) + self.cancel_button.setText(_translate("Dialog", "Cancel")) self.apply_button.setText(_translate("Dialog", "Apply")) import icons_rc diff --git a/ui/setting_dialog.ui b/ui/setting_dialog.ui index e0b3914..53e9e4a 100644 --- a/ui/setting_dialog.ui +++ b/ui/setting_dialog.ui @@ -150,9 +150,9 @@ - + - Cache + Cancel diff --git a/ui/zh_CN.qm b/ui/zh_CN.qm index 6302899012cbf651530660aae2ad02a078c4a1dd..ce982ef0c3d9e6422edeee055212461cba195cbb 100644 GIT binary patch delta 1370 zcmXApdr(wW9LIm`-q-HkdoL^(d9w=)f~}*FO@&i9A&MZPJSxIQYE~e5<&+3UvNLLy ziZ29Y)R<((avTL@2^%3~#?(nobYiM0W)XUTGiYk4AP)82&R?JVyZ4;$`ToA=oZFDq zlyxA?wS$OWBjQYq);utoh&M9&KLD4aE@#x6z!W0!H^xAKmJvx?7=!%4<*0vQ3@!t+ zh%A|m5&OX$)Fq5A+gv>45-Dwr_UqsqM5YQauB8W!oU;8Ks!;!AuQO) z7&J{>4@VS~K->Tr97^2H7_g4GpY{^@wh%YAo+zZ3xQTdjQAi{4+yGJNeBzrg5!sd# zKX3&L50ZcZq+O)crtgqY45PK0R#YXT9;S@@6%bCQRfdb8o3g86OmABe2JG^K7rCzC#fk6VbMR{HGt9MSr1GrWIB zhw$@;+H;@4Xt$wt)mI2VE$^=|I;{1Zfh$=tx^1_-#hn`@fU;V?Ho z1Vi%gJm-CH{+N%gLuaA8`0NfuZT^=(I+{de(D}1#y&YTmvo-G^iHD4lPX6vx1dI>! zlbL^G3(EN?E=5JBKk!c%Au{uEK}?ju0m1q!gd*C7oJW<2szoR$!NjOap`a8=sH=s7 zjf1FLh0>ZB80umS*M<6T@!h{xXc}FGg|9M3z9jtLpk@%d9?U}bE#X`z^ukjG*PXJ( z*y9$FTL&Xymqh8{K5R*ks2%nok!xbyGaNo&O-%dQTPKOmS&R#RD((#b47XyJc-4Ol z3+aruR&nU4h|VN&WTXw_dZp6U0a$RZbY6$9|5B+h@dG6GrgZthIy4&Ok{(U>A?j9> z@L@j$QyKL#lf!`y1J;-vx3Hjpx2epI&a^61`#28koGqsF+wSAcd||rQft#W%VYJ;c zKezBt=-3!_KXc*rNzBVK9~_3B_LsSP-U2lA*xX0ys9mw9u6%#WqxG^ zl5oiS_Ju_D33-XqfC+EQ`N20}s8KGG9wPb~xi%W(=Lqut0#FKI3@nw8jBLmIKDqyf zibJ?p9(DhLE&9}wJ@?CF zjGR#{@ol*8$;#qQ5is<+lD)ear`@CUmmtcJY32Kldtjn+XCB7c%9WW@=*;?pstMId zqEp>-JOv5L>V@GD=uW7EmRE2K(lq0RF?yMzW3||vO#EC(OF6P0!ke`X?YW4wkkKBe t9WK%#bX)r;M#J|L8;GJa-08eSIOH25yIrzJ5(VeG70$vkw^L8h{{xdVMBV@Z delta 1372 zcmXApeNa?o6vhv`_iOj=y%%<`tb8oHfSV$XfYuaNBnc6y7$4CL&Pc|WfSHpbIP18L zrX^%45HgAmHDxnSC|_lPA&r(JHlU4@4I>acI;fMTi2~{D^la~6zkA+$-gD0Lyzjlu zIZZkHBfUF`D3ypaFZ#jkeND0#52I8OD5M2Zb!8nUe1_4g(u}$V${qxjJ~~Pi zlNt2Ek#wSv_YLp1>u8W<*l}t%2JbO^;U6Q?Uodp!!>x!hW8z&nYFc4D*6=+BZ8y$5 zSp-K4jE}29DTC2IV)WO0Tan=5lE3~IXX4;CrTd5?JzPsB6zDzNH&1^>WM9S&Z-u>5 z7kBCP7APF$ZeGJ6vXAEi>t+u>|6?eN_>j--faPXCf7q8oWYGD}H37xJe5dCvIB}mb zdL4gf2FIq4@>AYyT(Iyeep*qX@FM^35?E$#6U1Z*91^S}C=}H$S_}|*R+J8Wf+P4r)DDi}YzM^!PjLBy6*2Q_Abv?K_9M?RBkpm0gs)<+ zIB1(h0~@2WO}utkgdjnjm^gvFUa4yJ95kFK_3Ef=OO^VQ--AyWy!Khc7;^U!gPPQrjG8)=?OdDKKq*a?v-o#}MtugiPyhmg`YP#5A#{eme z&SCSygd3>iWYjft>914Rx7vJQ9QCy8=I`PbLC}=BpRy2p-RAShp)ll}d8`2wT6W9) zij8n0PS$rN5V>y4FDp&hP$(CM4Pl^0xlH;8me0yNVv!%p$)6U1lFn$akPl7l!un}> zU`WNKtCxM<*Kss^EGa=y?C@B!6aT>aWlK%c0wS-a&r)*-36@DqUl2ApXBE>d&N`%k zF?v?9B%Z+co~kU}5`}^Cl-#;<-0o3jpb}PwPb(KX?t;%Lx8jiJtWq8yhcfG8RTFCA zM3-9sc^Vuvsb|K+QTMib#quI9eWqqSGfB@=tXrF(myMqbX=#T_P`FyFIGGPiOBh{G uX$Q-66#7$p;MVZ|OZ>WGv%0hRctPNouPa_(+Pz)&NdjN||8uFHr2hvrjYX{h diff --git a/ui/zh_CN.ts b/ui/zh_CN.ts index 1263ddd..2a1a698 100644 --- a/ui/zh_CN.ts +++ b/ui/zh_CN.ts @@ -40,7 +40,7 @@ - cache + cancel 取消 @@ -295,7 +295,7 @@ - Cache + Cancel 取消 diff --git a/widgets/COCO_to_ISAT_dialog.py b/widgets/COCO_to_ISAT_dialog.py index 80fcda6..8fc8d38 100644 --- a/widgets/COCO_to_ISAT_dialog.py +++ b/widgets/COCO_to_ISAT_dialog.py @@ -47,8 +47,8 @@ class COCOtoISATDialog(QtWidgets.QDialog, Ui_Dialog): else: self.lineEdit_save_root.clear() - def cache(self): - self.converter.cache = True + def cancel(self): + self.converter.cancel = True self.close() def apply(self): @@ -62,7 +62,7 @@ class COCOtoISATDialog(QtWidgets.QDialog, Ui_Dialog): self.progressBar.reset() self.textBrowser.clear() - self.converter.cache = False + self.converter.cancel = False self.converter.coco_json_path = self.label_path self.converter.to_root = self.save_root self.converter.keep_crowd = self.checkBox_keepcrowd.isChecked() @@ -85,4 +85,4 @@ class COCOtoISATDialog(QtWidgets.QDialog, Ui_Dialog): self.pushButton_label_path.clicked.connect(self._label_path) self.pushButton_save_root.clicked.connect(self._save_root) self.pushButton_apply.clicked.connect(self.apply) - self.pushButton_cache.clicked.connect(self.cache) \ No newline at end of file + self.pushButton_cancel.clicked.connect(self.cancel) \ No newline at end of file diff --git a/widgets/ISAT_to_COCO_dialog.py b/widgets/ISAT_to_COCO_dialog.py index 4454ed0..c906e4d 100644 --- a/widgets/ISAT_to_COCO_dialog.py +++ b/widgets/ISAT_to_COCO_dialog.py @@ -44,8 +44,8 @@ class ISATtoCOCODialog(QtWidgets.QDialog, Ui_Dialog): else: self.lineEdit_save_path.clear() - def cache(self): - self.converter.cache = True + def cancel(self): + self.converter.cancel = True self.close() def apply(self): @@ -58,7 +58,7 @@ class ISATtoCOCODialog(QtWidgets.QDialog, Ui_Dialog): self.progressBar.reset() self.textBrowser.clear() - self.converter.cache = False + self.converter.cancel = False self.converter.isat_json_root = self.label_root self.converter.to_path = self.save_path self.converter.start() @@ -79,4 +79,4 @@ class ISATtoCOCODialog(QtWidgets.QDialog, Ui_Dialog): self.pushButton_label_root.clicked.connect(self._label_root) self.pushButton_save_path.clicked.connect(self._save_path) self.pushButton_apply.clicked.connect(self.apply) - self.pushButton_cache.clicked.connect(self.cache) \ No newline at end of file + self.pushButton_cancel.clicked.connect(self.cancel) \ No newline at end of file diff --git a/widgets/ISAT_to_VOC_dialog.py b/widgets/ISAT_to_VOC_dialog.py index e8a8bb8..032944f 100644 --- a/widgets/ISAT_to_VOC_dialog.py +++ b/widgets/ISAT_to_VOC_dialog.py @@ -47,8 +47,8 @@ class ISATtoVOCDialog(QtWidgets.QDialog, Ui_Dialog): else: self.lineEdit_save_root.clear() - def cache(self): - self.converter.cache = True + def cancel(self): + self.converter.cancel = True self.close() def apply(self): @@ -68,7 +68,7 @@ class ISATtoVOCDialog(QtWidgets.QDialog, Ui_Dialog): self.progressBar.reset() self.textBrowser.clear() - self.converter.cache = False + self.converter.cancel = False if os.path.exists(os.path.join(self.label_root, 'isat.yaml')): self.converter.cfg = load_config(os.path.join(self.label_root, 'isat.yaml')) else: @@ -97,4 +97,4 @@ class ISATtoVOCDialog(QtWidgets.QDialog, Ui_Dialog): self.pushButton_label_root.clicked.connect(self._label_root) self.pushButton_save_root.clicked.connect(self._save_root) self.pushButton_apply.clicked.connect(self.apply) - self.pushButton_cache.clicked.connect(self.cache) \ No newline at end of file + self.pushButton_cancel.clicked.connect(self.cancel) \ No newline at end of file diff --git a/widgets/canvas.py b/widgets/canvas.py index 6d752de..7e9ff8b 100644 --- a/widgets/canvas.py +++ b/widgets/canvas.py @@ -347,9 +347,7 @@ class AnnotationScene(QtWidgets.QGraphicsScene): # 状态栏,显示当前坐标 if self.image_data is not None: - print('-- ', pos.x(), pos.y()) x, y = round(pos.x()), round(pos.y()) - print('---', x, y) self.mainwindow.labelCoord.setText('xy: ({:>4d},{:>4d})'.format(x, y)) data = self.image_data[y][x] diff --git a/widgets/category_choice_dialog.py b/widgets/category_choice_dialog.py index b959179..37412eb 100644 --- a/widgets/category_choice_dialog.py +++ b/widgets/category_choice_dialog.py @@ -20,7 +20,7 @@ class CategoryChoiceDialog(QtWidgets.QDialog, Ui_Dialog): self.listWidget.itemClicked.connect(self.get_category) self.pushButton_apply.clicked.connect(self.apply) - self.pushButton_cache.clicked.connect(self.cache) + self.pushButton_cancel.clicked.connect(self.cancel) self.setWindowModality(QtCore.Qt.WindowModality.WindowModal) @@ -94,12 +94,12 @@ class CategoryChoiceDialog(QtWidgets.QDialog, Ui_Dialog): self.scene.change_mode_to_view() self.close() - def cache(self): + def cancel(self): self.scene.cancel_draw() self.close() def closeEvent(self, a0: QtGui.QCloseEvent): - self.cache() + self.cancel() def reject(self): - self.cache() + self.cancel() diff --git a/widgets/category_edit_dialog.py b/widgets/category_edit_dialog.py index 1824b65..18aabae 100644 --- a/widgets/category_edit_dialog.py +++ b/widgets/category_edit_dialog.py @@ -21,7 +21,7 @@ class CategoryEditDialog(QtWidgets.QDialog, Ui_Dialog): self.listWidget.itemClicked.connect(self.get_category) self.pushButton_apply.clicked.connect(self.apply) - self.pushButton_cache.clicked.connect(self.cache) + self.pushButton_cancel.clicked.connect(self.cancel) self.setWindowModality(QtCore.Qt.WindowModality.WindowModal) @@ -105,12 +105,12 @@ class CategoryEditDialog(QtWidgets.QDialog, Ui_Dialog): self.scene.change_mode_to_view() self.close() - def cache(self): + def cancel(self): self.scene.cancel_draw() self.close() def closeEvent(self, a0: QtGui.QCloseEvent): - self.cache() + self.cancel() def reject(self): - self.cache() + self.cancel() diff --git a/widgets/process_dialog.py b/widgets/process_dialog.py deleted file mode 100644 index 91fdd19..0000000 --- a/widgets/process_dialog.py +++ /dev/null @@ -1,11 +0,0 @@ -# -*- coding: utf-8 -*- -# @Author : LG - -from ui.process_dialog import Ui_Dialog -from PyQt5 import QtGui, QtWidgets, QtCore - -class PorcessDialog(QtWidgets.QDialog, Ui_Dialog): - def __init__(self, parent): - super(PorcessDialog, self).__init__(parent) - self.setupUi(self) - diff --git a/widgets/setting_dialog.py b/widgets/setting_dialog.py index f49dcef..dd9b3dd 100644 --- a/widgets/setting_dialog.py +++ b/widgets/setting_dialog.py @@ -121,13 +121,13 @@ class SettingDialog(QtWidgets.QDialog, Ui_Dialog): self.mainwindow.reload_cfg() self.close() - def cache(self): + def cancel(self): self.close() def init_connect(self): self.add_button.clicked.connect(self.add_new_category) self.apply_button.clicked.connect(self.apply) - self.cache_button.clicked.connect(self.cache) + self.cancel_button.clicked.connect(self.cancel) self.color_button.clicked.connect(self.choice_color) self.pushButton_import.clicked.connect(self.import_cfg) self.pushButton_export.clicked.connect(self.export_cfg) \ No newline at end of file