Commit Graph

Select branches

Hide Pull Requests

backup

feature/shapes

feature/snapchatfilters

fill

implementing_menus

magic

main

main-merge-test

#10

#11

#12

#13

#14

#15

#16

#17

#2

#3

#4

#5

#6

#7

#8

#9

1st_release

2nd-release

Mono Color

• 4e7f6c91f6 modified: README.md main 2nd-release Viljar Bergstøl 2025-11-09 22:16:31 +01:00
• dea327e07a modified: src/utils/area_selection.py vb 2025-11-09 21:26:07 +01:00
• 650186cc2b modified: src/GUI.py vb 2025-11-09 20:04:01 +01:00
• efd0856187 adding pywin32 module to requirements, for windows clipboard access vb 2025-11-09 19:44:04 +01:00
• 3484478fdc Merge pull request #17 from UiA-IKT213-Gruppe4/feature/shapes viljarb0 2025-11-09 19:35:16 +01:00
• 3b686966aa removing useless options from selection right-click menu; removing test menu; putting options in their correct menus; adding options for shapes menu feature/shapes vb 2025-11-09 19:23:22 +01:00
• 5233b4ebe1 adding inverse selection for area selection vb 2025-11-09 16:07:32 +01:00
• 9ad39d8097 adding fill selection implementing_menus vb 2025-11-08 12:45:47 +01:00
• dc9806c896 Merge branch 'magic' fill Kim André Bjørkede 2025-11-08 12:39:38 +01:00
• b973907326 Merge branch 'main-merge-test' Kim André Bjørkede 2025-11-08 12:35:36 +01:00
• dac45749c5 Update to Git LFS main-merge-test Kim André Bjørkede 2025-11-08 12:35:02 +01:00
• 2bb8a30f97 added magic files magic Ali Hussain Zaki Al-Tamimy 2025-11-08 11:42:10 +01:00
• 844bd1643e Fix repo after someone fucked up all the binary files Kim André Bjørkede 2025-11-08 11:37:03 +01:00
• f0229f2aff Merge pull request #14 from UiA-IKT213-Gruppe4/implementing_menus viljarb0 2025-11-08 10:58:00 +01:00
• f9c9321907 cleaning vb 2025-11-08 10:56:54 +01:00
• b314c9887c Merge pull request #13 from UiA-IKT213-Gruppe4/tools-menu viljarb0 2025-11-08 10:25:37 +01:00
• 3429561abf adding fill color functionality; a fill button in shapes menu; and a fill button on the brush settings canvas vb 2025-11-08 10:24:47 +01:00
• 3ecf6636f4 adding erase functionality; adding brush shape option on the brush settings canvas vb 2025-11-07 17:24:53 +01:00
• 644c0eea1d Merge pull request #12 from UiA-IKT213-Gruppe4/image-menu viljarb0 2025-11-07 16:15:58 +01:00
• 193bf9b5b4 adding pre-existing flip/rotation functionalities to the image menu, and setting fixed options for vertical/horizontal flip and left/right 90 degree rotation vb 2025-11-07 16:09:13 +01:00
• eccc129189 updating readme vb 2025-11-07 15:26:59 +01:00
• c91e04c19f adding copy, paste, and cut functionalities to the clipboard menu vb 2025-11-07 15:24:14 +01:00
• e6599a1cd7 adding copy image from canvas; adding paste image to canvas vb 2025-11-07 14:51:01 +01:00
• eaa6b6f4d7 fixing crop and resize bug vb 2025-11-07 13:37:30 +01:00
• 0a83e847ca waaa vb 2025-11-07 13:24:30 +01:00
• 5aba41a4f9 adding requirements for image menu; integrating area selection with crop and resize functionalities vb 2025-11-06 16:10:48 +01:00
• db4fc94385 adding requirements for file menu; improving brush color palette. vb 2025-11-06 15:43:24 +01:00
• bedcc40596 adding requirement list to readme vb 2025-11-06 14:25:27 +01:00
• 8a25fb8201 readme update vb 2025-11-06 10:08:13 +01:00
• cc8e1fc836 Merge pull request #11 from UiA-IKT213-Gruppe4/main-merge-test viljarb0 2025-11-06 10:07:00 +01:00
• ebf691e910 Merge pull request #10 from UiA-IKT213-Gruppe4/guifix viljarb0 2025-11-06 10:03:52 +01:00
• 34c0f313a2 readme update vb 2025-11-06 10:01:22 +01:00
• 3916513cfd moving area selection, text input, and brush functionalities out of GUI.py and into their own files in the utils directory vb 2025-11-06 09:44:34 +01:00
• fd7d3bb537 add text functionality vb 2025-11-05 21:44:51 +01:00
• b2c109c97a adding empty menus vb 2025-11-05 20:57:27 +01:00
• b251adb4f9 removing test images vb 2025-11-05 19:34:19 +01:00
• 61673ad041 hotkey for quit, save image, and open image vb 2025-11-05 19:32:10 +01:00
• 009a3b6568 adding hotkeys vb 2025-11-05 19:25:36 +01:00
• 63529b1e3c fixing cropping coordinates vb 2025-11-05 18:37:32 +01:00
• f34bf706fb adding brush functionality and a new canvas for the brush settings vb 2025-11-05 17:09:49 +01:00
• 27cdbaa071 removing corrupt images vb 2025-11-03 21:54:10 +01:00
• b219fa72a5 adding a new icon and lena.png; adding openCamera() method manually to src/GUI.py after merge vb 2025-11-03 21:50:14 +01:00
• 1c5eeef8ad Merge pull request #9 from UiA-IKT213-Gruppe4/area-selection viljarb0 2025-11-03 21:20:08 +01:00
• d7f42be97c Merge branch 'main' into area-selection viljarb0 2025-11-03 21:19:59 +01:00
• 70e7d20ec2 Merge pull request #8 from UiA-IKT213-Gruppe4/feature/snapchatfilters Moira Daniella sebastian 2025-11-03 20:13:10 +01:00
• fce0641992 Merge pull request #7 from UiA-IKT213-Gruppe4/main feature/snapchatfilters Moira Daniella sebastian 2025-11-03 20:12:08 +01:00
• 9aee76e7fe adding redo and area selection Viljar Bergstøl 2025-11-03 16:51:55 +01:00
• e29adebd4e snapchat filter test Moira Daniella sebastian 2025-11-03 16:33:54 +01:00
• 80fa44a836 adding redo functionality Viljar Bergstøl 2025-11-03 16:03:44 +01:00
• e0b75b5796 Update signature of manipulateImage to return an ImageContainer backup Kim André Bjørkede 2025-10-27 10:59:19 +01:00
• 60cd4e5636 Add sequence diagram Kim André Bjørkede 2025-10-27 10:59:01 +01:00
• 1e535938b4 Update CONTRIBUTING.MD to include UML updating Kim André Bjørkede 2025-10-27 10:52:03 +01:00
• a85142c1cb Fix return signature for getImage Kim André Bjørkede 2025-10-27 10:50:41 +01:00
• 53c577d591 Remove unecessary comments Kim André Bjørkede 2025-10-27 10:50:21 +01:00
• c393947296 Fix direct access to private member Kim André Bjørkede 2025-10-27 10:49:57 +01:00
• c642945176 Update UML class diagram Kim André Bjørkede 2025-10-27 10:49:39 +01:00
• b417803472 removing test message vb 2025-10-25 23:32:37 +02:00
• 2e5bda4531 adding area selection vb 2025-10-25 22:17:47 +02:00
• 17d0b4b8c0 Add CONTRIBUTING.md Kim André Bjørkede 2025-10-23 11:58:40 +02:00
• cfadd5245a Update PyCharm run configuration and move project over to Git LFS Kim André Bjørkede 2025-10-23 11:27:55 +02:00
• b1f9d0d8c1 Update README.md viljarb0 2025-10-20 22:03:16 +02:00
• 018507091e Merge branch '1st' 1st_release Kim André Bjørkede 2025-10-20 21:49:37 +02:00
• 6453106dc0 Add setup instructions to README viljarb0 2025-10-20 18:12:40 +02:00
• 5b885a8aba Merge pull request #6 from UiA-IKT213-Gruppe4/viljar viljarb0 2025-10-20 16:52:26 +02:00
• 3002411a69 modified: src/GUI.py vb 2025-10-20 16:21:22 +02:00
• 642021516d modified: src/GUI.py vb 2025-10-20 15:45:21 +02:00
• 25ef345e99 Merge pull request #5 from UiA-IKT213-Gruppe4/viljar viljarb0 2025-10-20 15:12:34 +02:00
• 2e168f408e transferring functionalities from main.py to src vb 2025-10-20 14:37:49 +02:00
• 8f8f4b11ce adding opencv to requirements.txt vb 2025-10-20 14:36:34 +02:00
• 48b88adf6d Merge pull request #4 from UiA-IKT213-Gruppe4/Refactor_and_add_documentation viljarb0 2025-10-20 13:05:50 +02:00
• 8f1ae488eb Add CropImage child of ImageManipulation Kim André Bjørkede 2025-10-11 20:48:28 +02:00
• 3024756b9c Update UML Kim André Bjørkede 2025-10-11 18:11:09 +02:00
• b57ea23e62 Add runConfigurations from PyCharm Kim André Bjørkede 2025-10-11 17:49:56 +02:00
• 0dc89f2e9b Add .idea configuration Kim André Bjørkede 2025-10-11 17:49:38 +02:00
• a32cc51fb6 Begin refactor Kim André Bjørkede 2025-10-11 17:43:49 +02:00
• 79f4313cc6 Add UML documentation Kim André Bjørkede 2025-10-11 16:57:26 +02:00
• f1cc6d73cc Update README.md viljarb0 2025-10-11 15:38:01 +02:00
• fbc86391f5 Merge pull request #3 from UiA-IKT213-Gruppe4/viljar viljarb0 2025-10-11 13:36:06 +02:00
• bef5f5edb3 deleted: app/__init__.py deleted: app/functions.py vb 2025-10-11 13:34:23 +02:00
• 0741b85b24 deleted: demo.py vb 2025-10-11 13:33:58 +02:00
• 9b0c14129c demo.py -> main.py vb 2025-10-11 13:33:50 +02:00
• 4b299d3ac3 Merge pull request #2 from UiA-IKT213-Gruppe4/viljar viljarb0 2025-10-11 13:31:20 +02:00
• 61328540a2 demo.py -> main.py; don't push cache vb 2025-10-11 13:29:46 +02:00
• be2dae1f27 don't save cache vb 2025-10-11 13:28:36 +02:00
• 9976443029 modified: README.md vb 2025-10-10 14:28:08 +02:00
• 0926f37b38 modified: demo.py modified: f512418272.png vb 2025-10-10 14:27:34 +02:00
• f218af4810 adding gitignore vb 2025-10-10 14:12:26 +02:00
• f5b5f9f6e7 new file: cache/f512418272.png new file: cache/lena.jpg new file: demo.py new file: f512418272.png new file: icon.png new file: lena.jpg vb 2025-10-10 14:02:41 +02:00
• 6ca192701e first commit vb 2025-10-10 14:02:38 +02:00