-
Notifications
You must be signed in to change notification settings - Fork 55
Advanced Shuffle Editor #70
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
Merged
Merged
Changes from all commits
Commits
Show all changes
41 commits
Select commit
Hold shift + click to select a range
a2b53fd
Have draggable nodes (demo)
Gaming32 4f0b1aa
Finish demo editor editing (serialization still to come)
Gaming32 647fd8e
Implement demo in Java
Gaming32 43b263e
Implement the Collection interface, fix bugs, and add support for dis…
Gaming32 712a1b6
Make it actually work
Gaming32 aef921b
Add button (took a lot of effort lol)
Gaming32 170f763
It's alive!
Gaming32 e00ec64
Import/export feature
Gaming32 7697ef1
Improve errors
Gaming32 418e1ad
Fix distribution shuffling
Gaming32 74cd7eb
Add some labels
Gaming32 f4abca3
Add warped distributions
Gaming32 d665699
Merge branch 'new-shuffles' of https://github.com/gaming32/ArrayV-v4.…
Gaming32 b9f03fc
Reimplement and deprecate old method
Gaming32 0353c34
GUI improvements
Gaming32 bc05cb3
Add dragging limit for nodes
Gaming32 3e00fb7
Add panning using middle click
Gaming32 3832028
Revamp scrambled tail/head
Gaming32 acb0175
Remove some redundant shuffles
Gaming32 202fa4d
Fix infinite shuffle loops
Gaming32 80acaeb
Improve the Choose Shuffle dialog
Gaming32 fcec386
Fix bug(s)
Gaming32 76a4991
Shrink text when necessary
Gaming32 08187dc
Add base distribution selector
Gaming32 52ffda5
Change heading
Gaming32 8c2edf3
Delete shuffle_editor_test.py
Gaming32 9905de5
Update CustomImageDialog.java
Gaming32 c2ae11a
Update ArrayManager.java
Gaming32 09f9d08
Offset added nodes
Gaming32 7eb5a7b
Add a button to clear disconnected nodes
Gaming32 c69d7e0
Added sleep ratio and made coordinates optional in shuffle files
Gaming32 7abe505
Add GUI
Gaming32 d7da291
Rename Node and Connection classes
Gaming32 095143d
Update ShufflePrompt.java
Gaming32 0ebba95
Ignore CUSTOM distribution
Gaming32 22eaa5e
Update ShuffleDialog.java
Gaming32 215430f
Update Noisily sorted.txt
Gaming32 f83b9a7
Rename findSafeCoordinate to findSafeCoordinates
Gaming32 bd42a95
Add delays per sub-shuffle
Gaming32 6d00b59
Remove an unnecessary field
Gaming32 5a26192
Persist the per-shuffle delay checkbox
Gaming32 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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,5 @@ | ||
| 2 2.0 | ||
| N true RANDOM true 0 1 | ||
| N false SORTED 1 -1 | ||
| C 0 1 | ||
| C 1 2 | ||
This file contains hidden or 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,4 @@ | ||
| N false REVERSE 25 15 0 1 | ||
| N false ALMOST 275 15 1 -1 | ||
| C 0 1 | ||
| C 1 2 |
This file contains hidden or 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 hidden or 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,12 @@ | ||
| package dialogs; | ||
|
|
||
| final public class ExportShuffleDialog extends FileDialog { | ||
| public ExportShuffleDialog() { | ||
| super(); | ||
|
|
||
| fileDialog.setDialogTitle("Choose where to export the current shuffle graph..."); | ||
|
|
||
| fileDialog.showSaveDialog(null); | ||
| this.file = fileDialog.getSelectedFile(); | ||
| } | ||
| } |
This file contains hidden or 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,12 @@ | ||
| package dialogs; | ||
|
|
||
| final public class ImportShuffleDialog extends FileDialog { | ||
| public ImportShuffleDialog() { | ||
| super(); | ||
|
|
||
| fileDialog.setDialogTitle("Choose where to import the current shuffle graph from..."); | ||
|
|
||
| fileDialog.showOpenDialog(null); | ||
| this.file = fileDialog.getSelectedFile(); | ||
| } | ||
| } |
This file contains hidden or 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 hidden or 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 hidden or 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 hidden or 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,14 +1,12 @@ | ||
| package dialogs; | ||
|
|
||
| import javax.swing.filechooser.FileNameExtensionFilter; | ||
|
|
||
| final public class SaveArrayDialog extends FileDialog { | ||
| public SaveArrayDialog() { | ||
| super(); | ||
|
|
||
| this.fileDialog.setDialogTitle("Choose where to save the contents of the main array..."); | ||
| fileDialog.setDialogTitle("Choose where to save the contents of the main array..."); | ||
|
|
||
| this.fileDialog.showSaveDialog(null); | ||
| this.file = this.fileDialog.getSelectedFile(); | ||
| fileDialog.showSaveDialog(null); | ||
| this.file = fileDialog.getSelectedFile(); | ||
| } | ||
| } |
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.
Uh oh!
There was an error while loading. Please reload this page.