Skip to content

Commit d131d09

Browse files
committed
xreversed, yreversed
1 parent d408a41 commit d131d09

2 files changed

Lines changed: 37 additions & 5 deletions

File tree

epics-vtype/vtype/src/main/java/org/epics/vtype/IVImage.java

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,19 @@ public class IVImage extends VImage {
1717
private final int width;
1818
private final int xoffset;
1919
private final int yoffset;
20+
private final boolean xreversed;
21+
private final boolean yreversed;
2022
private final ListNumber data;
2123
private final VImageDataType imageDataType;
2224
private final VImageType imageType;
2325

2426
IVImage(int height, int width, ListNumber data, VImageDataType imageDataType, VImageType imageType, Alarm alarm,
2527
Time time) {
26-
this(height, width, 0, 0, data, imageDataType, imageType, alarm, time);
28+
this(height, width, 0, 0, false, false, data, imageDataType, imageType, alarm, time);
2729
}
2830

29-
IVImage(int height, int width, int xoffset, int yoffset, ListNumber data, VImageDataType imageDataType, VImageType imageType, Alarm alarm,
31+
IVImage(int height, int width, int xoffset, int yoffset, boolean xreversed, boolean yreversed,
32+
ListNumber data, VImageDataType imageDataType, VImageType imageType, Alarm alarm,
3033
Time time) {
3134
VType.argumentNotNull("alarm", alarm);
3235
VType.argumentNotNull("time", time);
@@ -36,6 +39,8 @@ public class IVImage extends VImage {
3639
this.width = width;
3740
this.xoffset = xoffset;
3841
this.yoffset = yoffset;
42+
this.xreversed = xreversed;
43+
this.yreversed = yreversed;
3944
this.data = data;
4045
this.imageDataType = imageDataType;
4146
this.imageType = imageType;
@@ -57,6 +62,14 @@ public int getYOffset() {
5762
return yoffset;
5863
}
5964

65+
public boolean isXReversed() {
66+
return xreversed;
67+
}
68+
69+
public boolean isYReversed() {
70+
return yreversed;
71+
}
72+
6073
public ListNumber getData() {
6174
return data;
6275
}

epics-vtype/vtype/src/main/java/org/epics/vtype/VImage.java

Lines changed: 22 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,22 @@ public abstract class VImage extends VType implements AlarmProvider, TimeProvide
4949
*/
5050
public abstract int getYOffset();
5151

52+
/**
53+
* Is the horizontal axis reversed?
54+
* Defaults to false.
55+
*
56+
* @return <code>true</code> if axis is reversed
57+
*/
58+
public abstract boolean isXReversed();
59+
60+
/**
61+
* Is the vertical axis reversed?
62+
* Defaults to false.
63+
*
64+
* @return <code>true</code> if axis is reversed
65+
*/
66+
public abstract boolean isYReversed();
67+
5268
/**
5369
* Image data;
5470
*
@@ -85,7 +101,7 @@ public abstract class VImage extends VType implements AlarmProvider, TimeProvide
85101
* @return a new instance of VImage
86102
*/
87103
public static VImage of(int height, int width, final ListNumber data, VImageDataType imageDataType, VImageType vImageType, Alarm alarm, Time time) {
88-
return of(height, width, 0, 0, data, imageDataType, vImageType, alarm, time);
104+
return of(height, width, 0, 0, false, false, data, imageDataType, vImageType, alarm, time);
89105
}
90106

91107
/**
@@ -95,15 +111,18 @@ public static VImage of(int height, int width, final ListNumber data, VImageData
95111
* @param width image width
96112
* @param xoffset horizontal offset
97113
* @param yoffset vertical offset
114+
* @param xreversed is horizontal axis reversed?
115+
* @param yreversed is vertical axis reversed?
98116
* @param data image data
99117
* @param imageDataType image data type
100118
* @param vImageType image type
101119
* @param alarm alarm information
102120
* @param time timestamp
103121
* @return a new instance of VImage
104122
*/
105-
public static VImage of(int height, int width, int xoffset, int yoffset, final ListNumber data, VImageDataType imageDataType, VImageType vImageType, Alarm alarm, Time time) {
106-
return new IVImage(height, width, xoffset, yoffset, data, imageDataType, vImageType, alarm, time);
123+
public static VImage of(int height, int width, int xoffset, int yoffset, boolean xreversed, boolean yreversed,
124+
final ListNumber data, VImageDataType imageDataType, VImageType vImageType, Alarm alarm, Time time) {
125+
return new IVImage(height, width, xoffset, yoffset, xreversed, yreversed, data, imageDataType, vImageType, alarm, time);
107126
}
108127

109128
@Override

0 commit comments

Comments
 (0)