repeated .inr.numass.data.Point.Channel.Block.Event events = 2;
+ * repeated .inr.numass.data.Point.Channel.Block.Frame frames = 2;
*/
- java.util.List
* массив необработанных событий
*
*
- * repeated .inr.numass.data.Point.Channel.Block.Event events = 2;
+ * repeated .inr.numass.data.Point.Channel.Block.Frame frames = 2;
*/
- inr.numass.data.NumassProto.Point.Channel.Block.Event getEvents(int index);
+ inr.numass.data.NumassProto.Point.Channel.Block.Frame getFrames(int index);
/**
*
* массив необработанных событий
*
*
- * repeated .inr.numass.data.Point.Channel.Block.Event events = 2;
+ * repeated .inr.numass.data.Point.Channel.Block.Frame frames = 2;
*/
- int getEventsCount();
+ int getFramesCount();
/**
*
* массив необработанных событий
*
*
- * repeated .inr.numass.data.Point.Channel.Block.Event events = 2;
+ * repeated .inr.numass.data.Point.Channel.Block.Frame frames = 2;
*/
- java.util.List
- getEventsOrBuilderList();
+ java.util.List
+ getFramesOrBuilderList();
/**
*
* массив необработанных событий
*
*
- * repeated .inr.numass.data.Point.Channel.Block.Event events = 2;
+ * repeated .inr.numass.data.Point.Channel.Block.Frame frames = 2;
*/
- inr.numass.data.NumassProto.Point.Channel.Block.EventOrBuilder getEventsOrBuilder(
+ inr.numass.data.NumassProto.Point.Channel.Block.FrameOrBuilder getFramesOrBuilder(
int index);
/**
@@ -337,25 +337,25 @@ public final class NumassProto {
* массив обработанных событий
*
*
- * .inr.numass.data.Point.Channel.Block.Peaks peaks = 3;
+ * .inr.numass.data.Point.Channel.Block.Events events = 3;
*/
- boolean hasPeaks();
+ boolean hasEvents();
/**
*
* массив обработанных событий
*
*
- * .inr.numass.data.Point.Channel.Block.Peaks peaks = 3;
+ * .inr.numass.data.Point.Channel.Block.Events events = 3;
*/
- inr.numass.data.NumassProto.Point.Channel.Block.Peaks getPeaks();
+ inr.numass.data.NumassProto.Point.Channel.Block.Events getEvents();
/**
*
* массив обработанных событий
*
*
- * .inr.numass.data.Point.Channel.Block.Peaks peaks = 3;
+ * .inr.numass.data.Point.Channel.Block.Events events = 3;
*/
- inr.numass.data.NumassProto.Point.Channel.Block.PeaksOrBuilder getPeaksOrBuilder();
+ inr.numass.data.NumassProto.Point.Channel.Block.EventsOrBuilder getEventsOrBuilder();
}
/**
* Protobuf type {@code inr.numass.data.Point.Channel.Block}
@@ -370,7 +370,7 @@ public final class NumassProto {
}
private Block() {
time_ = 0L;
- events_ = java.util.Collections.emptyList();
+ frames_ = java.util.Collections.emptyList();
}
@java.lang.Override
@@ -405,22 +405,22 @@ public final class NumassProto {
}
case 18: {
if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) {
- events_ = new java.util.ArrayList
* массив необработанных событий
*
*
- * repeated .inr.numass.data.Point.Channel.Block.Event events = 2;
+ * repeated .inr.numass.data.Point.Channel.Block.Frame frames = 2;
*/
- public java.util.List
* массив необработанных событий
*
*
- * repeated .inr.numass.data.Point.Channel.Block.Event events = 2;
+ * repeated .inr.numass.data.Point.Channel.Block.Frame frames = 2;
*/
- public java.util.List
- getEventsOrBuilderList() {
- return events_;
+ public java.util.List
+ getFramesOrBuilderList() {
+ return frames_;
}
/**
*
* массив необработанных событий
*
*
- * repeated .inr.numass.data.Point.Channel.Block.Event events = 2;
+ * repeated .inr.numass.data.Point.Channel.Block.Frame frames = 2;
*/
- public int getEventsCount() {
- return events_.size();
+ public int getFramesCount() {
+ return frames_.size();
}
/**
*
* массив необработанных событий
*
*
- * repeated .inr.numass.data.Point.Channel.Block.Event events = 2;
+ * repeated .inr.numass.data.Point.Channel.Block.Frame frames = 2;
*/
- public inr.numass.data.NumassProto.Point.Channel.Block.Event getEvents(int index) {
- return events_.get(index);
+ public inr.numass.data.NumassProto.Point.Channel.Block.Frame getFrames(int index) {
+ return frames_.get(index);
}
/**
*
* массив необработанных событий
*
*
- * repeated .inr.numass.data.Point.Channel.Block.Event events = 2;
+ * repeated .inr.numass.data.Point.Channel.Block.Frame frames = 2;
*/
- public inr.numass.data.NumassProto.Point.Channel.Block.EventOrBuilder getEventsOrBuilder(
+ public inr.numass.data.NumassProto.Point.Channel.Block.FrameOrBuilder getFramesOrBuilder(
int index) {
- return events_.get(index);
+ return frames_.get(index);
}
- public static final int PEAKS_FIELD_NUMBER = 3;
- private inr.numass.data.NumassProto.Point.Channel.Block.Peaks peaks_;
+ public static final int EVENTS_FIELD_NUMBER = 3;
+ private inr.numass.data.NumassProto.Point.Channel.Block.Events events_;
/**
*
* массив обработанных событий
*
*
- * .inr.numass.data.Point.Channel.Block.Peaks peaks = 3;
+ * .inr.numass.data.Point.Channel.Block.Events events = 3;
*/
- public boolean hasPeaks() {
- return peaks_ != null;
+ public boolean hasEvents() {
+ return events_ != null;
}
/**
*
* массив обработанных событий
*
*
- * .inr.numass.data.Point.Channel.Block.Peaks peaks = 3;
+ * .inr.numass.data.Point.Channel.Block.Events events = 3;
*/
- public inr.numass.data.NumassProto.Point.Channel.Block.Peaks getPeaks() {
- return peaks_ == null ? inr.numass.data.NumassProto.Point.Channel.Block.Peaks.getDefaultInstance() : peaks_;
+ public inr.numass.data.NumassProto.Point.Channel.Block.Events getEvents() {
+ return events_ == null ? inr.numass.data.NumassProto.Point.Channel.Block.Events.getDefaultInstance() : events_;
}
/**
*
* массив обработанных событий
*
*
- * .inr.numass.data.Point.Channel.Block.Peaks peaks = 3;
+ * .inr.numass.data.Point.Channel.Block.Events events = 3;
*/
- public inr.numass.data.NumassProto.Point.Channel.Block.PeaksOrBuilder getPeaksOrBuilder() {
- return getPeaks();
+ public inr.numass.data.NumassProto.Point.Channel.Block.EventsOrBuilder getEventsOrBuilder() {
+ return getEvents();
}
private byte memoizedIsInitialized = -1;
@@ -1941,11 +1963,11 @@ public final class NumassProto {
if (time_ != 0L) {
output.writeUInt64(1, time_);
}
- for (int i = 0; i < events_.size(); i++) {
- output.writeMessage(2, events_.get(i));
+ for (int i = 0; i < frames_.size(); i++) {
+ output.writeMessage(2, frames_.get(i));
}
- if (peaks_ != null) {
- output.writeMessage(3, getPeaks());
+ if (events_ != null) {
+ output.writeMessage(3, getEvents());
}
}
@@ -1958,13 +1980,13 @@ public final class NumassProto {
size += com.google.protobuf.CodedOutputStream
.computeUInt64Size(1, time_);
}
- for (int i = 0; i < events_.size(); i++) {
+ for (int i = 0; i < frames_.size(); i++) {
size += com.google.protobuf.CodedOutputStream
- .computeMessageSize(2, events_.get(i));
+ .computeMessageSize(2, frames_.get(i));
}
- if (peaks_ != null) {
+ if (events_ != null) {
size += com.google.protobuf.CodedOutputStream
- .computeMessageSize(3, getPeaks());
+ .computeMessageSize(3, getEvents());
}
memoizedSize = size;
return size;
@@ -1984,12 +2006,12 @@ public final class NumassProto {
boolean result = true;
result = result && (getTime()
== other.getTime());
- result = result && getEventsList()
- .equals(other.getEventsList());
- result = result && (hasPeaks() == other.hasPeaks());
- if (hasPeaks()) {
- result = result && getPeaks()
- .equals(other.getPeaks());
+ result = result && getFramesList()
+ .equals(other.getFramesList());
+ result = result && (hasEvents() == other.hasEvents());
+ if (hasEvents()) {
+ result = result && getEvents()
+ .equals(other.getEvents());
}
return result;
}
@@ -2004,19 +2026,30 @@ public final class NumassProto {
hash = (37 * hash) + TIME_FIELD_NUMBER;
hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
getTime());
- if (getEventsCount() > 0) {
- hash = (37 * hash) + EVENTS_FIELD_NUMBER;
- hash = (53 * hash) + getEventsList().hashCode();
+ if (getFramesCount() > 0) {
+ hash = (37 * hash) + FRAMES_FIELD_NUMBER;
+ hash = (53 * hash) + getFramesList().hashCode();
}
- if (hasPeaks()) {
- hash = (37 * hash) + PEAKS_FIELD_NUMBER;
- hash = (53 * hash) + getPeaks().hashCode();
+ if (hasEvents()) {
+ hash = (37 * hash) + EVENTS_FIELD_NUMBER;
+ hash = (53 * hash) + getEvents().hashCode();
}
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
}
+ public static inr.numass.data.NumassProto.Point.Channel.Block parseFrom(
+ java.nio.ByteBuffer data)
+ throws com.google.protobuf.InvalidProtocolBufferException {
+ return PARSER.parseFrom(data);
+ }
+ public static inr.numass.data.NumassProto.Point.Channel.Block parseFrom(
+ java.nio.ByteBuffer data,
+ com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.protobuf.InvalidProtocolBufferException {
+ return PARSER.parseFrom(data, extensionRegistry);
+ }
public static inr.numass.data.NumassProto.Point.Channel.Block parseFrom(
com.google.protobuf.ByteString data)
throws com.google.protobuf.InvalidProtocolBufferException {
@@ -2126,24 +2159,24 @@ public final class NumassProto {
private void maybeForceBuilderInitialization() {
if (com.google.protobuf.GeneratedMessageV3
.alwaysUseFieldBuilders) {
- getEventsFieldBuilder();
+ getFramesFieldBuilder();
}
}
public Builder clear() {
super.clear();
time_ = 0L;
- if (eventsBuilder_ == null) {
- events_ = java.util.Collections.emptyList();
+ if (framesBuilder_ == null) {
+ frames_ = java.util.Collections.emptyList();
bitField0_ = (bitField0_ & ~0x00000002);
} else {
- eventsBuilder_.clear();
+ framesBuilder_.clear();
}
- if (peaksBuilder_ == null) {
- peaks_ = null;
+ if (eventsBuilder_ == null) {
+ events_ = null;
} else {
- peaks_ = null;
- peaksBuilder_ = null;
+ events_ = null;
+ eventsBuilder_ = null;
}
return this;
}
@@ -2170,20 +2203,20 @@ public final class NumassProto {
int from_bitField0_ = bitField0_;
int to_bitField0_ = 0;
result.time_ = time_;
- if (eventsBuilder_ == null) {
+ if (framesBuilder_ == null) {
if (((bitField0_ & 0x00000002) == 0x00000002)) {
- events_ = java.util.Collections.unmodifiableList(events_);
+ frames_ = java.util.Collections.unmodifiableList(frames_);
bitField0_ = (bitField0_ & ~0x00000002);
}
+ result.frames_ = frames_;
+ } else {
+ result.frames_ = framesBuilder_.build();
+ }
+ if (eventsBuilder_ == null) {
result.events_ = events_;
} else {
result.events_ = eventsBuilder_.build();
}
- if (peaksBuilder_ == null) {
- result.peaks_ = peaks_;
- } else {
- result.peaks_ = peaksBuilder_.build();
- }
result.bitField0_ = to_bitField0_;
onBuilt();
return result;
@@ -2229,34 +2262,34 @@ public final class NumassProto {
if (other.getTime() != 0L) {
setTime(other.getTime());
}
- if (eventsBuilder_ == null) {
- if (!other.events_.isEmpty()) {
- if (events_.isEmpty()) {
- events_ = other.events_;
+ if (framesBuilder_ == null) {
+ if (!other.frames_.isEmpty()) {
+ if (frames_.isEmpty()) {
+ frames_ = other.frames_;
bitField0_ = (bitField0_ & ~0x00000002);
} else {
- ensureEventsIsMutable();
- events_.addAll(other.events_);
+ ensureFramesIsMutable();
+ frames_.addAll(other.frames_);
}
onChanged();
}
} else {
- if (!other.events_.isEmpty()) {
- if (eventsBuilder_.isEmpty()) {
- eventsBuilder_.dispose();
- eventsBuilder_ = null;
- events_ = other.events_;
+ if (!other.frames_.isEmpty()) {
+ if (framesBuilder_.isEmpty()) {
+ framesBuilder_.dispose();
+ framesBuilder_ = null;
+ frames_ = other.frames_;
bitField0_ = (bitField0_ & ~0x00000002);
- eventsBuilder_ =
+ framesBuilder_ =
com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
- getEventsFieldBuilder() : null;
+ getFramesFieldBuilder() : null;
} else {
- eventsBuilder_.addAllMessages(other.events_);
+ framesBuilder_.addAllMessages(other.frames_);
}
}
}
- if (other.hasPeaks()) {
- mergePeaks(other.getPeaks());
+ if (other.hasEvents()) {
+ mergeEvents(other.getEvents());
}
onChanged();
return this;
@@ -2323,30 +2356,30 @@ public final class NumassProto {
return this;
}
- private java.util.List
* массив необработанных событий
*
*
- * repeated .inr.numass.data.Point.Channel.Block.Event events = 2;
+ * repeated .inr.numass.data.Point.Channel.Block.Frame frames = 2;
*/
- public java.util.Listrepeated .inr.numass.data.Point.Channel.Block.Event events = 2;
+ * repeated .inr.numass.data.Point.Channel.Block.Frame frames = 2;
*/
- public int getEventsCount() {
- if (eventsBuilder_ == null) {
- return events_.size();
+ public int getFramesCount() {
+ if (framesBuilder_ == null) {
+ return frames_.size();
} else {
- return eventsBuilder_.getCount();
+ return framesBuilder_.getCount();
}
}
/**
@@ -2368,13 +2401,13 @@ public final class NumassProto {
* массив необработанных событий
*
*
- * repeated .inr.numass.data.Point.Channel.Block.Event events = 2;
+ * repeated .inr.numass.data.Point.Channel.Block.Frame frames = 2;
*/
- public inr.numass.data.NumassProto.Point.Channel.Block.Event getEvents(int index) {
- if (eventsBuilder_ == null) {
- return events_.get(index);
+ public inr.numass.data.NumassProto.Point.Channel.Block.Frame getFrames(int index) {
+ if (framesBuilder_ == null) {
+ return frames_.get(index);
} else {
- return eventsBuilder_.getMessage(index);
+ return framesBuilder_.getMessage(index);
}
}
/**
@@ -2382,19 +2415,19 @@ public final class NumassProto {
* массив необработанных событий
*
*
- * repeated .inr.numass.data.Point.Channel.Block.Event events = 2;
+ * repeated .inr.numass.data.Point.Channel.Block.Frame frames = 2;
*/
- public Builder setEvents(
- int index, inr.numass.data.NumassProto.Point.Channel.Block.Event value) {
- if (eventsBuilder_ == null) {
+ public Builder setFrames(
+ int index, inr.numass.data.NumassProto.Point.Channel.Block.Frame value) {
+ if (framesBuilder_ == null) {
if (value == null) {
throw new NullPointerException();
}
- ensureEventsIsMutable();
- events_.set(index, value);
+ ensureFramesIsMutable();
+ frames_.set(index, value);
onChanged();
} else {
- eventsBuilder_.setMessage(index, value);
+ framesBuilder_.setMessage(index, value);
}
return this;
}
@@ -2403,16 +2436,16 @@ public final class NumassProto {
* массив необработанных событий
*
*
- * repeated .inr.numass.data.Point.Channel.Block.Event events = 2;
+ * repeated .inr.numass.data.Point.Channel.Block.Frame frames = 2;
*/
- public Builder setEvents(
- int index, inr.numass.data.NumassProto.Point.Channel.Block.Event.Builder builderForValue) {
- if (eventsBuilder_ == null) {
- ensureEventsIsMutable();
- events_.set(index, builderForValue.build());
+ public Builder setFrames(
+ int index, inr.numass.data.NumassProto.Point.Channel.Block.Frame.Builder builderForValue) {
+ if (framesBuilder_ == null) {
+ ensureFramesIsMutable();
+ frames_.set(index, builderForValue.build());
onChanged();
} else {
- eventsBuilder_.setMessage(index, builderForValue.build());
+ framesBuilder_.setMessage(index, builderForValue.build());
}
return this;
}
@@ -2421,18 +2454,18 @@ public final class NumassProto {
* массив необработанных событий
*
*
- * repeated .inr.numass.data.Point.Channel.Block.Event events = 2;
+ * repeated .inr.numass.data.Point.Channel.Block.Frame frames = 2;
*/
- public Builder addEvents(inr.numass.data.NumassProto.Point.Channel.Block.Event value) {
- if (eventsBuilder_ == null) {
+ public Builder addFrames(inr.numass.data.NumassProto.Point.Channel.Block.Frame value) {
+ if (framesBuilder_ == null) {
if (value == null) {
throw new NullPointerException();
}
- ensureEventsIsMutable();
- events_.add(value);
+ ensureFramesIsMutable();
+ frames_.add(value);
onChanged();
} else {
- eventsBuilder_.addMessage(value);
+ framesBuilder_.addMessage(value);
}
return this;
}
@@ -2441,19 +2474,19 @@ public final class NumassProto {
* массив необработанных событий
*
*
- * repeated .inr.numass.data.Point.Channel.Block.Event events = 2;
+ * repeated .inr.numass.data.Point.Channel.Block.Frame frames = 2;
*/
- public Builder addEvents(
- int index, inr.numass.data.NumassProto.Point.Channel.Block.Event value) {
- if (eventsBuilder_ == null) {
+ public Builder addFrames(
+ int index, inr.numass.data.NumassProto.Point.Channel.Block.Frame value) {
+ if (framesBuilder_ == null) {
if (value == null) {
throw new NullPointerException();
}
- ensureEventsIsMutable();
- events_.add(index, value);
+ ensureFramesIsMutable();
+ frames_.add(index, value);
onChanged();
} else {
- eventsBuilder_.addMessage(index, value);
+ framesBuilder_.addMessage(index, value);
}
return this;
}
@@ -2462,16 +2495,16 @@ public final class NumassProto {
* массив необработанных событий
*
*
- * repeated .inr.numass.data.Point.Channel.Block.Event events = 2;
+ * repeated .inr.numass.data.Point.Channel.Block.Frame frames = 2;
*/
- public Builder addEvents(
- inr.numass.data.NumassProto.Point.Channel.Block.Event.Builder builderForValue) {
- if (eventsBuilder_ == null) {
- ensureEventsIsMutable();
- events_.add(builderForValue.build());
+ public Builder addFrames(
+ inr.numass.data.NumassProto.Point.Channel.Block.Frame.Builder builderForValue) {
+ if (framesBuilder_ == null) {
+ ensureFramesIsMutable();
+ frames_.add(builderForValue.build());
onChanged();
} else {
- eventsBuilder_.addMessage(builderForValue.build());
+ framesBuilder_.addMessage(builderForValue.build());
}
return this;
}
@@ -2480,16 +2513,16 @@ public final class NumassProto {
* массив необработанных событий
*
*
- * repeated .inr.numass.data.Point.Channel.Block.Event events = 2;
+ * repeated .inr.numass.data.Point.Channel.Block.Frame frames = 2;
*/
- public Builder addEvents(
- int index, inr.numass.data.NumassProto.Point.Channel.Block.Event.Builder builderForValue) {
- if (eventsBuilder_ == null) {
- ensureEventsIsMutable();
- events_.add(index, builderForValue.build());
+ public Builder addFrames(
+ int index, inr.numass.data.NumassProto.Point.Channel.Block.Frame.Builder builderForValue) {
+ if (framesBuilder_ == null) {
+ ensureFramesIsMutable();
+ frames_.add(index, builderForValue.build());
onChanged();
} else {
- eventsBuilder_.addMessage(index, builderForValue.build());
+ framesBuilder_.addMessage(index, builderForValue.build());
}
return this;
}
@@ -2498,17 +2531,17 @@ public final class NumassProto {
* массив необработанных событий
*
*
- * repeated .inr.numass.data.Point.Channel.Block.Event events = 2;
+ * repeated .inr.numass.data.Point.Channel.Block.Frame frames = 2;
*/
- public Builder addAllEvents(
- java.lang.Iterable values) {
- if (eventsBuilder_ == null) {
- ensureEventsIsMutable();
+ public Builder addAllFrames(
+ java.lang.Iterable values) {
+ if (framesBuilder_ == null) {
+ ensureFramesIsMutable();
com.google.protobuf.AbstractMessageLite.Builder.addAll(
- values, events_);
+ values, frames_);
onChanged();
} else {
- eventsBuilder_.addAllMessages(values);
+ framesBuilder_.addAllMessages(values);
}
return this;
}
@@ -2517,15 +2550,15 @@ public final class NumassProto {
* массив необработанных событий
*
*
- * repeated .inr.numass.data.Point.Channel.Block.Event events = 2;
+ * repeated .inr.numass.data.Point.Channel.Block.Frame frames = 2;
*/
- public Builder clearEvents() {
- if (eventsBuilder_ == null) {
- events_ = java.util.Collections.emptyList();
+ public Builder clearFrames() {
+ if (framesBuilder_ == null) {
+ frames_ = java.util.Collections.emptyList();
bitField0_ = (bitField0_ & ~0x00000002);
onChanged();
} else {
- eventsBuilder_.clear();
+ framesBuilder_.clear();
}
return this;
}
@@ -2534,15 +2567,15 @@ public final class NumassProto {
* массив необработанных событий
*
*
- * repeated .inr.numass.data.Point.Channel.Block.Event events = 2;
+ * repeated .inr.numass.data.Point.Channel.Block.Frame frames = 2;
*/
- public Builder removeEvents(int index) {
- if (eventsBuilder_ == null) {
- ensureEventsIsMutable();
- events_.remove(index);
+ public Builder removeFrames(int index) {
+ if (framesBuilder_ == null) {
+ ensureFramesIsMutable();
+ frames_.remove(index);
onChanged();
} else {
- eventsBuilder_.remove(index);
+ framesBuilder_.remove(index);
}
return this;
}
@@ -2551,24 +2584,24 @@ public final class NumassProto {
* массив необработанных событий
*
*
- * repeated .inr.numass.data.Point.Channel.Block.Event events = 2;
+ * repeated .inr.numass.data.Point.Channel.Block.Frame frames = 2;
*/
- public inr.numass.data.NumassProto.Point.Channel.Block.Event.Builder getEventsBuilder(
+ public inr.numass.data.NumassProto.Point.Channel.Block.Frame.Builder getFramesBuilder(
int index) {
- return getEventsFieldBuilder().getBuilder(index);
+ return getFramesFieldBuilder().getBuilder(index);
}
/**
*
* массив необработанных событий
*
*
- * repeated .inr.numass.data.Point.Channel.Block.Event events = 2;
+ * repeated .inr.numass.data.Point.Channel.Block.Frame frames = 2;
*/
- public inr.numass.data.NumassProto.Point.Channel.Block.EventOrBuilder getEventsOrBuilder(
+ public inr.numass.data.NumassProto.Point.Channel.Block.FrameOrBuilder getFramesOrBuilder(
int index) {
- if (eventsBuilder_ == null) {
- return events_.get(index); } else {
- return eventsBuilder_.getMessageOrBuilder(index);
+ if (framesBuilder_ == null) {
+ return frames_.get(index); } else {
+ return framesBuilder_.getMessageOrBuilder(index);
}
}
/**
@@ -2576,14 +2609,14 @@ public final class NumassProto {
* массив необработанных событий
*
*
- * repeated .inr.numass.data.Point.Channel.Block.Event events = 2;
+ * repeated .inr.numass.data.Point.Channel.Block.Frame frames = 2;
*/
- public java.util.List
- getEventsOrBuilderList() {
- if (eventsBuilder_ != null) {
- return eventsBuilder_.getMessageOrBuilderList();
+ public java.util.List
+ getFramesOrBuilderList() {
+ if (framesBuilder_ != null) {
+ return framesBuilder_.getMessageOrBuilderList();
} else {
- return java.util.Collections.unmodifiableList(events_);
+ return java.util.Collections.unmodifiableList(frames_);
}
}
/**
@@ -2591,202 +2624,202 @@ public final class NumassProto {
* массив необработанных событий
*
*
- * repeated .inr.numass.data.Point.Channel.Block.Event events = 2;
+ * repeated .inr.numass.data.Point.Channel.Block.Frame frames = 2;
*/
- public inr.numass.data.NumassProto.Point.Channel.Block.Event.Builder addEventsBuilder() {
- return getEventsFieldBuilder().addBuilder(
- inr.numass.data.NumassProto.Point.Channel.Block.Event.getDefaultInstance());
+ public inr.numass.data.NumassProto.Point.Channel.Block.Frame.Builder addFramesBuilder() {
+ return getFramesFieldBuilder().addBuilder(
+ inr.numass.data.NumassProto.Point.Channel.Block.Frame.getDefaultInstance());
}
/**
*
* массив необработанных событий
*
*
- * repeated .inr.numass.data.Point.Channel.Block.Event events = 2;
+ * repeated .inr.numass.data.Point.Channel.Block.Frame frames = 2;
*/
- public inr.numass.data.NumassProto.Point.Channel.Block.Event.Builder addEventsBuilder(
+ public inr.numass.data.NumassProto.Point.Channel.Block.Frame.Builder addFramesBuilder(
int index) {
- return getEventsFieldBuilder().addBuilder(
- index, inr.numass.data.NumassProto.Point.Channel.Block.Event.getDefaultInstance());
+ return getFramesFieldBuilder().addBuilder(
+ index, inr.numass.data.NumassProto.Point.Channel.Block.Frame.getDefaultInstance());
}
/**
*
* массив необработанных событий
*
*
- * repeated .inr.numass.data.Point.Channel.Block.Event events = 2;
+ * repeated .inr.numass.data.Point.Channel.Block.Frame frames = 2;
*/
- public java.util.List+ * массив обработанных событий + *+ * + *
.inr.numass.data.Point.Channel.Block.Events events = 3;
+ */
+ public boolean hasEvents() {
+ return eventsBuilder_ != null || events_ != null;
+ }
+ /**
+ * + * массив обработанных событий + *+ * + *
.inr.numass.data.Point.Channel.Block.Events events = 3;
+ */
+ public inr.numass.data.NumassProto.Point.Channel.Block.Events getEvents() {
+ if (eventsBuilder_ == null) {
+ return events_ == null ? inr.numass.data.NumassProto.Point.Channel.Block.Events.getDefaultInstance() : events_;
+ } else {
+ return eventsBuilder_.getMessage();
+ }
+ }
+ /**
+ * + * массив обработанных событий + *+ * + *
.inr.numass.data.Point.Channel.Block.Events events = 3;
+ */
+ public Builder setEvents(inr.numass.data.NumassProto.Point.Channel.Block.Events value) {
+ if (eventsBuilder_ == null) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+ events_ = value;
+ onChanged();
+ } else {
+ eventsBuilder_.setMessage(value);
+ }
+
+ return this;
+ }
+ /**
+ * + * массив обработанных событий + *+ * + *
.inr.numass.data.Point.Channel.Block.Events events = 3;
+ */
+ public Builder setEvents(
+ inr.numass.data.NumassProto.Point.Channel.Block.Events.Builder builderForValue) {
+ if (eventsBuilder_ == null) {
+ events_ = builderForValue.build();
+ onChanged();
+ } else {
+ eventsBuilder_.setMessage(builderForValue.build());
+ }
+
+ return this;
+ }
+ /**
+ * + * массив обработанных событий + *+ * + *
.inr.numass.data.Point.Channel.Block.Events events = 3;
+ */
+ public Builder mergeEvents(inr.numass.data.NumassProto.Point.Channel.Block.Events value) {
+ if (eventsBuilder_ == null) {
+ if (events_ != null) {
+ events_ =
+ inr.numass.data.NumassProto.Point.Channel.Block.Events.newBuilder(events_).mergeFrom(value).buildPartial();
+ } else {
+ events_ = value;
+ }
+ onChanged();
+ } else {
+ eventsBuilder_.mergeFrom(value);
+ }
+
+ return this;
+ }
+ /**
+ * + * массив обработанных событий + *+ * + *
.inr.numass.data.Point.Channel.Block.Events events = 3;
+ */
+ public Builder clearEvents() {
+ if (eventsBuilder_ == null) {
+ events_ = null;
+ onChanged();
+ } else {
+ events_ = null;
+ eventsBuilder_ = null;
+ }
+
+ return this;
+ }
+ /**
+ * + * массив обработанных событий + *+ * + *
.inr.numass.data.Point.Channel.Block.Events events = 3;
+ */
+ public inr.numass.data.NumassProto.Point.Channel.Block.Events.Builder getEventsBuilder() {
+
+ onChanged();
+ return getEventsFieldBuilder().getBuilder();
+ }
+ /**
+ * + * массив обработанных событий + *+ * + *
.inr.numass.data.Point.Channel.Block.Events events = 3;
+ */
+ public inr.numass.data.NumassProto.Point.Channel.Block.EventsOrBuilder getEventsOrBuilder() {
+ if (eventsBuilder_ != null) {
+ return eventsBuilder_.getMessageOrBuilder();
+ } else {
+ return events_ == null ?
+ inr.numass.data.NumassProto.Point.Channel.Block.Events.getDefaultInstance() : events_;
+ }
+ }
+ /**
+ * + * массив обработанных событий + *+ * + *
.inr.numass.data.Point.Channel.Block.Events events = 3;
+ */
+ private com.google.protobuf.SingleFieldBuilderV3<
+ inr.numass.data.NumassProto.Point.Channel.Block.Events, inr.numass.data.NumassProto.Point.Channel.Block.Events.Builder, inr.numass.data.NumassProto.Point.Channel.Block.EventsOrBuilder>
getEventsFieldBuilder() {
if (eventsBuilder_ == null) {
- eventsBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
- inr.numass.data.NumassProto.Point.Channel.Block.Event, inr.numass.data.NumassProto.Point.Channel.Block.Event.Builder, inr.numass.data.NumassProto.Point.Channel.Block.EventOrBuilder>(
- events_,
- ((bitField0_ & 0x00000002) == 0x00000002),
+ eventsBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+ inr.numass.data.NumassProto.Point.Channel.Block.Events, inr.numass.data.NumassProto.Point.Channel.Block.Events.Builder, inr.numass.data.NumassProto.Point.Channel.Block.EventsOrBuilder>(
+ getEvents(),
getParentForChildren(),
isClean());
events_ = null;
}
return eventsBuilder_;
}
-
- private inr.numass.data.NumassProto.Point.Channel.Block.Peaks peaks_ = null;
- private com.google.protobuf.SingleFieldBuilderV3<
- inr.numass.data.NumassProto.Point.Channel.Block.Peaks, inr.numass.data.NumassProto.Point.Channel.Block.Peaks.Builder, inr.numass.data.NumassProto.Point.Channel.Block.PeaksOrBuilder> peaksBuilder_;
- /**
- * - * массив обработанных событий - *- * - *
.inr.numass.data.Point.Channel.Block.Peaks peaks = 3;
- */
- public boolean hasPeaks() {
- return peaksBuilder_ != null || peaks_ != null;
- }
- /**
- * - * массив обработанных событий - *- * - *
.inr.numass.data.Point.Channel.Block.Peaks peaks = 3;
- */
- public inr.numass.data.NumassProto.Point.Channel.Block.Peaks getPeaks() {
- if (peaksBuilder_ == null) {
- return peaks_ == null ? inr.numass.data.NumassProto.Point.Channel.Block.Peaks.getDefaultInstance() : peaks_;
- } else {
- return peaksBuilder_.getMessage();
- }
- }
- /**
- * - * массив обработанных событий - *- * - *
.inr.numass.data.Point.Channel.Block.Peaks peaks = 3;
- */
- public Builder setPeaks(inr.numass.data.NumassProto.Point.Channel.Block.Peaks value) {
- if (peaksBuilder_ == null) {
- if (value == null) {
- throw new NullPointerException();
- }
- peaks_ = value;
- onChanged();
- } else {
- peaksBuilder_.setMessage(value);
- }
-
- return this;
- }
- /**
- * - * массив обработанных событий - *- * - *
.inr.numass.data.Point.Channel.Block.Peaks peaks = 3;
- */
- public Builder setPeaks(
- inr.numass.data.NumassProto.Point.Channel.Block.Peaks.Builder builderForValue) {
- if (peaksBuilder_ == null) {
- peaks_ = builderForValue.build();
- onChanged();
- } else {
- peaksBuilder_.setMessage(builderForValue.build());
- }
-
- return this;
- }
- /**
- * - * массив обработанных событий - *- * - *
.inr.numass.data.Point.Channel.Block.Peaks peaks = 3;
- */
- public Builder mergePeaks(inr.numass.data.NumassProto.Point.Channel.Block.Peaks value) {
- if (peaksBuilder_ == null) {
- if (peaks_ != null) {
- peaks_ =
- inr.numass.data.NumassProto.Point.Channel.Block.Peaks.newBuilder(peaks_).mergeFrom(value).buildPartial();
- } else {
- peaks_ = value;
- }
- onChanged();
- } else {
- peaksBuilder_.mergeFrom(value);
- }
-
- return this;
- }
- /**
- * - * массив обработанных событий - *- * - *
.inr.numass.data.Point.Channel.Block.Peaks peaks = 3;
- */
- public Builder clearPeaks() {
- if (peaksBuilder_ == null) {
- peaks_ = null;
- onChanged();
- } else {
- peaks_ = null;
- peaksBuilder_ = null;
- }
-
- return this;
- }
- /**
- * - * массив обработанных событий - *- * - *
.inr.numass.data.Point.Channel.Block.Peaks peaks = 3;
- */
- public inr.numass.data.NumassProto.Point.Channel.Block.Peaks.Builder getPeaksBuilder() {
-
- onChanged();
- return getPeaksFieldBuilder().getBuilder();
- }
- /**
- * - * массив обработанных событий - *- * - *
.inr.numass.data.Point.Channel.Block.Peaks peaks = 3;
- */
- public inr.numass.data.NumassProto.Point.Channel.Block.PeaksOrBuilder getPeaksOrBuilder() {
- if (peaksBuilder_ != null) {
- return peaksBuilder_.getMessageOrBuilder();
- } else {
- return peaks_ == null ?
- inr.numass.data.NumassProto.Point.Channel.Block.Peaks.getDefaultInstance() : peaks_;
- }
- }
- /**
- * - * массив обработанных событий - *- * - *
.inr.numass.data.Point.Channel.Block.Peaks peaks = 3;
- */
- private com.google.protobuf.SingleFieldBuilderV3<
- inr.numass.data.NumassProto.Point.Channel.Block.Peaks, inr.numass.data.NumassProto.Point.Channel.Block.Peaks.Builder, inr.numass.data.NumassProto.Point.Channel.Block.PeaksOrBuilder>
- getPeaksFieldBuilder() {
- if (peaksBuilder_ == null) {
- peaksBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
- inr.numass.data.NumassProto.Point.Channel.Block.Peaks, inr.numass.data.NumassProto.Point.Channel.Block.Peaks.Builder, inr.numass.data.NumassProto.Point.Channel.Block.PeaksOrBuilder>(
- getPeaks(),
- getParentForChildren(),
- isClean());
- peaks_ = null;
- }
- return peaksBuilder_;
- }
public final Builder setUnknownFields(
final com.google.protobuf.UnknownFieldSet unknownFields) {
return this;
@@ -2980,6 +3013,17 @@ public final class NumassProto {
return hash;
}
+ public static inr.numass.data.NumassProto.Point.Channel parseFrom(
+ java.nio.ByteBuffer data)
+ throws com.google.protobuf.InvalidProtocolBufferException {
+ return PARSER.parseFrom(data);
+ }
+ public static inr.numass.data.NumassProto.Point.Channel parseFrom(
+ java.nio.ByteBuffer data,
+ com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.protobuf.InvalidProtocolBufferException {
+ return PARSER.parseFrom(data, extensionRegistry);
+ }
public static inr.numass.data.NumassProto.Point.Channel parseFrom(
com.google.protobuf.ByteString data)
throws com.google.protobuf.InvalidProtocolBufferException {
@@ -3750,6 +3794,17 @@ public final class NumassProto {
return hash;
}
+ public static inr.numass.data.NumassProto.Point parseFrom(
+ java.nio.ByteBuffer data)
+ throws com.google.protobuf.InvalidProtocolBufferException {
+ return PARSER.parseFrom(data);
+ }
+ public static inr.numass.data.NumassProto.Point parseFrom(
+ java.nio.ByteBuffer data,
+ com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.protobuf.InvalidProtocolBufferException {
+ return PARSER.parseFrom(data, extensionRegistry);
+ }
public static inr.numass.data.NumassProto.Point parseFrom(
com.google.protobuf.ByteString data)
throws com.google.protobuf.InvalidProtocolBufferException {
@@ -4372,15 +4427,15 @@ public final class NumassProto {
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
internal_static_inr_numass_data_Point_Channel_Block_fieldAccessorTable;
private static final com.google.protobuf.Descriptors.Descriptor
- internal_static_inr_numass_data_Point_Channel_Block_Event_descriptor;
+ internal_static_inr_numass_data_Point_Channel_Block_Frame_descriptor;
private static final
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
- internal_static_inr_numass_data_Point_Channel_Block_Event_fieldAccessorTable;
+ internal_static_inr_numass_data_Point_Channel_Block_Frame_fieldAccessorTable;
private static final com.google.protobuf.Descriptors.Descriptor
- internal_static_inr_numass_data_Point_Channel_Block_Peaks_descriptor;
+ internal_static_inr_numass_data_Point_Channel_Block_Events_descriptor;
private static final
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
- internal_static_inr_numass_data_Point_Channel_Block_Peaks_fieldAccessorTable;
+ internal_static_inr_numass_data_Point_Channel_Block_Events_fieldAccessorTable;
public static com.google.protobuf.Descriptors.FileDescriptor
getDescriptor() {
@@ -4391,16 +4446,16 @@ public final class NumassProto {
static {
java.lang.String[] descriptorData = {
"\n\034inr/numas/numass-proto.proto\022\017inr.numa" +
- "ss.data\"\350\002\n\005Point\0220\n\010channels\030\001 \003(\0132\036.in" +
- "r.numass.data.Point.Channel\032\254\002\n\007Channel\022" +
+ "ss.data\"\353\002\n\005Point\0220\n\010channels\030\001 \003(\0132\036.in" +
+ "r.numass.data.Point.Channel\032\257\002\n\007Channel\022" +
"\013\n\003num\030\001 \001(\004\0224\n\006blocks\030\002 \003(\0132$.inr.numas" +
- "s.data.Point.Channel.Block\032\335\001\n\005Block\022\014\n\004" +
- "time\030\001 \001(\004\022:\n\006events\030\002 \003(\0132*.inr.numass." +
- "data.Point.Channel.Block.Event\0229\n\005peaks\030" +
- "\003 \001(\0132*.inr.numass.data.Point.Channel.Bl" +
- "ock.Peaks\032#\n\005Event\022\014\n\004time\030\001 \001(\004\022\014\n\004data" +
- "\030\002 \001(\014\032*\n\005Peaks\022\r\n\005times\030\001 \003(\004\022\022\n\namplit",
- "udes\030\002 \003(\004b\006proto3"
+ "s.data.Point.Channel.Block\032\340\001\n\005Block\022\014\n\004" +
+ "time\030\001 \001(\004\022:\n\006frames\030\002 \003(\0132*.inr.numass." +
+ "data.Point.Channel.Block.Frame\022;\n\006events" +
+ "\030\003 \001(\0132+.inr.numass.data.Point.Channel.B" +
+ "lock.Events\032#\n\005Frame\022\014\n\004time\030\001 \001(\004\022\014\n\004da" +
+ "ta\030\002 \001(\014\032+\n\006Events\022\r\n\005times\030\001 \003(\004\022\022\n\namp",
+ "litudes\030\002 \003(\004b\006proto3"
};
com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
new com.google.protobuf.Descriptors.FileDescriptor. InternalDescriptorAssigner() {
@@ -4431,18 +4486,18 @@ public final class NumassProto {
internal_static_inr_numass_data_Point_Channel_Block_fieldAccessorTable = new
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_inr_numass_data_Point_Channel_Block_descriptor,
- new java.lang.String[] { "Time", "Events", "Peaks", });
- internal_static_inr_numass_data_Point_Channel_Block_Event_descriptor =
+ new java.lang.String[] { "Time", "Frames", "Events", });
+ internal_static_inr_numass_data_Point_Channel_Block_Frame_descriptor =
internal_static_inr_numass_data_Point_Channel_Block_descriptor.getNestedTypes().get(0);
- internal_static_inr_numass_data_Point_Channel_Block_Event_fieldAccessorTable = new
+ internal_static_inr_numass_data_Point_Channel_Block_Frame_fieldAccessorTable = new
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
- internal_static_inr_numass_data_Point_Channel_Block_Event_descriptor,
+ internal_static_inr_numass_data_Point_Channel_Block_Frame_descriptor,
new java.lang.String[] { "Time", "Data", });
- internal_static_inr_numass_data_Point_Channel_Block_Peaks_descriptor =
+ internal_static_inr_numass_data_Point_Channel_Block_Events_descriptor =
internal_static_inr_numass_data_Point_Channel_Block_descriptor.getNestedTypes().get(1);
- internal_static_inr_numass_data_Point_Channel_Block_Peaks_fieldAccessorTable = new
+ internal_static_inr_numass_data_Point_Channel_Block_Events_fieldAccessorTable = new
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
- internal_static_inr_numass_data_Point_Channel_Block_Peaks_descriptor,
+ internal_static_inr_numass_data_Point_Channel_Block_Events_descriptor,
new java.lang.String[] { "Times", "Amplitudes", });
}
diff --git a/numass-core/src/main/java/inr/numass/data/PointBuilders.java b/numass-core/src/main/java/inr/numass/data/PointBuilders.java
index 3b2b9f4e..93a75d55 100644
--- a/numass-core/src/main/java/inr/numass/data/PointBuilders.java
+++ b/numass-core/src/main/java/inr/numass/data/PointBuilders.java
@@ -1,5 +1,6 @@
package inr.numass.data;
+import inr.numass.data.api.NumassPoint;
import org.jetbrains.annotations.NotNull;
import java.io.IOException;
@@ -21,9 +22,9 @@ public class PointBuilders {
int[] spectrum = count(ch.getBlocksList().stream()
.flatMapToInt(block -> IntStream.concat(
block.getPeaks().getAmplitudesList()
- .stream().mapToInt(it -> it.intValue()),
+ .stream().mapToInt(Long::intValue),
block.getEventsList().stream()
- .mapToInt(event -> peakFinder.apply(event))
+ .mapToInt(peakFinder::apply)
)),0
);
@@ -52,6 +53,6 @@ public class PointBuilders {
}
list.get(i).incrementAndGet();
});
- return list.stream().mapToInt(i -> i.get()).toArray();
+ return list.stream().mapToInt(AtomicInteger::get).toArray();
}
}
diff --git a/numass-core/src/main/java/inr/numass/data/storage/EnvelopeNumassPoint.java b/numass-core/src/main/java/inr/numass/data/storage/ClassicNumassPoint.java
similarity index 64%
rename from numass-core/src/main/java/inr/numass/data/storage/EnvelopeNumassPoint.java
rename to numass-core/src/main/java/inr/numass/data/storage/ClassicNumassPoint.java
index 434df8fa..afa5f312 100644
--- a/numass-core/src/main/java/inr/numass/data/storage/EnvelopeNumassPoint.java
+++ b/numass-core/src/main/java/inr/numass/data/storage/ClassicNumassPoint.java
@@ -21,16 +21,32 @@ import java.util.stream.StreamSupport;
/**
* Created by darksnake on 08.07.2017.
*/
-public class EnvelopeNumassPoint implements NumassPoint {
+public class ClassicNumassPoint implements NumassPoint {
private final Envelope envelope;
- public EnvelopeNumassPoint(Envelope envelope) {
+ public ClassicNumassPoint(Envelope envelope) {
this.envelope = envelope;
}
@Override
public Stream