generated from JetBrains/intellij-platform-plugin-template
-
Notifications
You must be signed in to change notification settings - Fork 0
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
Dev hackathon refactor model #67
Merged
nbirillo
merged 6 commits into
dev-hackathon-refactor
from
dev-hackathon-refactor-model
Oct 17, 2023
Merged
Dev hackathon refactor model #67
nbirillo
merged 6 commits into
dev-hackathon-refactor
from
dev-hackathon-refactor-model
Oct 17, 2023
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
# Conflicts: # ijPlugin/src/main/kotlin/org/jetbrains/research/tasktracker/modelInference/EmoPredictor.kt # ijPlugin/src/main/kotlin/org/jetbrains/research/tasktracker/tracking/webcam/WebCamTracker.kt
nbirillo
approved these changes
Oct 17, 2023
nbirillo
added a commit
that referenced
this pull request
Oct 17, 2023
* Add a camera checker + make the main page flexible (#38) * Add a mock photo maker (#39) * server part * fix detekt * send data * Add emoji panel (#42) * Add emoji panel * Finish with emotion handling * Code refactoring (#43) * Code refactoring * Revert changes * survey and walking between pages * survey sending/handling. * Fix connection refused error (#46) * Trying to add model with KInference * Trying to add client with model * Refactored client * Add request to emotional server * Fix code style * Fix bugs (#48) * Fix connection refused error * Rewrite tracking, and error server page and small other fixes * Resolve conflicts * Add a logger for emotions (#49) * Add a notification popup (#50) * survey sending/handling. * fixed isSuccessful and survey sending * KInference * Fixed KInference * Fixed KInference * Fixed after merge * Fix detect * Parse survey (#54) * Collect survey data * Resolve merge conflicts * Add thank you screen (#55) * Track emotions during changes between tool windows (#56) * FileEditorTracker * Add files via upload * model restoring * make a photo in FileEditorTracker * Add readme and small fixes (#58) * Add readme and small fixes * Add plugin link * Add youtube link * [ML4SE-129] new templates architecture. * [ML4SE-132] trackers refactored * Dev hackathon refactor configs (#59) * [ML4SE-128] removed Solve web page; Refactored main page config * [ML4SE-128] inheritance of BaseTrackingConfig in WebCamTrackingConfig * [ML4SE-129] resolved conflicts * [ML4SE-131] Refactoring of the existing templates * [ML4SE-130] Non base templates (#62) * [ML4SE-134] loggers refactored (#64) * [ML4SE-131] added ErrorPageTemplate * [ML4SE-131] changed final.html text * [ML4SE-131] added log files folder * [ML4SE-131] fixed text in final.html * [ML4SE-133] added survey config (#65) * [ML4SE-133] added survey config * [ML4SE-133] removed TODO * [ML4SE-133] Survey config has been reformatted. Survey html builds from the config file * [ML4SE-133] Added KDocs for HtmlQuestion * [ML4SE-133] resolved conflicts * [ML4SE-135] WebCamService (#66) * [ML4SE-135] WebCamService * [ML4SE-135] fixed WebCumService and WebCamUtils * [ML4SE-135] changed loop for detecting all devices * Dev hackathon refactor model (#67) * [ML4SE-137] added EmojiConfig * [ML4SE-137] Refactored system to use EmotionConfig * [ML4SE-137] removed ui items for emotion detection * [ML4SE-137] removed currentEmotion global variable, fixed log files names. * [ML4SE-137] added thresholds to the config. * [ML4SE-160] Divided configs into 2 types (#69) * [ML4SE-160] Divided configs into 2 types * [ML4SE-160] fixed tests * Returned original README.md * Dev hackathon refactor server (#68) * [ML4SE-153] routing functions * [ML4SE-153] some refactor * [ML4SE-153] fixed comments * [ML4SE-153] fixed EmotionHandler --------- Co-authored-by: Anastasiia Birillo <[email protected]> Co-authored-by: Maria Tigina <[email protected]> Co-authored-by: Maria Tigina <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.