viljarb/IKT213-photo-app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'magic'

Browse Source
This commit is contained in:
Kim André Bjørkede
2025-11-08 12:39:38 +01:00
parent b973907326 2bb8a30f97
commit dc9806c896
5 changed files with 639 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
.idea/workspace.xml generated
View File

@@ -5,11 +5,11 @@
</component>
<component name="ChangeListManager">
<list default="true" id="5e47ddf2-717f-442d-8925-70fd842ea97b" name="Changes" comment="">
<change beforePath="$PROJECT_DIR$/.idea/assignment_2_improved.iml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/assignment_2_improved.iml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/runConfigurations/Run_project.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/runConfigurations/Run_Project.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/utils/magic_scissors.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/icon.png" beforeDir="false" afterPath="$PROJECT_DIR$/src/icon.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/main.py" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/GUI.py" beforeDir="false" afterPath="$PROJECT_DIR$/src/GUI.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/SelectionArea.py" beforeDir="false" afterPath="$PROJECT_DIR$/src/SelectionArea.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/utils/area_selection.py" beforeDir="false" afterPath="$PROJECT_DIR$/src/utils/area_selection.py" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -38,14 +38,16 @@
"keyToString": {
"ModuleVcsDetector.initialDetectionPerformed": "true",
"Python.Main.executor": "Run",
"Python.Run Project.executor": "Run",
"Python.Run project.executor": "Run",
"Python.demo.executor": "Run",
"RunOnceActivity.ShowReadmeOnStart": "true",
"RunOnceActivity.TerminalTabsStorage.copyFrom.TerminalArrangementManager.252": "true",
"RunOnceActivity.git.unshallow": "true",
"com.intellij.ml.llm.matterhorn.ej.ui.settings.DefaultModelSelectionForGA.v1": "true",
"git-widget-placeholder": "main",
"git-widget-placeholder": "Merging main",
"junie.onboarding.icon.badge.shown": "true",
"last_opened_file_path": "/home/kim/Dokumenter/Universitet/Machine Vision/ikt213_project/src",
"last_opened_file_path": "C:/Users/ali-a/ikt213g25h/project/ikt213_project",
"node.js.detected.package.eslint": "true",
"node.js.detected.package.tslint": "true",
"node.js.selected.package.eslint": "(autodetect)",
@@ -65,8 +67,8 @@
<component name="SharedIndexes">
<attachedChunks>
<set>
<option value="bundled-js-predefined-d6986cc7102b-3aa1da707db6-JavaScript-PY-252.26830.99" />
<option value="bundled-python-sdk-164cda30dcd9-0af03a5fa574-com.jetbrains.pycharm.pro.sharedIndexes.bundled-PY-252.26830.99" />
<option value="bundled-js-predefined-d6986cc7102b-b598e85cdad2-JavaScript-PY-252.25557.130" />
<option value="bundled-python-sdk-1bde30d8e611-7b97d883f26b-com.jetbrains.pycharm.pro.sharedIndexes.bundled-PY-252.25557.130" />
</set>
</attachedChunks>
</component>
@@ -81,6 +83,8 @@
<workItem from="1760178939983" duration="46000" />
<workItem from="1760179006753" duration="6999000" />
<workItem from="1761202447788" duration="4986000" />
<workItem from="1762449673210" duration="27000" />
<workItem from="1762450070679" duration="216000" />
</task>
<servers />
</component>
@@ -91,5 +95,6 @@
<SUITE FILE_PATH="coverage/ikt213_project$demo.coverage" NAME="demo Coverage Results" MODIFIED="1760179584389" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
<SUITE FILE_PATH="coverage/ikt213_project$Run_project.coverage" NAME="Run project Coverage Results" MODIFIED="1761211029222" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$Sourcepath$" />
<SUITE FILE_PATH="coverage/ikt213_project$Main.coverage" NAME="Main Coverage Results" MODIFIED="1761211517199" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$Projectpath$" />
<SUITE FILE_PATH="coverage/ikt213_project$Run_Project.coverage" NAME="Run Project Coverage Results" MODIFIED="1762601932407" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$Projectpath$" />
</component>
</project>