Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -648,6 +648,17 @@ public WidgetProperty<String> createProperty(final Widget widget, final String d
public static final WidgetPropertyDescriptor<Boolean> propLabelsFromPV =
newBooleanPropertyDescriptor(WidgetPropertyCategory.DISPLAY, "labels_from_pv", Messages.WidgetProperties_LabelsFromPV);

/** 'gap' property: Gap between repeated elements or instances */
public static final WidgetPropertyDescriptor<Integer> propGap =
new WidgetPropertyDescriptor<>(WidgetPropertyCategory.DISPLAY, "gap", Messages.WidgetProperties_Gap)
{
@Override
public WidgetProperty<Integer> createProperty(final Widget widget, final Integer value)
{
return new IntegerWidgetProperty(this, widget, value, 0, 500);
}
};

/**
* 'items_from_pv' property: If PV is enum PV, get items from PV?
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
import static org.csstudio.display.builder.model.properties.CommonWidgetProperties.propBackgroundColor;
import static org.csstudio.display.builder.model.properties.CommonWidgetProperties.propForegroundColor;
import static org.csstudio.display.builder.model.properties.CommonWidgetProperties.propMacros;
import static org.csstudio.display.builder.model.properties.CommonWidgetProperties.propGap;
import static org.csstudio.display.builder.model.properties.InsetsWidgetProperty.runtimePropInsets;

import java.util.Arrays;
Expand Down Expand Up @@ -75,6 +76,7 @@
private volatile WidgetProperty<WidgetColor> foreground;
private volatile WidgetProperty<WidgetColor> background;
private volatile WidgetProperty<int[]> insets;
private volatile WidgetProperty<Integer> gap;

/** Constructor */
public ArrayWidget()
Expand All @@ -93,6 +95,7 @@
properties.add(background = propBackgroundColor.createProperty(this,
WidgetColorService.getColor(NamedWidgetColors.BACKGROUND)));
properties.add(insets = runtimePropInsets.createProperty(this, new int[] { 0, 0 }));
properties.add(gap = propGap.createProperty(this, 0));

Check warning on line 98 in app/display/model/src/main/java/org/csstudio/display/builder/model/widgets/ArrayWidget.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=AaGmfQsVSalCXJOCX6-5&open=AaGmfQsVSalCXJOCX6-5&pullRequest=4009
}

/** {@inheritDoc} */
Expand Down Expand Up @@ -140,4 +143,10 @@
{
return insets;
}

/** @return 'gap' property */
public WidgetProperty<Integer> propGap()
{
return gap;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
import static org.csstudio.display.builder.model.properties.CommonWidgetProperties.propFile;
import static org.csstudio.display.builder.model.properties.CommonWidgetProperties.propHorizontal;
import static org.csstudio.display.builder.model.properties.CommonWidgetProperties.propMacros;
import static org.csstudio.display.builder.model.properties.CommonWidgetProperties.propGap;
import static org.csstudio.display.builder.model.properties.CommonWidgetProperties.propTransparent;

import java.util.Arrays;
Expand Down Expand Up @@ -80,17 +81,6 @@ public InstanceProperty(final Widget widget, final int index)
(widget, index) -> new InstanceProperty(widget, index),
/* minimum count */ 1);

/** 'gap' property: Gap between instances */
public static final WidgetPropertyDescriptor<Integer> propGap =
new WidgetPropertyDescriptor<>(WidgetPropertyCategory.DISPLAY, "gap", Messages.WidgetProperties_Gap)
{
@Override
public WidgetProperty<Integer> createProperty(final Widget widget, final Integer value)
{
return new IntegerWidgetProperty(this, widget, value, 0, 500);
}
};

/** 'wrap_count' property: Optional instance count for wrapping to next row/column */
public static final WidgetPropertyDescriptor<Integer> propWrapCount =
new WidgetPropertyDescriptor<>(WidgetPropertyCategory.DISPLAY, "wrap_count", Messages.WidgetProperties_WrapCount)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,7 @@ protected void registerListeners()
model_widget.propWidth().addPropertyListener(sizeChangedListener);
model_widget.propForegroundColor().addPropertyListener(colorChangedListener);
model_widget.displayBackgroundColor().addPropertyListener(colorChangedListener);
model_widget.propGap().addPropertyListener(sizeChangedListener);

childrenChanged(null, null, model_widget.runtimeChildren().getValue());
adjustNumberByLength();
Expand All @@ -104,6 +105,7 @@ protected void unregisterListeners()
model_widget.propWidth().removePropertyListener(sizeChangedListener);
model_widget.propForegroundColor().removePropertyListener(colorChangedListener);
model_widget.displayBackgroundColor().removePropertyListener(colorChangedListener);
model_widget.propGap().removePropertyListener(sizeChangedListener);
super.unregisterListeners();
}

Expand Down Expand Up @@ -323,16 +325,18 @@ private void arrangeChildren()
: (height = model_widget.propHeight().getValue()) - inset * 2;
final int w = vertical ? (width = model_widget.propWidth().getValue()) - inset * 2
: master.propWidth().getValue();
final int gap = model_widget.propGap().getValue();
int len = 0;
for (Widget child : children)
{
child.propHeight().setValue(h);
child.propWidth().setValue(w);
child.propX().setValue(vertical ? 0 : len);
child.propY().setValue(vertical ? len : 0);
len += vertical ? h : w;
len += (vertical ? h : w) + gap;
}
len += inset * 2;
// No gap after the last element
len += (inset * 2) - gap;
if (vertical && len != height)
model_widget.propHeight().setValue(height = len);
else if (!vertical && len != width)
Expand All @@ -351,8 +355,9 @@ private void adjustNumberByLength()
final boolean vertical = testVerticalStacking(children.get(0));
final int l = vertical ? children.get(0).propHeight().getValue()
: children.get(0).propWidth().getValue();
numChildren = vertical ? (height - inset * 2) / l
: (width - inset * 2) / l;
final int gap = model_widget.propGap().getValue();
numChildren = vertical ? (height - inset * 2 + gap) / (l + gap)
: (width - inset * 2 + gap) / (l + gap);
dirty_number.mark();
toolkit.scheduleUpdate(this);
}
Expand Down
Loading