mirror of
https://github.com/EyeTrackVR/EyeTrackVR.git
synced 2025-11-04 14:39:42 +08:00
fix ransac thresh add, add setup config
This commit is contained in:
parent
2465df6697
commit
373c29ceb6
@ -5,6 +5,7 @@ def BLINK(self):
|
|||||||
if self.blink_clear == True:
|
if self.blink_clear == True:
|
||||||
self.max_ints = []
|
self.max_ints = []
|
||||||
self.max_int = 0
|
self.max_int = 0
|
||||||
|
self.frames = 0
|
||||||
|
|
||||||
intensity = np.sum(self.current_image_gray_clean)
|
intensity = np.sum(self.current_image_gray_clean)
|
||||||
self.frames = self.frames + 1
|
self.frames = self.frames + 1
|
||||||
@ -14,7 +15,7 @@ def BLINK(self):
|
|||||||
|
|
||||||
if intensity > self.max_int:
|
if intensity > self.max_int:
|
||||||
self.max_int = intensity
|
self.max_int = intensity
|
||||||
if self.frames > 200: #TODO: test this number more (make it a setting??)
|
if self.frames > 300: #TODO: test this number more (make it a setting??)
|
||||||
self.max_ints.append(self.max_int)
|
self.max_ints.append(self.max_int)
|
||||||
if intensity < self.min_int:
|
if intensity < self.min_int:
|
||||||
self.min_int = intensity
|
self.min_int = intensity
|
||||||
|
|||||||
@ -296,7 +296,7 @@ class EyeProcessor:
|
|||||||
# todo: add process to initialise er_hsrac when resolution changes
|
# todo: add process to initialise er_hsrac when resolution changes
|
||||||
self.rawx, self.rawy, self.thresh, self.radius = self.er_hsf.run(self.current_image_gray)
|
self.rawx, self.rawy, self.thresh, self.radius = self.er_hsf.run(self.current_image_gray)
|
||||||
self.rawx, self.rawy, self.thresh = RANSAC3D(self, True)
|
self.rawx, self.rawy, self.thresh = RANSAC3D(self, True)
|
||||||
|
print(self.radius)
|
||||||
#if self.prev_x is None:
|
#if self.prev_x is None:
|
||||||
# self.prev_x = self.rawx
|
# self.prev_x = self.rawx
|
||||||
# self.prev_y = self.rawy
|
# self.prev_y = self.rawy
|
||||||
|
|||||||
@ -166,7 +166,7 @@ def RANSAC3D(self, hsrac_en):
|
|||||||
frame = self.current_image_gray_clean
|
frame = self.current_image_gray_clean
|
||||||
|
|
||||||
kernel = cv2.getStructuringElement(cv2.MORPH_ELLIPSE, (3, 3))
|
kernel = cv2.getStructuringElement(cv2.MORPH_ELLIPSE, (3, 3))
|
||||||
thresh_add = 10
|
|
||||||
rng = np.random.default_rng()
|
rng = np.random.default_rng()
|
||||||
newFrame2 = self.current_image_gray.copy()
|
newFrame2 = self.current_image_gray.copy()
|
||||||
# Convert the image to grayscale, and set up thresholding. Thresholds here are basically a
|
# Convert the image to grayscale, and set up thresholding. Thresholds here are basically a
|
||||||
@ -199,7 +199,7 @@ def RANSAC3D(self, hsrac_en):
|
|||||||
# frame_gray = frame_gray[max_loc[1] - maxloc1_hf:max_loc[1] + maxloc1_hf,
|
# frame_gray = frame_gray[max_loc[1] - maxloc1_hf:max_loc[1] + maxloc1_hf,
|
||||||
# max_loc[0] - maxloc0_hf:max_loc[0] + maxloc0_hf]
|
# max_loc[0] - maxloc0_hf:max_loc[0] + maxloc0_hf]
|
||||||
|
|
||||||
threshold_value = min_val + thresh_add
|
threshold_value = min_val + self.settings.gui_thresh_add
|
||||||
_, thresh = cv2.threshold(frame_gray, threshold_value, 255, cv2.THRESH_BINARY)
|
_, thresh = cv2.threshold(frame_gray, threshold_value, 255, cv2.THRESH_BINARY)
|
||||||
try:
|
try:
|
||||||
opening = cv2.morphologyEx(thresh, cv2.MORPH_OPEN, kernel)
|
opening = cv2.morphologyEx(thresh, cv2.MORPH_OPEN, kernel)
|
||||||
|
|||||||
53
scripts/ETVR_installer.iss
Normal file
53
scripts/ETVR_installer.iss
Normal file
@ -0,0 +1,53 @@
|
|||||||
|
; Script generated by the Inno Setup Script Wizard.
|
||||||
|
; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
|
||||||
|
|
||||||
|
#define MyAppName "EyeTrackVR"
|
||||||
|
#define MyAppVersion "0.2 BETA 5"
|
||||||
|
#define MyAppPublisher "EyeTrackVR"
|
||||||
|
#define MyAppURL "https://redhawk989.github.io/EyeTrackVR/"
|
||||||
|
#define MyAppExeName "eyetrackapp.exe"
|
||||||
|
|
||||||
|
[Setup]
|
||||||
|
; NOTE: The value of AppId uniquely identifies this application. Do not use the same AppId value in installers for other applications.
|
||||||
|
; (To generate a new GUID, click Tools | Generate GUID inside the IDE.)
|
||||||
|
AppId={{60B32C3C-819B-4685-AF40-49AB93539405}
|
||||||
|
AppName={#MyAppName}
|
||||||
|
AppVersion={#MyAppVersion}
|
||||||
|
;AppVerName={#MyAppName} {#MyAppVersion}
|
||||||
|
AppPublisher={#MyAppPublisher}
|
||||||
|
AppPublisherURL={#MyAppURL}
|
||||||
|
AppSupportURL={#MyAppURL}
|
||||||
|
AppUpdatesURL={#MyAppURL}
|
||||||
|
DefaultDirName={autopf}\{#MyAppName}
|
||||||
|
DisableProgramGroupPage=yes
|
||||||
|
OutputDir=C:\Users\beaul\OneDrive\Desktop\Output\
|
||||||
|
; Uncomment the following line to run in non administrative install mode (install for current user only.)
|
||||||
|
;PrivilegesRequired=lowest
|
||||||
|
OutputBaseFilename=EyeTrackVR-Setup
|
||||||
|
SetupIconFile=C:\Users\beaul\PycharmProjects\EyeTrackVR\EyeTrackApp\Images\logo.ico
|
||||||
|
Compression=lzma/ultra64
|
||||||
|
|
||||||
|
SolidCompression=yes
|
||||||
|
WizardStyle=modern
|
||||||
|
|
||||||
|
[Languages]
|
||||||
|
Name: "english"; MessagesFile: "compiler:Default.isl"
|
||||||
|
|
||||||
|
[Tasks]
|
||||||
|
Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}";
|
||||||
|
|
||||||
|
[Files]
|
||||||
|
Source: "C:\Users\beaul\PycharmProjects\EyeTrackVR\EyeTrackApp\dist\EyeTrackApp\{#MyAppExeName}"; DestDir: "{app}"; Flags: ignoreversion
|
||||||
|
Source: "C:\Users\beaul\PycharmProjects\EyeTrackVR\EyeTrackApp\dist\EyeTrackApp\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
|
||||||
|
; NOTE: Don't use "Flags: ignoreversion" on any shared system files
|
||||||
|
|
||||||
|
[Dirs]
|
||||||
|
Name: {app}; Permissions: users-full
|
||||||
|
|
||||||
|
[Icons]
|
||||||
|
Name: "{autoprograms}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"
|
||||||
|
Name: "{autodesktop}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: desktopicon
|
||||||
|
|
||||||
|
[Run]
|
||||||
|
Filename: "{app}\{#MyAppExeName}"; Description: "{cm:LaunchProgram,{#StringChange(MyAppName, '&', '&&')}}"; Flags: nowait postinstall skipifsilent
|
||||||
|
|
||||||
Loading…
Reference in New Issue
Block a user