final

yeyeyeping · Mar 22, 2023 · 37ae183 · 37ae183
1 parent bf39896
commit 37ae183
Show file tree

Hide file tree

Showing 41 changed files with 10 additions and 8 deletions.
diff --git a/Logic/Common/__pycache__/BboxCropper.cpython-38.pyc b/Logic/Common/__pycache__/BboxCropper.cpython-38.pyc
diff --git a/Logic/Common/__pycache__/ImageDelegate.cpython-38.pyc b/Logic/Common/__pycache__/ImageDelegate.cpython-38.pyc
diff --git a/Logic/Common/__pycache__/MainApplication.cpython-38.pyc b/Logic/Common/__pycache__/MainApplication.cpython-38.pyc
diff --git a/Logic/Common/__pycache__/NetworkDelegate.cpython-38.pyc b/Logic/Common/__pycache__/NetworkDelegate.cpython-38.pyc
diff --git a/Logic/Common/__pycache__/network.cpython-38.pyc b/Logic/Common/__pycache__/network.cpython-38.pyc
diff --git a/Logic/__pycache__/__init__.cpython-38.pyc b/Logic/__pycache__/__init__.cpython-38.pyc
diff --git a/Logic/utils/__pycache__/Pathdb.cpython-38.pyc b/Logic/utils/__pycache__/Pathdb.cpython-38.pyc
diff --git a/Logic/utils/__pycache__/utils.cpython-37.pyc b/Logic/utils/__pycache__/utils.cpython-37.pyc
diff --git a/Logic/utils/__pycache__/utils.cpython-38.pyc b/Logic/utils/__pycache__/utils.cpython-38.pyc
diff --git a/Logic/utils/utils.py b/Logic/utils/utils.py
@@ -59,7 +59,7 @@ def QImageToGrayCvMat(incomingImage):
     height = incomingImage.height()
 
     ptr = incomingImage.constBits()
-    arr = np.array(ptr).reshape(height, width)  # Copies the data
+    arr = np.array(ptr).reshape(height, incomingImage.bytesPerLine())  # Copies the data
     return arr
 
 

diff --git a/Model/Scribble.py b/Model/Scribble.py
@@ -11,8 +11,8 @@ class SCRIBBLE_TYPE(enum.Flag):
 
 
 class Point:
-    x: int
-    y: int
+    # x: int
+    # y: int
 
     def __init__(self, x, y):
         self.x = x

diff --git a/Model/__pycache__/GlobalViewModel.cpython-37.pyc b/Model/__pycache__/GlobalViewModel.cpython-37.pyc
diff --git a/Model/__pycache__/GlobalViewModel.cpython-38.pyc b/Model/__pycache__/GlobalViewModel.cpython-38.pyc
diff --git a/Model/__pycache__/ImageLabelModel.cpython-37.pyc b/Model/__pycache__/ImageLabelModel.cpython-37.pyc
diff --git a/Model/__pycache__/ImageLabelModel.cpython-38.pyc b/Model/__pycache__/ImageLabelModel.cpython-38.pyc
diff --git a/Model/__pycache__/Scribble.cpython-38.pyc b/Model/__pycache__/Scribble.cpython-38.pyc
diff --git a/Model/__pycache__/__init__.cpython-38.pyc b/Model/__pycache__/__init__.cpython-38.pyc
diff --git a/Res/mask/mask_spleen_img0003_133.png b/Res/mask/mask_spleen_img0003_133.png
diff --git a/Res/mask/mask_spleen_img0003_140.png b/Res/mask/mask_spleen_img0003_140.png
diff --git a/Res/test/spleen_img0003_133.png b/Res/test/spleen_img0003_133.png
diff --git a/Res/test/spleen_img0003_140.png b/Res/test/spleen_img0003_140.png
diff --git a/Res/test/spleen_img0004_103.png b/Res/test/spleen_img0004_103.png
diff --git a/Res/test/spleen_img0004_53.png b/Res/test/spleen_img0004_53.png
diff --git a/Res/test/spleen_img0005_64.png b/Res/test/spleen_img0005_64.png
diff --git a/Res/test/spleen_img0006_102.png b/Res/test/spleen_img0006_102.png
diff --git a/Res/test/spleen_img0007_110.png b/Res/test/spleen_img0007_110.png
diff --git a/Res/test/spleen_img0009_59.png b/Res/test/spleen_img0009_59.png
diff --git a/Res/test/tumor_Brats18_CBICA_AAP_1_img_108.png b/Res/test/tumor_Brats18_CBICA_AAP_1_img_108.png
diff --git a/Res/test/tumor_Brats18_CBICA_AAP_1_img_84.png b/Res/test/tumor_Brats18_CBICA_AAP_1_img_84.png
diff --git a/Res/test/tumor_Brats18_CBICA_ABB_1_img_91.png b/Res/test/tumor_Brats18_CBICA_ABB_1_img_91.png
diff --git a/Res/test/tumor_Brats18_CBICA_ABE_1_img_81.png b/Res/test/tumor_Brats18_CBICA_ABE_1_img_81.png
diff --git a/Res/test/tumor_Brats18_CBICA_ABE_1_img_97.png b/Res/test/tumor_Brats18_CBICA_ABE_1_img_97.png
diff --git a/Res/weight/iter_15000.pth b/Res/weight/iter_15000.pth
diff --git a/Res/weight/iter_15000.pth.bak b/Res/weight/iter_15000.pth.bak
diff --git a/Scribble.png b/Scribble.png
diff --git a/UI/ApplicationWindow.py b/UI/ApplicationWindow.py
@@ -35,7 +35,7 @@ def initUI(self):
         '''设置菜单栏'''
 
         mainMenu = self.menuBar()
-        fileMenu = mainMenu.addMenu('&File')
+        fileMenu = mainMenu.addMenu('&文件')
         # 文件菜单
         self.openAction = QAction(QIcon(get_resource_path("Res/Image/open.bmp")), '打开图片', self)
         self.openAction.setShortcut('Ctrl+O')
@@ -93,6 +93,7 @@ def initUI(self):
         self.editFileList2.setFixedHeight(30)
         self.editFileList2.setMinimumWidth(600)
         self.editFileList2.setFocusPolicy(Qt.NoFocus)
+
         hlbox2.addWidget(self.editFileList2)
         hlbox2.addStretch(10)
         self.annotationButton2 = QPushButton("加载输出路径")
@@ -101,8 +102,8 @@ def initUI(self):
         hlbox2.addWidget(self.annotationButton2)
         mainvlayout.addLayout(hlbox2)
 
-        self.fileListView = QListView(self)
-        self.fileListView.setMinimumWidth(100)
+        self.fileListView = QTableView(self)
+        self.fileListView.setMinimumWidth(450)
         self.fileListView.setMinimumHeight(200)
         self.fileModel = QFileSystemModel(self)
         # self.fileListView.selectionChanged
@@ -202,6 +203,7 @@ def initUI(self):
         self.auxWidget = MaskSaveWidget()
         self.auxWidget.resultSignal.connect(self.handle_save)
         self.auxWidget.setWindowModality(Qt.WindowModality.ApplicationModal)
+        # self.auxWidget.setParent(self)
         ApplicationWindow.center(self.auxWidget)
         vLayout.addStretch(1)
         self.setCentralWidget(self.centerWidget)

diff --git a/UI/Component/__pycache__/LabelImage.cpython-38.pyc b/UI/Component/__pycache__/LabelImage.cpython-38.pyc
diff --git a/UI/Component/__pycache__/MaskSaveWidget.cpython-38.pyc b/UI/Component/__pycache__/MaskSaveWidget.cpython-38.pyc
diff --git a/UI/__pycache__/ApplicationWindow.cpython-37.pyc b/UI/__pycache__/ApplicationWindow.cpython-37.pyc
diff --git a/UI/__pycache__/ApplicationWindow.cpython-38.pyc b/UI/__pycache__/ApplicationWindow.cpython-38.pyc
diff --git a/main.py b/main.py
@@ -1,10 +1,10 @@
 import sys
 from PySide6.QtWidgets import QApplication, QStyleFactory
-
+from qt_material import apply_stylesheet
 from UI.ApplicationWindow import ApplicationWindow
 
 if __name__ == "__main__":
     app = QApplication()
     main = ApplicationWindow()
-    main.setStyle(QStyleFactory.create("window"))
+    apply_stylesheet(main, theme='light_cyan.xml')
     sys.exit(app.exec())