Skip to content

feat: add Rotation function for embedded display #3925

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

Open
agaget wants to merge 1 commit into
base: master
Choose a base branch
from
+33 −3
Open

feat: add Rotation function for embedded display #3925

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 13 additions & 0 deletions ...model/src/main/java/org/csstudio/display/builder/model/widgets/EmbeddedDisplayWidget.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,11 @@
static final WidgetPropertyDescriptor<String> propGroupName =
CommonWidgetProperties.newStringPropertyDescriptor(
WidgetPropertyCategory.DISPLAY, "group_name", Messages.EmbeddedDisplayWidget_GroupName);
/**
* 'rotation' property
*/
static final WidgetPropertyDescriptor<Double> propRotation =
CommonWidgetProperties.newDoublePropertyDescriptor(WidgetPropertyCategory.DISPLAY, "rotation", Messages.WidgetProperties_Rotation);

/** 'embedded_model' */
public static final WidgetPropertyDescriptor<DisplayModel> runtimeModel =
Expand Down Expand Up @@ -279,6 +284,7 @@
private volatile WidgetProperty<String> group_name;
private volatile WidgetProperty<DisplayModel> embedded_model;
private volatile WidgetProperty<Boolean> transparent;
private volatile WidgetProperty<Double> rotation;

/** Constructor */
public EmbeddedDisplayWidget()
Expand All @@ -295,6 +301,7 @@
properties.add(group_name = propGroupName.createProperty(this, ""));
properties.add(embedded_model = runtimeModel.createProperty(this, null));
properties.add(transparent = propTransparent.createProperty(this, false));
properties.add(rotation = propRotation.createProperty(this, 0.0));

Check warning on line 304 in app/display/model/src/main/java/org/csstudio/display/builder/model/widgets/EmbeddedDisplayWidget.java

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

Extract the assignment out of this expression. 


See more on https://sonarcloud.io/project/issues?id=ControlSystemStudio_phoebus&issues=AaCvhDtL7EhZ8Rzjkxe3&open=AaCvhDtL7EhZ8Rzjkxe3&pullRequest=3925
BorderSupport.addBorderProperties(this, properties);
}

Expand Down Expand Up @@ -344,6 +351,12 @@
return transparent;
}

/** @return 'rotation' property */
public WidgetProperty<Double> propRotation()
{
return rotation;
}

@Override
public WidgetConfigurator getConfigurator(Version persisted_version)
throws Exception
Expand Down
23 changes: 20 additions & 3 deletions ...csstudio/display/builder/representation/javafx/widgets/EmbeddedDisplayRepresentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@
import java.util.logging.Level;

import javafx.application.Platform;
import javafx.collections.ObservableList;
import javafx.scene.transform.Rotate;
import javafx.scene.transform.Transform;
import org.csstudio.display.builder.model.DirtyFlag;
import org.csstudio.display.builder.model.DisplayModel;
import org.csstudio.display.builder.model.UntypedWidgetPropertyListener;
Expand Down Expand Up @@ -87,7 +90,7 @@

private volatile double zoom_factor_x = 1.0;
private volatile double zoom_factor_y = 1.0;

private volatile double rotate = 0;

/** Inner pane that holds child widgets
*
Expand All @@ -99,6 +102,8 @@

/** Zoom for 'inner' pane */
private Scale zoom;
/** Rotation for 'inner' pane */
private Rotate rotation;

/** Optional scroll pane between 'jfx_node' Pane and 'inner'.
*
Expand Down Expand Up @@ -143,7 +148,10 @@
// Using a separate Scale transformation does not have that problem.
// See http://stackoverflow.com/questions/10707880/javafx-scale-and-translate-operation-results-in-anomaly
inner = new Pane();
inner.getTransforms().add(zoom = new Scale());

ObservableList<Transform> innerTransforms = inner.getTransforms();
innerTransforms.add(zoom = new Scale());

Check warning on line 153 in app/display/representation-javafx/src/main/java/org/csstudio/display/builder/representation/javafx/widgets/EmbeddedDisplayRepresentation.java

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

Extract the assignment out of this expression. 


See more on https://sonarcloud.io/project/issues?id=ControlSystemStudio_phoebus&issues=AaCvhDz07EhZ8Rzjkxe4&open=AaCvhDz07EhZ8Rzjkxe4&pullRequest=3925
innerTransforms.add(rotation = new Rotate(0, 0, 0));

Check warning on line 154 in app/display/representation-javafx/src/main/java/org/csstudio/display/builder/representation/javafx/widgets/EmbeddedDisplayRepresentation.java

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

Extract the assignment out of this expression. 


See more on https://sonarcloud.io/project/issues?id=ControlSystemStudio_phoebus&issues=AaCvhDz07EhZ8Rzjkxe5&open=AaCvhDz07EhZ8Rzjkxe5&pullRequest=3925

scroll = new NonCachingScrollPane(inner);
scroll.setHbarPolicy(ScrollBarPolicy.AS_NEEDED);
Expand Down Expand Up @@ -175,13 +183,13 @@
model_widget.propWidth().addUntypedPropertyListener(sizesChangedListener);
model_widget.propHeight().addUntypedPropertyListener(sizesChangedListener);
model_widget.propResize().addUntypedPropertyListener(sizesChangedListener);
model_widget.propRotation().addUntypedPropertyListener(sizesChangedListener);

model_widget.propFile().addUntypedPropertyListener(fileChangedListener);
model_widget.propGroupName().addUntypedPropertyListener(fileChangedListener);
model_widget.propMacros().addUntypedPropertyListener(fileChangedListener);

model_widget.propTransparent().addUntypedPropertyListener(backgroundChangedListener);

fileChanged(null, null, null);
}

Expand All @@ -191,10 +199,12 @@
model_widget.propWidth().removePropertyListener(sizesChangedListener);
model_widget.propHeight().removePropertyListener(sizesChangedListener);
model_widget.propResize().removePropertyListener(sizesChangedListener);
model_widget.propRotation().removePropertyListener(sizesChangedListener);
model_widget.propFile().removePropertyListener(fileChangedListener);
model_widget.propGroupName().removePropertyListener(fileChangedListener);
model_widget.propMacros().removePropertyListener(fileChangedListener);
model_widget.propTransparent().removePropertyListener(backgroundChangedListener);

super.unregisterListeners();
}

Expand Down Expand Up @@ -233,6 +243,13 @@
zoom_factor_x = content_width > 0 ? (double) widget_width / content_width : 1.0;
zoom_factor_y = content_height > 0 ? (double) widget_height / content_height : 1.0;
}

// Apply the rotation
rotate=model_widget.propRotation().getValue();
rotation.setAngle(rotate);
rotation.setPivotX((double)content_width / 2);
rotation.setPivotY((double) content_height / 2);

}

dirty_sizes.mark();
Expand Down
Loading