Skip to content

Commit a622217

Browse files
gselzergselzer
committed
WIP: fix OpField annotations
1 parent 061771c commit a622217

33 files changed

Lines changed: 2825 additions & 2836 deletions

‎src/main/java/net/imagej/ops/convert/ConvertTypes.java‎

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -66,117 +66,117 @@
6666
@Plugin(type = OpCollection.class)
6767
public final class ConvertTypes<C extends ComplexType<C>, T extends IntegerType<T>> {
6868

69-
@OpField(names = "convert.bit")
69+
@OpField(names = "convert.bit", params = "x")
7070
@Parameter(key = "input")
7171
@Parameter(key = "output", itemIO = ItemIO.BOTH)
7272
public final Computers.Arity1<C, BitType> complexToBit = (input, output) -> output.set(input.getRealDouble() != 0);
7373

74-
@OpField(names = "convert.bit")
74+
@OpField(names = "convert.bit", params = "x")
7575
@Parameter(key = "input")
7676
@Parameter(key = "output", itemIO = ItemIO.BOTH)
7777
public final Computers.Arity1<T, BitType> integerToBit = (input, output) -> output.set(input.getIntegerLong() != 0);
7878

79-
@OpField(names = "convert.uint2")
79+
@OpField(names = "convert.uint2", params = "x")
8080
@Parameter(key = "input")
8181
@Parameter(key = "output", itemIO = ItemIO.BOTH)
8282
public final Computers.Arity1<C, Unsigned2BitType> complexToUint2 = (input, output) -> output.set((long) input.getRealDouble());
8383

84-
@OpField(names = "convert.uint2")
84+
@OpField(names = "convert.uint2", params = "x")
8585
@Parameter(key = "input")
8686
@Parameter(key = "output", itemIO = ItemIO.BOTH)
8787
public final Computers.Arity1<T, Unsigned2BitType> integerToUint2 = (input, output) -> output.set(input.getIntegerLong());
8888

89-
@OpField(names = "convert.uint4")
89+
@OpField(names = "convert.uint4", params = "x")
9090
@Parameter(key = "input")
9191
@Parameter(key = "output", itemIO = ItemIO.BOTH)
9292
public final Computers.Arity1<C, Unsigned4BitType> complexToUint4 = (input, output) -> output.set((long) input.getRealDouble());
9393

94-
@OpField(names = "convert.uint4")
94+
@OpField(names = "convert.uint4", params = "x")
9595
@Parameter(key = "input")
9696
@Parameter(key = "output", itemIO = ItemIO.BOTH)
9797
public final Computers.Arity1<T, Unsigned4BitType> integerToUint4 = (input, output) -> output.set(input.getIntegerLong());
9898

99-
@OpField(names = "convert.byte")
99+
@OpField(names = "convert.byte", params = "x")
100100
@Parameter(key = "input")
101101
@Parameter(key = "output", itemIO = ItemIO.BOTH)
102102
public final Computers.Arity1<C, ByteType> complexToInt8 = (input, output) -> output.set((byte) input.getRealDouble());
103103

104-
@OpField(names = "convert.byte")
104+
@OpField(names = "convert.byte", params = "x")
105105
@Parameter(key = "input")
106106
@Parameter(key = "output", itemIO = ItemIO.BOTH)
107107
public final Computers.Arity1<T, ByteType> integerToInt8 = (input, output) -> output.set((byte) input.getIntegerLong());
108108

109-
@OpField(names = "convert.uint8")
109+
@OpField(names = "convert.uint8", params = "x")
110110
@Parameter(key = "input")
111111
@Parameter(key = "output", itemIO = ItemIO.BOTH)
112112
public final Computers.Arity1<C, UnsignedByteType> complexToUint8 = (input, output) -> output.set((int) input.getRealDouble());
113113

114-
@OpField(names = "convert.uint8")
114+
@OpField(names = "convert.uint8", params = "x")
115115
@Parameter(key = "input")
116116
@Parameter(key = "output", itemIO = ItemIO.BOTH)
117117
public final Computers.Arity1<T, UnsignedByteType> integerToUint8 = (input, output) -> output.set(input.getInteger());
118118

119-
@OpField(names = "convert.uint12")
119+
@OpField(names = "convert.uint12", params = "x")
120120
@Parameter(key = "input")
121121
@Parameter(key = "output", itemIO = ItemIO.BOTH)
122122
public final Computers.Arity1<C, Unsigned12BitType> complexToUint12 = (input, output) -> output.set((long) input.getRealDouble());
123123

124-
@OpField(names = "convert.uint12")
124+
@OpField(names = "convert.uint12", params = "x")
125125
@Parameter(key = "input")
126126
@Parameter(key = "output", itemIO = ItemIO.BOTH)
127127
public final Computers.Arity1<T, Unsigned12BitType> integerToUint12 = (input, output) -> output.set(input.getIntegerLong());
128128

129-
@OpField(names = "convert.int16")
129+
@OpField(names = "convert.int16", params = "x")
130130
@Parameter(key = "input")
131131
@Parameter(key = "output", itemIO = ItemIO.BOTH)
132132
public final Computers.Arity1<C, ShortType> complexToInt16 = (input, output) -> output.set((short) input.getRealDouble());
133133

134-
@OpField(names = "convert.int16")
134+
@OpField(names = "convert.int16", params = "x")
135135
@Parameter(key = "input")
136136
@Parameter(key = "output", itemIO = ItemIO.BOTH)
137137
public final Computers.Arity1<T, ShortType> integerToInt16 = (input, output) -> output.set((short) input.getIntegerLong());
138138

139-
@OpField(names = "convert.uint16")
139+
@OpField(names = "convert.uint16", params = "x")
140140
@Parameter(key = "input")
141141
@Parameter(key = "output", itemIO = ItemIO.BOTH)
142142
public final Computers.Arity1<C, UnsignedShortType> complexToUint16 = (input, output) -> output.set((int) input.getRealDouble());
143143

144-
@OpField(names = "convert.uint16")
144+
@OpField(names = "convert.uint16", params = "x")
145145
@Parameter(key = "input")
146146
@Parameter(key = "output", itemIO = ItemIO.BOTH)
147147
public final Computers.Arity1<T, UnsignedShortType> integerToUint16 = (input, output) -> output.set(input.getInteger());
148148

149-
@OpField(names = "convert.int32")
149+
@OpField(names = "convert.int32", params = "x")
150150
@Parameter(key = "input")
151151
@Parameter(key = "output", itemIO = ItemIO.BOTH)
152152
public final Computers.Arity1<C, IntType> complexToInt32 = (input, output) -> output.set((int) input.getRealDouble());
153153

154-
@OpField(names = "convert.int32")
154+
@OpField(names = "convert.int32", params = "x")
155155
@Parameter(key = "input")
156156
@Parameter(key = "output", itemIO = ItemIO.BOTH)
157157
public final Computers.Arity1<T, IntType> integerToInt32 = (input, output) -> output.set(input.getInteger());
158158

159-
@OpField(names = "convert.uint32")
159+
@OpField(names = "convert.uint32", params = "x")
160160
@Parameter(key = "input")
161161
@Parameter(key = "output", itemIO = ItemIO.BOTH)
162162
public final Computers.Arity1<C, UnsignedIntType> complexToUint32 = (input, output) -> output.set((long) input.getRealDouble());
163163

164-
@OpField(names = "convert.uint32")
164+
@OpField(names = "convert.uint32", params = "x")
165165
@Parameter(key = "input")
166166
@Parameter(key = "output", itemIO = ItemIO.BOTH)
167167
public final Computers.Arity1<T, UnsignedIntType> integerToUint32 = (input, output) -> output.set(input.getIntegerLong());
168168

169-
@OpField(names = "convert.int64")
169+
@OpField(names = "convert.int64", params = "x")
170170
@Parameter(key = "input")
171171
@Parameter(key = "output", itemIO = ItemIO.BOTH)
172172
public final Computers.Arity1<C, LongType> complexToInt64 = (input, output) -> output.set((long) input.getRealDouble());
173173

174-
@OpField(names = "convert.int64")
174+
@OpField(names = "convert.int64", params = "x")
175175
@Parameter(key = "input")
176176
@Parameter(key = "output", itemIO = ItemIO.BOTH)
177177
public final Computers.Arity1<T, LongType> integerToInt64 = (input, output) -> output.set(input.getIntegerLong());
178178

179-
@OpField(names = "convert.uint64")
179+
@OpField(names = "convert.uint64", params = "x")
180180
@Parameter(key = "input")
181181
@Parameter(key = "output", itemIO = ItemIO.BOTH)
182182
public final Computers.Arity1<C, UnsignedLongType> complexToUint64 = (input, output) -> {
@@ -189,7 +189,7 @@ public final class ConvertTypes<C extends ComplexType<C>, T extends IntegerType<
189189
}
190190
};
191191

192-
@OpField(names = "convert.uint128")
192+
@OpField(names = "convert.uint128", params = "x")
193193
@Parameter(key = "input")
194194
@Parameter(key = "output", itemIO = ItemIO.BOTH)
195195
public final Computers.Arity1<C, Unsigned128BitType> complexToUint128 = (input, output) -> {
@@ -202,28 +202,28 @@ public final class ConvertTypes<C extends ComplexType<C>, T extends IntegerType<
202202
}
203203
};
204204

205-
@OpField(names = "convert.uint128")
205+
@OpField(names = "convert.uint128", params = "x")
206206
@Parameter(key = "input")
207207
@Parameter(key = "output", itemIO = ItemIO.BOTH)
208208
public final Computers.Arity1<T, Unsigned128BitType> integerToUint128 = (input, output) -> output.set(input.getBigInteger());
209209

210-
@OpField(names = "convert.float32")
210+
@OpField(names = "convert.float32", params = "x")
211211
@Parameter(key = "input")
212212
@Parameter(key = "output", itemIO = ItemIO.BOTH)
213213
public final Computers.Arity1<C, FloatType> complexToFloat32 = (input, output) -> output.set(input.getRealFloat());
214214

215-
@OpField(names = "convert.cfloat32")
215+
@OpField(names = "convert.cfloat32", params = "x")
216216
@Parameter(key = "input")
217217
@Parameter(key = "output", itemIO = ItemIO.BOTH)
218218
public final Computers.Arity1<C, ComplexFloatType> complexToCfloat32 = (input, output) -> output.set(input.getRealFloat(),
219219
input.getImaginaryFloat());
220220

221-
@OpField(names = "convert.float64")
221+
@OpField(names = "convert.float64", params = "x")
222222
@Parameter(key = "input")
223223
@Parameter(key = "output", itemIO = ItemIO.BOTH)
224224
public final Computers.Arity1<C, DoubleType> complexToFloat64 = (input, output) -> output.set(input.getRealDouble());
225225

226-
@OpField(names = "convert.cfloat64")
226+
@OpField(names = "convert.cfloat64", params = "x")
227227
@Parameter(key = "input")
228228
@Parameter(key = "output", itemIO = ItemIO.BOTH)
229229
public final Computers.Arity1<C, ComplexDoubleType> complexToCfloat64 = (input, output) -> output.set(input.getRealDouble(),

‎src/main/java/net/imagej/ops/convert/Converters.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,15 @@
1515
@Plugin(type = OpCollection.class)
1616
public class Converters<I, O extends Type<O>> {
1717

18-
@OpField(names = "convert")
18+
@OpField(names = "convert", params = "x")
1919
@Parameter(key = "inputII")
2020
@Parameter(key = "converter")
2121
@Parameter(key = "outputType")
2222
@Parameter(key = "outputII", itemIO = ItemIO.OUTPUT)
2323
public final Functions.Arity3<RandomAccessible<I>, Converter<? super I, ? super O>, O, RandomAccessible<O>> generalConverterRA = (
2424
inputRA, converter, type) -> net.imglib2.converter.Converters.convert(inputRA, converter, type);
2525

26-
@OpField(names = "convert")
26+
@OpField(names = "convert", params = "x")
2727
@Parameter(key = "inputII")
2828
@Parameter(key = "converter")
2929
@Parameter(key = "outputType")

‎src/main/java/net/imagej/ops/create/CreateTypes.java‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -28,71 +28,71 @@
2828
@Plugin(type = OpCollection.class)
2929
public class CreateTypes {
3030

31-
@OpField(names = "create, create.bit")
31+
@OpField(names = "create, create.bit", params = "x")
3232
@Parameter(key = "output", itemIO = ItemIO.OUTPUT)
3333
public final Producer<BitType> bitTypeSource = () -> new BitType();
3434

35-
@OpField(names = "create, create.uint2")
35+
@OpField(names = "create, create.uint2", params = "x")
3636
@Parameter(key = "output", itemIO = ItemIO.OUTPUT)
3737
public final Producer<Unsigned2BitType> uint2TypeSource = () -> new Unsigned2BitType();
3838

39-
@OpField(names = "create, create.uint4")
39+
@OpField(names = "create, create.uint4", params = "x")
4040
@Parameter(key = "output", itemIO = ItemIO.OUTPUT)
4141
public final Producer<Unsigned4BitType> uint4TypeSource = () -> new Unsigned4BitType();
4242

43-
@OpField(names = "create, create.byte")
43+
@OpField(names = "create, create.byte", params = "x")
4444
@Parameter(key = "output", itemIO = ItemIO.OUTPUT)
4545
public final Producer<ByteType> byteTypeSource = () -> new ByteType();
4646

47-
@OpField(names = "create, create.uint8")
47+
@OpField(names = "create, create.uint8", params = "x")
4848
@Parameter(key = "output", itemIO = ItemIO.OUTPUT)
4949
public final Producer<UnsignedByteType> uint8TypeSource = () -> new UnsignedByteType();
5050

51-
@OpField(names = "create, create.uint12")
51+
@OpField(names = "create, create.uint12", params = "x")
5252
@Parameter(key = "output", itemIO = ItemIO.OUTPUT)
5353
public final Producer<Unsigned12BitType> uint12TypeSource = () -> new Unsigned12BitType();
5454

55-
@OpField(names = "create, create.int16")
55+
@OpField(names = "create, create.int16", params = "x")
5656
@Parameter(key = "output", itemIO = ItemIO.OUTPUT)
5757
public final Producer<ShortType> shortTypeSource = () -> new ShortType();
5858

59-
@OpField(names = "create, create.uint16")
59+
@OpField(names = "create, create.uint16", params = "x")
6060
@Parameter(key = "output", itemIO = ItemIO.OUTPUT)
6161
public final Producer<UnsignedShortType> uint16TypeSource = () -> new UnsignedShortType();
6262

63-
@OpField(names = "create, create.int32")
63+
@OpField(names = "create, create.int32", params = "x")
6464
@Parameter(key = "output", itemIO = ItemIO.OUTPUT)
6565
public final Producer<IntType> int32TypeSource = () -> new IntType();
6666

67-
@OpField(names = "create, create.uint32")
67+
@OpField(names = "create, create.uint32", params = "x")
6868
@Parameter(key = "output", itemIO = ItemIO.OUTPUT)
6969
public final Producer<UnsignedIntType> uint32TypeSource = () -> new UnsignedIntType();
7070

71-
@OpField(names = "create, create.int64")
71+
@OpField(names = "create, create.int64", params = "x")
7272
@Parameter(key = "output", itemIO = ItemIO.OUTPUT)
7373
public final Producer<LongType> int64TypeSource = () -> new LongType();
7474

75-
@OpField(names = "create, create.uint64")
75+
@OpField(names = "create, create.uint64", params = "x")
7676
@Parameter(key = "output", itemIO = ItemIO.OUTPUT)
7777
public final Producer<UnsignedLongType> uint64TypeSource = () -> new UnsignedLongType();
7878

79-
@OpField(names = "create, create.uint128")
79+
@OpField(names = "create, create.uint128", params = "x")
8080
@Parameter(key = "output", itemIO = ItemIO.OUTPUT)
8181
public final Producer<Unsigned128BitType> uint128TypeSource = () -> new Unsigned128BitType();
8282

83-
@OpField(names = "create, create.float32")
83+
@OpField(names = "create, create.float32", params = "x")
8484
@Parameter(key = "output", itemIO = ItemIO.OUTPUT)
8585
public final Producer<FloatType> float32TypeSource = () -> new FloatType();
8686

87-
@OpField(names = "create, create.cfloat32")
87+
@OpField(names = "create, create.cfloat32", params = "x")
8888
@Parameter(key = "output", itemIO = ItemIO.OUTPUT)
8989
public final Producer<ComplexFloatType> cfloat32TypeSource = () -> new ComplexFloatType();
9090

91-
@OpField(names = "create, create.float64")
91+
@OpField(names = "create, create.float64", params = "x")
9292
@Parameter(key = "output", itemIO = ItemIO.OUTPUT)
9393
public final Producer<DoubleType> float64TypeSource = () -> new DoubleType();
9494

95-
@OpField(names = "create, create.cfloat64")
95+
@OpField(names = "create, create.cfloat64", params = "x")
9696
@Parameter(key = "output", itemIO = ItemIO.OUTPUT)
9797
public final Producer<ComplexDoubleType> cfloat64TypeSource = () -> new ComplexDoubleType();
9898

0 commit comments

Comments
 (0)