forked from se-edu/addressbook-level4
-
Notifications
You must be signed in to change notification settings - Fork 64
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
[T09-3] Picconso #50
Open
benedictcss
wants to merge
1,538
commits into
nus-cs2103-AY1819S1:master
Choose a base branch
from
CS2103-AY1819S1-T09-3:master
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
[T09-3] Picconso #50
Changes from all commits
Commits
Show all changes
1538 commits
Select commit
Hold shift + click to select a range
f2d8c96
Merge pull request #177 from lancelotwillow/master
lancelotzty dfd7e7e
Add Codacy badge
codacy-badger b0c7ab9
Add Codacy badge
codacy-badger 78869fa
Merge pull request #179 from codacy-badger/codacy-badge
lancelotzty 5155014
Merge pull request #179 from codacy-badger/codacy-badge
lancelotzty 47f8551
Update README.adoc
lancelotzty 55aea42
Update README.adoc
lancelotzty 15ac611
ignore the package for repo sense
1420176
Update config.json
lancelotzty 59040b0
Update config.json
lancelotzty 61cb7f5
Merge branch 'master' of https://github.com/CS2103-AY1819S1-T09-3/main
j-lum b25ed8f
Merge branch 'master' of https://github.com/CS2103-AY1819S1-T09-3/main
jeffrylum 7f0e377
Merge pull request #169 from j-lum/master
benedictcss df8c678
Merge pull request #169 from j-lum/master
benedictcss d799d64
remove useless package
1cfe244
merge the team master for layer
719acdb
Added comments for Layers and Canvas commands
j-lum c5c2a87
Added more comments for Canvas and Layer and ModelManager methods.
j-lum 6f91252
Merge branch 'master' of https://github.com/CS2103-AY1819S1-T09-3/main
benedictcss 587c631
update SelectCommand to OpenCommand
benedictcss 6b5a516
Merge pull request #183 from j-lum/master
benedictcss 94862f7
fix checkstyle error
benedictcss 8533a4e
fix checkstyle error
benedictcss 1c05803
Removed the canvas save commmand.
j-lum 2710c61
add test for imageMagickUtil
18dd323
merge changes from team
b691d4e
Merge pull request #184 from benedictcss/refactorSelectToOpen
benedictcss fab839f
Merge branch 'master' of https://github.com/CS2103-AY1819S1-T09-3/main
j-lum 5ed73b9
first test for travis
670883e
second approach for passing travis
e75faaf
merge the team master
3b835af
Removed the canvas save commmand.
j-lum 9136f70
third approach for passing travis
53d309d
Remove the extra test for raw
j-lum c36f126
forth approach for passing travis
061d748
fifth approach for passing travis
137e9be
Fixed canvas resizing.
j-lum 82d44a1
modify save command
90b65c6
Fixed the author tag for most of my commits.
j-lum bbe78fd
Merge branch 'master' of https://github.com/CS2103-AY1819S1-T09-3/mai…
j-lum 43ab476
Minor performance fixes recommended by codacy.
j-lum 7fc3aa8
Merge pull request #186 from j-lum/master
j-lum b2669ba
Added a bunch of tests and refactored some error handling in commands.
j-lum aa806a6
Added a bunch of tests and refactored some error handling in commands.
j-lum 40b2caf
Updated the DG and my PPP.
j-lum 4c95a2f
Merge pull request #188 from j-lum/master
j-lum 73a0b19
combine raw command
76652c4
modify convert command
e125cfe
fix travis
af0070f
fix travis2
b40f856
fix travis3
e9c65a6
fix travis4
69d0896
Merge pull request #181 from lancelotwillow/master
lancelotzty 34ca95a
Misc codacy fixes.
j-lum 98a6ace
correct methods naming for tests
052a5c5
add test for clear cache
ihwk1996 1949eef
Merge pull request #189 from j-lum/master
lancelotzty ace6114
fix conflict
237539b
Merge commit '69d089685d2f8423474b1b70f4d6cefaf993faf8' into add-test…
ihwk1996 314bd95
Merge pull request #191 from lancelotwillow/master
lancelotzty d0df730
checkstyle fixes
ihwk1996 4157845
checkstyle fix 2
ihwk1996 0b80acf
Merge pull request #192 from ihwk1996/add-test-clearcache-minor-fixes
ihwk1996 a10b43d
More codacy fixes.
j-lum 72d4730
Merge branch 'master' of https://github.com/CS2103-AY1819S1-T09-3/mai…
j-lum 1ba14a1
Merge pull request #193 from j-lum/master
j-lum 5ca6a27
DeveloperGuide.adoc: Updating diagrams and content for login, Google …
bb17540
Merge branch 'master' of https://github.com/CS2103-AY1819S1-T09-3/mai…
5b81749
DeveloperGuide.adoc: Updating for Google Download Feature
4a7ed4a
DG updates
ihwk1996 6e6114e
Merge pull request #194 from ihwk1996/undoredo-DG-changes
ihwk1996 c3f1988
DeveloperGuide.adoc: Removing redundant areas
0432086
Merge branch 'master' into documentation-update
65c0196
DeveloperGuide.adoc: Adding updates to general portions
f6ace9c
spelling fix
ihwk1996 f8a97e4
modify some test in imageMagick
25dffc8
fix checkstyle
44a1d0b
update command box to handle multiple tabs
benedictcss 4f878ad
fix some codacy
8c8e2b7
Update UGDG for open command
benedictcss d871b70
fix checkstyle
2611436
update reposense
benedictcss 913998f
Merge pull request #196 from lancelotwillow/master
lancelotzty f855b0c
Merge branch 'master' into update-ugdg
benedictcss 02503f9
merge branch
benedictcss 9e4752e
Merge branch 'update-ugdg' of https://github.com/benedictcss/main int…
benedictcss c50a563
fix test fail on travis
benedictcss 60f5503
fix codacy
benedictcss 5af282a
update commandbox test to fix assertion failure
benedictcss 0dec3bf
check travis errors
benedictcss 89387bc
add line to check travis test
benedictcss efe1e29
DeveloperGuide.adoc: Formatting and Grammar checks
6a9f69e
Merge branch 'master' of https://github.com/CS2103-AY1819S1-T09-3/mai…
13c5486
modify UG
7b59175
Merge pull request #195 from chivent/documentation-update
ff037e3
Merge branch 'master' into update-ugdg
d26505b
modify UG2
b47963e
fix conflict
6ca142a
fix checkstyle
efb219e
Merge pull request #199 from lancelotwillow/master
lancelotzty ff54ecb
DeveloperGuide.adoc: Updating the Appendix
63b6d20
Merge branch 'master' of https://github.com/CS2103-AY1819S1-T09-3/mai…
3e45e77
Editing files to remove warnings
4cc8e32
Merge pull request #200 from chivent/documentation-update
ebbc0c6
Merge branch 'master' into update-ugdg
333bbfa
Adding tests for coveralls
d3361e6
Adding Google tests for coveralls
146beee
Correcting test for Google
ca0199d
merge branch
benedictcss 294cd59
Merge branch 'master' of https://github.com/CS2103-AY1819S1-T09-3/mai…
benedictcss 3e00dd7
Adding tests for Google and HistoryListPanel
1b0b88e
Merge branch 'update-ugdg' of https://github.com/benedictcss/main int…
benedictcss 64cd703
Merge pull request #198 from benedictcss/update-ugdg
benedictcss 96d3f78
adding test for layer panel
ae0fcde
Merge pull request #201 from chivent/general-updates
dd9fb3b
remove gif images from imagelist
benedictcss 49f9e00
update benedictcss.adoc
benedictcss 4f23df8
update DG
benedictcss 2f35749
update userprefs to improve codacy
benedictcss 332ae28
update remaining convert to apply
benedictcss 74b8290
Merge pull request #202 from benedictcss/update-ugdg
benedictcss 66248c4
Reformatting error/success messages for applying transformations and …
0b4d2f2
Merge branch 'master' of https://github.com/CS2103-AY1819S1-T09-3/mai…
j-lum 9ff8ec4
Correcting common diagrams and messages
c2d7e5a
Updating general portions of userGuide, readMe, aboutUs and contactUs
f6a2f23
Merge branch 'master' into general-updates
b01019d
added EOF AboutUs
c50e396
Merge pull request #203 from chivent/general-updates
6d341cb
editing user guide
38422ac
Updated UG further.
j-lum 297fa36
Forgot the new images.
j-lum e7d68ec
Merged before push, sorry to whoever wrote the quick start.
j-lum a04a837
Merge pull request #204 from j-lum/master
j-lum 57479ca
Merge branch 'master' of https://github.com/CS2103-AY1819S1-T09-3/mai…
49f4410
More grammar changes in the UG.
j-lum 3b857ea
Merge pull request #205 from j-lum/master
j-lum 80de950
fix test
d068e2a
fix test2
26a9df8
Merge branch 'master' of https://github.com/CS2103-AY1819S1-T09-3/main
d868fca
Merge pull request #206 from lancelotwillow/master
lancelotzty 3081ec2
Fixed format of png files for export.
j-lum f733ba4
Minor grammar changes
j-lum 8be34c2
Merge pull request #207 from j-lum/master
j-lum d5d54a4
add test
d1587c4
Merge branch 'master' of team
f5a1470
modify DG
c656248
merge my master
5fcc996
fix checkstyle
88b5e63
fix codacy
ae1cbe5
fix checkstyle
dc6cfc8
Merge pull request #208 from lancelotwillow/master
lancelotzty 125c473
Update lancelotwillow.adoc
lancelotzty 72fda94
Update lancelotwillow.adoc
lancelotzty f188f5f
Update lancelotwillow.adoc
lancelotzty 9575079
update diagram
d7ab97e
Merge branch 'master' of https://github.com/CS2103-AY1819S1-T09-3/main
332556d
fix checkstyle
fa687c1
reformatting ug
8142187
Merge pull request #209 from lancelotwillow/master
lancelotzty c4c5aee
Merge branch 'master' of https://github.com/CS2103-AY1819S1-T09-3/mai…
3a49f53
Merge branch 'master' into general-updates
88ff3d0
Merge pull request #210 from chivent/general-updates
9ce231a
remove top Addressbook bar
ihwk1996 1a015d2
Change undoredo diagram
ihwk1996 cb6ced2
Minor grammar changes
j-lum 6cbbc35
Removed unused class Test.java.
j-lum 3920593
Style fixes.
j-lum 8bb7c97
Merge pull request #212 from j-lum/master
j-lum 97a7adc
Fixed tianyang's face
j-lum 70ed964
Update sequence diagrams and ugdg
benedictcss a011fbc
Rewrote some of Transformations.
j-lum 9b112b3
Merge pull request #211 from ihwk1996/DG-amendments
ihwk1996 d7d5f7d
Merge branch 'master' of https://github.com/CS2103-AY1819S1-T09-3/mai…
j-lum 07224dc
Grammar fixes.
j-lum c414009
Merge pull request #214 from j-lum/master
j-lum 0adf670
Merge pull request #213 from benedictcss/update-ugdg
j-lum bdcefab
Fixed comments in code.
j-lum 3a99f7e
Merge pull request #215 from j-lum/master
j-lum 8c12529
change wording
01dbd8d
Merge branch 'master' of https://github.com/CS2103-AY1819S1-T09-3/main
e5a26f2
Gave `apply raw` it's own section, clarified the `apply resize` command.
j-lum c058e29
minor english changes
ihwk1996 32d8b96
Merge pull request #217 from ihwk1996/ivan-PPP-changes
ihwk1996 080c4ed
update benedictcss.adoc
benedictcss c3375e4
update diagram
benedictcss fd1c439
Fixed the conjugation of canvas size.
j-lum f8b570b
Merge branch 'master' of https://github.com/CS2103-AY1819S1-T09-3/mai…
j-lum b5d9fde
Merge pull request #219 from j-lum/master
j-lum 6516109
Merge branch 'master' of https://github.com/CS2103-AY1819S1-T09-3/mai…
j-lum f0aaa98
update ihwk1996.adoc
ihwk1996 ab9eaa0
Updated own PPP doc.
b109f47
Merge pull request #218 from benedictcss/update-ugdg
benedictcss 8a51587
Merge branch 'master' of https://github.com/CS2103-AY1819S1-T09-3/mai…
69d70b6
update Developer Guide Diagram
340ba96
Merge branch 'master' of https://github.com/CS2103-AY1819S1-T09-3/main
27cdf83
update ivan page
ihwk1996 bd3956b
increase photo size
ihwk1996 b7c0a4d
Merge pull request #216 from lancelotwillow/master
lancelotzty 8a986bb
Merge pull request #221 from ihwk1996/ivan-PPP-more-changes
ihwk1996 e75d3ea
Merge pull request #220 from chivent/general-updates
94fb614
update DG with figure labels
ihwk1996 f299306
update ppp benedictcss
benedictcss 9c08d91
Merge pull request #223 from ihwk1996/ivan-general-updates
ihwk1996 fb1912e
typo fix
ihwk1996 d37255e
add image
8f06e42
Merge branch 'master' of https://github.com/CS2103-AY1819S1-T09-3/main
e660d37
Merge pull request #224 from lancelotwillow/master
lancelotzty 0de5279
Update lancelotwillow.adoc
lancelotzty 52ef22d
fix image
ddf5fc1
update adocs to include manual testing
benedictcss 654518a
fix image2
89c11d8
further updates on manual testing in DG
benedictcss f816f89
Merge pull request #226 from lancelotwillow/master
lancelotzty 6f5f1ec
Merge pull request #225 from benedictcss/update-ugdg
benedictcss 5cbbaf1
Update lancelotwillow.adoc
lancelotzty 383b0de
Only known image of me in a suit.
j-lum 6a136ca
Merge branch 'master' of https://github.com/CS2103-AY1819S1-T09-3/mai…
j-lum 99aa4c4
Only known image of me in a suit.
j-lum db1e654
update tags in DG
benedictcss d430a35
fix tags in DG
benedictcss 6694713
Merge pull request #227 from benedictcss/update-ugdg
benedictcss 99ab300
update benedictcss.adoc
benedictcss 19454d3
add manual test
6a7a482
Updated the DG to include a testing guide.
j-lum 856e8f7
Merge pull request #228 from lancelotwillow/master
lancelotzty 2e009a5
Merge pull request #229 from j-lum/master
j-lum a8e7222
update own adoc
benedictcss 14957a4
update my adoc
benedictcss f5ba90d
Delete j-lum.pdf
j-lum ffe2103
update ascii.adoc
benedictcss d045291
update manual testing of undo redo
ihwk1996 91d8c36
Merge pull request #230 from ihwk1996/undoredo-manual-tests
ihwk1996 002fbed
developer and user guide update
080f0bf
Merge branch 'master' of https://github.com/CS2103-AY1819S1-T09-3/mai…
7d45f26
Merge pull request #231 from chivent/general-updates
c3f7244
Pants wetting exception fixing experience.
j-lum e930cc0
More fixes.
j-lum 3ad58b7
Please figure out how to write tests.
j-lum 02c0f8f
Merge pull request #232 from j-lum/master
j-lum 3d65a15
Please figure out how to write tests.
j-lum 7491730
Merge pull request #233 from j-lum/master
j-lum ecb1aab
Update SaveCommandTest.java
lancelotzty 9d3b1a4
Clued in clueless users.
j-lum d506a00
Added blurb about rotation center and added missing image files.
j-lum 7a582f3
Added alternate link for tutorial.
j-lum 6001115
Added a blurb about file formats supported.
j-lum cc287fa
added warning for redirecting
74c031d
removal of google auto-login since it does not seem to add value to u…
ff00cc0
check style fixes
1db6fa1
Merge pull request #235 from chivent/master
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
There are no files selected for viewing
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,40 +1,47 @@ | ||
= Address Book (Level 4) | ||
= Piconso: The Console-based Image Editor | ||
|
||
ifdef::env-github,env-browser[:relfileprefix: docs/] | ||
|
||
https://travis-ci.org/se-edu/addressbook-level4[image:https://travis-ci.org/se-edu/addressbook-level4.svg?branch=master[Build Status]] | ||
https://ci.appveyor.com/project/damithc/addressbook-level4[image:https://ci.appveyor.com/api/projects/status/3boko2x2vr5cc3w2?svg=true[Build status]] | ||
https://coveralls.io/github/se-edu/addressbook-level4?branch=master[image:https://coveralls.io/repos/github/se-edu/addressbook-level4/badge.svg?branch=master[Coverage Status]] | ||
https://www.codacy.com/app/damith/addressbook-level4?utm_source=github.com&utm_medium=referral&utm_content=se-edu/addressbook-level4&utm_campaign=Badge_Grade[image:https://api.codacy.com/project/badge/Grade/fc0b7775cf7f4fdeaf08776f3d8e364a[Codacy Badge]] | ||
https://gitter.im/se-edu/Lobby[image:https://badges.gitter.im/se-edu/Lobby.svg[Gitter chat]] | ||
https://travis-ci.org/CS2103-AY1819S1-T09-3/main[image:https://travis-ci.org/CS2103-AY1819S1-T09-3/main.svg?branch=master[Build Status]] | ||
https://ci.appveyor.com/project/benedictcss/main[image:https://ci.appveyor.com/api/projects/status/9odxi2csp68dsqm7?svg=true[Build Status]] | ||
https://coveralls.io/github/CS2103-AY1819S1-T09-3/main?branch=master[image:https://coveralls.io/repos/github/CS2103-AY1819S1-T09-3/main/badge.svg?branch=master[Coverage Status]] | ||
image:https://api.codacy.com/project/badge/Grade/6e5a3a4804ff4ce08fa5d3358ed0d67a[link="https://app.codacy.com/app/lancelotwillow/main?utm_source=github.com&utm_medium=referral&utm_content=CS2103-AY1819S1-T09-3/main&utm_campaign=Badge_Grade_Dashboard"] | ||
|
||
Piconso is an CLI-based (Command Line Interface) Image Editor designed and developed for quick and efficient image-editing. Many image-editors are complex and difficult to pick up, coupled with a steep learning curve, and sometimes even a steep price! + | ||
|
||
Unlike them, Piconso offers the same features, in a much more simplified manner. With Piconso, all traditional image-editing features can be performed solely through text commands, removing the hassle of working with a mouse. The interface can be used by | ||
photographers, designers, developers and more, and is very easy to pick up. | ||
|
||
== Product | ||
|
||
ifdef::env-github[] | ||
image::docs/images/Ui.png[width="600"] | ||
image::docs/images/Ui.png[width="602"] | ||
endif::[] | ||
|
||
ifndef::env-github[] | ||
image::images/Ui.png[width="600"] | ||
image::images/Ui.png[width="602"] | ||
endif::[] | ||
|
||
* This is a desktop Address Book application. It has a GUI but most of the user interactions happen using a CLI (Command Line Interface). | ||
* It is a Java sample application intended for students learning Software Engineering while using Java as the main programming language. | ||
* It is *written in OOP fashion*. It provides a *reasonably well-written* code example that is *significantly bigger* (around 6 KLoC)than what students usually write in beginner-level SE modules. | ||
* What's different from https://github.com/se-edu/addressbook-level3[level 3]: | ||
** A more sophisticated GUI that includes a list panel and an in-built Browser. | ||
** More test cases, including automated GUI testing. | ||
** Support for _Build Automation_ using Gradle and for _Continuous Integration_ using Travis CI. | ||
Above shows the UI layout | ||
|
||
* *Upper left column*: Shows history of transformations performed on current layer. | ||
* *Lower left column*: Shows first 10 images in current directory. | ||
* *Middle*: Shows original image and rendered preview. | ||
* *Right column*: Layers currently used. | ||
* *Bottom*: Command output console and input for commands. | ||
|
||
== Features | ||
* Several traditional image-editing features such as crop, blur etc. | ||
* Capability to define own custom transformation set. | ||
* Direct access to images on Google Photos (download and upload). | ||
* A wide range of edit text-commands that remove the need for a mouse. | ||
|
||
== Site Map | ||
|
||
* <<UserGuide#, User Guide>> | ||
* <<DeveloperGuide#, Developer Guide>> | ||
* <<LearningOutcomes#, Learning Outcomes>> | ||
* <<AboutUs#, About Us>> | ||
* <<ContactUs#, Contact Us>> | ||
|
||
== Acknowledgements | ||
|
||
* Some parts of this sample application were inspired by the excellent http://code.makery.ch/library/javafx-8-tutorial/[Java FX tutorial] by | ||
_Marco Jakob_. | ||
* Libraries used: https://github.com/TestFX/TestFX[TextFX], https://bitbucket.org/controlsfx/controlsfx/[ControlsFX], https://github.com/FasterXML/jackson[Jackson], https://github.com/google/guava[Guava], https://github.com/junit-team/junit5[JUnit5] | ||
|
||
== Licence : link:LICENSE[MIT] | ||
* This application is morphed from the https://github.com/se-edu/[AddressBook-Level4] project created by _SE-EDU_ initiative for student learning. |
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,32 @@ | ||
{ | ||
"ignoreGlobList": ["**.adoc", "collate**", "**resources/imageMagic**"], | ||
"formats": ["gradle", "jade", "java", "js", "md", "scss", "yml", "xml"], | ||
"authors": | ||
[ | ||
{ | ||
"githubId": "j-lum", | ||
"displayName": "Jeffry", | ||
"authorNames": ["j-lum", "Jeffry Lum"] | ||
}, | ||
{ | ||
"githubId": "benedictcss", | ||
"displayName": "Benedict", | ||
"authorNames": ["benedictcss", "DESKTOP-56O063T\\Benedict"] | ||
}, | ||
{ | ||
"githubId": "chivent", | ||
"displayName": "Kai Le", | ||
"authorNames": ["Ong Kai Le"] | ||
}, | ||
{ | ||
"githubId": "ihwk1996", | ||
"displayName": "Ivan", | ||
"authorNames": ["Ivan Ho Weng Kwong"] | ||
}, | ||
{ | ||
"githubId": "lancelotwillow", | ||
"displayName": "Tianyang", | ||
"authorNames": ["ZHANG TIANYANG"] | ||
} | ||
] | ||
} |
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
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
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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
instead of removing, you can update them with your own repo link