Skip to content

Implement user defined runtime zoom factor #3369

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

Merged
merged 4 commits into from
Apr 22, 2025
Merged

Implement user defined runtime zoom factor #3369

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2794700
Implement user defined runtime zoom factor
UrbanBobek Oct 24, 2024
ed5b95f
Define zoom as a percentage, fix typo
UrbanBobek Apr 18, 2025
716cbb4
Invoke zoom changed handler to apply the zoom factor
UrbanBobek Apr 18, 2025
603c657
Move default_zoom_factor to display runtime preferences
UrbanBobek Apr 22, 2025
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
2 changes: 2 additions & 0 deletions app/display/runtime/src/main/java/org/csstudio/display/builder/runtime/Preferences.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@ public class Preferences
@Preference public static String probe_display;
/** Preference setting */
public static final List<TextPatch> pv_name_patches = new ArrayList<>();
/** Preference setting */
@Preference public static int default_zoom_factor;

static
{
Expand Down
10 changes: 10 additions & 0 deletions app/display/runtime/src/main/java/org/csstudio/display/builder/runtime/app/ZoomAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
package org.csstudio.display.builder.runtime.app;

import org.csstudio.display.builder.representation.javafx.JFXRepresentation;
import org.csstudio.display.builder.runtime.Preferences;

import javafx.application.Platform;
import javafx.scene.control.ComboBox;
Expand All @@ -33,6 +34,15 @@ public ZoomAction(final DisplayRuntimeInstance instance)
getEditor().setText(txt);
});
setOnAction(event -> zoom(instance.getRepresentation()));

// Apply default zoom factor from settings.ini
Platform.runLater(() ->
{
String zoom = String.format("%d %%", Preferences.default_zoom_factor);
setValue(zoom);
// Invoke zoom changed handler
getOnAction().handle(null);
});
}

private void zoom(final JFXRepresentation representation)
Expand Down
3 changes: 3 additions & 0 deletions app/display/runtime/src/main/resources/display_runtime_preferences.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,3 +46,6 @@ update_throttle=250
# When left empty, the "Probe Display"
# context menu entry is disabled.
probe_display=examples:/probe.bob

# Default zoom factor (percentage) of display runtime window
default_zoom_factor=100