Skip to content

Dynamic gridView, sources and views description#416

Open
KateMoreva wants to merge 36 commits into
mobie:mainfrom
KateMoreva:dynamic_grid_views
Open

Dynamic gridView, sources and views description#416
KateMoreva wants to merge 36 commits into
mobie:mainfrom
KateMoreva:dynamic_grid_views

Conversation

@KateMoreva
Copy link
Copy Markdown
Collaborator

@KateMoreva KateMoreva commented Aug 23, 2021 •
edited
Loading

Sources and views now have a description

  • sourses description shows as a tooltip over the source name
  • foe views description there is a separate window

It is possible to create gridViews from selected sources

Change the dependency from bigdataviewer-imageloader to mobie-io

@KateMoreva KateMoreva marked this pull request as draft August 23, 2021 20:57
@KateMoreva KateMoreva changed the title WIP: Initial Grid view menu WIP: Grid view menu Aug 27, 2021
@KateMoreva KateMoreva mentioned this pull request Aug 27, 2021
Open
@KateMoreva KateMoreva changed the base branch from master to develop September 3, 2021 17:39
@KateMoreva KateMoreva changed the title WIP: Grid view menu Sources and views description Sep 14, 2021
@KateMoreva
Merge branch 'develop' of https://github.com/mobie/mobie-viewer-fiji …
3979158 
…into dynamic_grid_views

� Conflicts:
�	src/main/java/org/embl/mobie/viewer/serialize/JsonHelper.java
�	src/main/java/org/embl/mobie/viewer/ui/UserInterfaceHelper.java
@KateMoreva
Merge develop
0ab21a0
@KateMoreva
WIP over mergedGridSource
d47f9e1
@KateMoreva
Merge branch 'develop' of https://github.com/mobie/mobie-viewer-fiji …
95c14d4 
…into dynamic_grid_views
@KateMoreva
mobie-io dependency
adedf5d
@KateMoreva KateMoreva marked this pull request as ready for review September 20, 2021 06:24
@KateMoreva
Naming fix
3564907
@KateMoreva
Merge branch 'develop' of https://github.com/mobie/mobie-viewer-fiji …
74078e0 
…into dynamic_grid_views

� Conflicts:
�	src/main/java/org/embl/mobie/viewer/MoBIE.java
�	src/main/java/org/embl/mobie/viewer/ui/UserInterfaceHelper.java
@KateMoreva
Working dynamic gridView with TransformedGridSourceTransformer
691fc41
@KateMoreva
Merge branch 'develop' of https://github.com/mobie/mobie-viewer-fiji …
8295796 
…into dynamic_grid_views

� Conflicts:
�	src/main/java/org/embl/mobie/viewer/bdv/view/SliceViewer.java
�	src/main/java/org/embl/mobie/viewer/projectcreator/ImagesCreator.java
@KateMoreva
Merge fixes
e6808f8
@KateMoreva
Default description
ce042d0
@KateMoreva
Fix hint text field
2c0e24d
@tischi
Copy link
Copy Markdown
Contributor

tischi commented Oct 5, 2021

@KateMoreva Is this ready for review and merging? If not, could you please make it a "Draft" PR and put WIP in the title of the PR?

@KateMoreva KateMoreva changed the title Sources and views description Dynamic gridView, sources and views description Nov 2, 2021
@KateMoreva
Merge branch 'develop' into dynamic_grid_views
eb7f5f4 
# Conflicts:
#	pom.xml
#	src/main/java/org/embl/mobie/viewer/bdv/view/SegmentationSliceView.java
#	src/main/java/org/embl/mobie/viewer/command/OpenOMEZARRCommand.java
#	src/main/java/org/embl/mobie/viewer/command/OpenOMEZARRFromS3AdvancedCommand.java
#	src/main/java/org/embl/mobie/viewer/command/WriteOMEZARRCommand.java
#	src/main/java/org/embl/mobie/viewer/projectcreator/ImagesCreator.java
#	src/main/java/org/embl/mobie/viewer/projectcreator/ProjectCreatorHelper.java
#	src/main/java/org/embl/mobie/viewer/projectcreator/RemoteMetadataCreator.java
#	src/main/java/org/embl/mobie/viewer/projectcreator/ui/ManualExportPanel.java
#	src/main/java/org/embl/mobie/viewer/source/SpimDataOpener.java
#	src/test/java/develop/DevelopOmeZarrWriting.java
#	src/test/java/org/embl/mobie/viewer/projectcreator/ImagesCreatorTest.java
@KateMoreva
new mobie-io version
f1c4def
@KateMoreva KateMoreva requested a review from tischi November 3, 2021 09:54
@constantinpape
Copy link
Copy Markdown
Contributor

constantinpape commented Nov 4, 2021

@KateMoreva Is this ready for review now? If so, could you please fix the conflict?

@KateMoreva
Copy link
Copy Markdown
Collaborator Author

KateMoreva commented Nov 5, 2021

@KateMoreva Is this ready for review now? If so, could you please fix the conflict?
@constantinpape
Conflict is fixed.

@constantinpape
Copy link
Copy Markdown
Contributor

constantinpape commented Nov 5, 2021

Thanks @KateMoreva.
Unfortunately there is some confusion with the name of the grids in the spec, see #511 and #510.
Let's wait till this is resolved and it's all on develop.

@tischi
Copy link
Copy Markdown
Contributor

tischi commented Nov 9, 2021

@KateMoreva I think develop should now be "stable". Please pull the latest develop branch into your PR to check whether everything works now.

@constantinpape constantinpape mentioned this pull request Nov 15, 2021
Closed
@tischi
Copy link
Copy Markdown
Contributor

tischi commented Jan 24, 2022

@KateMoreva could you please remove the merge conflicts?

@K-Meech if we merge this, can we then also export the grid as a view.json?

@K-Meech
Copy link
Copy Markdown
Collaborator

K-Meech commented Jan 24, 2022

@tischi I'm not sure if this will get saved into the view yet. Happy to look into it once the merge conflicts are fixed.

@KateMoreva
Merge branch 'develop' of https://github.com/mobie/mobie-viewer-fiji …
a4a66e1 
…into dynamic_grid_views

� Conflicts:
�	src/main/java/org/embl/mobie/viewer/ui/UserInterfaceHelper.java
@KateMoreva
Update
42cd672
@KateMoreva
Merge branch 'develop' of https://github.com/mobie/mobie-viewer-fiji …
28ac632 
…into dynamic_grid_views
@constantinpape constantinpape mentioned this pull request Apr 7, 2022
Open
@KateMoreva KateMoreva changed the base branch from develop to main June 16, 2024 18:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@tischi tischi Awaiting requested review from tischi

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@KateMoreva @tischi @constantinpape @K-Meech