Concatenate Files + Replace Files + Bug Fixes #118
Merged
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
…oncatenated show savable and then loadable again. The naming convention for the sets has changed, so any old .emrick files will not work. Sets are now named "movementNumber-setNumber" e.g 1-2A, 2-4, 2-1B
… files and they will automatically be converted to up-to-date ones. That means you can concatenate an old file with a new file or two old files. If saved, they will no longer have the old format. As a side quest, I also fixed the scrub bar slider throwing exceptions when sliding to the very last count by adding in null checks.
Also changed color in programming response matrix to be blue instead of green. It was easier to see. Progress from 9/25
Also changed color in programming response matrix to be blue instead of green. It was easier to see. Progress from 9/25
…mecoming. Test concatenating the homecoming files and then programming the boards with this branch and then running via flow viewer. Do not use this branch to create new .emrick files for homecoming. It will cause issues.
…oncatenated show savable and then loadable again. The naming convention for the sets has changed, so any old .emrick files will not work. Sets are now named "movementNumber-setNumber" e.g 1-2A, 2-4, 2-1B
… files and they will automatically be converted to up-to-date ones. That means you can concatenate an old file with a new file or two old files. If saved, they will no longer have the old format. As a side quest, I also fixed the scrub bar slider throwing exceptions when sliding to the very last count by adding in null checks.
Also changed color in programming response matrix to be blue instead of green. It was easier to see. Progress from 9/25
Also changed color in programming response matrix to be blue instead of green. It was easier to see. Progress from 9/25
…mecoming. Test concatenating the homecoming files and then programming the boards with this branch and then running via flow viewer. Do not use this branch to create new .emrick files for homecoming. It will cause issues.
Changed Run Light Board via View and Run Light Board Web Server labels to Run Parade Mode via View and Run Parade Mode Web Server
…mecomingTest' into ShowConcatenationHomecoming # Conflicts: # src/main/java/org/emrick/project/ImportArchive.java # src/main/java/org/emrick/project/MediaEditorGUI.java # src/main/java/org/emrick/project/Unzip.java # src/main/java/org/emrick/project/effect/RFTrigger.java
…mingBranches # Conflicts: # src/main/java/org/emrick/project/MediaEditorGUI.java
…l needs to be done with the flowviewer and programming the boards.
…Further testing needs to be done to ensure that they all work.
Added ability to update RFTriggers Fixed audio in concatenated shows by taking into account the length of the last movement when determining the relative timestamp of the audio. Effect view panel no longer will update while a show is playing. The effect information is redisplayed when the show is paused. It will update as usual if the slider is used while the show is paused. Removed rftriggerGUI while show is playing to avoid modificaitons to rftriggers that are not at the current count. (since the panel no longer updates while the show is playing.) Did a little bit of code cleaning. Mostly making things more organized and taking out print statements. No major changes though.
Fixed updateEffectViewPanel throwing exception when modifying effects on the last count.
# Conflicts: # docs/allclasses-index.html # docs/allpackages-index.html # docs/constant-values.html # docs/help-doc.html # docs/index-all.html # docs/org/emrick/project/Coordinate.html # docs/org/emrick/project/Drill.html # docs/org/emrick/project/DrillParser.html # docs/org/emrick/project/EffectsGroup.html # docs/org/emrick/project/FilterSelect.html # docs/org/emrick/project/FlowViewGUI.html # docs/org/emrick/project/FootballFieldBackground.html # docs/org/emrick/project/FootballFieldListener.html # docs/org/emrick/project/FootballFieldPanel.SelectionMethod.html # docs/org/emrick/project/FootballFieldPanel.html # docs/org/emrick/project/GetHandler.html # docs/org/emrick/project/ImportArchive.html # docs/org/emrick/project/ImportListener.html # docs/org/emrick/project/LEDConfigListener.html # docs/org/emrick/project/LEDConfigurationGUI.PerformerConfigPanel.html # docs/org/emrick/project/LEDConfigurationGUI.html # docs/org/emrick/project/LEDStrip.html # docs/org/emrick/project/LEDStripViewGUI.LEDDisplay.html # docs/org/emrick/project/LEDStripViewGUI.html # docs/org/emrick/project/MediaEditorGUI.PacketExport.html # docs/org/emrick/project/MediaEditorGUI.PlaybackTask.html # docs/org/emrick/project/MediaEditorGUI.ProgrammingTracker.html # docs/org/emrick/project/MediaEditorGUI.html # docs/org/emrick/project/PathConverter.html # docs/org/emrick/project/Performer.html # docs/org/emrick/project/PerformerConfig.html # docs/org/emrick/project/RFSignalListener.html # docs/org/emrick/project/RepaintListener.html # docs/org/emrick/project/RequestCompleteListener.html # docs/org/emrick/project/ScrubBarGUI.html # docs/org/emrick/project/ScrubBarListener.html # docs/org/emrick/project/SelectFileGUI.html # docs/org/emrick/project/SelectListener.html # docs/org/emrick/project/SelectionGroupGUI.SelectionGroup.html # docs/org/emrick/project/SelectionGroupGUI.html # docs/org/emrick/project/SerialTransmitter.html # docs/org/emrick/project/ServerExecutor.html # docs/org/emrick/project/Set.html # docs/org/emrick/project/SyncListener.html # docs/org/emrick/project/SyncTimeGUI.Pair.html # docs/org/emrick/project/SyncTimeGUI.PairCountMS.html # docs/org/emrick/project/SyncTimeGUI.TapAction.html # docs/org/emrick/project/SyncTimeGUI.html # docs/org/emrick/project/TimeManager.html # docs/org/emrick/project/TimelineGUI.html # docs/org/emrick/project/Unzip.html # docs/org/emrick/project/UserAuthGUI.html # docs/org/emrick/project/UserAuthListener.html # docs/org/emrick/project/actions/CreateEffectAction.html # docs/org/emrick/project/actions/CreateEffectsAction.html # docs/org/emrick/project/actions/EffectLEDStripMap.html # docs/org/emrick/project/actions/LEDConfig.html # docs/org/emrick/project/actions/LEDConfigLEDStripMap.html # docs/org/emrick/project/actions/PerformerConfigMap.html # docs/org/emrick/project/actions/RemoveEffectAction.html # docs/org/emrick/project/actions/RemoveEffectsAction.html # docs/org/emrick/project/actions/ReplaceEffectAction.html # docs/org/emrick/project/actions/ReplaceEffectsAction.html # docs/org/emrick/project/actions/UndoableAction.html # docs/org/emrick/project/actions/UpdateConfigAction.html # docs/org/emrick/project/actions/UpdateConfigsAction.html # docs/org/emrick/project/actions/package-summary.html # docs/org/emrick/project/actions/package-tree.html # docs/org/emrick/project/audio/AudioPlayer.html # docs/org/emrick/project/audio/OggData.html # docs/org/emrick/project/audio/OggDecoder.html # docs/org/emrick/project/audio/package-summary.html # docs/org/emrick/project/audio/package-tree.html # docs/org/emrick/project/effect/AlternatingColorEffect.html # docs/org/emrick/project/effect/ChaseEffect.html # docs/org/emrick/project/effect/CircleChaseEffect.html # docs/org/emrick/project/effect/Effect.html # docs/org/emrick/project/effect/EffectGUI.html # docs/org/emrick/project/effect/EffectList.html # docs/org/emrick/project/effect/EffectListener.html # docs/org/emrick/project/effect/EffectManager.html # docs/org/emrick/project/effect/FadeEffect.html # docs/org/emrick/project/effect/GeneratedEffect.html # docs/org/emrick/project/effect/GeneratedEffectLoader.html # docs/org/emrick/project/effect/GridEffect.html # docs/org/emrick/project/effect/GridShape.html # docs/org/emrick/project/effect/LightingDisplay.Function.html # docs/org/emrick/project/effect/LightingDisplay.html # docs/org/emrick/project/effect/RFTrigger.html # docs/org/emrick/project/effect/RFTriggerGUI.html # docs/org/emrick/project/effect/RFTriggerListener.html # docs/org/emrick/project/effect/RippleEffect.html # docs/org/emrick/project/effect/StaticColorEffect.html # docs/org/emrick/project/effect/TimelineEvent.html # docs/org/emrick/project/effect/WaveEffect.html # docs/org/emrick/project/effect/package-summary.html # docs/org/emrick/project/effect/package-tree.html # docs/org/emrick/project/package-summary.html # docs/org/emrick/project/package-tree.html # docs/org/emrick/project/serde/ColorAdapter.html # docs/org/emrick/project/serde/DurationAdapter.html # docs/org/emrick/project/serde/GeneratedEffectAdapter.html # docs/org/emrick/project/serde/JButtonAdapter.html # docs/org/emrick/project/serde/PairAdapter.html # docs/org/emrick/project/serde/Point2DAdapter.html # docs/org/emrick/project/serde/ProjectFile.html # docs/org/emrick/project/serde/package-summary.html # docs/org/emrick/project/serde/package-tree.html # docs/serialized-form.html
# Conflicts: # src/main/java/org/emrick/project/MediaEditorGUI.java # src/main/java/org/emrick/project/effect/Effect.java
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.