Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Log #37

Open
wants to merge 24 commits into
base: main
Choose a base branch
from
Open

Log #37

Changes from 1 commit
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
43c8f8b
Add human feature.
john-rocky May 21, 2024
1c72a52
Add human feature.
john-rocky May 21, 2024
0cef67b
Edit porstprocessing.
john-rocky May 22, 2024
a7fcb2b
Merge branch 'main' into human
glenn-jocher May 29, 2024
51b6226
Merge branch 'main' into human
john-rocky Jun 3, 2024
09c6447
simple swift tracking
john-rocky Jun 4, 2024
cbfd8c5
hide a tracking toggle in detect mode
john-rocky Jun 4, 2024
b73291e
Fix feature value order.
john-rocky Jun 4, 2024
22eec3d
updated human features every frame
john-rocky Jun 5, 2024
16c668f
add landscape mode
john-rocky Jun 14, 2024
0299227
Merge branch 'main' into landscapemode
glenn-jocher Jun 16, 2024
8c19ab0
Merge branch 'main' into landscapemode
glenn-jocher Jun 20, 2024
d020aba
fix zoom label position.
john-rocky Jun 23, 2024
a245109
Detection log for developer mode
john-rocky Jun 26, 2024
1d11612
Auto-format by https://ultralytics.com/actions
UltralyticsAssistant Jun 26, 2024
f2a0cf7
Delete app sandbox log files after sharing
john-rocky Jun 26, 2024
aaa8e77
Merge remote-tracking branch 'refs/remotes/origin/log'
john-rocky Jun 26, 2024
9a88943
Merge branch 'main' into log
john-rocky Jun 26, 2024
5339c8d
correct the item name in detection mode
john-rocky Jun 26, 2024
41d820a
Merge remote-tracking branch 'refs/remotes/origin/log'
john-rocky Jun 26, 2024
46ec93e
Merge branch 'main' into log
glenn-jocher Aug 11, 2024
8530c07
Auto-format by https://ultralytics.com/actions
UltralyticsAssistant Aug 11, 2024
66d2e9d
Update format.yml
glenn-jocher Aug 11, 2024
dab00d4
Auto-format by https://ultralytics.com/actions
UltralyticsAssistant Aug 11, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
hide a tracking toggle in detect mode
john-rocky committed Jun 4, 2024
commit cbfd8c54f60717d2ee435d915b4ce6e8baec7995
2 changes: 1 addition & 1 deletion YOLO/Info.plist
Original file line number Diff line number Diff line change
@@ -21,7 +21,7 @@
<key>CFBundleShortVersionString</key>
<string>$(MARKETING_VERSION)</string>
<key>CFBundleVersion</key>
<string>34</string>
<string>40</string>
<key>ITSAppUsesNonExemptEncryption</key>
<false/>
<key>LSRequiresIPhoneOS</key>
6 changes: 4 additions & 2 deletions YOLO/Main.storyboard
Original file line number Diff line number Diff line change
@@ -192,13 +192,13 @@
<action selector="taskSegmentControlChanged:" destination="BYZ-38-t0r" eventType="valueChanged" id="XL0-bf-CL7"/>
</connections>
</segmentedControl>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Tracking" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="vmV-l5-46D">
<label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Tracking" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="vmV-l5-46D">
<rect key="frame" x="291.66666666666669" y="645.66666666666663" width="66" height="21"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<color key="textColor" red="0.91247808929999996" green="0.97697538139999995" blue="0.98418968920000005" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" translatesAutoresizingMaskIntoConstraints="NO" id="bmb-wR-twF">
<switch hidden="YES" opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" translatesAutoresizingMaskIntoConstraints="NO" id="bmb-wR-twF">
<rect key="frame" x="300" y="676.66666666666663" width="51" height="31"/>
<connections>
<action selector="TrackingSwitch:" destination="BYZ-38-t0r" eventType="valueChanged" id="rza-vu-vi5"/>
@@ -252,6 +252,8 @@
<outlet property="sliderConf" destination="Gax-hR-qdY" id="KNe-MM-FBA"/>
<outlet property="sliderIoU" destination="6JI-Fw-yih" id="dqE-hH-MVS"/>
<outlet property="taskSegmentControl" destination="pGx-Os-eUk" id="2Fh-eH-HZm"/>
<outlet property="trackingLabel" destination="vmV-l5-46D" id="oaI-pU-iPT"/>
<outlet property="trackingSwitch" destination="bmb-wR-twF" id="mpp-e1-9Hx"/>
<outlet property="videoPreview" destination="mCE-j4-QAA" id="mP0-Qx-oq6"/>
</connections>
</viewController>
6 changes: 6 additions & 0 deletions YOLO/ViewController.swift
Original file line number Diff line number Diff line change
@@ -24,6 +24,8 @@ class ViewController: UIViewController {
@IBOutlet var View0: UIView!
@IBOutlet var segmentedControl: UISegmentedControl!
@IBOutlet weak var taskSegmentControl: UISegmentedControl!
@IBOutlet weak var trackingLabel: UILabel!
@IBOutlet weak var trackingSwitch: UISwitch!
@IBOutlet var playButtonOutlet: UIBarButtonItem!
@IBOutlet var pauseButtonOutlet: UIBarButtonItem!
@IBOutlet var slider: UISlider!
@@ -198,6 +200,8 @@ class ViewController: UIViewController {
switch sender.selectedSegmentIndex {
case 0:
if self.task != .detect {
self.trackingLabel.isHidden = true
self.trackingSwitch.isHidden = true
self.task = .detect
self.setModel()
}
@@ -207,6 +211,8 @@ class ViewController: UIViewController {
for i in 0..<self.boundingBoxViews.count {
self.boundingBoxViews[i].hide()
}
self.trackingLabel.isHidden = false
self.trackingSwitch.isHidden = false
self.setModel()
}
default: