Skip to content

Commit

Permalink
Merge pull request #133 from Jordan-Pierce/dev
Browse files Browse the repository at this point in the history
Dev
  • Loading branch information
Jordan-Pierce authored Jan 28, 2025
2 parents 990e9b6 + df553b8 commit f0c86bf
Show file tree
Hide file tree
Showing 9 changed files with 417 additions and 300 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ Enhance your CoralNet experience with these tools:
- 🧱 Tile Dataset: Tile existing Detection / Segmentation datasets
- Uses [`yolo-tiling`](https://github.com/Jordan-Pierce/yolo-tiling)
- 🏁 Tile Inference: Perform Tile Inference on large images
- Uses [`YOLO-Patch-Based-Inference`](https://github.com/Jordan-Pierce/YOLO-Patch-Based-Inference)
- Uses [`YOLO-Patch-Based-Inference`](https://github.com/Koldim2001/YOLO-Patch-Based-Inference)

### TODO
- 🔍 API: Get predictions from any CoralNet source model
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import warnings

warnings.filterwarnings("ignore", category=DeprecationWarning)
warnings.filterwarnings("ignore", category=UserWarning)

Expand Down
10 changes: 6 additions & 4 deletions coralnet_toolbox/QtEventFilter.py
Original file line number Diff line number Diff line change
Expand Up @@ -85,13 +85,15 @@ def eventFilter(self, obj, event):

# Select all annotations on < key press with Shift+Ctrl
if event.key() == Qt.Key_Less and event.modifiers() == (Qt.ShiftModifier | Qt.ControlModifier):
self.annotation_window.select_annotations()
return True
if self.main_window.select_tool_action.isChecked():
self.annotation_window.select_annotations()
return True

# Unselect all annotations on > key press with Shift+Ctrl
if event.key() == Qt.Key_Greater and event.modifiers() == (Qt.ShiftModifier | Qt.ControlModifier):
self.annotation_window.unselect_annotations()
return True
if self.main_window.select_tool_action.isChecked():
self.annotation_window.select_annotations()
return True

# Handle Escape key for exiting program
if event.key() == Qt.Key_Escape:
Expand Down
4 changes: 2 additions & 2 deletions coralnet_toolbox/QtMainWindow.py
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ class MainWindow(QMainWindow):
iouChanged = pyqtSignal(float) # Signal to emit the current IoU threshold
areaChanged = pyqtSignal(float, float) # Signal to emit the current area threshold

def __init__(self):
def __init__(self, version):
super().__init__()

# Define icons
Expand All @@ -120,7 +120,7 @@ def __init__(self):
self.unlock_icon = get_icon("unlock.png")

# Set the title and icon for the main window
self.setWindowTitle("CoralNet-Toolbox")
self.setWindowTitle(f"CoralNet-Toolbox v{version}")
self.setWindowIcon(self.coral_icon)

# Set window flags for resizing, minimize, maximize, and customizing
Expand Down
Loading

0 comments on commit f0c86bf

Please sign in to comment.