Skip to content
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.

Sign up for GitHub

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

Separate group owner dropdown #9

Merged
merged 2 commits into from
Feb 15, 2024
Merged

Separate group owner dropdown #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d3fa034
Separate dropdowns for groups and users
Rylern Feb 15, 2024
078b82b
Corrected bug in bindListInUIThread
Rylern Feb 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions src/main/java/qupath/ext/omero/core/entities/repositoryentities/OrphanedFolder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,10 +78,7 @@ public ObservableList<? extends RepositoryEntity> getChildren() {

@Override
public ReadOnlyStringProperty getLabel() {
return new SimpleStringProperty(
resources.getString("Web.Entities.RepositoryEntities.OrphanedFolder.orphanedImages") +
" (" + numberOfImages + ")"
);
return new SimpleStringProperty(resources.getString("Web.Entities.RepositoryEntities.OrphanedFolder.orphanedImages"));
}

@Override
Expand Down
22 changes: 20 additions & 2 deletions src/main/java/qupath/ext/omero/gui/UiUtilities.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,9 +229,27 @@ public static <T> void bindListInUIThread(ObservableList<T> listToUpdate, Observ

listToListen.addListener((ListChangeListener<? super T>) change -> Platform.runLater(() -> {
if (Platform.isFxApplicationThread()) {
listToUpdate.setAll(change.getList());
while (change.next()) {
if (change.wasAdded()) {
listToUpdate.addAll(change.getAddedSubList());
} else {
listToUpdate.removeAll(change.getRemoved());
}
}
// Change needs to be reset, otherwise calling this function several times
// with the same listToListen parameter will work for only one of them
change.reset();
} else {
Platform.runLater(() -> listToUpdate.setAll(change.getList()));
Platform.runLater(() -> {
while (change.next()) {
if (change.wasAdded()) {
listToUpdate.addAll(change.getAddedSubList());
} else {
listToUpdate.removeAll(change.getRemoved());
}
}
change.reset();
});
}
}));
}
Expand Down
71 changes: 38 additions & 33 deletions src/main/java/qupath/ext/omero/gui/browser/serverbrowser/Browser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,9 @@ public class Browser extends Stage {
@FXML
private Label loadingThumbnail;
@FXML
private MenuButton groupOwner;
private ChoiceBox<Group> group;
@FXML
private ChoiceBox<Owner> owner;
@FXML
private TreeView<RepositoryEntity> hierarchy;
@FXML
Expand Down Expand Up @@ -279,34 +281,26 @@ public PixelAPI fromString(String string) {
});
pixelAPI.getSelectionModel().select(browserModel.getSelectedPixelAPI().get());

groupOwner.getItems().addAll(client.getServer().getGroups().stream()
.map(group -> {
List<Owner> owners = group.equals(Group.getAllGroupsGroup()) ?
client.getServer().getOwners() :
group.getOwners();

if (!owners.isEmpty()) {
Menu menu = new Menu(group.getName());
menu.getItems().addAll(
owners.stream()
.map(owner -> {
MenuItem ownerItem = new MenuItem(owner.getFullName());
ownerItem.setOnAction(ignoredEvent -> {
browserModel.getSelectedGroup().set(group);
browserModel.getSelectedOwner().set(owner);
});
return ownerItem;
})
.toList()
);
return menu;
} else {
return null;
}
})
.filter(Objects::nonNull)
.toList()
);
group.getItems().addAll(client.getServer().getGroups());
group.getSelectionModel().select(client.getServer().getDefaultGroup().orElse(Group.getAllGroupsGroup()));

owner.getItems().clear();
if (group.getSelectionModel().getSelectedItem().equals(Group.getAllGroupsGroup())) {
owner.getItems().addAll(client.getServer().getOwners());
} else {
owner.getItems().addAll(group.getSelectionModel().getSelectedItem().getOwners());
}
owner.getSelectionModel().select(client.getServer().getDefaultOwner().orElse(Owner.getAllMembersOwner()));owner.setConverter(new StringConverter<>() {
@Override
public String toString(Owner object) {
return object == null ? "" : object.getFullName();
}

@Override
public Owner fromString(String string) {
return null;
}
});

PredicateTextField<RepositoryEntity> predicateTextField = new PredicateTextField<>(entity ->
entity.getLabel().get()
Expand Down Expand Up @@ -399,10 +393,21 @@ private void setUpListeners() {
loadingThumbnail.visibleProperty().bind(Bindings.notEqual(browserModel.getNumberOfThumbnailsLoading(), 0));
loadingThumbnail.managedProperty().bind(loadingThumbnail.visibleProperty());

groupOwner.textProperty().bind(Bindings.createStringBinding(
() -> String.format("%s %s", browserModel.getSelectedGroup().get().getName(), browserModel.getSelectedOwner().get().getFullName()),
browserModel.getSelectedGroup(), browserModel.getSelectedOwner()
));
browserModel.getSelectedGroup().addListener((p, o, n) -> {
owner.getItems().clear();

if (n != null) {
if (n.equals(Group.getAllGroupsGroup())) {
owner.getItems().addAll(client.getServer().getOwners());
} else {
owner.getItems().addAll(n.getOwners());
}
}

owner.getSelectionModel().selectFirst();
});
browserModel.getSelectedGroup().bind(group.getSelectionModel().selectedItemProperty());
browserModel.getSelectedOwner().bind(owner.getSelectionModel().selectedItemProperty());

hierarchy.getSelectionModel().selectedItemProperty().addListener((v, o, n) -> {
updateCanvas();
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/qupath/ext/omero/gui/browser/serverbrowser/BrowserCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ public BrowserCommand(URI uri) {
@Override
public void run() {
if (browser == null) {
Optional<WebClient> existingClient = WebClients.getClients().stream()
Optional<WebClient> existingClient = BrowserModel.getClients().stream()
.filter(client -> client.getApisHandler().getWebServerURI().equals(uri))
.findAny();

Expand Down
19 changes: 7 additions & 12 deletions src/main/resources/qupath/ext/omero/gui/browser/serverbrowser/browser.fxml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
<?import javafx.scene.Scene?>
<?import javafx.scene.canvas.Canvas?>
<?import javafx.scene.control.Button?>
<?import javafx.scene.control.ChoiceBox?>
<?import javafx.scene.control.ComboBox?>
<?import javafx.scene.control.ContextMenu?>
<?import javafx.scene.control.Label?>
<?import javafx.scene.control.MenuButton?>
<?import javafx.scene.control.MenuItem?>
<?import javafx.scene.control.ProgressIndicator?>
<?import javafx.scene.control.SplitPane?>
Expand Down Expand Up @@ -69,12 +69,10 @@
</font>
</Label>
<Label text="%Browser.ServerBrowser.pixelAPI" GridPane.rowIndex="3" />
<HBox alignment="CENTER" spacing="20.0" GridPane.columnIndex="1" GridPane.rowIndex="3">
<children>
<ComboBox fx:id="pixelAPI" maxWidth="1.7976931348623157E308" />
<Label fx:id="rawPixelAccess" />
</children>
</HBox>
<HBox alignment="CENTER" spacing="20.0" GridPane.columnIndex="1" GridPane.rowIndex="3">
<ComboBox fx:id="pixelAPI" maxWidth="1.7976931348623157E308"/>
<Label fx:id="rawPixelAccess"/>
</HBox>
</GridPane>
<Region HBox.hgrow="ALWAYS" />
<VBox alignment="TOP_RIGHT">
Expand Down Expand Up @@ -110,11 +108,8 @@
<SplitPane dividerPositions="0.5" BorderPane.alignment="CENTER">
<VBox>
<HBox>
<MenuButton fx:id="groupOwner" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" mnemonicParsing="false" HBox.hgrow="ALWAYS">
<tooltip>
<Tooltip text="%Browser.ServerBrowser.filterByGroupAndOwner" />
</tooltip>
</MenuButton>
<ChoiceBox fx:id="group" maxWidth="1.7976931348623157E308" HBox.hgrow="ALWAYS" />
<ChoiceBox fx:id="owner" maxWidth="1.7976931348623157E308" HBox.hgrow="ALWAYS" />
</HBox>
<TreeView fx:id="hierarchy" onMouseClicked="#onImagesTreeClicked" prefWidth="600.0" showRoot="false" VBox.vgrow="ALWAYS">
<contextMenu>
Expand Down
Loading