From 2aa90dc94f71419a209b5d45478a1b82a7b171c6 Mon Sep 17 00:00:00 2001 From: Peter Nemere Date: Fri, 7 Jun 2024 14:14:09 +1000 Subject: [PATCH 1/7] If no beam locations found for an image, dont treat this as an error, simply return no beams. Also multiquant was failing to overwrite zstack because it wasn't defined as an upsert --- api/ws/handlers/image-beam-location.go | 5 ++++- api/ws/handlers/quantification-multi.go | 9 ++++++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/api/ws/handlers/image-beam-location.go b/api/ws/handlers/image-beam-location.go index 6e001aa9..7b78ad55 100644 --- a/api/ws/handlers/image-beam-location.go +++ b/api/ws/handlers/image-beam-location.go @@ -60,7 +60,10 @@ func HandleImageBeamLocationsReq(req *protos.ImageBeamLocationsReq, hctx wsHelpe result := coll.FindOne(ctx, bson.M{"_id": req.ImageName}) if result.Err() != nil { if result.Err() == mongo.ErrNoDocuments { - return nil, errorwithstatus.MakeNotFoundError(req.ImageName) + // If there are no beam locations, don't return an error, just return a message with no items in it + return &protos.ImageBeamLocationsResp{ + Locations: &protos.ImageLocations{ImageName: req.ImageName}, + }, nil } return nil, result.Err() } diff --git a/api/ws/handlers/quantification-multi.go b/api/ws/handlers/quantification-multi.go index aea54ce3..c500ae32 100644 --- a/api/ws/handlers/quantification-multi.go +++ b/api/ws/handlers/quantification-multi.go @@ -11,6 +11,7 @@ import ( protos "github.com/pixlise/core/v4/generated-protos" "go.mongodb.org/mongo-driver/bson" "go.mongodb.org/mongo-driver/mongo" + "go.mongodb.org/mongo-driver/mongo/options" ) // Anyone can retrieve a quant z-stack if they have quant messaging permissions @@ -65,13 +66,15 @@ func HandleQuantCombineListWriteReq(req *protos.QuantCombineListWriteReq, hctx w List: req.List, } - result, err := coll.InsertOne(ctx, doc) + opt := options.Update().SetUpsert(true) + + result, err := coll.UpdateByID(ctx, zId, bson.D{{Key: "$set", Value: doc}}, opt) if err != nil { return nil, err } - if result.InsertedID != zId { - hctx.Svcs.Log.Errorf("MultiQuant Z-Stack insert %v inserted different id %v", zId, result.InsertedID) + if result.UpsertedCount != 1 { + hctx.Svcs.Log.Errorf("MultiQuant Z-Stack write for: %v got unexpected DB write result: %+v", req.ScanId, result) } return &protos.QuantCombineListWriteResp{}, nil From fb608678fe4b8818d14b3b80f82d425d9539749c Mon Sep 17 00:00:00 2001 From: Peter Nemere Date: Fri, 7 Jun 2024 14:24:40 +1000 Subject: [PATCH 2/7] Fixing test --- .../cmd-line-tools/api-integration-test/testScanData.go | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/internal/cmd-line-tools/api-integration-test/testScanData.go b/internal/cmd-line-tools/api-integration-test/testScanData.go index cbdca51f..2a963eff 100644 --- a/internal/cmd-line-tools/api-integration-test/testScanData.go +++ b/internal/cmd-line-tools/api-integration-test/testScanData.go @@ -1462,9 +1462,12 @@ func testScanDataHasPermission(apiHost string, actionMsg string, editAllowed boo `{"imageBeamLocationsReq":{"imageName": "non-existant.jpg"}}`, `{ "msgId": 12, - "status": "WS_NOT_FOUND", - "errorText": "non-existant.jpg not found", - "imageBeamLocationsResp": {} + "status": "WS_OK", + "imageBeamLocationsResp": { + "locations": { + "imageName": "non-existant.jpg" + } + } }`, ) From de21e16a1c82fdc1bc0b47f1ecc7cc3543d3d2fa Mon Sep 17 00:00:00 2001 From: Peter Nemere Date: Fri, 7 Jun 2024 14:24:59 +1000 Subject: [PATCH 3/7] For some reason data-formats is updated --- data-formats | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data-formats b/data-formats index 6daaa5c6..7f490073 160000 --- a/data-formats +++ b/data-formats @@ -1 +1 @@ -Subproject commit 6daaa5c688651c5aa7833a98b63c1a41b1f2c053 +Subproject commit 7f49007352ed4d1e2b51819ada17961ce8df8793 From fba2f446d8c5989d526121b86b29cfc06b22bfe9 Mon Sep 17 00:00:00 2001 From: Peter Nemere Date: Tue, 11 Jun 2024 15:10:35 +1000 Subject: [PATCH 4/7] Data-formats updated for widget state of quant table new field --- data-formats | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data-formats b/data-formats index 7f490073..98cf3f64 160000 --- a/data-formats +++ b/data-formats @@ -1 +1 @@ -Subproject commit 7f49007352ed4d1e2b51819ada17961ce8df8793 +Subproject commit 98cf3f64074cf1d3c598d0b5895b70a2e7d98eba From 55ed34986af10e6a1dff74b4635e286b52b203c9 Mon Sep 17 00:00:00 2001 From: Peter Nemere Date: Tue, 11 Jun 2024 16:09:39 +1000 Subject: [PATCH 5/7] Regen msgs --- generated-protos/detector-config-msgs.pb.go | 4 +- generated-protos/detector-config.pb.go | 4 +- generated-protos/diffraction-data.pb.go | 4 +- .../diffraction-detected-peak-msgs.pb.go | 4 +- .../diffraction-manual-msgs.pb.go | 4 +- .../diffraction-status-msgs.pb.go | 4 +- generated-protos/diffraction.pb.go | 4 +- generated-protos/doi-msgs.pb.go | 4 +- generated-protos/doi.pb.go | 4 +- generated-protos/element-set-msgs.pb.go | 4 +- generated-protos/element-set.pb.go | 4 +- generated-protos/experiment.pb.go | 4 +- generated-protos/export-msgs.pb.go | 4 +- generated-protos/export.pb.go | 4 +- generated-protos/expression-group-msgs.pb.go | 4 +- generated-protos/expression-group.pb.go | 4 +- generated-protos/expression-msgs.pb.go | 4 +- generated-protos/expressions.pb.go | 4 +- .../image-beam-location-msgs.pb.go | 4 +- generated-protos/image-beam-location.pb.go | 4 +- generated-protos/image-coreg-msgs.pb.go | 4 +- generated-protos/image-coreg.pb.go | 4 +- generated-protos/image-msgs.pb.go | 4 +- generated-protos/image.pb.go | 4 +- generated-protos/job-msgs.pb.go | 4 +- generated-protos/job.pb.go | 4 +- generated-protos/log-msgs.pb.go | 4 +- generated-protos/log.pb.go | 4 +- generated-protos/memoisation-msgs.pb.go | 4 +- generated-protos/memoisation.pb.go | 4 +- generated-protos/module-msgs.pb.go | 4 +- generated-protos/modules.pb.go | 4 +- generated-protos/notification-msgs.pb.go | 4 +- generated-protos/notification.pb.go | 4 +- generated-protos/ownership-access-msgs.pb.go | 4 +- generated-protos/ownership-access.pb.go | 4 +- generated-protos/permissions.pb.go | 4 +- generated-protos/piquant-config.pb.go | 4 +- generated-protos/piquant-msgs.pb.go | 4 +- .../pseudo-intensities-msgs.pb.go | 4 +- generated-protos/pseudo-intensities.pb.go | 4 +- generated-protos/quantification-create.pb.go | 4 +- .../quantification-management-msgs.pb.go | 4 +- generated-protos/quantification-meta.pb.go | 4 +- .../quantification-multi-msgs.pb.go | 4 +- generated-protos/quantification-multi.pb.go | 4 +- .../quantification-retrieval-msgs.pb.go | 4 +- .../quantification-upload-msgs.pb.go | 4 +- generated-protos/quantification.pb.go | 4 +- generated-protos/restmsgs.pb.go | 4 +- generated-protos/roi-msgs.pb.go | 4 +- generated-protos/roi.pb.go | 4 +- .../scan-beam-location-msgs.pb.go | 4 +- generated-protos/scan-beam-location.pb.go | 4 +- .../scan-entry-metadata-msgs.pb.go | 4 +- generated-protos/scan-entry-metadata.pb.go | 4 +- generated-protos/scan-entry-msgs.pb.go | 4 +- generated-protos/scan-entry.pb.go | 4 +- generated-protos/scan-msgs.pb.go | 4 +- generated-protos/scan.pb.go | 4 +- .../screen-configuration-msgs.pb.go | 4 +- generated-protos/screen-configuration.pb.go | 4 +- generated-protos/search-params.pb.go | 4 +- generated-protos/selection-entry-msgs.pb.go | 4 +- generated-protos/selection-pixel-msgs.pb.go | 4 +- generated-protos/spectrum-msgs.pb.go | 4 +- generated-protos/spectrum.pb.go | 4 +- generated-protos/tag-msgs.pb.go | 4 +- generated-protos/tags.pb.go | 4 +- generated-protos/test-msgs.pb.go | 4 +- generated-protos/user-db-items.pb.go | 4 +- generated-protos/user-group-admins-msgs.pb.go | 4 +- .../user-group-joining-msgs.pb.go | 4 +- .../user-group-management-msgs.pb.go | 4 +- .../user-group-membership-msgs.pb.go | 4 +- .../user-group-retrieval-msgs.pb.go | 4 +- generated-protos/user-group.pb.go | 4 +- generated-protos/user-management-msgs.pb.go | 4 +- generated-protos/user-msgs.pb.go | 4 +- .../user-notification-setting-msgs.pb.go | 4 +- .../user-notification-settings.pb.go | 4 +- generated-protos/user.pb.go | 4 +- generated-protos/version.pb.go | 4 +- generated-protos/websocket.pb.go | 4 +- generated-protos/widget-data-msgs.pb.go | 4 +- generated-protos/widget-data.pb.go | 830 ++++++++++-------- 86 files changed, 626 insertions(+), 544 deletions(-) diff --git a/generated-protos/detector-config-msgs.pb.go b/generated-protos/detector-config-msgs.pb.go index 594ad16b..e1d80b24 100644 --- a/generated-protos/detector-config-msgs.pb.go +++ b/generated-protos/detector-config-msgs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.28.1 -// protoc v3.20.3 +// protoc-gen-go v1.30.0 +// protoc v3.19.4 // source: detector-config-msgs.proto package protos diff --git a/generated-protos/detector-config.pb.go b/generated-protos/detector-config.pb.go index 7dddbd9d..5d5b19c5 100644 --- a/generated-protos/detector-config.pb.go +++ b/generated-protos/detector-config.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.28.1 -// protoc v3.20.3 +// protoc-gen-go v1.30.0 +// protoc v3.19.4 // source: detector-config.proto package protos diff --git a/generated-protos/diffraction-data.pb.go b/generated-protos/diffraction-data.pb.go index a16350e0..58ce0764 100644 --- a/generated-protos/diffraction-data.pb.go +++ b/generated-protos/diffraction-data.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.28.1 -// protoc v3.20.3 +// protoc-gen-go v1.30.0 +// protoc v3.19.4 // source: diffraction-data.proto package protos diff --git a/generated-protos/diffraction-detected-peak-msgs.pb.go b/generated-protos/diffraction-detected-peak-msgs.pb.go index 17a2234c..250ee0d2 100644 --- a/generated-protos/diffraction-detected-peak-msgs.pb.go +++ b/generated-protos/diffraction-detected-peak-msgs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.28.1 -// protoc v3.20.3 +// protoc-gen-go v1.30.0 +// protoc v3.19.4 // source: diffraction-detected-peak-msgs.proto package protos diff --git a/generated-protos/diffraction-manual-msgs.pb.go b/generated-protos/diffraction-manual-msgs.pb.go index 6683e807..f20cb474 100644 --- a/generated-protos/diffraction-manual-msgs.pb.go +++ b/generated-protos/diffraction-manual-msgs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.28.1 -// protoc v3.20.3 +// protoc-gen-go v1.30.0 +// protoc v3.19.4 // source: diffraction-manual-msgs.proto package protos diff --git a/generated-protos/diffraction-status-msgs.pb.go b/generated-protos/diffraction-status-msgs.pb.go index 710eee91..966801f2 100644 --- a/generated-protos/diffraction-status-msgs.pb.go +++ b/generated-protos/diffraction-status-msgs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.28.1 -// protoc v3.20.3 +// protoc-gen-go v1.30.0 +// protoc v3.19.4 // source: diffraction-status-msgs.proto package protos diff --git a/generated-protos/diffraction.pb.go b/generated-protos/diffraction.pb.go index 77ca2271..281a37a9 100644 --- a/generated-protos/diffraction.pb.go +++ b/generated-protos/diffraction.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.28.1 -// protoc v3.20.3 +// protoc-gen-go v1.30.0 +// protoc v3.19.4 // source: data-formats/file-formats/diffraction.proto package protos diff --git a/generated-protos/doi-msgs.pb.go b/generated-protos/doi-msgs.pb.go index 8542205e..13f76db2 100644 --- a/generated-protos/doi-msgs.pb.go +++ b/generated-protos/doi-msgs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.28.1 -// protoc v3.20.3 +// protoc-gen-go v1.30.0 +// protoc v3.19.4 // source: doi-msgs.proto package protos diff --git a/generated-protos/doi.pb.go b/generated-protos/doi.pb.go index 893a7e80..7d5bd02f 100644 --- a/generated-protos/doi.pb.go +++ b/generated-protos/doi.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.28.1 -// protoc v3.20.3 +// protoc-gen-go v1.30.0 +// protoc v3.19.4 // source: doi.proto package protos diff --git a/generated-protos/element-set-msgs.pb.go b/generated-protos/element-set-msgs.pb.go index 9e3b01d3..2d58e2db 100644 --- a/generated-protos/element-set-msgs.pb.go +++ b/generated-protos/element-set-msgs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.28.1 -// protoc v3.20.3 +// protoc-gen-go v1.30.0 +// protoc v3.19.4 // source: element-set-msgs.proto package protos diff --git a/generated-protos/element-set.pb.go b/generated-protos/element-set.pb.go index b96c3637..37d9bd0e 100644 --- a/generated-protos/element-set.pb.go +++ b/generated-protos/element-set.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.28.1 -// protoc v3.20.3 +// protoc-gen-go v1.30.0 +// protoc v3.19.4 // source: element-set.proto package protos diff --git a/generated-protos/experiment.pb.go b/generated-protos/experiment.pb.go index 1bde8d45..6092e776 100644 --- a/generated-protos/experiment.pb.go +++ b/generated-protos/experiment.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.28.1 -// protoc v3.20.3 +// protoc-gen-go v1.30.0 +// protoc v3.19.4 // source: data-formats/file-formats/experiment.proto package protos diff --git a/generated-protos/export-msgs.pb.go b/generated-protos/export-msgs.pb.go index f3161de7..dc06af3e 100644 --- a/generated-protos/export-msgs.pb.go +++ b/generated-protos/export-msgs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.28.1 -// protoc v3.20.3 +// protoc-gen-go v1.30.0 +// protoc v3.19.4 // source: export-msgs.proto package protos diff --git a/generated-protos/export.pb.go b/generated-protos/export.pb.go index 2b6d309d..833b227e 100644 --- a/generated-protos/export.pb.go +++ b/generated-protos/export.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.28.1 -// protoc v3.20.3 +// protoc-gen-go v1.30.0 +// protoc v3.19.4 // source: export.proto package protos diff --git a/generated-protos/expression-group-msgs.pb.go b/generated-protos/expression-group-msgs.pb.go index f867bfa9..d7975d7e 100644 --- a/generated-protos/expression-group-msgs.pb.go +++ b/generated-protos/expression-group-msgs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.28.1 -// protoc v3.20.3 +// protoc-gen-go v1.30.0 +// protoc v3.19.4 // source: expression-group-msgs.proto package protos diff --git a/generated-protos/expression-group.pb.go b/generated-protos/expression-group.pb.go index f71ded8f..90f1716b 100644 --- a/generated-protos/expression-group.pb.go +++ b/generated-protos/expression-group.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.28.1 -// protoc v3.20.3 +// protoc-gen-go v1.30.0 +// protoc v3.19.4 // source: expression-group.proto package protos diff --git a/generated-protos/expression-msgs.pb.go b/generated-protos/expression-msgs.pb.go index b681ed9e..4e6b94e9 100644 --- a/generated-protos/expression-msgs.pb.go +++ b/generated-protos/expression-msgs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.28.1 -// protoc v3.20.3 +// protoc-gen-go v1.30.0 +// protoc v3.19.4 // source: expression-msgs.proto package protos diff --git a/generated-protos/expressions.pb.go b/generated-protos/expressions.pb.go index f1e19fbf..db902dcb 100644 --- a/generated-protos/expressions.pb.go +++ b/generated-protos/expressions.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.28.1 -// protoc v3.20.3 +// protoc-gen-go v1.30.0 +// protoc v3.19.4 // source: expressions.proto package protos diff --git a/generated-protos/image-beam-location-msgs.pb.go b/generated-protos/image-beam-location-msgs.pb.go index 325c1c4e..18c3d37d 100644 --- a/generated-protos/image-beam-location-msgs.pb.go +++ b/generated-protos/image-beam-location-msgs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.28.1 -// protoc v3.20.3 +// protoc-gen-go v1.30.0 +// protoc v3.19.4 // source: image-beam-location-msgs.proto package protos diff --git a/generated-protos/image-beam-location.pb.go b/generated-protos/image-beam-location.pb.go index 7a7b0344..6e8ae2ab 100644 --- a/generated-protos/image-beam-location.pb.go +++ b/generated-protos/image-beam-location.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.28.1 -// protoc v3.20.3 +// protoc-gen-go v1.30.0 +// protoc v3.19.4 // source: image-beam-location.proto package protos diff --git a/generated-protos/image-coreg-msgs.pb.go b/generated-protos/image-coreg-msgs.pb.go index d736058a..a2cbb23d 100644 --- a/generated-protos/image-coreg-msgs.pb.go +++ b/generated-protos/image-coreg-msgs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.28.1 -// protoc v3.20.3 +// protoc-gen-go v1.30.0 +// protoc v3.19.4 // source: image-coreg-msgs.proto package protos diff --git a/generated-protos/image-coreg.pb.go b/generated-protos/image-coreg.pb.go index edf35579..7f636355 100644 --- a/generated-protos/image-coreg.pb.go +++ b/generated-protos/image-coreg.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.28.1 -// protoc v3.20.3 +// protoc-gen-go v1.30.0 +// protoc v3.19.4 // source: image-coreg.proto package protos diff --git a/generated-protos/image-msgs.pb.go b/generated-protos/image-msgs.pb.go index 2c5974fb..5784f9b5 100644 --- a/generated-protos/image-msgs.pb.go +++ b/generated-protos/image-msgs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.28.1 -// protoc v3.20.3 +// protoc-gen-go v1.30.0 +// protoc v3.19.4 // source: image-msgs.proto package protos diff --git a/generated-protos/image.pb.go b/generated-protos/image.pb.go index df12738d..a8316b61 100644 --- a/generated-protos/image.pb.go +++ b/generated-protos/image.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.28.1 -// protoc v3.20.3 +// protoc-gen-go v1.30.0 +// protoc v3.19.4 // source: image.proto package protos diff --git a/generated-protos/job-msgs.pb.go b/generated-protos/job-msgs.pb.go index 344a7e94..63a874bd 100644 --- a/generated-protos/job-msgs.pb.go +++ b/generated-protos/job-msgs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.28.1 -// protoc v3.20.3 +// protoc-gen-go v1.30.0 +// protoc v3.19.4 // source: job-msgs.proto package protos diff --git a/generated-protos/job.pb.go b/generated-protos/job.pb.go index 7686c5ff..91edb26c 100644 --- a/generated-protos/job.pb.go +++ b/generated-protos/job.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.28.1 -// protoc v3.20.3 +// protoc-gen-go v1.30.0 +// protoc v3.19.4 // source: job.proto package protos diff --git a/generated-protos/log-msgs.pb.go b/generated-protos/log-msgs.pb.go index b741e1d5..1b490026 100644 --- a/generated-protos/log-msgs.pb.go +++ b/generated-protos/log-msgs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.28.1 -// protoc v3.20.3 +// protoc-gen-go v1.30.0 +// protoc v3.19.4 // source: log-msgs.proto package protos diff --git a/generated-protos/log.pb.go b/generated-protos/log.pb.go index 82e2509f..ac5666d3 100644 --- a/generated-protos/log.pb.go +++ b/generated-protos/log.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.28.1 -// protoc v3.20.3 +// protoc-gen-go v1.30.0 +// protoc v3.19.4 // source: log.proto package protos diff --git a/generated-protos/memoisation-msgs.pb.go b/generated-protos/memoisation-msgs.pb.go index b34b5fcb..3b40cbad 100644 --- a/generated-protos/memoisation-msgs.pb.go +++ b/generated-protos/memoisation-msgs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.28.1 -// protoc v3.20.3 +// protoc-gen-go v1.30.0 +// protoc v3.19.4 // source: memoisation-msgs.proto package protos diff --git a/generated-protos/memoisation.pb.go b/generated-protos/memoisation.pb.go index 07349006..b01797d2 100644 --- a/generated-protos/memoisation.pb.go +++ b/generated-protos/memoisation.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.28.1 -// protoc v3.20.3 +// protoc-gen-go v1.30.0 +// protoc v3.19.4 // source: memoisation.proto package protos diff --git a/generated-protos/module-msgs.pb.go b/generated-protos/module-msgs.pb.go index b6b752da..bc17fe28 100644 --- a/generated-protos/module-msgs.pb.go +++ b/generated-protos/module-msgs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.28.1 -// protoc v3.20.3 +// protoc-gen-go v1.30.0 +// protoc v3.19.4 // source: module-msgs.proto package protos diff --git a/generated-protos/modules.pb.go b/generated-protos/modules.pb.go index 21b3054a..fd1124d4 100644 --- a/generated-protos/modules.pb.go +++ b/generated-protos/modules.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.28.1 -// protoc v3.20.3 +// protoc-gen-go v1.30.0 +// protoc v3.19.4 // source: modules.proto package protos diff --git a/generated-protos/notification-msgs.pb.go b/generated-protos/notification-msgs.pb.go index 200f5230..ef76689d 100644 --- a/generated-protos/notification-msgs.pb.go +++ b/generated-protos/notification-msgs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.28.1 -// protoc v3.20.3 +// protoc-gen-go v1.30.0 +// protoc v3.19.4 // source: notification-msgs.proto package protos diff --git a/generated-protos/notification.pb.go b/generated-protos/notification.pb.go index ec0f2890..48d4c45a 100644 --- a/generated-protos/notification.pb.go +++ b/generated-protos/notification.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.28.1 -// protoc v3.20.3 +// protoc-gen-go v1.30.0 +// protoc v3.19.4 // source: notification.proto package protos diff --git a/generated-protos/ownership-access-msgs.pb.go b/generated-protos/ownership-access-msgs.pb.go index 679277e4..36d54a65 100644 --- a/generated-protos/ownership-access-msgs.pb.go +++ b/generated-protos/ownership-access-msgs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.28.1 -// protoc v3.20.3 +// protoc-gen-go v1.30.0 +// protoc v3.19.4 // source: ownership-access-msgs.proto package protos diff --git a/generated-protos/ownership-access.pb.go b/generated-protos/ownership-access.pb.go index 9fa2e2a4..730662a0 100644 --- a/generated-protos/ownership-access.pb.go +++ b/generated-protos/ownership-access.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.28.1 -// protoc v3.20.3 +// protoc-gen-go v1.30.0 +// protoc v3.19.4 // source: ownership-access.proto package protos diff --git a/generated-protos/permissions.pb.go b/generated-protos/permissions.pb.go index 676e6fe1..6ab98ee6 100644 --- a/generated-protos/permissions.pb.go +++ b/generated-protos/permissions.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.28.1 -// protoc v3.20.3 +// protoc-gen-go v1.30.0 +// protoc v3.19.4 // source: permissions.proto package protos diff --git a/generated-protos/piquant-config.pb.go b/generated-protos/piquant-config.pb.go index 67854fde..0c3e38cf 100644 --- a/generated-protos/piquant-config.pb.go +++ b/generated-protos/piquant-config.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.28.1 -// protoc v3.20.3 +// protoc-gen-go v1.30.0 +// protoc v3.19.4 // source: piquant-config.proto package protos diff --git a/generated-protos/piquant-msgs.pb.go b/generated-protos/piquant-msgs.pb.go index 91f97ad1..474254bd 100644 --- a/generated-protos/piquant-msgs.pb.go +++ b/generated-protos/piquant-msgs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.28.1 -// protoc v3.20.3 +// protoc-gen-go v1.30.0 +// protoc v3.19.4 // source: piquant-msgs.proto package protos diff --git a/generated-protos/pseudo-intensities-msgs.pb.go b/generated-protos/pseudo-intensities-msgs.pb.go index 4fc6fc1a..bf12ad6d 100644 --- a/generated-protos/pseudo-intensities-msgs.pb.go +++ b/generated-protos/pseudo-intensities-msgs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.28.1 -// protoc v3.20.3 +// protoc-gen-go v1.30.0 +// protoc v3.19.4 // source: pseudo-intensities-msgs.proto package protos diff --git a/generated-protos/pseudo-intensities.pb.go b/generated-protos/pseudo-intensities.pb.go index 141c3b8f..549fa381 100644 --- a/generated-protos/pseudo-intensities.pb.go +++ b/generated-protos/pseudo-intensities.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.28.1 -// protoc v3.20.3 +// protoc-gen-go v1.30.0 +// protoc v3.19.4 // source: pseudo-intensities.proto package protos diff --git a/generated-protos/quantification-create.pb.go b/generated-protos/quantification-create.pb.go index cb6b40e7..7ae937f0 100644 --- a/generated-protos/quantification-create.pb.go +++ b/generated-protos/quantification-create.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.28.1 -// protoc v3.20.3 +// protoc-gen-go v1.30.0 +// protoc v3.19.4 // source: quantification-create.proto package protos diff --git a/generated-protos/quantification-management-msgs.pb.go b/generated-protos/quantification-management-msgs.pb.go index dde9e2bc..9f77418f 100644 --- a/generated-protos/quantification-management-msgs.pb.go +++ b/generated-protos/quantification-management-msgs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.28.1 -// protoc v3.20.3 +// protoc-gen-go v1.30.0 +// protoc v3.19.4 // source: quantification-management-msgs.proto package protos diff --git a/generated-protos/quantification-meta.pb.go b/generated-protos/quantification-meta.pb.go index 5625f11e..50f3cab7 100644 --- a/generated-protos/quantification-meta.pb.go +++ b/generated-protos/quantification-meta.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.28.1 -// protoc v3.20.3 +// protoc-gen-go v1.30.0 +// protoc v3.19.4 // source: quantification-meta.proto package protos diff --git a/generated-protos/quantification-multi-msgs.pb.go b/generated-protos/quantification-multi-msgs.pb.go index 615831f1..b40544b4 100644 --- a/generated-protos/quantification-multi-msgs.pb.go +++ b/generated-protos/quantification-multi-msgs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.28.1 -// protoc v3.20.3 +// protoc-gen-go v1.30.0 +// protoc v3.19.4 // source: quantification-multi-msgs.proto package protos diff --git a/generated-protos/quantification-multi.pb.go b/generated-protos/quantification-multi.pb.go index 3dfc1203..a7c08ac4 100644 --- a/generated-protos/quantification-multi.pb.go +++ b/generated-protos/quantification-multi.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.28.1 -// protoc v3.20.3 +// protoc-gen-go v1.30.0 +// protoc v3.19.4 // source: quantification-multi.proto package protos diff --git a/generated-protos/quantification-retrieval-msgs.pb.go b/generated-protos/quantification-retrieval-msgs.pb.go index e6cd4da8..2effc136 100644 --- a/generated-protos/quantification-retrieval-msgs.pb.go +++ b/generated-protos/quantification-retrieval-msgs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.28.1 -// protoc v3.20.3 +// protoc-gen-go v1.30.0 +// protoc v3.19.4 // source: quantification-retrieval-msgs.proto package protos diff --git a/generated-protos/quantification-upload-msgs.pb.go b/generated-protos/quantification-upload-msgs.pb.go index 580d28b6..9408dce0 100644 --- a/generated-protos/quantification-upload-msgs.pb.go +++ b/generated-protos/quantification-upload-msgs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.28.1 -// protoc v3.20.3 +// protoc-gen-go v1.30.0 +// protoc v3.19.4 // source: quantification-upload-msgs.proto package protos diff --git a/generated-protos/quantification.pb.go b/generated-protos/quantification.pb.go index 333fc858..d5737b8f 100644 --- a/generated-protos/quantification.pb.go +++ b/generated-protos/quantification.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.28.1 -// protoc v3.20.3 +// protoc-gen-go v1.30.0 +// protoc v3.19.4 // source: quantification.proto package protos diff --git a/generated-protos/restmsgs.pb.go b/generated-protos/restmsgs.pb.go index 3c69f5dc..077d2be9 100644 --- a/generated-protos/restmsgs.pb.go +++ b/generated-protos/restmsgs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.28.1 -// protoc v3.20.3 +// protoc-gen-go v1.30.0 +// protoc v3.19.4 // source: restmsgs.proto package protos diff --git a/generated-protos/roi-msgs.pb.go b/generated-protos/roi-msgs.pb.go index e4600026..ea6c68c7 100644 --- a/generated-protos/roi-msgs.pb.go +++ b/generated-protos/roi-msgs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.28.1 -// protoc v3.20.3 +// protoc-gen-go v1.30.0 +// protoc v3.19.4 // source: roi-msgs.proto package protos diff --git a/generated-protos/roi.pb.go b/generated-protos/roi.pb.go index c8e3a69b..50e24b29 100644 --- a/generated-protos/roi.pb.go +++ b/generated-protos/roi.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.28.1 -// protoc v3.20.3 +// protoc-gen-go v1.30.0 +// protoc v3.19.4 // source: roi.proto package protos diff --git a/generated-protos/scan-beam-location-msgs.pb.go b/generated-protos/scan-beam-location-msgs.pb.go index 482c2696..e0163691 100644 --- a/generated-protos/scan-beam-location-msgs.pb.go +++ b/generated-protos/scan-beam-location-msgs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.28.1 -// protoc v3.20.3 +// protoc-gen-go v1.30.0 +// protoc v3.19.4 // source: scan-beam-location-msgs.proto package protos diff --git a/generated-protos/scan-beam-location.pb.go b/generated-protos/scan-beam-location.pb.go index f6531300..22773ca8 100644 --- a/generated-protos/scan-beam-location.pb.go +++ b/generated-protos/scan-beam-location.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.28.1 -// protoc v3.20.3 +// protoc-gen-go v1.30.0 +// protoc v3.19.4 // source: scan-beam-location.proto package protos diff --git a/generated-protos/scan-entry-metadata-msgs.pb.go b/generated-protos/scan-entry-metadata-msgs.pb.go index 037c7947..5e748e1b 100644 --- a/generated-protos/scan-entry-metadata-msgs.pb.go +++ b/generated-protos/scan-entry-metadata-msgs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.28.1 -// protoc v3.20.3 +// protoc-gen-go v1.30.0 +// protoc v3.19.4 // source: scan-entry-metadata-msgs.proto package protos diff --git a/generated-protos/scan-entry-metadata.pb.go b/generated-protos/scan-entry-metadata.pb.go index 65cd4ebb..05565a9e 100644 --- a/generated-protos/scan-entry-metadata.pb.go +++ b/generated-protos/scan-entry-metadata.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.28.1 -// protoc v3.20.3 +// protoc-gen-go v1.30.0 +// protoc v3.19.4 // source: scan-entry-metadata.proto package protos diff --git a/generated-protos/scan-entry-msgs.pb.go b/generated-protos/scan-entry-msgs.pb.go index 8c15ab1e..d4cda4ad 100644 --- a/generated-protos/scan-entry-msgs.pb.go +++ b/generated-protos/scan-entry-msgs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.28.1 -// protoc v3.20.3 +// protoc-gen-go v1.30.0 +// protoc v3.19.4 // source: scan-entry-msgs.proto package protos diff --git a/generated-protos/scan-entry.pb.go b/generated-protos/scan-entry.pb.go index 1a8f62cd..6f0c3d57 100644 --- a/generated-protos/scan-entry.pb.go +++ b/generated-protos/scan-entry.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.28.1 -// protoc v3.20.3 +// protoc-gen-go v1.30.0 +// protoc v3.19.4 // source: scan-entry.proto package protos diff --git a/generated-protos/scan-msgs.pb.go b/generated-protos/scan-msgs.pb.go index a99a8602..c9e96e83 100644 --- a/generated-protos/scan-msgs.pb.go +++ b/generated-protos/scan-msgs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.28.1 -// protoc v3.20.3 +// protoc-gen-go v1.30.0 +// protoc v3.19.4 // source: scan-msgs.proto package protos diff --git a/generated-protos/scan.pb.go b/generated-protos/scan.pb.go index 0ae71605..49441601 100644 --- a/generated-protos/scan.pb.go +++ b/generated-protos/scan.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.28.1 -// protoc v3.20.3 +// protoc-gen-go v1.30.0 +// protoc v3.19.4 // source: scan.proto package protos diff --git a/generated-protos/screen-configuration-msgs.pb.go b/generated-protos/screen-configuration-msgs.pb.go index b58d8e1f..0586c064 100644 --- a/generated-protos/screen-configuration-msgs.pb.go +++ b/generated-protos/screen-configuration-msgs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.28.1 -// protoc v3.20.3 +// protoc-gen-go v1.30.0 +// protoc v3.19.4 // source: screen-configuration-msgs.proto package protos diff --git a/generated-protos/screen-configuration.pb.go b/generated-protos/screen-configuration.pb.go index 0a7352c7..d2ebb60d 100644 --- a/generated-protos/screen-configuration.pb.go +++ b/generated-protos/screen-configuration.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.28.1 -// protoc v3.20.3 +// protoc-gen-go v1.30.0 +// protoc v3.19.4 // source: screen-configuration.proto package protos diff --git a/generated-protos/search-params.pb.go b/generated-protos/search-params.pb.go index c00313fa..309b142f 100644 --- a/generated-protos/search-params.pb.go +++ b/generated-protos/search-params.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.28.1 -// protoc v3.20.3 +// protoc-gen-go v1.30.0 +// protoc v3.19.4 // source: search-params.proto package protos diff --git a/generated-protos/selection-entry-msgs.pb.go b/generated-protos/selection-entry-msgs.pb.go index 8a0e9cc8..1c5c18f1 100644 --- a/generated-protos/selection-entry-msgs.pb.go +++ b/generated-protos/selection-entry-msgs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.28.1 -// protoc v3.20.3 +// protoc-gen-go v1.30.0 +// protoc v3.19.4 // source: selection-entry-msgs.proto package protos diff --git a/generated-protos/selection-pixel-msgs.pb.go b/generated-protos/selection-pixel-msgs.pb.go index fda4be2d..8bad0215 100644 --- a/generated-protos/selection-pixel-msgs.pb.go +++ b/generated-protos/selection-pixel-msgs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.28.1 -// protoc v3.20.3 +// protoc-gen-go v1.30.0 +// protoc v3.19.4 // source: selection-pixel-msgs.proto package protos diff --git a/generated-protos/spectrum-msgs.pb.go b/generated-protos/spectrum-msgs.pb.go index faf94fac..72ef5fbe 100644 --- a/generated-protos/spectrum-msgs.pb.go +++ b/generated-protos/spectrum-msgs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.28.1 -// protoc v3.20.3 +// protoc-gen-go v1.30.0 +// protoc v3.19.4 // source: spectrum-msgs.proto package protos diff --git a/generated-protos/spectrum.pb.go b/generated-protos/spectrum.pb.go index 6913d8fb..18f5adef 100644 --- a/generated-protos/spectrum.pb.go +++ b/generated-protos/spectrum.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.28.1 -// protoc v3.20.3 +// protoc-gen-go v1.30.0 +// protoc v3.19.4 // source: spectrum.proto package protos diff --git a/generated-protos/tag-msgs.pb.go b/generated-protos/tag-msgs.pb.go index 39f47461..79946b98 100644 --- a/generated-protos/tag-msgs.pb.go +++ b/generated-protos/tag-msgs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.28.1 -// protoc v3.20.3 +// protoc-gen-go v1.30.0 +// protoc v3.19.4 // source: tag-msgs.proto package protos diff --git a/generated-protos/tags.pb.go b/generated-protos/tags.pb.go index a233f8c2..6fcc8ebb 100644 --- a/generated-protos/tags.pb.go +++ b/generated-protos/tags.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.28.1 -// protoc v3.20.3 +// protoc-gen-go v1.30.0 +// protoc v3.19.4 // source: tags.proto package protos diff --git a/generated-protos/test-msgs.pb.go b/generated-protos/test-msgs.pb.go index 44f5de72..c6e2e75a 100644 --- a/generated-protos/test-msgs.pb.go +++ b/generated-protos/test-msgs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.28.1 -// protoc v3.20.3 +// protoc-gen-go v1.30.0 +// protoc v3.19.4 // source: test-msgs.proto package protos diff --git a/generated-protos/user-db-items.pb.go b/generated-protos/user-db-items.pb.go index a30f4e4b..5e0fd88e 100644 --- a/generated-protos/user-db-items.pb.go +++ b/generated-protos/user-db-items.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.28.1 -// protoc v3.20.3 +// protoc-gen-go v1.30.0 +// protoc v3.19.4 // source: user-db-items.proto package protos diff --git a/generated-protos/user-group-admins-msgs.pb.go b/generated-protos/user-group-admins-msgs.pb.go index 98a63b86..4d0062ab 100644 --- a/generated-protos/user-group-admins-msgs.pb.go +++ b/generated-protos/user-group-admins-msgs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.28.1 -// protoc v3.20.3 +// protoc-gen-go v1.30.0 +// protoc v3.19.4 // source: user-group-admins-msgs.proto package protos diff --git a/generated-protos/user-group-joining-msgs.pb.go b/generated-protos/user-group-joining-msgs.pb.go index 2af8766b..80731bba 100644 --- a/generated-protos/user-group-joining-msgs.pb.go +++ b/generated-protos/user-group-joining-msgs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.28.1 -// protoc v3.20.3 +// protoc-gen-go v1.30.0 +// protoc v3.19.4 // source: user-group-joining-msgs.proto package protos diff --git a/generated-protos/user-group-management-msgs.pb.go b/generated-protos/user-group-management-msgs.pb.go index c3a480fa..fec608b2 100644 --- a/generated-protos/user-group-management-msgs.pb.go +++ b/generated-protos/user-group-management-msgs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.28.1 -// protoc v3.20.3 +// protoc-gen-go v1.30.0 +// protoc v3.19.4 // source: user-group-management-msgs.proto package protos diff --git a/generated-protos/user-group-membership-msgs.pb.go b/generated-protos/user-group-membership-msgs.pb.go index 5b48e29c..0679f2f4 100644 --- a/generated-protos/user-group-membership-msgs.pb.go +++ b/generated-protos/user-group-membership-msgs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.28.1 -// protoc v3.20.3 +// protoc-gen-go v1.30.0 +// protoc v3.19.4 // source: user-group-membership-msgs.proto package protos diff --git a/generated-protos/user-group-retrieval-msgs.pb.go b/generated-protos/user-group-retrieval-msgs.pb.go index e6e1d7db..37b865a9 100644 --- a/generated-protos/user-group-retrieval-msgs.pb.go +++ b/generated-protos/user-group-retrieval-msgs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.28.1 -// protoc v3.20.3 +// protoc-gen-go v1.30.0 +// protoc v3.19.4 // source: user-group-retrieval-msgs.proto package protos diff --git a/generated-protos/user-group.pb.go b/generated-protos/user-group.pb.go index 44f8bf32..dbbd9876 100644 --- a/generated-protos/user-group.pb.go +++ b/generated-protos/user-group.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.28.1 -// protoc v3.20.3 +// protoc-gen-go v1.30.0 +// protoc v3.19.4 // source: user-group.proto package protos diff --git a/generated-protos/user-management-msgs.pb.go b/generated-protos/user-management-msgs.pb.go index 49c0d317..1d76081d 100644 --- a/generated-protos/user-management-msgs.pb.go +++ b/generated-protos/user-management-msgs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.28.1 -// protoc v3.20.3 +// protoc-gen-go v1.30.0 +// protoc v3.19.4 // source: user-management-msgs.proto package protos diff --git a/generated-protos/user-msgs.pb.go b/generated-protos/user-msgs.pb.go index 4ec68913..6bb811e8 100644 --- a/generated-protos/user-msgs.pb.go +++ b/generated-protos/user-msgs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.28.1 -// protoc v3.20.3 +// protoc-gen-go v1.30.0 +// protoc v3.19.4 // source: user-msgs.proto package protos diff --git a/generated-protos/user-notification-setting-msgs.pb.go b/generated-protos/user-notification-setting-msgs.pb.go index d83fe206..28249f5e 100644 --- a/generated-protos/user-notification-setting-msgs.pb.go +++ b/generated-protos/user-notification-setting-msgs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.28.1 -// protoc v3.20.3 +// protoc-gen-go v1.30.0 +// protoc v3.19.4 // source: user-notification-setting-msgs.proto package protos diff --git a/generated-protos/user-notification-settings.pb.go b/generated-protos/user-notification-settings.pb.go index caf4b6ae..76a55c97 100644 --- a/generated-protos/user-notification-settings.pb.go +++ b/generated-protos/user-notification-settings.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.28.1 -// protoc v3.20.3 +// protoc-gen-go v1.30.0 +// protoc v3.19.4 // source: user-notification-settings.proto package protos diff --git a/generated-protos/user.pb.go b/generated-protos/user.pb.go index 82598223..fc680e5b 100644 --- a/generated-protos/user.pb.go +++ b/generated-protos/user.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.28.1 -// protoc v3.20.3 +// protoc-gen-go v1.30.0 +// protoc v3.19.4 // source: user.proto package protos diff --git a/generated-protos/version.pb.go b/generated-protos/version.pb.go index 3f1a73d4..58100287 100644 --- a/generated-protos/version.pb.go +++ b/generated-protos/version.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.28.1 -// protoc v3.20.3 +// protoc-gen-go v1.30.0 +// protoc v3.19.4 // source: version.proto package protos diff --git a/generated-protos/websocket.pb.go b/generated-protos/websocket.pb.go index f9275927..0c45eed9 100644 --- a/generated-protos/websocket.pb.go +++ b/generated-protos/websocket.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.28.1 -// protoc v3.20.3 +// protoc-gen-go v1.30.0 +// protoc v3.19.4 // source: websocket.proto package protos diff --git a/generated-protos/widget-data-msgs.pb.go b/generated-protos/widget-data-msgs.pb.go index cc100e37..8438a1a9 100644 --- a/generated-protos/widget-data-msgs.pb.go +++ b/generated-protos/widget-data-msgs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.28.1 -// protoc v3.20.3 +// protoc-gen-go v1.30.0 +// protoc v3.19.4 // source: widget-data-msgs.proto package protos diff --git a/generated-protos/widget-data.pb.go b/generated-protos/widget-data.pb.go index 2a70709b..edab5c8e 100644 --- a/generated-protos/widget-data.pb.go +++ b/generated-protos/widget-data.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.28.1 -// protoc v3.20.3 +// protoc-gen-go v1.30.0 +// protoc v3.19.4 // source: widget-data.proto package protos @@ -645,20 +645,83 @@ func (x *TernaryState) GetVisibleROIs() []*VisibleROI { return nil } +type VisibleROIAndQuant struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"` + ScanId string `protobuf:"bytes,2,opt,name=scanId,proto3" json:"scanId,omitempty"` + QuantId string `protobuf:"bytes,3,opt,name=quantId,proto3" json:"quantId,omitempty"` +} + +func (x *VisibleROIAndQuant) Reset() { + *x = VisibleROIAndQuant{} + if protoimpl.UnsafeEnabled { + mi := &file_widget_data_proto_msgTypes[9] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *VisibleROIAndQuant) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*VisibleROIAndQuant) ProtoMessage() {} + +func (x *VisibleROIAndQuant) ProtoReflect() protoreflect.Message { + mi := &file_widget_data_proto_msgTypes[9] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use VisibleROIAndQuant.ProtoReflect.Descriptor instead. +func (*VisibleROIAndQuant) Descriptor() ([]byte, []int) { + return file_widget_data_proto_rawDescGZIP(), []int{9} +} + +func (x *VisibleROIAndQuant) GetId() string { + if x != nil { + return x.Id + } + return "" +} + +func (x *VisibleROIAndQuant) GetScanId() string { + if x != nil { + return x.ScanId + } + return "" +} + +func (x *VisibleROIAndQuant) GetQuantId() string { + if x != nil { + return x.QuantId + } + return "" +} + type TableState struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - ShowPureElements bool `protobuf:"varint,1,opt,name=showPureElements,proto3" json:"showPureElements,omitempty"` - Order string `protobuf:"bytes,2,opt,name=order,proto3" json:"order,omitempty"` - VisibleROIs []*VisibleROI `protobuf:"bytes,3,rep,name=visibleROIs,proto3" json:"visibleROIs,omitempty"` + ShowPureElements bool `protobuf:"varint,1,opt,name=showPureElements,proto3" json:"showPureElements,omitempty"` + Order string `protobuf:"bytes,2,opt,name=order,proto3" json:"order,omitempty"` + VisibleROIs []*VisibleROIAndQuant `protobuf:"bytes,3,rep,name=visibleROIs,proto3" json:"visibleROIs,omitempty"` } func (x *TableState) Reset() { *x = TableState{} if protoimpl.UnsafeEnabled { - mi := &file_widget_data_proto_msgTypes[9] + mi := &file_widget_data_proto_msgTypes[10] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -671,7 +734,7 @@ func (x *TableState) String() string { func (*TableState) ProtoMessage() {} func (x *TableState) ProtoReflect() protoreflect.Message { - mi := &file_widget_data_proto_msgTypes[9] + mi := &file_widget_data_proto_msgTypes[10] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -684,7 +747,7 @@ func (x *TableState) ProtoReflect() protoreflect.Message { // Deprecated: Use TableState.ProtoReflect.Descriptor instead. func (*TableState) Descriptor() ([]byte, []int) { - return file_widget_data_proto_rawDescGZIP(), []int{9} + return file_widget_data_proto_rawDescGZIP(), []int{10} } func (x *TableState) GetShowPureElements() bool { @@ -701,7 +764,7 @@ func (x *TableState) GetOrder() string { return "" } -func (x *TableState) GetVisibleROIs() []*VisibleROI { +func (x *TableState) GetVisibleROIs() []*VisibleROIAndQuant { if x != nil { return x.VisibleROIs } @@ -720,7 +783,7 @@ type ROIQuantTableState struct { func (x *ROIQuantTableState) Reset() { *x = ROIQuantTableState{} if protoimpl.UnsafeEnabled { - mi := &file_widget_data_proto_msgTypes[10] + mi := &file_widget_data_proto_msgTypes[11] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -733,7 +796,7 @@ func (x *ROIQuantTableState) String() string { func (*ROIQuantTableState) ProtoMessage() {} func (x *ROIQuantTableState) ProtoReflect() protoreflect.Message { - mi := &file_widget_data_proto_msgTypes[10] + mi := &file_widget_data_proto_msgTypes[11] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -746,7 +809,7 @@ func (x *ROIQuantTableState) ProtoReflect() protoreflect.Message { // Deprecated: Use ROIQuantTableState.ProtoReflect.Descriptor instead. func (*ROIQuantTableState) Descriptor() ([]byte, []int) { - return file_widget_data_proto_rawDescGZIP(), []int{10} + return file_widget_data_proto_rawDescGZIP(), []int{11} } func (x *ROIQuantTableState) GetRoi() string { @@ -786,7 +849,7 @@ type VariogramState struct { func (x *VariogramState) Reset() { *x = VariogramState{} if protoimpl.UnsafeEnabled { - mi := &file_widget_data_proto_msgTypes[11] + mi := &file_widget_data_proto_msgTypes[12] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -799,7 +862,7 @@ func (x *VariogramState) String() string { func (*VariogramState) ProtoMessage() {} func (x *VariogramState) ProtoReflect() protoreflect.Message { - mi := &file_widget_data_proto_msgTypes[11] + mi := &file_widget_data_proto_msgTypes[12] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -812,7 +875,7 @@ func (x *VariogramState) ProtoReflect() protoreflect.Message { // Deprecated: Use VariogramState.ProtoReflect.Descriptor instead. func (*VariogramState) Descriptor() ([]byte, []int) { - return file_widget_data_proto_rawDescGZIP(), []int{11} + return file_widget_data_proto_rawDescGZIP(), []int{12} } func (x *VariogramState) GetExpressionIDs() []string { @@ -922,7 +985,7 @@ type MapLayerVisibility struct { func (x *MapLayerVisibility) Reset() { *x = MapLayerVisibility{} if protoimpl.UnsafeEnabled { - mi := &file_widget_data_proto_msgTypes[12] + mi := &file_widget_data_proto_msgTypes[13] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -935,7 +998,7 @@ func (x *MapLayerVisibility) String() string { func (*MapLayerVisibility) ProtoMessage() {} func (x *MapLayerVisibility) ProtoReflect() protoreflect.Message { - mi := &file_widget_data_proto_msgTypes[12] + mi := &file_widget_data_proto_msgTypes[13] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -948,7 +1011,7 @@ func (x *MapLayerVisibility) ProtoReflect() protoreflect.Message { // Deprecated: Use MapLayerVisibility.ProtoReflect.Descriptor instead. func (*MapLayerVisibility) Descriptor() ([]byte, []int) { - return file_widget_data_proto_rawDescGZIP(), []int{12} + return file_widget_data_proto_rawDescGZIP(), []int{13} } func (x *MapLayerVisibility) GetExpressionID() string { @@ -1007,7 +1070,7 @@ type ROILayerVisibility struct { func (x *ROILayerVisibility) Reset() { *x = ROILayerVisibility{} if protoimpl.UnsafeEnabled { - mi := &file_widget_data_proto_msgTypes[13] + mi := &file_widget_data_proto_msgTypes[14] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1020,7 +1083,7 @@ func (x *ROILayerVisibility) String() string { func (*ROILayerVisibility) ProtoMessage() {} func (x *ROILayerVisibility) ProtoReflect() protoreflect.Message { - mi := &file_widget_data_proto_msgTypes[13] + mi := &file_widget_data_proto_msgTypes[14] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1033,7 +1096,7 @@ func (x *ROILayerVisibility) ProtoReflect() protoreflect.Message { // Deprecated: Use ROILayerVisibility.ProtoReflect.Descriptor instead. func (*ROILayerVisibility) Descriptor() ([]byte, []int) { - return file_widget_data_proto_rawDescGZIP(), []int{13} + return file_widget_data_proto_rawDescGZIP(), []int{14} } func (x *ROILayerVisibility) GetId() string { @@ -1095,7 +1158,7 @@ type ContextImageState struct { func (x *ContextImageState) Reset() { *x = ContextImageState{} if protoimpl.UnsafeEnabled { - mi := &file_widget_data_proto_msgTypes[14] + mi := &file_widget_data_proto_msgTypes[15] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1108,7 +1171,7 @@ func (x *ContextImageState) String() string { func (*ContextImageState) ProtoMessage() {} func (x *ContextImageState) ProtoReflect() protoreflect.Message { - mi := &file_widget_data_proto_msgTypes[14] + mi := &file_widget_data_proto_msgTypes[15] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1121,7 +1184,7 @@ func (x *ContextImageState) ProtoReflect() protoreflect.Message { // Deprecated: Use ContextImageState.ProtoReflect.Descriptor instead. func (*ContextImageState) Descriptor() ([]byte, []int) { - return file_widget_data_proto_rawDescGZIP(), []int{14} + return file_widget_data_proto_rawDescGZIP(), []int{15} } func (x *ContextImageState) GetPanX() float32 { @@ -1285,7 +1348,7 @@ type AnnotationPoint struct { func (x *AnnotationPoint) Reset() { *x = AnnotationPoint{} if protoimpl.UnsafeEnabled { - mi := &file_widget_data_proto_msgTypes[15] + mi := &file_widget_data_proto_msgTypes[16] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1298,7 +1361,7 @@ func (x *AnnotationPoint) String() string { func (*AnnotationPoint) ProtoMessage() {} func (x *AnnotationPoint) ProtoReflect() protoreflect.Message { - mi := &file_widget_data_proto_msgTypes[15] + mi := &file_widget_data_proto_msgTypes[16] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1311,7 +1374,7 @@ func (x *AnnotationPoint) ProtoReflect() protoreflect.Message { // Deprecated: Use AnnotationPoint.ProtoReflect.Descriptor instead. func (*AnnotationPoint) Descriptor() ([]byte, []int) { - return file_widget_data_proto_rawDescGZIP(), []int{15} + return file_widget_data_proto_rawDescGZIP(), []int{16} } func (x *AnnotationPoint) GetX() float32 { @@ -1359,7 +1422,7 @@ type FullScreenAnnotationItem struct { func (x *FullScreenAnnotationItem) Reset() { *x = FullScreenAnnotationItem{} if protoimpl.UnsafeEnabled { - mi := &file_widget_data_proto_msgTypes[16] + mi := &file_widget_data_proto_msgTypes[17] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1372,7 +1435,7 @@ func (x *FullScreenAnnotationItem) String() string { func (*FullScreenAnnotationItem) ProtoMessage() {} func (x *FullScreenAnnotationItem) ProtoReflect() protoreflect.Message { - mi := &file_widget_data_proto_msgTypes[16] + mi := &file_widget_data_proto_msgTypes[17] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1385,7 +1448,7 @@ func (x *FullScreenAnnotationItem) ProtoReflect() protoreflect.Message { // Deprecated: Use FullScreenAnnotationItem.ProtoReflect.Descriptor instead. func (*FullScreenAnnotationItem) Descriptor() ([]byte, []int) { - return file_widget_data_proto_rawDescGZIP(), []int{16} + return file_widget_data_proto_rawDescGZIP(), []int{17} } func (x *FullScreenAnnotationItem) GetType() string { @@ -1448,7 +1511,7 @@ type AnnotationDisplayState struct { func (x *AnnotationDisplayState) Reset() { *x = AnnotationDisplayState{} if protoimpl.UnsafeEnabled { - mi := &file_widget_data_proto_msgTypes[17] + mi := &file_widget_data_proto_msgTypes[18] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1461,7 +1524,7 @@ func (x *AnnotationDisplayState) String() string { func (*AnnotationDisplayState) ProtoMessage() {} func (x *AnnotationDisplayState) ProtoReflect() protoreflect.Message { - mi := &file_widget_data_proto_msgTypes[17] + mi := &file_widget_data_proto_msgTypes[18] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1474,7 +1537,7 @@ func (x *AnnotationDisplayState) ProtoReflect() protoreflect.Message { // Deprecated: Use AnnotationDisplayState.ProtoReflect.Descriptor instead. func (*AnnotationDisplayState) Descriptor() ([]byte, []int) { - return file_widget_data_proto_rawDescGZIP(), []int{17} + return file_widget_data_proto_rawDescGZIP(), []int{18} } func (x *AnnotationDisplayState) GetSavedAnnotations() []*FullScreenAnnotationItem { @@ -1496,7 +1559,7 @@ type ROIDisplayState struct { func (x *ROIDisplayState) Reset() { *x = ROIDisplayState{} if protoimpl.UnsafeEnabled { - mi := &file_widget_data_proto_msgTypes[18] + mi := &file_widget_data_proto_msgTypes[19] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1509,7 +1572,7 @@ func (x *ROIDisplayState) String() string { func (*ROIDisplayState) ProtoMessage() {} func (x *ROIDisplayState) ProtoReflect() protoreflect.Message { - mi := &file_widget_data_proto_msgTypes[18] + mi := &file_widget_data_proto_msgTypes[19] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1522,7 +1585,7 @@ func (x *ROIDisplayState) ProtoReflect() protoreflect.Message { // Deprecated: Use ROIDisplayState.ProtoReflect.Descriptor instead. func (*ROIDisplayState) Descriptor() ([]byte, []int) { - return file_widget_data_proto_rawDescGZIP(), []int{18} + return file_widget_data_proto_rawDescGZIP(), []int{19} } func (x *ROIDisplayState) GetRoiColours() map[string]string { @@ -1560,7 +1623,7 @@ type RGBUPlotWidgetState struct { func (x *RGBUPlotWidgetState) Reset() { *x = RGBUPlotWidgetState{} if protoimpl.UnsafeEnabled { - mi := &file_widget_data_proto_msgTypes[19] + mi := &file_widget_data_proto_msgTypes[20] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1573,7 +1636,7 @@ func (x *RGBUPlotWidgetState) String() string { func (*RGBUPlotWidgetState) ProtoMessage() {} func (x *RGBUPlotWidgetState) ProtoReflect() protoreflect.Message { - mi := &file_widget_data_proto_msgTypes[19] + mi := &file_widget_data_proto_msgTypes[20] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1586,7 +1649,7 @@ func (x *RGBUPlotWidgetState) ProtoReflect() protoreflect.Message { // Deprecated: Use RGBUPlotWidgetState.ProtoReflect.Descriptor instead. func (*RGBUPlotWidgetState) Descriptor() ([]byte, []int) { - return file_widget_data_proto_rawDescGZIP(), []int{19} + return file_widget_data_proto_rawDescGZIP(), []int{20} } func (x *RGBUPlotWidgetState) GetMinerals() []string { @@ -1685,7 +1748,7 @@ type SingleAxisRGBUWidgetState struct { func (x *SingleAxisRGBUWidgetState) Reset() { *x = SingleAxisRGBUWidgetState{} if protoimpl.UnsafeEnabled { - mi := &file_widget_data_proto_msgTypes[20] + mi := &file_widget_data_proto_msgTypes[21] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1698,7 +1761,7 @@ func (x *SingleAxisRGBUWidgetState) String() string { func (*SingleAxisRGBUWidgetState) ProtoMessage() {} func (x *SingleAxisRGBUWidgetState) ProtoReflect() protoreflect.Message { - mi := &file_widget_data_proto_msgTypes[20] + mi := &file_widget_data_proto_msgTypes[21] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1711,7 +1774,7 @@ func (x *SingleAxisRGBUWidgetState) ProtoReflect() protoreflect.Message { // Deprecated: Use SingleAxisRGBUWidgetState.ProtoReflect.Descriptor instead. func (*SingleAxisRGBUWidgetState) Descriptor() ([]byte, []int) { - return file_widget_data_proto_rawDescGZIP(), []int{20} + return file_widget_data_proto_rawDescGZIP(), []int{21} } func (x *SingleAxisRGBUWidgetState) GetMinerals() []string { @@ -1791,7 +1854,7 @@ type RGBUImagesWidgetState struct { func (x *RGBUImagesWidgetState) Reset() { *x = RGBUImagesWidgetState{} if protoimpl.UnsafeEnabled { - mi := &file_widget_data_proto_msgTypes[21] + mi := &file_widget_data_proto_msgTypes[22] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1804,7 +1867,7 @@ func (x *RGBUImagesWidgetState) String() string { func (*RGBUImagesWidgetState) ProtoMessage() {} func (x *RGBUImagesWidgetState) ProtoReflect() protoreflect.Message { - mi := &file_widget_data_proto_msgTypes[21] + mi := &file_widget_data_proto_msgTypes[22] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1817,7 +1880,7 @@ func (x *RGBUImagesWidgetState) ProtoReflect() protoreflect.Message { // Deprecated: Use RGBUImagesWidgetState.ProtoReflect.Descriptor instead. func (*RGBUImagesWidgetState) Descriptor() ([]byte, []int) { - return file_widget_data_proto_rawDescGZIP(), []int{21} + return file_widget_data_proto_rawDescGZIP(), []int{22} } func (x *RGBUImagesWidgetState) GetBrightness() float32 { @@ -1847,7 +1910,7 @@ type ParallelogramWidgetState struct { func (x *ParallelogramWidgetState) Reset() { *x = ParallelogramWidgetState{} if protoimpl.UnsafeEnabled { - mi := &file_widget_data_proto_msgTypes[22] + mi := &file_widget_data_proto_msgTypes[23] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1860,7 +1923,7 @@ func (x *ParallelogramWidgetState) String() string { func (*ParallelogramWidgetState) ProtoMessage() {} func (x *ParallelogramWidgetState) ProtoReflect() protoreflect.Message { - mi := &file_widget_data_proto_msgTypes[22] + mi := &file_widget_data_proto_msgTypes[23] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1873,7 +1936,7 @@ func (x *ParallelogramWidgetState) ProtoReflect() protoreflect.Message { // Deprecated: Use ParallelogramWidgetState.ProtoReflect.Descriptor instead. func (*ParallelogramWidgetState) Descriptor() ([]byte, []int) { - return file_widget_data_proto_rawDescGZIP(), []int{22} + return file_widget_data_proto_rawDescGZIP(), []int{23} } func (x *ParallelogramWidgetState) GetRegions() []string { @@ -1921,7 +1984,7 @@ type WidgetData struct { func (x *WidgetData) Reset() { *x = WidgetData{} if protoimpl.UnsafeEnabled { - mi := &file_widget_data_proto_msgTypes[23] + mi := &file_widget_data_proto_msgTypes[24] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1934,7 +1997,7 @@ func (x *WidgetData) String() string { func (*WidgetData) ProtoMessage() {} func (x *WidgetData) ProtoReflect() protoreflect.Message { - mi := &file_widget_data_proto_msgTypes[23] + mi := &file_widget_data_proto_msgTypes[24] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1947,7 +2010,7 @@ func (x *WidgetData) ProtoReflect() protoreflect.Message { // Deprecated: Use WidgetData.ProtoReflect.Descriptor instead. func (*WidgetData) Descriptor() ([]byte, []int) { - return file_widget_data_proto_rawDescGZIP(), []int{23} + return file_widget_data_proto_rawDescGZIP(), []int{24} } func (x *WidgetData) GetId() string { @@ -2134,280 +2197,286 @@ var file_widget_data_proto_rawDesc = []byte{ 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x49, 0x44, 0x73, 0x12, 0x2d, 0x0a, 0x0b, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x52, 0x4f, 0x49, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x56, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x52, 0x4f, 0x49, 0x52, 0x0b, 0x76, 0x69, 0x73, - 0x69, 0x62, 0x6c, 0x65, 0x52, 0x4f, 0x49, 0x73, 0x22, 0x7d, 0x0a, 0x0a, 0x54, 0x61, 0x62, 0x6c, - 0x65, 0x53, 0x74, 0x61, 0x74, 0x65, 0x12, 0x2a, 0x0a, 0x10, 0x73, 0x68, 0x6f, 0x77, 0x50, 0x75, - 0x72, 0x65, 0x45, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, - 0x52, 0x10, 0x73, 0x68, 0x6f, 0x77, 0x50, 0x75, 0x72, 0x65, 0x45, 0x6c, 0x65, 0x6d, 0x65, 0x6e, - 0x74, 0x73, 0x12, 0x14, 0x0a, 0x05, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, - 0x09, 0x52, 0x05, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x12, 0x2d, 0x0a, 0x0b, 0x76, 0x69, 0x73, 0x69, - 0x62, 0x6c, 0x65, 0x52, 0x4f, 0x49, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, - 0x56, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x52, 0x4f, 0x49, 0x52, 0x0b, 0x76, 0x69, 0x73, 0x69, - 0x62, 0x6c, 0x65, 0x52, 0x4f, 0x49, 0x73, 0x22, 0x42, 0x0a, 0x12, 0x52, 0x4f, 0x49, 0x51, 0x75, - 0x61, 0x6e, 0x74, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x53, 0x74, 0x61, 0x74, 0x65, 0x12, 0x10, 0x0a, - 0x03, 0x72, 0x6f, 0x69, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x72, 0x6f, 0x69, 0x12, - 0x1a, 0x0a, 0x08, 0x71, 0x75, 0x61, 0x6e, 0x74, 0x49, 0x44, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, - 0x09, 0x52, 0x08, 0x71, 0x75, 0x61, 0x6e, 0x74, 0x49, 0x44, 0x73, 0x22, 0x85, 0x04, 0x0a, 0x0e, - 0x56, 0x61, 0x72, 0x69, 0x6f, 0x67, 0x72, 0x61, 0x6d, 0x53, 0x74, 0x61, 0x74, 0x65, 0x12, 0x24, - 0x0a, 0x0d, 0x65, 0x78, 0x70, 0x72, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x49, 0x44, 0x73, 0x18, - 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0d, 0x65, 0x78, 0x70, 0x72, 0x65, 0x73, 0x73, 0x69, 0x6f, - 0x6e, 0x49, 0x44, 0x73, 0x12, 0x2d, 0x0a, 0x0b, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x52, - 0x4f, 0x49, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x56, 0x69, 0x73, 0x69, - 0x62, 0x6c, 0x65, 0x52, 0x4f, 0x49, 0x52, 0x0b, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x52, - 0x4f, 0x49, 0x73, 0x12, 0x1e, 0x0a, 0x0a, 0x76, 0x61, 0x72, 0x69, 0x6f, 0x4d, 0x6f, 0x64, 0x65, - 0x6c, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x76, 0x61, 0x72, 0x69, 0x6f, 0x4d, 0x6f, - 0x64, 0x65, 0x6c, 0x12, 0x20, 0x0a, 0x0b, 0x6d, 0x61, 0x78, 0x44, 0x69, 0x73, 0x74, 0x61, 0x6e, - 0x63, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x02, 0x52, 0x0b, 0x6d, 0x61, 0x78, 0x44, 0x69, 0x73, - 0x74, 0x61, 0x6e, 0x63, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x62, 0x69, 0x6e, 0x43, 0x6f, 0x75, 0x6e, - 0x74, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x62, 0x69, 0x6e, 0x43, 0x6f, 0x75, 0x6e, - 0x74, 0x12, 0x26, 0x0a, 0x0e, 0x64, 0x72, 0x61, 0x77, 0x4d, 0x6f, 0x64, 0x65, 0x56, 0x65, 0x63, - 0x74, 0x6f, 0x72, 0x18, 0x06, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0e, 0x64, 0x72, 0x61, 0x77, 0x4d, - 0x6f, 0x64, 0x65, 0x56, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x12, 0x32, 0x0a, 0x14, 0x63, 0x6f, 0x6d, - 0x70, 0x61, 0x72, 0x69, 0x73, 0x6f, 0x6e, 0x41, 0x6c, 0x67, 0x6f, 0x72, 0x69, 0x74, 0x68, 0x6d, - 0x73, 0x18, 0x07, 0x20, 0x03, 0x28, 0x09, 0x52, 0x14, 0x63, 0x6f, 0x6d, 0x70, 0x61, 0x72, 0x69, - 0x73, 0x6f, 0x6e, 0x41, 0x6c, 0x67, 0x6f, 0x72, 0x69, 0x74, 0x68, 0x6d, 0x73, 0x12, 0x1e, 0x0a, - 0x0a, 0x6c, 0x69, 0x76, 0x65, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x18, 0x08, 0x20, 0x01, 0x28, - 0x08, 0x52, 0x0a, 0x6c, 0x69, 0x76, 0x65, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x12, 0x2c, 0x0a, - 0x11, 0x64, 0x69, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x53, 0x6c, 0x69, 0x64, 0x65, 0x72, 0x4d, - 0x69, 0x6e, 0x18, 0x09, 0x20, 0x01, 0x28, 0x02, 0x52, 0x11, 0x64, 0x69, 0x73, 0x74, 0x61, 0x6e, - 0x63, 0x65, 0x53, 0x6c, 0x69, 0x64, 0x65, 0x72, 0x4d, 0x69, 0x6e, 0x12, 0x2c, 0x0a, 0x11, 0x64, - 0x69, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x53, 0x6c, 0x69, 0x64, 0x65, 0x72, 0x4d, 0x61, 0x78, - 0x18, 0x0a, 0x20, 0x01, 0x28, 0x02, 0x52, 0x11, 0x64, 0x69, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, - 0x53, 0x6c, 0x69, 0x64, 0x65, 0x72, 0x4d, 0x61, 0x78, 0x12, 0x22, 0x0a, 0x0c, 0x62, 0x69, 0x6e, - 0x53, 0x6c, 0x69, 0x64, 0x65, 0x72, 0x4d, 0x69, 0x6e, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x02, 0x52, - 0x0c, 0x62, 0x69, 0x6e, 0x53, 0x6c, 0x69, 0x64, 0x65, 0x72, 0x4d, 0x69, 0x6e, 0x12, 0x22, 0x0a, - 0x0c, 0x62, 0x69, 0x6e, 0x53, 0x6c, 0x69, 0x64, 0x65, 0x72, 0x4d, 0x61, 0x78, 0x18, 0x0c, 0x20, - 0x01, 0x28, 0x02, 0x52, 0x0c, 0x62, 0x69, 0x6e, 0x53, 0x6c, 0x69, 0x64, 0x65, 0x72, 0x4d, 0x61, - 0x78, 0x12, 0x20, 0x0a, 0x0b, 0x64, 0x72, 0x61, 0x77, 0x42, 0x65, 0x73, 0x74, 0x46, 0x69, 0x74, - 0x18, 0x0d, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0b, 0x64, 0x72, 0x61, 0x77, 0x42, 0x65, 0x73, 0x74, - 0x46, 0x69, 0x74, 0x22, 0x86, 0x02, 0x0a, 0x12, 0x4d, 0x61, 0x70, 0x4c, 0x61, 0x79, 0x65, 0x72, - 0x56, 0x69, 0x73, 0x69, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79, 0x12, 0x22, 0x0a, 0x0c, 0x65, 0x78, - 0x70, 0x72, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x49, 0x44, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, - 0x52, 0x0c, 0x65, 0x78, 0x70, 0x72, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x49, 0x44, 0x12, 0x18, - 0x0a, 0x07, 0x6f, 0x70, 0x61, 0x63, 0x69, 0x74, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x02, 0x52, - 0x07, 0x6f, 0x70, 0x61, 0x63, 0x69, 0x74, 0x79, 0x12, 0x18, 0x0a, 0x07, 0x76, 0x69, 0x73, 0x69, - 0x62, 0x6c, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x07, 0x76, 0x69, 0x73, 0x69, 0x62, - 0x6c, 0x65, 0x12, 0x32, 0x0a, 0x14, 0x64, 0x69, 0x73, 0x70, 0x6c, 0x61, 0x79, 0x56, 0x61, 0x6c, - 0x75, 0x65, 0x52, 0x61, 0x6e, 0x67, 0x65, 0x4d, 0x69, 0x6e, 0x18, 0x04, 0x20, 0x01, 0x28, 0x02, - 0x52, 0x14, 0x64, 0x69, 0x73, 0x70, 0x6c, 0x61, 0x79, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x61, - 0x6e, 0x67, 0x65, 0x4d, 0x69, 0x6e, 0x12, 0x32, 0x0a, 0x14, 0x64, 0x69, 0x73, 0x70, 0x6c, 0x61, - 0x79, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x61, 0x6e, 0x67, 0x65, 0x4d, 0x61, 0x78, 0x18, 0x05, - 0x20, 0x01, 0x28, 0x02, 0x52, 0x14, 0x64, 0x69, 0x73, 0x70, 0x6c, 0x61, 0x79, 0x56, 0x61, 0x6c, - 0x75, 0x65, 0x52, 0x61, 0x6e, 0x67, 0x65, 0x4d, 0x61, 0x78, 0x12, 0x30, 0x0a, 0x13, 0x64, 0x69, - 0x73, 0x70, 0x6c, 0x61, 0x79, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x53, 0x68, 0x61, 0x64, 0x69, 0x6e, - 0x67, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x13, 0x64, 0x69, 0x73, 0x70, 0x6c, 0x61, 0x79, - 0x56, 0x61, 0x6c, 0x75, 0x65, 0x53, 0x68, 0x61, 0x64, 0x69, 0x6e, 0x67, 0x22, 0x70, 0x0a, 0x12, - 0x52, 0x4f, 0x49, 0x4c, 0x61, 0x79, 0x65, 0x72, 0x56, 0x69, 0x73, 0x69, 0x62, 0x69, 0x6c, 0x69, - 0x74, 0x79, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, - 0x69, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x6f, 0x70, 0x61, 0x63, 0x69, 0x74, 0x79, 0x18, 0x02, 0x20, - 0x01, 0x28, 0x02, 0x52, 0x07, 0x6f, 0x70, 0x61, 0x63, 0x69, 0x74, 0x79, 0x12, 0x18, 0x0a, 0x07, - 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x07, 0x76, - 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x73, 0x63, 0x61, 0x6e, 0x49, 0x64, - 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x73, 0x63, 0x61, 0x6e, 0x49, 0x64, 0x22, 0x83, - 0x07, 0x0a, 0x11, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x49, 0x6d, 0x61, 0x67, 0x65, 0x53, - 0x74, 0x61, 0x74, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x70, 0x61, 0x6e, 0x58, 0x18, 0x01, 0x20, 0x01, - 0x28, 0x02, 0x52, 0x04, 0x70, 0x61, 0x6e, 0x58, 0x12, 0x12, 0x0a, 0x04, 0x70, 0x61, 0x6e, 0x59, - 0x18, 0x02, 0x20, 0x01, 0x28, 0x02, 0x52, 0x04, 0x70, 0x61, 0x6e, 0x59, 0x12, 0x14, 0x0a, 0x05, - 0x7a, 0x6f, 0x6f, 0x6d, 0x58, 0x18, 0x03, 0x20, 0x01, 0x28, 0x02, 0x52, 0x05, 0x7a, 0x6f, 0x6f, - 0x6d, 0x58, 0x12, 0x14, 0x0a, 0x05, 0x7a, 0x6f, 0x6f, 0x6d, 0x59, 0x18, 0x04, 0x20, 0x01, 0x28, - 0x02, 0x52, 0x05, 0x7a, 0x6f, 0x6f, 0x6d, 0x59, 0x12, 0x1e, 0x0a, 0x0a, 0x73, 0x68, 0x6f, 0x77, - 0x50, 0x6f, 0x69, 0x6e, 0x74, 0x73, 0x18, 0x05, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0a, 0x73, 0x68, - 0x6f, 0x77, 0x50, 0x6f, 0x69, 0x6e, 0x74, 0x73, 0x12, 0x24, 0x0a, 0x0d, 0x73, 0x68, 0x6f, 0x77, - 0x50, 0x6f, 0x69, 0x6e, 0x74, 0x42, 0x42, 0x6f, 0x78, 0x18, 0x06, 0x20, 0x01, 0x28, 0x08, 0x52, - 0x0d, 0x73, 0x68, 0x6f, 0x77, 0x50, 0x6f, 0x69, 0x6e, 0x74, 0x42, 0x42, 0x6f, 0x78, 0x12, 0x2c, - 0x0a, 0x11, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x43, 0x6f, 0x6c, 0x6f, 0x75, 0x72, 0x53, 0x63, 0x68, - 0x65, 0x6d, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x11, 0x70, 0x6f, 0x69, 0x6e, 0x74, - 0x43, 0x6f, 0x6c, 0x6f, 0x75, 0x72, 0x53, 0x63, 0x68, 0x65, 0x6d, 0x65, 0x12, 0x34, 0x0a, 0x15, - 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x42, 0x42, 0x6f, 0x78, 0x43, 0x6f, 0x6c, 0x6f, 0x75, 0x72, 0x53, - 0x63, 0x68, 0x65, 0x6d, 0x65, 0x18, 0x08, 0x20, 0x01, 0x28, 0x09, 0x52, 0x15, 0x70, 0x6f, 0x69, - 0x6e, 0x74, 0x42, 0x42, 0x6f, 0x78, 0x43, 0x6f, 0x6c, 0x6f, 0x75, 0x72, 0x53, 0x63, 0x68, 0x65, - 0x6d, 0x65, 0x12, 0x22, 0x0a, 0x0c, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x49, 0x6d, 0x61, - 0x67, 0x65, 0x18, 0x09, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x78, - 0x74, 0x49, 0x6d, 0x61, 0x67, 0x65, 0x12, 0x34, 0x0a, 0x15, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x78, - 0x74, 0x49, 0x6d, 0x61, 0x67, 0x65, 0x53, 0x6d, 0x6f, 0x6f, 0x74, 0x68, 0x69, 0x6e, 0x67, 0x18, - 0x0a, 0x20, 0x01, 0x28, 0x09, 0x52, 0x15, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x49, 0x6d, - 0x61, 0x67, 0x65, 0x53, 0x6d, 0x6f, 0x6f, 0x74, 0x68, 0x69, 0x6e, 0x67, 0x12, 0x31, 0x0a, 0x09, - 0x6d, 0x61, 0x70, 0x4c, 0x61, 0x79, 0x65, 0x72, 0x73, 0x18, 0x0b, 0x20, 0x03, 0x28, 0x0b, 0x32, - 0x13, 0x2e, 0x4d, 0x61, 0x70, 0x4c, 0x61, 0x79, 0x65, 0x72, 0x56, 0x69, 0x73, 0x69, 0x62, 0x69, - 0x6c, 0x69, 0x74, 0x79, 0x52, 0x09, 0x6d, 0x61, 0x70, 0x4c, 0x61, 0x79, 0x65, 0x72, 0x73, 0x12, - 0x31, 0x0a, 0x09, 0x72, 0x6f, 0x69, 0x4c, 0x61, 0x79, 0x65, 0x72, 0x73, 0x18, 0x0c, 0x20, 0x03, - 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x52, 0x4f, 0x49, 0x4c, 0x61, 0x79, 0x65, 0x72, 0x56, 0x69, 0x73, - 0x69, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79, 0x52, 0x09, 0x72, 0x6f, 0x69, 0x4c, 0x61, 0x79, 0x65, - 0x72, 0x73, 0x12, 0x36, 0x0a, 0x16, 0x65, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x6c, - 0x61, 0x74, 0x69, 0x76, 0x65, 0x53, 0x68, 0x61, 0x64, 0x69, 0x6e, 0x67, 0x18, 0x0d, 0x20, 0x01, - 0x28, 0x08, 0x52, 0x16, 0x65, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x6c, 0x61, 0x74, - 0x69, 0x76, 0x65, 0x53, 0x68, 0x61, 0x64, 0x69, 0x6e, 0x67, 0x12, 0x1e, 0x0a, 0x0a, 0x62, 0x72, - 0x69, 0x67, 0x68, 0x74, 0x6e, 0x65, 0x73, 0x73, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x02, 0x52, 0x0a, - 0x62, 0x72, 0x69, 0x67, 0x68, 0x74, 0x6e, 0x65, 0x73, 0x73, 0x12, 0x22, 0x0a, 0x0c, 0x72, 0x67, - 0x62, 0x75, 0x43, 0x68, 0x61, 0x6e, 0x6e, 0x65, 0x6c, 0x73, 0x18, 0x0f, 0x20, 0x01, 0x28, 0x09, - 0x52, 0x0c, 0x72, 0x67, 0x62, 0x75, 0x43, 0x68, 0x61, 0x6e, 0x6e, 0x65, 0x6c, 0x73, 0x12, 0x2c, - 0x0a, 0x11, 0x75, 0x6e, 0x73, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x65, 0x64, 0x4f, 0x70, 0x61, 0x63, - 0x69, 0x74, 0x79, 0x18, 0x10, 0x20, 0x01, 0x28, 0x02, 0x52, 0x11, 0x75, 0x6e, 0x73, 0x65, 0x6c, - 0x65, 0x63, 0x74, 0x65, 0x64, 0x4f, 0x70, 0x61, 0x63, 0x69, 0x74, 0x79, 0x12, 0x30, 0x0a, 0x13, - 0x75, 0x6e, 0x73, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x65, 0x64, 0x47, 0x72, 0x61, 0x79, 0x73, 0x63, - 0x61, 0x6c, 0x65, 0x18, 0x11, 0x20, 0x01, 0x28, 0x08, 0x52, 0x13, 0x75, 0x6e, 0x73, 0x65, 0x6c, - 0x65, 0x63, 0x74, 0x65, 0x64, 0x47, 0x72, 0x61, 0x79, 0x73, 0x63, 0x61, 0x6c, 0x65, 0x12, 0x26, - 0x0a, 0x0e, 0x63, 0x6f, 0x6c, 0x6f, 0x75, 0x72, 0x52, 0x61, 0x74, 0x69, 0x6f, 0x4d, 0x69, 0x6e, - 0x18, 0x12, 0x20, 0x01, 0x28, 0x02, 0x52, 0x0e, 0x63, 0x6f, 0x6c, 0x6f, 0x75, 0x72, 0x52, 0x61, - 0x74, 0x69, 0x6f, 0x4d, 0x69, 0x6e, 0x12, 0x26, 0x0a, 0x0e, 0x63, 0x6f, 0x6c, 0x6f, 0x75, 0x72, - 0x52, 0x61, 0x74, 0x69, 0x6f, 0x4d, 0x61, 0x78, 0x18, 0x13, 0x20, 0x01, 0x28, 0x02, 0x52, 0x0e, - 0x63, 0x6f, 0x6c, 0x6f, 0x75, 0x72, 0x52, 0x61, 0x74, 0x69, 0x6f, 0x4d, 0x61, 0x78, 0x12, 0x3e, - 0x0a, 0x1a, 0x72, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x54, 0x6f, 0x70, 0x53, 0x70, 0x65, 0x63, 0x75, - 0x6c, 0x61, 0x72, 0x41, 0x72, 0x74, 0x69, 0x66, 0x61, 0x63, 0x74, 0x73, 0x18, 0x14, 0x20, 0x01, - 0x28, 0x08, 0x52, 0x1a, 0x72, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x54, 0x6f, 0x70, 0x53, 0x70, 0x65, - 0x63, 0x75, 0x6c, 0x61, 0x72, 0x41, 0x72, 0x74, 0x69, 0x66, 0x61, 0x63, 0x74, 0x73, 0x12, 0x44, - 0x0a, 0x1d, 0x72, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x42, 0x6f, 0x74, 0x74, 0x6f, 0x6d, 0x53, 0x70, - 0x65, 0x63, 0x75, 0x6c, 0x61, 0x72, 0x41, 0x72, 0x74, 0x69, 0x66, 0x61, 0x63, 0x74, 0x73, 0x18, - 0x15, 0x20, 0x01, 0x28, 0x08, 0x52, 0x1d, 0x72, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x42, 0x6f, 0x74, - 0x74, 0x6f, 0x6d, 0x53, 0x70, 0x65, 0x63, 0x75, 0x6c, 0x61, 0x72, 0x41, 0x72, 0x74, 0x69, 0x66, - 0x61, 0x63, 0x74, 0x73, 0x22, 0x73, 0x0a, 0x0f, 0x41, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, - 0x6f, 0x6e, 0x50, 0x6f, 0x69, 0x6e, 0x74, 0x12, 0x0c, 0x0a, 0x01, 0x78, 0x18, 0x01, 0x20, 0x01, - 0x28, 0x02, 0x52, 0x01, 0x78, 0x12, 0x0c, 0x0a, 0x01, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x02, - 0x52, 0x01, 0x79, 0x12, 0x20, 0x0a, 0x0b, 0x73, 0x63, 0x72, 0x65, 0x65, 0x6e, 0x57, 0x69, 0x64, - 0x74, 0x68, 0x18, 0x03, 0x20, 0x01, 0x28, 0x02, 0x52, 0x0b, 0x73, 0x63, 0x72, 0x65, 0x65, 0x6e, - 0x57, 0x69, 0x64, 0x74, 0x68, 0x12, 0x22, 0x0a, 0x0c, 0x73, 0x63, 0x72, 0x65, 0x65, 0x6e, 0x48, - 0x65, 0x69, 0x67, 0x68, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x02, 0x52, 0x0c, 0x73, 0x63, 0x72, - 0x65, 0x65, 0x6e, 0x48, 0x65, 0x69, 0x67, 0x68, 0x74, 0x22, 0xcc, 0x01, 0x0a, 0x18, 0x46, 0x75, - 0x6c, 0x6c, 0x53, 0x63, 0x72, 0x65, 0x65, 0x6e, 0x41, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, - 0x6f, 0x6e, 0x49, 0x74, 0x65, 0x6d, 0x12, 0x12, 0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, - 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x74, 0x79, 0x70, 0x65, 0x12, 0x28, 0x0a, 0x06, 0x70, 0x6f, - 0x69, 0x6e, 0x74, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x41, 0x6e, 0x6e, - 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x50, 0x6f, 0x69, 0x6e, 0x74, 0x52, 0x06, 0x70, 0x6f, - 0x69, 0x6e, 0x74, 0x73, 0x12, 0x16, 0x0a, 0x06, 0x63, 0x6f, 0x6c, 0x6f, 0x75, 0x72, 0x18, 0x03, - 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x63, 0x6f, 0x6c, 0x6f, 0x75, 0x72, 0x12, 0x1a, 0x0a, 0x08, - 0x63, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x08, 0x52, 0x08, - 0x63, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x74, 0x65, 0x78, 0x74, - 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x74, 0x65, 0x78, 0x74, 0x12, 0x1a, 0x0a, 0x08, - 0x66, 0x6f, 0x6e, 0x74, 0x53, 0x69, 0x7a, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, - 0x66, 0x6f, 0x6e, 0x74, 0x53, 0x69, 0x7a, 0x65, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x07, - 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x69, 0x64, 0x22, 0x5f, 0x0a, 0x16, 0x41, 0x6e, 0x6e, 0x6f, - 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x44, 0x69, 0x73, 0x70, 0x6c, 0x61, 0x79, 0x53, 0x74, 0x61, - 0x74, 0x65, 0x12, 0x45, 0x0a, 0x10, 0x73, 0x61, 0x76, 0x65, 0x64, 0x41, 0x6e, 0x6e, 0x6f, 0x74, - 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x46, + 0x69, 0x62, 0x6c, 0x65, 0x52, 0x4f, 0x49, 0x73, 0x22, 0x56, 0x0a, 0x12, 0x56, 0x69, 0x73, 0x69, + 0x62, 0x6c, 0x65, 0x52, 0x4f, 0x49, 0x41, 0x6e, 0x64, 0x51, 0x75, 0x61, 0x6e, 0x74, 0x12, 0x0e, + 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x16, + 0x0a, 0x06, 0x73, 0x63, 0x61, 0x6e, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, + 0x73, 0x63, 0x61, 0x6e, 0x49, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x71, 0x75, 0x61, 0x6e, 0x74, 0x49, + 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x71, 0x75, 0x61, 0x6e, 0x74, 0x49, 0x64, + 0x22, 0x85, 0x01, 0x0a, 0x0a, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x53, 0x74, 0x61, 0x74, 0x65, 0x12, + 0x2a, 0x0a, 0x10, 0x73, 0x68, 0x6f, 0x77, 0x50, 0x75, 0x72, 0x65, 0x45, 0x6c, 0x65, 0x6d, 0x65, + 0x6e, 0x74, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x10, 0x73, 0x68, 0x6f, 0x77, 0x50, + 0x75, 0x72, 0x65, 0x45, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x12, 0x14, 0x0a, 0x05, 0x6f, + 0x72, 0x64, 0x65, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x6f, 0x72, 0x64, 0x65, + 0x72, 0x12, 0x35, 0x0a, 0x0b, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x52, 0x4f, 0x49, 0x73, + 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x56, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, + 0x52, 0x4f, 0x49, 0x41, 0x6e, 0x64, 0x51, 0x75, 0x61, 0x6e, 0x74, 0x52, 0x0b, 0x76, 0x69, 0x73, + 0x69, 0x62, 0x6c, 0x65, 0x52, 0x4f, 0x49, 0x73, 0x22, 0x42, 0x0a, 0x12, 0x52, 0x4f, 0x49, 0x51, + 0x75, 0x61, 0x6e, 0x74, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x53, 0x74, 0x61, 0x74, 0x65, 0x12, 0x10, + 0x0a, 0x03, 0x72, 0x6f, 0x69, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x72, 0x6f, 0x69, + 0x12, 0x1a, 0x0a, 0x08, 0x71, 0x75, 0x61, 0x6e, 0x74, 0x49, 0x44, 0x73, 0x18, 0x02, 0x20, 0x03, + 0x28, 0x09, 0x52, 0x08, 0x71, 0x75, 0x61, 0x6e, 0x74, 0x49, 0x44, 0x73, 0x22, 0x85, 0x04, 0x0a, + 0x0e, 0x56, 0x61, 0x72, 0x69, 0x6f, 0x67, 0x72, 0x61, 0x6d, 0x53, 0x74, 0x61, 0x74, 0x65, 0x12, + 0x24, 0x0a, 0x0d, 0x65, 0x78, 0x70, 0x72, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x49, 0x44, 0x73, + 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0d, 0x65, 0x78, 0x70, 0x72, 0x65, 0x73, 0x73, 0x69, + 0x6f, 0x6e, 0x49, 0x44, 0x73, 0x12, 0x2d, 0x0a, 0x0b, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, + 0x52, 0x4f, 0x49, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x56, 0x69, 0x73, + 0x69, 0x62, 0x6c, 0x65, 0x52, 0x4f, 0x49, 0x52, 0x0b, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, + 0x52, 0x4f, 0x49, 0x73, 0x12, 0x1e, 0x0a, 0x0a, 0x76, 0x61, 0x72, 0x69, 0x6f, 0x4d, 0x6f, 0x64, + 0x65, 0x6c, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x76, 0x61, 0x72, 0x69, 0x6f, 0x4d, + 0x6f, 0x64, 0x65, 0x6c, 0x12, 0x20, 0x0a, 0x0b, 0x6d, 0x61, 0x78, 0x44, 0x69, 0x73, 0x74, 0x61, + 0x6e, 0x63, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x02, 0x52, 0x0b, 0x6d, 0x61, 0x78, 0x44, 0x69, + 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x62, 0x69, 0x6e, 0x43, 0x6f, 0x75, + 0x6e, 0x74, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x62, 0x69, 0x6e, 0x43, 0x6f, 0x75, + 0x6e, 0x74, 0x12, 0x26, 0x0a, 0x0e, 0x64, 0x72, 0x61, 0x77, 0x4d, 0x6f, 0x64, 0x65, 0x56, 0x65, + 0x63, 0x74, 0x6f, 0x72, 0x18, 0x06, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0e, 0x64, 0x72, 0x61, 0x77, + 0x4d, 0x6f, 0x64, 0x65, 0x56, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x12, 0x32, 0x0a, 0x14, 0x63, 0x6f, + 0x6d, 0x70, 0x61, 0x72, 0x69, 0x73, 0x6f, 0x6e, 0x41, 0x6c, 0x67, 0x6f, 0x72, 0x69, 0x74, 0x68, + 0x6d, 0x73, 0x18, 0x07, 0x20, 0x03, 0x28, 0x09, 0x52, 0x14, 0x63, 0x6f, 0x6d, 0x70, 0x61, 0x72, + 0x69, 0x73, 0x6f, 0x6e, 0x41, 0x6c, 0x67, 0x6f, 0x72, 0x69, 0x74, 0x68, 0x6d, 0x73, 0x12, 0x1e, + 0x0a, 0x0a, 0x6c, 0x69, 0x76, 0x65, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x18, 0x08, 0x20, 0x01, + 0x28, 0x08, 0x52, 0x0a, 0x6c, 0x69, 0x76, 0x65, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x12, 0x2c, + 0x0a, 0x11, 0x64, 0x69, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x53, 0x6c, 0x69, 0x64, 0x65, 0x72, + 0x4d, 0x69, 0x6e, 0x18, 0x09, 0x20, 0x01, 0x28, 0x02, 0x52, 0x11, 0x64, 0x69, 0x73, 0x74, 0x61, + 0x6e, 0x63, 0x65, 0x53, 0x6c, 0x69, 0x64, 0x65, 0x72, 0x4d, 0x69, 0x6e, 0x12, 0x2c, 0x0a, 0x11, + 0x64, 0x69, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x53, 0x6c, 0x69, 0x64, 0x65, 0x72, 0x4d, 0x61, + 0x78, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x02, 0x52, 0x11, 0x64, 0x69, 0x73, 0x74, 0x61, 0x6e, 0x63, + 0x65, 0x53, 0x6c, 0x69, 0x64, 0x65, 0x72, 0x4d, 0x61, 0x78, 0x12, 0x22, 0x0a, 0x0c, 0x62, 0x69, + 0x6e, 0x53, 0x6c, 0x69, 0x64, 0x65, 0x72, 0x4d, 0x69, 0x6e, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x02, + 0x52, 0x0c, 0x62, 0x69, 0x6e, 0x53, 0x6c, 0x69, 0x64, 0x65, 0x72, 0x4d, 0x69, 0x6e, 0x12, 0x22, + 0x0a, 0x0c, 0x62, 0x69, 0x6e, 0x53, 0x6c, 0x69, 0x64, 0x65, 0x72, 0x4d, 0x61, 0x78, 0x18, 0x0c, + 0x20, 0x01, 0x28, 0x02, 0x52, 0x0c, 0x62, 0x69, 0x6e, 0x53, 0x6c, 0x69, 0x64, 0x65, 0x72, 0x4d, + 0x61, 0x78, 0x12, 0x20, 0x0a, 0x0b, 0x64, 0x72, 0x61, 0x77, 0x42, 0x65, 0x73, 0x74, 0x46, 0x69, + 0x74, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0b, 0x64, 0x72, 0x61, 0x77, 0x42, 0x65, 0x73, + 0x74, 0x46, 0x69, 0x74, 0x22, 0x86, 0x02, 0x0a, 0x12, 0x4d, 0x61, 0x70, 0x4c, 0x61, 0x79, 0x65, + 0x72, 0x56, 0x69, 0x73, 0x69, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79, 0x12, 0x22, 0x0a, 0x0c, 0x65, + 0x78, 0x70, 0x72, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x49, 0x44, 0x18, 0x01, 0x20, 0x01, 0x28, + 0x09, 0x52, 0x0c, 0x65, 0x78, 0x70, 0x72, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x49, 0x44, 0x12, + 0x18, 0x0a, 0x07, 0x6f, 0x70, 0x61, 0x63, 0x69, 0x74, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x02, + 0x52, 0x07, 0x6f, 0x70, 0x61, 0x63, 0x69, 0x74, 0x79, 0x12, 0x18, 0x0a, 0x07, 0x76, 0x69, 0x73, + 0x69, 0x62, 0x6c, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x07, 0x76, 0x69, 0x73, 0x69, + 0x62, 0x6c, 0x65, 0x12, 0x32, 0x0a, 0x14, 0x64, 0x69, 0x73, 0x70, 0x6c, 0x61, 0x79, 0x56, 0x61, + 0x6c, 0x75, 0x65, 0x52, 0x61, 0x6e, 0x67, 0x65, 0x4d, 0x69, 0x6e, 0x18, 0x04, 0x20, 0x01, 0x28, + 0x02, 0x52, 0x14, 0x64, 0x69, 0x73, 0x70, 0x6c, 0x61, 0x79, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, + 0x61, 0x6e, 0x67, 0x65, 0x4d, 0x69, 0x6e, 0x12, 0x32, 0x0a, 0x14, 0x64, 0x69, 0x73, 0x70, 0x6c, + 0x61, 0x79, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x61, 0x6e, 0x67, 0x65, 0x4d, 0x61, 0x78, 0x18, + 0x05, 0x20, 0x01, 0x28, 0x02, 0x52, 0x14, 0x64, 0x69, 0x73, 0x70, 0x6c, 0x61, 0x79, 0x56, 0x61, + 0x6c, 0x75, 0x65, 0x52, 0x61, 0x6e, 0x67, 0x65, 0x4d, 0x61, 0x78, 0x12, 0x30, 0x0a, 0x13, 0x64, + 0x69, 0x73, 0x70, 0x6c, 0x61, 0x79, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x53, 0x68, 0x61, 0x64, 0x69, + 0x6e, 0x67, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x13, 0x64, 0x69, 0x73, 0x70, 0x6c, 0x61, + 0x79, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x53, 0x68, 0x61, 0x64, 0x69, 0x6e, 0x67, 0x22, 0x70, 0x0a, + 0x12, 0x52, 0x4f, 0x49, 0x4c, 0x61, 0x79, 0x65, 0x72, 0x56, 0x69, 0x73, 0x69, 0x62, 0x69, 0x6c, + 0x69, 0x74, 0x79, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, + 0x02, 0x69, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x6f, 0x70, 0x61, 0x63, 0x69, 0x74, 0x79, 0x18, 0x02, + 0x20, 0x01, 0x28, 0x02, 0x52, 0x07, 0x6f, 0x70, 0x61, 0x63, 0x69, 0x74, 0x79, 0x12, 0x18, 0x0a, + 0x07, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x07, + 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x73, 0x63, 0x61, 0x6e, 0x49, + 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x73, 0x63, 0x61, 0x6e, 0x49, 0x64, 0x22, + 0x83, 0x07, 0x0a, 0x11, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x49, 0x6d, 0x61, 0x67, 0x65, + 0x53, 0x74, 0x61, 0x74, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x70, 0x61, 0x6e, 0x58, 0x18, 0x01, 0x20, + 0x01, 0x28, 0x02, 0x52, 0x04, 0x70, 0x61, 0x6e, 0x58, 0x12, 0x12, 0x0a, 0x04, 0x70, 0x61, 0x6e, + 0x59, 0x18, 0x02, 0x20, 0x01, 0x28, 0x02, 0x52, 0x04, 0x70, 0x61, 0x6e, 0x59, 0x12, 0x14, 0x0a, + 0x05, 0x7a, 0x6f, 0x6f, 0x6d, 0x58, 0x18, 0x03, 0x20, 0x01, 0x28, 0x02, 0x52, 0x05, 0x7a, 0x6f, + 0x6f, 0x6d, 0x58, 0x12, 0x14, 0x0a, 0x05, 0x7a, 0x6f, 0x6f, 0x6d, 0x59, 0x18, 0x04, 0x20, 0x01, + 0x28, 0x02, 0x52, 0x05, 0x7a, 0x6f, 0x6f, 0x6d, 0x59, 0x12, 0x1e, 0x0a, 0x0a, 0x73, 0x68, 0x6f, + 0x77, 0x50, 0x6f, 0x69, 0x6e, 0x74, 0x73, 0x18, 0x05, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0a, 0x73, + 0x68, 0x6f, 0x77, 0x50, 0x6f, 0x69, 0x6e, 0x74, 0x73, 0x12, 0x24, 0x0a, 0x0d, 0x73, 0x68, 0x6f, + 0x77, 0x50, 0x6f, 0x69, 0x6e, 0x74, 0x42, 0x42, 0x6f, 0x78, 0x18, 0x06, 0x20, 0x01, 0x28, 0x08, + 0x52, 0x0d, 0x73, 0x68, 0x6f, 0x77, 0x50, 0x6f, 0x69, 0x6e, 0x74, 0x42, 0x42, 0x6f, 0x78, 0x12, + 0x2c, 0x0a, 0x11, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x43, 0x6f, 0x6c, 0x6f, 0x75, 0x72, 0x53, 0x63, + 0x68, 0x65, 0x6d, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x11, 0x70, 0x6f, 0x69, 0x6e, + 0x74, 0x43, 0x6f, 0x6c, 0x6f, 0x75, 0x72, 0x53, 0x63, 0x68, 0x65, 0x6d, 0x65, 0x12, 0x34, 0x0a, + 0x15, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x42, 0x42, 0x6f, 0x78, 0x43, 0x6f, 0x6c, 0x6f, 0x75, 0x72, + 0x53, 0x63, 0x68, 0x65, 0x6d, 0x65, 0x18, 0x08, 0x20, 0x01, 0x28, 0x09, 0x52, 0x15, 0x70, 0x6f, + 0x69, 0x6e, 0x74, 0x42, 0x42, 0x6f, 0x78, 0x43, 0x6f, 0x6c, 0x6f, 0x75, 0x72, 0x53, 0x63, 0x68, + 0x65, 0x6d, 0x65, 0x12, 0x22, 0x0a, 0x0c, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x49, 0x6d, + 0x61, 0x67, 0x65, 0x18, 0x09, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x63, 0x6f, 0x6e, 0x74, 0x65, + 0x78, 0x74, 0x49, 0x6d, 0x61, 0x67, 0x65, 0x12, 0x34, 0x0a, 0x15, 0x63, 0x6f, 0x6e, 0x74, 0x65, + 0x78, 0x74, 0x49, 0x6d, 0x61, 0x67, 0x65, 0x53, 0x6d, 0x6f, 0x6f, 0x74, 0x68, 0x69, 0x6e, 0x67, + 0x18, 0x0a, 0x20, 0x01, 0x28, 0x09, 0x52, 0x15, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x49, + 0x6d, 0x61, 0x67, 0x65, 0x53, 0x6d, 0x6f, 0x6f, 0x74, 0x68, 0x69, 0x6e, 0x67, 0x12, 0x31, 0x0a, + 0x09, 0x6d, 0x61, 0x70, 0x4c, 0x61, 0x79, 0x65, 0x72, 0x73, 0x18, 0x0b, 0x20, 0x03, 0x28, 0x0b, + 0x32, 0x13, 0x2e, 0x4d, 0x61, 0x70, 0x4c, 0x61, 0x79, 0x65, 0x72, 0x56, 0x69, 0x73, 0x69, 0x62, + 0x69, 0x6c, 0x69, 0x74, 0x79, 0x52, 0x09, 0x6d, 0x61, 0x70, 0x4c, 0x61, 0x79, 0x65, 0x72, 0x73, + 0x12, 0x31, 0x0a, 0x09, 0x72, 0x6f, 0x69, 0x4c, 0x61, 0x79, 0x65, 0x72, 0x73, 0x18, 0x0c, 0x20, + 0x03, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x52, 0x4f, 0x49, 0x4c, 0x61, 0x79, 0x65, 0x72, 0x56, 0x69, + 0x73, 0x69, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79, 0x52, 0x09, 0x72, 0x6f, 0x69, 0x4c, 0x61, 0x79, + 0x65, 0x72, 0x73, 0x12, 0x36, 0x0a, 0x16, 0x65, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x65, + 0x6c, 0x61, 0x74, 0x69, 0x76, 0x65, 0x53, 0x68, 0x61, 0x64, 0x69, 0x6e, 0x67, 0x18, 0x0d, 0x20, + 0x01, 0x28, 0x08, 0x52, 0x16, 0x65, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x6c, 0x61, + 0x74, 0x69, 0x76, 0x65, 0x53, 0x68, 0x61, 0x64, 0x69, 0x6e, 0x67, 0x12, 0x1e, 0x0a, 0x0a, 0x62, + 0x72, 0x69, 0x67, 0x68, 0x74, 0x6e, 0x65, 0x73, 0x73, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x02, 0x52, + 0x0a, 0x62, 0x72, 0x69, 0x67, 0x68, 0x74, 0x6e, 0x65, 0x73, 0x73, 0x12, 0x22, 0x0a, 0x0c, 0x72, + 0x67, 0x62, 0x75, 0x43, 0x68, 0x61, 0x6e, 0x6e, 0x65, 0x6c, 0x73, 0x18, 0x0f, 0x20, 0x01, 0x28, + 0x09, 0x52, 0x0c, 0x72, 0x67, 0x62, 0x75, 0x43, 0x68, 0x61, 0x6e, 0x6e, 0x65, 0x6c, 0x73, 0x12, + 0x2c, 0x0a, 0x11, 0x75, 0x6e, 0x73, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x65, 0x64, 0x4f, 0x70, 0x61, + 0x63, 0x69, 0x74, 0x79, 0x18, 0x10, 0x20, 0x01, 0x28, 0x02, 0x52, 0x11, 0x75, 0x6e, 0x73, 0x65, + 0x6c, 0x65, 0x63, 0x74, 0x65, 0x64, 0x4f, 0x70, 0x61, 0x63, 0x69, 0x74, 0x79, 0x12, 0x30, 0x0a, + 0x13, 0x75, 0x6e, 0x73, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x65, 0x64, 0x47, 0x72, 0x61, 0x79, 0x73, + 0x63, 0x61, 0x6c, 0x65, 0x18, 0x11, 0x20, 0x01, 0x28, 0x08, 0x52, 0x13, 0x75, 0x6e, 0x73, 0x65, + 0x6c, 0x65, 0x63, 0x74, 0x65, 0x64, 0x47, 0x72, 0x61, 0x79, 0x73, 0x63, 0x61, 0x6c, 0x65, 0x12, + 0x26, 0x0a, 0x0e, 0x63, 0x6f, 0x6c, 0x6f, 0x75, 0x72, 0x52, 0x61, 0x74, 0x69, 0x6f, 0x4d, 0x69, + 0x6e, 0x18, 0x12, 0x20, 0x01, 0x28, 0x02, 0x52, 0x0e, 0x63, 0x6f, 0x6c, 0x6f, 0x75, 0x72, 0x52, + 0x61, 0x74, 0x69, 0x6f, 0x4d, 0x69, 0x6e, 0x12, 0x26, 0x0a, 0x0e, 0x63, 0x6f, 0x6c, 0x6f, 0x75, + 0x72, 0x52, 0x61, 0x74, 0x69, 0x6f, 0x4d, 0x61, 0x78, 0x18, 0x13, 0x20, 0x01, 0x28, 0x02, 0x52, + 0x0e, 0x63, 0x6f, 0x6c, 0x6f, 0x75, 0x72, 0x52, 0x61, 0x74, 0x69, 0x6f, 0x4d, 0x61, 0x78, 0x12, + 0x3e, 0x0a, 0x1a, 0x72, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x54, 0x6f, 0x70, 0x53, 0x70, 0x65, 0x63, + 0x75, 0x6c, 0x61, 0x72, 0x41, 0x72, 0x74, 0x69, 0x66, 0x61, 0x63, 0x74, 0x73, 0x18, 0x14, 0x20, + 0x01, 0x28, 0x08, 0x52, 0x1a, 0x72, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x54, 0x6f, 0x70, 0x53, 0x70, + 0x65, 0x63, 0x75, 0x6c, 0x61, 0x72, 0x41, 0x72, 0x74, 0x69, 0x66, 0x61, 0x63, 0x74, 0x73, 0x12, + 0x44, 0x0a, 0x1d, 0x72, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x42, 0x6f, 0x74, 0x74, 0x6f, 0x6d, 0x53, + 0x70, 0x65, 0x63, 0x75, 0x6c, 0x61, 0x72, 0x41, 0x72, 0x74, 0x69, 0x66, 0x61, 0x63, 0x74, 0x73, + 0x18, 0x15, 0x20, 0x01, 0x28, 0x08, 0x52, 0x1d, 0x72, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x42, 0x6f, + 0x74, 0x74, 0x6f, 0x6d, 0x53, 0x70, 0x65, 0x63, 0x75, 0x6c, 0x61, 0x72, 0x41, 0x72, 0x74, 0x69, + 0x66, 0x61, 0x63, 0x74, 0x73, 0x22, 0x73, 0x0a, 0x0f, 0x41, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, + 0x69, 0x6f, 0x6e, 0x50, 0x6f, 0x69, 0x6e, 0x74, 0x12, 0x0c, 0x0a, 0x01, 0x78, 0x18, 0x01, 0x20, + 0x01, 0x28, 0x02, 0x52, 0x01, 0x78, 0x12, 0x0c, 0x0a, 0x01, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, + 0x02, 0x52, 0x01, 0x79, 0x12, 0x20, 0x0a, 0x0b, 0x73, 0x63, 0x72, 0x65, 0x65, 0x6e, 0x57, 0x69, + 0x64, 0x74, 0x68, 0x18, 0x03, 0x20, 0x01, 0x28, 0x02, 0x52, 0x0b, 0x73, 0x63, 0x72, 0x65, 0x65, + 0x6e, 0x57, 0x69, 0x64, 0x74, 0x68, 0x12, 0x22, 0x0a, 0x0c, 0x73, 0x63, 0x72, 0x65, 0x65, 0x6e, + 0x48, 0x65, 0x69, 0x67, 0x68, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x02, 0x52, 0x0c, 0x73, 0x63, + 0x72, 0x65, 0x65, 0x6e, 0x48, 0x65, 0x69, 0x67, 0x68, 0x74, 0x22, 0xcc, 0x01, 0x0a, 0x18, 0x46, 0x75, 0x6c, 0x6c, 0x53, 0x63, 0x72, 0x65, 0x65, 0x6e, 0x41, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, - 0x69, 0x6f, 0x6e, 0x49, 0x74, 0x65, 0x6d, 0x52, 0x10, 0x73, 0x61, 0x76, 0x65, 0x64, 0x41, 0x6e, - 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, 0x8f, 0x02, 0x0a, 0x0f, 0x52, 0x4f, - 0x49, 0x44, 0x69, 0x73, 0x70, 0x6c, 0x61, 0x79, 0x53, 0x74, 0x61, 0x74, 0x65, 0x12, 0x40, 0x0a, - 0x0a, 0x72, 0x6f, 0x69, 0x43, 0x6f, 0x6c, 0x6f, 0x75, 0x72, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, - 0x0b, 0x32, 0x20, 0x2e, 0x52, 0x4f, 0x49, 0x44, 0x69, 0x73, 0x70, 0x6c, 0x61, 0x79, 0x53, 0x74, - 0x61, 0x74, 0x65, 0x2e, 0x52, 0x6f, 0x69, 0x43, 0x6f, 0x6c, 0x6f, 0x75, 0x72, 0x73, 0x45, 0x6e, - 0x74, 0x72, 0x79, 0x52, 0x0a, 0x72, 0x6f, 0x69, 0x43, 0x6f, 0x6c, 0x6f, 0x75, 0x72, 0x73, 0x12, - 0x3d, 0x0a, 0x09, 0x72, 0x6f, 0x69, 0x53, 0x68, 0x61, 0x70, 0x65, 0x73, 0x18, 0x02, 0x20, 0x03, - 0x28, 0x0b, 0x32, 0x1f, 0x2e, 0x52, 0x4f, 0x49, 0x44, 0x69, 0x73, 0x70, 0x6c, 0x61, 0x79, 0x53, - 0x74, 0x61, 0x74, 0x65, 0x2e, 0x52, 0x6f, 0x69, 0x53, 0x68, 0x61, 0x70, 0x65, 0x73, 0x45, 0x6e, - 0x74, 0x72, 0x79, 0x52, 0x09, 0x72, 0x6f, 0x69, 0x53, 0x68, 0x61, 0x70, 0x65, 0x73, 0x1a, 0x3d, - 0x0a, 0x0f, 0x52, 0x6f, 0x69, 0x43, 0x6f, 0x6c, 0x6f, 0x75, 0x72, 0x73, 0x45, 0x6e, 0x74, 0x72, - 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, - 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, - 0x28, 0x09, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x3c, 0x0a, - 0x0e, 0x52, 0x6f, 0x69, 0x53, 0x68, 0x61, 0x70, 0x65, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, - 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, - 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, - 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0xa7, 0x03, 0x0a, 0x13, - 0x52, 0x47, 0x42, 0x55, 0x50, 0x6c, 0x6f, 0x74, 0x57, 0x69, 0x64, 0x67, 0x65, 0x74, 0x53, 0x74, - 0x61, 0x74, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x6d, 0x69, 0x6e, 0x65, 0x72, 0x61, 0x6c, 0x73, 0x18, - 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x08, 0x6d, 0x69, 0x6e, 0x65, 0x72, 0x61, 0x6c, 0x73, 0x12, - 0x1c, 0x0a, 0x09, 0x79, 0x43, 0x68, 0x61, 0x6e, 0x6e, 0x65, 0x6c, 0x41, 0x18, 0x02, 0x20, 0x01, - 0x28, 0x09, 0x52, 0x09, 0x79, 0x43, 0x68, 0x61, 0x6e, 0x6e, 0x65, 0x6c, 0x41, 0x12, 0x1c, 0x0a, - 0x09, 0x79, 0x43, 0x68, 0x61, 0x6e, 0x6e, 0x65, 0x6c, 0x42, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, - 0x52, 0x09, 0x79, 0x43, 0x68, 0x61, 0x6e, 0x6e, 0x65, 0x6c, 0x42, 0x12, 0x1c, 0x0a, 0x09, 0x78, - 0x43, 0x68, 0x61, 0x6e, 0x6e, 0x65, 0x6c, 0x41, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, - 0x78, 0x43, 0x68, 0x61, 0x6e, 0x6e, 0x65, 0x6c, 0x41, 0x12, 0x1c, 0x0a, 0x09, 0x78, 0x43, 0x68, - 0x61, 0x6e, 0x6e, 0x65, 0x6c, 0x42, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x78, 0x43, - 0x68, 0x61, 0x6e, 0x6e, 0x65, 0x6c, 0x42, 0x12, 0x26, 0x0a, 0x0e, 0x64, 0x72, 0x61, 0x77, 0x4d, - 0x6f, 0x6e, 0x6f, 0x63, 0x68, 0x72, 0x6f, 0x6d, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x08, 0x52, - 0x0e, 0x64, 0x72, 0x61, 0x77, 0x4d, 0x6f, 0x6e, 0x6f, 0x63, 0x68, 0x72, 0x6f, 0x6d, 0x65, 0x12, - 0x2c, 0x0a, 0x11, 0x73, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x65, 0x64, 0x4d, 0x69, 0x6e, 0x58, 0x56, - 0x61, 0x6c, 0x75, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x02, 0x52, 0x11, 0x73, 0x65, 0x6c, 0x65, - 0x63, 0x74, 0x65, 0x64, 0x4d, 0x69, 0x6e, 0x58, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x2c, 0x0a, - 0x11, 0x73, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x65, 0x64, 0x4d, 0x61, 0x78, 0x58, 0x56, 0x61, 0x6c, - 0x75, 0x65, 0x18, 0x08, 0x20, 0x01, 0x28, 0x02, 0x52, 0x11, 0x73, 0x65, 0x6c, 0x65, 0x63, 0x74, - 0x65, 0x64, 0x4d, 0x61, 0x78, 0x58, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x2c, 0x0a, 0x11, 0x73, - 0x65, 0x6c, 0x65, 0x63, 0x74, 0x65, 0x64, 0x4d, 0x69, 0x6e, 0x59, 0x56, 0x61, 0x6c, 0x75, 0x65, - 0x18, 0x09, 0x20, 0x01, 0x28, 0x02, 0x52, 0x11, 0x73, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x65, 0x64, - 0x4d, 0x69, 0x6e, 0x59, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x2c, 0x0a, 0x11, 0x73, 0x65, 0x6c, - 0x65, 0x63, 0x74, 0x65, 0x64, 0x4d, 0x61, 0x78, 0x59, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x0a, - 0x20, 0x01, 0x28, 0x02, 0x52, 0x11, 0x73, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x65, 0x64, 0x4d, 0x61, - 0x78, 0x59, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x69, 0x6d, 0x61, 0x67, 0x65, - 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x69, 0x6d, 0x61, 0x67, - 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x22, 0xdf, 0x02, 0x0a, 0x19, 0x53, 0x69, 0x6e, 0x67, 0x6c, 0x65, - 0x41, 0x78, 0x69, 0x73, 0x52, 0x47, 0x42, 0x55, 0x57, 0x69, 0x64, 0x67, 0x65, 0x74, 0x53, 0x74, - 0x61, 0x74, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x6d, 0x69, 0x6e, 0x65, 0x72, 0x61, 0x6c, 0x73, 0x18, - 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x08, 0x6d, 0x69, 0x6e, 0x65, 0x72, 0x61, 0x6c, 0x73, 0x12, - 0x1a, 0x0a, 0x08, 0x63, 0x68, 0x61, 0x6e, 0x6e, 0x65, 0x6c, 0x41, 0x18, 0x02, 0x20, 0x01, 0x28, - 0x09, 0x52, 0x08, 0x63, 0x68, 0x61, 0x6e, 0x6e, 0x65, 0x6c, 0x41, 0x12, 0x1a, 0x0a, 0x08, 0x63, - 0x68, 0x61, 0x6e, 0x6e, 0x65, 0x6c, 0x42, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x63, - 0x68, 0x61, 0x6e, 0x6e, 0x65, 0x6c, 0x42, 0x12, 0x2c, 0x0a, 0x11, 0x72, 0x6f, 0x69, 0x53, 0x74, - 0x61, 0x63, 0x6b, 0x65, 0x64, 0x4f, 0x76, 0x65, 0x72, 0x6c, 0x61, 0x70, 0x18, 0x04, 0x20, 0x01, - 0x28, 0x08, 0x52, 0x11, 0x72, 0x6f, 0x69, 0x53, 0x74, 0x61, 0x63, 0x6b, 0x65, 0x64, 0x4f, 0x76, - 0x65, 0x72, 0x6c, 0x61, 0x70, 0x12, 0x1c, 0x0a, 0x09, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x4e, 0x61, - 0x6d, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x4e, - 0x61, 0x6d, 0x65, 0x12, 0x2a, 0x0a, 0x10, 0x73, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x65, 0x64, 0x4d, - 0x69, 0x6e, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x02, 0x52, 0x10, 0x73, - 0x65, 0x6c, 0x65, 0x63, 0x74, 0x65, 0x64, 0x4d, 0x69, 0x6e, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x12, - 0x2a, 0x0a, 0x10, 0x73, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x65, 0x64, 0x4d, 0x61, 0x78, 0x56, 0x61, - 0x6c, 0x75, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x02, 0x52, 0x10, 0x73, 0x65, 0x6c, 0x65, 0x63, - 0x74, 0x65, 0x64, 0x4d, 0x61, 0x78, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x72, - 0x6f, 0x69, 0x49, 0x64, 0x73, 0x18, 0x08, 0x20, 0x03, 0x28, 0x09, 0x52, 0x06, 0x72, 0x6f, 0x69, - 0x49, 0x64, 0x73, 0x12, 0x32, 0x0a, 0x14, 0x73, 0x68, 0x6f, 0x77, 0x41, 0x6c, 0x6c, 0x4d, 0x69, - 0x6e, 0x65, 0x72, 0x61, 0x6c, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x73, 0x18, 0x09, 0x20, 0x01, 0x28, - 0x08, 0x52, 0x14, 0x73, 0x68, 0x6f, 0x77, 0x41, 0x6c, 0x6c, 0x4d, 0x69, 0x6e, 0x65, 0x72, 0x61, - 0x6c, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x73, 0x22, 0x55, 0x0a, 0x15, 0x52, 0x47, 0x42, 0x55, 0x49, - 0x6d, 0x61, 0x67, 0x65, 0x73, 0x57, 0x69, 0x64, 0x67, 0x65, 0x74, 0x53, 0x74, 0x61, 0x74, 0x65, - 0x12, 0x1e, 0x0a, 0x0a, 0x62, 0x72, 0x69, 0x67, 0x68, 0x74, 0x6e, 0x65, 0x73, 0x73, 0x18, 0x02, - 0x20, 0x01, 0x28, 0x02, 0x52, 0x0a, 0x62, 0x72, 0x69, 0x67, 0x68, 0x74, 0x6e, 0x65, 0x73, 0x73, - 0x12, 0x1c, 0x0a, 0x09, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x03, 0x20, - 0x01, 0x28, 0x09, 0x52, 0x09, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x22, 0x6e, - 0x0a, 0x18, 0x50, 0x61, 0x72, 0x61, 0x6c, 0x6c, 0x65, 0x6c, 0x6f, 0x67, 0x72, 0x61, 0x6d, 0x57, - 0x69, 0x64, 0x67, 0x65, 0x74, 0x53, 0x74, 0x61, 0x74, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x72, 0x65, - 0x67, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x07, 0x72, 0x65, 0x67, - 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x1a, 0x0a, 0x08, 0x63, 0x68, 0x61, 0x6e, 0x6e, 0x65, 0x6c, 0x73, - 0x18, 0x02, 0x20, 0x03, 0x28, 0x09, 0x52, 0x08, 0x63, 0x68, 0x61, 0x6e, 0x6e, 0x65, 0x6c, 0x73, - 0x12, 0x1c, 0x0a, 0x09, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x03, 0x20, - 0x01, 0x28, 0x09, 0x52, 0x09, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x22, 0xa1, - 0x05, 0x0a, 0x0a, 0x57, 0x69, 0x64, 0x67, 0x65, 0x74, 0x44, 0x61, 0x74, 0x61, 0x12, 0x0e, 0x0a, - 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x30, 0x0a, - 0x08, 0x73, 0x70, 0x65, 0x63, 0x74, 0x72, 0x75, 0x6d, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, - 0x14, 0x2e, 0x53, 0x70, 0x65, 0x63, 0x74, 0x72, 0x75, 0x6d, 0x57, 0x69, 0x64, 0x67, 0x65, 0x74, - 0x53, 0x74, 0x61, 0x74, 0x65, 0x52, 0x08, 0x73, 0x70, 0x65, 0x63, 0x74, 0x72, 0x75, 0x6d, 0x12, - 0x24, 0x0a, 0x06, 0x62, 0x69, 0x6e, 0x61, 0x72, 0x79, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, - 0x0c, 0x2e, 0x42, 0x69, 0x6e, 0x61, 0x72, 0x79, 0x53, 0x74, 0x61, 0x74, 0x65, 0x52, 0x06, 0x62, - 0x69, 0x6e, 0x61, 0x72, 0x79, 0x12, 0x27, 0x0a, 0x07, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x72, 0x79, - 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x54, 0x65, 0x72, 0x6e, 0x61, 0x72, 0x79, - 0x53, 0x74, 0x61, 0x74, 0x65, 0x52, 0x07, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x72, 0x79, 0x12, 0x2d, - 0x0a, 0x09, 0x68, 0x69, 0x73, 0x74, 0x6f, 0x67, 0x72, 0x61, 0x6d, 0x18, 0x05, 0x20, 0x01, 0x28, - 0x0b, 0x32, 0x0f, 0x2e, 0x48, 0x69, 0x73, 0x74, 0x6f, 0x67, 0x72, 0x61, 0x6d, 0x53, 0x74, 0x61, - 0x74, 0x65, 0x52, 0x09, 0x68, 0x69, 0x73, 0x74, 0x6f, 0x67, 0x72, 0x61, 0x6d, 0x12, 0x36, 0x0a, - 0x0c, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x49, 0x6d, 0x61, 0x67, 0x65, 0x18, 0x06, 0x20, - 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x49, 0x6d, 0x61, - 0x67, 0x65, 0x53, 0x74, 0x61, 0x74, 0x65, 0x52, 0x0c, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, - 0x49, 0x6d, 0x61, 0x67, 0x65, 0x12, 0x21, 0x0a, 0x05, 0x63, 0x68, 0x6f, 0x72, 0x64, 0x18, 0x07, - 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x43, 0x68, 0x6f, 0x72, 0x64, 0x53, 0x74, 0x61, 0x74, - 0x65, 0x52, 0x05, 0x63, 0x68, 0x6f, 0x72, 0x64, 0x12, 0x21, 0x0a, 0x05, 0x74, 0x61, 0x62, 0x6c, - 0x65, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x53, - 0x74, 0x61, 0x74, 0x65, 0x52, 0x05, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x12, 0x39, 0x0a, 0x0d, 0x72, - 0x6f, 0x69, 0x51, 0x75, 0x61, 0x6e, 0x74, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x18, 0x09, 0x20, 0x01, - 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x52, 0x4f, 0x49, 0x51, 0x75, 0x61, 0x6e, 0x74, 0x54, 0x61, 0x62, - 0x6c, 0x65, 0x53, 0x74, 0x61, 0x74, 0x65, 0x52, 0x0d, 0x72, 0x6f, 0x69, 0x51, 0x75, 0x61, 0x6e, - 0x74, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x12, 0x2d, 0x0a, 0x09, 0x76, 0x61, 0x72, 0x69, 0x6f, 0x67, - 0x72, 0x61, 0x6d, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x56, 0x61, 0x72, 0x69, - 0x6f, 0x67, 0x72, 0x61, 0x6d, 0x53, 0x74, 0x61, 0x74, 0x65, 0x52, 0x09, 0x76, 0x61, 0x72, 0x69, - 0x6f, 0x67, 0x72, 0x61, 0x6d, 0x12, 0x30, 0x0a, 0x08, 0x72, 0x67, 0x62, 0x75, 0x50, 0x6c, 0x6f, - 0x74, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x52, 0x47, 0x42, 0x55, 0x50, 0x6c, - 0x6f, 0x74, 0x57, 0x69, 0x64, 0x67, 0x65, 0x74, 0x53, 0x74, 0x61, 0x74, 0x65, 0x52, 0x08, 0x72, - 0x67, 0x62, 0x75, 0x50, 0x6c, 0x6f, 0x74, 0x12, 0x42, 0x0a, 0x0e, 0x73, 0x69, 0x6e, 0x67, 0x6c, - 0x65, 0x41, 0x78, 0x69, 0x73, 0x52, 0x47, 0x42, 0x55, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x0b, 0x32, - 0x1a, 0x2e, 0x53, 0x69, 0x6e, 0x67, 0x6c, 0x65, 0x41, 0x78, 0x69, 0x73, 0x52, 0x47, 0x42, 0x55, - 0x57, 0x69, 0x64, 0x67, 0x65, 0x74, 0x53, 0x74, 0x61, 0x74, 0x65, 0x52, 0x0e, 0x73, 0x69, 0x6e, - 0x67, 0x6c, 0x65, 0x41, 0x78, 0x69, 0x73, 0x52, 0x47, 0x42, 0x55, 0x12, 0x34, 0x0a, 0x09, 0x72, - 0x67, 0x62, 0x75, 0x49, 0x6d, 0x61, 0x67, 0x65, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x16, - 0x2e, 0x52, 0x47, 0x42, 0x55, 0x49, 0x6d, 0x61, 0x67, 0x65, 0x73, 0x57, 0x69, 0x64, 0x67, 0x65, - 0x74, 0x53, 0x74, 0x61, 0x74, 0x65, 0x52, 0x09, 0x72, 0x67, 0x62, 0x75, 0x49, 0x6d, 0x61, 0x67, - 0x65, 0x12, 0x3f, 0x0a, 0x0d, 0x70, 0x61, 0x72, 0x61, 0x6c, 0x6c, 0x65, 0x6c, 0x6f, 0x67, 0x72, - 0x61, 0x6d, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x50, 0x61, 0x72, 0x61, 0x6c, - 0x6c, 0x65, 0x6c, 0x6f, 0x67, 0x72, 0x61, 0x6d, 0x57, 0x69, 0x64, 0x67, 0x65, 0x74, 0x53, 0x74, - 0x61, 0x74, 0x65, 0x52, 0x0d, 0x70, 0x61, 0x72, 0x61, 0x6c, 0x6c, 0x65, 0x6c, 0x6f, 0x67, 0x72, - 0x61, 0x6d, 0x42, 0x0a, 0x5a, 0x08, 0x2e, 0x3b, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x73, 0x62, 0x06, - 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x69, 0x6f, 0x6e, 0x49, 0x74, 0x65, 0x6d, 0x12, 0x12, 0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x18, + 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x74, 0x79, 0x70, 0x65, 0x12, 0x28, 0x0a, 0x06, 0x70, + 0x6f, 0x69, 0x6e, 0x74, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x41, 0x6e, + 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x50, 0x6f, 0x69, 0x6e, 0x74, 0x52, 0x06, 0x70, + 0x6f, 0x69, 0x6e, 0x74, 0x73, 0x12, 0x16, 0x0a, 0x06, 0x63, 0x6f, 0x6c, 0x6f, 0x75, 0x72, 0x18, + 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x63, 0x6f, 0x6c, 0x6f, 0x75, 0x72, 0x12, 0x1a, 0x0a, + 0x08, 0x63, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x08, 0x52, + 0x08, 0x63, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x74, 0x65, 0x78, + 0x74, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x74, 0x65, 0x78, 0x74, 0x12, 0x1a, 0x0a, + 0x08, 0x66, 0x6f, 0x6e, 0x74, 0x53, 0x69, 0x7a, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, + 0x08, 0x66, 0x6f, 0x6e, 0x74, 0x53, 0x69, 0x7a, 0x65, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, + 0x07, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x69, 0x64, 0x22, 0x5f, 0x0a, 0x16, 0x41, 0x6e, 0x6e, + 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x44, 0x69, 0x73, 0x70, 0x6c, 0x61, 0x79, 0x53, 0x74, + 0x61, 0x74, 0x65, 0x12, 0x45, 0x0a, 0x10, 0x73, 0x61, 0x76, 0x65, 0x64, 0x41, 0x6e, 0x6e, 0x6f, + 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x19, 0x2e, + 0x46, 0x75, 0x6c, 0x6c, 0x53, 0x63, 0x72, 0x65, 0x65, 0x6e, 0x41, 0x6e, 0x6e, 0x6f, 0x74, 0x61, + 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x74, 0x65, 0x6d, 0x52, 0x10, 0x73, 0x61, 0x76, 0x65, 0x64, 0x41, + 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, 0x8f, 0x02, 0x0a, 0x0f, 0x52, + 0x4f, 0x49, 0x44, 0x69, 0x73, 0x70, 0x6c, 0x61, 0x79, 0x53, 0x74, 0x61, 0x74, 0x65, 0x12, 0x40, + 0x0a, 0x0a, 0x72, 0x6f, 0x69, 0x43, 0x6f, 0x6c, 0x6f, 0x75, 0x72, 0x73, 0x18, 0x01, 0x20, 0x03, + 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x52, 0x4f, 0x49, 0x44, 0x69, 0x73, 0x70, 0x6c, 0x61, 0x79, 0x53, + 0x74, 0x61, 0x74, 0x65, 0x2e, 0x52, 0x6f, 0x69, 0x43, 0x6f, 0x6c, 0x6f, 0x75, 0x72, 0x73, 0x45, + 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0a, 0x72, 0x6f, 0x69, 0x43, 0x6f, 0x6c, 0x6f, 0x75, 0x72, 0x73, + 0x12, 0x3d, 0x0a, 0x09, 0x72, 0x6f, 0x69, 0x53, 0x68, 0x61, 0x70, 0x65, 0x73, 0x18, 0x02, 0x20, + 0x03, 0x28, 0x0b, 0x32, 0x1f, 0x2e, 0x52, 0x4f, 0x49, 0x44, 0x69, 0x73, 0x70, 0x6c, 0x61, 0x79, + 0x53, 0x74, 0x61, 0x74, 0x65, 0x2e, 0x52, 0x6f, 0x69, 0x53, 0x68, 0x61, 0x70, 0x65, 0x73, 0x45, + 0x6e, 0x74, 0x72, 0x79, 0x52, 0x09, 0x72, 0x6f, 0x69, 0x53, 0x68, 0x61, 0x70, 0x65, 0x73, 0x1a, + 0x3d, 0x0a, 0x0f, 0x52, 0x6f, 0x69, 0x43, 0x6f, 0x6c, 0x6f, 0x75, 0x72, 0x73, 0x45, 0x6e, 0x74, + 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, + 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, + 0x01, 0x28, 0x09, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x3c, + 0x0a, 0x0e, 0x52, 0x6f, 0x69, 0x53, 0x68, 0x61, 0x70, 0x65, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, + 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, + 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, + 0x09, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0xa7, 0x03, 0x0a, + 0x13, 0x52, 0x47, 0x42, 0x55, 0x50, 0x6c, 0x6f, 0x74, 0x57, 0x69, 0x64, 0x67, 0x65, 0x74, 0x53, + 0x74, 0x61, 0x74, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x6d, 0x69, 0x6e, 0x65, 0x72, 0x61, 0x6c, 0x73, + 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x08, 0x6d, 0x69, 0x6e, 0x65, 0x72, 0x61, 0x6c, 0x73, + 0x12, 0x1c, 0x0a, 0x09, 0x79, 0x43, 0x68, 0x61, 0x6e, 0x6e, 0x65, 0x6c, 0x41, 0x18, 0x02, 0x20, + 0x01, 0x28, 0x09, 0x52, 0x09, 0x79, 0x43, 0x68, 0x61, 0x6e, 0x6e, 0x65, 0x6c, 0x41, 0x12, 0x1c, + 0x0a, 0x09, 0x79, 0x43, 0x68, 0x61, 0x6e, 0x6e, 0x65, 0x6c, 0x42, 0x18, 0x03, 0x20, 0x01, 0x28, + 0x09, 0x52, 0x09, 0x79, 0x43, 0x68, 0x61, 0x6e, 0x6e, 0x65, 0x6c, 0x42, 0x12, 0x1c, 0x0a, 0x09, + 0x78, 0x43, 0x68, 0x61, 0x6e, 0x6e, 0x65, 0x6c, 0x41, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, + 0x09, 0x78, 0x43, 0x68, 0x61, 0x6e, 0x6e, 0x65, 0x6c, 0x41, 0x12, 0x1c, 0x0a, 0x09, 0x78, 0x43, + 0x68, 0x61, 0x6e, 0x6e, 0x65, 0x6c, 0x42, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x78, + 0x43, 0x68, 0x61, 0x6e, 0x6e, 0x65, 0x6c, 0x42, 0x12, 0x26, 0x0a, 0x0e, 0x64, 0x72, 0x61, 0x77, + 0x4d, 0x6f, 0x6e, 0x6f, 0x63, 0x68, 0x72, 0x6f, 0x6d, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x08, + 0x52, 0x0e, 0x64, 0x72, 0x61, 0x77, 0x4d, 0x6f, 0x6e, 0x6f, 0x63, 0x68, 0x72, 0x6f, 0x6d, 0x65, + 0x12, 0x2c, 0x0a, 0x11, 0x73, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x65, 0x64, 0x4d, 0x69, 0x6e, 0x58, + 0x56, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x02, 0x52, 0x11, 0x73, 0x65, 0x6c, + 0x65, 0x63, 0x74, 0x65, 0x64, 0x4d, 0x69, 0x6e, 0x58, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x2c, + 0x0a, 0x11, 0x73, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x65, 0x64, 0x4d, 0x61, 0x78, 0x58, 0x56, 0x61, + 0x6c, 0x75, 0x65, 0x18, 0x08, 0x20, 0x01, 0x28, 0x02, 0x52, 0x11, 0x73, 0x65, 0x6c, 0x65, 0x63, + 0x74, 0x65, 0x64, 0x4d, 0x61, 0x78, 0x58, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x2c, 0x0a, 0x11, + 0x73, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x65, 0x64, 0x4d, 0x69, 0x6e, 0x59, 0x56, 0x61, 0x6c, 0x75, + 0x65, 0x18, 0x09, 0x20, 0x01, 0x28, 0x02, 0x52, 0x11, 0x73, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x65, + 0x64, 0x4d, 0x69, 0x6e, 0x59, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x2c, 0x0a, 0x11, 0x73, 0x65, + 0x6c, 0x65, 0x63, 0x74, 0x65, 0x64, 0x4d, 0x61, 0x78, 0x59, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x18, + 0x0a, 0x20, 0x01, 0x28, 0x02, 0x52, 0x11, 0x73, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x65, 0x64, 0x4d, + 0x61, 0x78, 0x59, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x69, 0x6d, 0x61, 0x67, + 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x69, 0x6d, 0x61, + 0x67, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x22, 0xdf, 0x02, 0x0a, 0x19, 0x53, 0x69, 0x6e, 0x67, 0x6c, + 0x65, 0x41, 0x78, 0x69, 0x73, 0x52, 0x47, 0x42, 0x55, 0x57, 0x69, 0x64, 0x67, 0x65, 0x74, 0x53, + 0x74, 0x61, 0x74, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x6d, 0x69, 0x6e, 0x65, 0x72, 0x61, 0x6c, 0x73, + 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x08, 0x6d, 0x69, 0x6e, 0x65, 0x72, 0x61, 0x6c, 0x73, + 0x12, 0x1a, 0x0a, 0x08, 0x63, 0x68, 0x61, 0x6e, 0x6e, 0x65, 0x6c, 0x41, 0x18, 0x02, 0x20, 0x01, + 0x28, 0x09, 0x52, 0x08, 0x63, 0x68, 0x61, 0x6e, 0x6e, 0x65, 0x6c, 0x41, 0x12, 0x1a, 0x0a, 0x08, + 0x63, 0x68, 0x61, 0x6e, 0x6e, 0x65, 0x6c, 0x42, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, + 0x63, 0x68, 0x61, 0x6e, 0x6e, 0x65, 0x6c, 0x42, 0x12, 0x2c, 0x0a, 0x11, 0x72, 0x6f, 0x69, 0x53, + 0x74, 0x61, 0x63, 0x6b, 0x65, 0x64, 0x4f, 0x76, 0x65, 0x72, 0x6c, 0x61, 0x70, 0x18, 0x04, 0x20, + 0x01, 0x28, 0x08, 0x52, 0x11, 0x72, 0x6f, 0x69, 0x53, 0x74, 0x61, 0x63, 0x6b, 0x65, 0x64, 0x4f, + 0x76, 0x65, 0x72, 0x6c, 0x61, 0x70, 0x12, 0x1c, 0x0a, 0x09, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x4e, + 0x61, 0x6d, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x69, 0x6d, 0x61, 0x67, 0x65, + 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x2a, 0x0a, 0x10, 0x73, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x65, 0x64, + 0x4d, 0x69, 0x6e, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x02, 0x52, 0x10, + 0x73, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x65, 0x64, 0x4d, 0x69, 0x6e, 0x56, 0x61, 0x6c, 0x75, 0x65, + 0x12, 0x2a, 0x0a, 0x10, 0x73, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x65, 0x64, 0x4d, 0x61, 0x78, 0x56, + 0x61, 0x6c, 0x75, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x02, 0x52, 0x10, 0x73, 0x65, 0x6c, 0x65, + 0x63, 0x74, 0x65, 0x64, 0x4d, 0x61, 0x78, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x16, 0x0a, 0x06, + 0x72, 0x6f, 0x69, 0x49, 0x64, 0x73, 0x18, 0x08, 0x20, 0x03, 0x28, 0x09, 0x52, 0x06, 0x72, 0x6f, + 0x69, 0x49, 0x64, 0x73, 0x12, 0x32, 0x0a, 0x14, 0x73, 0x68, 0x6f, 0x77, 0x41, 0x6c, 0x6c, 0x4d, + 0x69, 0x6e, 0x65, 0x72, 0x61, 0x6c, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x73, 0x18, 0x09, 0x20, 0x01, + 0x28, 0x08, 0x52, 0x14, 0x73, 0x68, 0x6f, 0x77, 0x41, 0x6c, 0x6c, 0x4d, 0x69, 0x6e, 0x65, 0x72, + 0x61, 0x6c, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x73, 0x22, 0x55, 0x0a, 0x15, 0x52, 0x47, 0x42, 0x55, + 0x49, 0x6d, 0x61, 0x67, 0x65, 0x73, 0x57, 0x69, 0x64, 0x67, 0x65, 0x74, 0x53, 0x74, 0x61, 0x74, + 0x65, 0x12, 0x1e, 0x0a, 0x0a, 0x62, 0x72, 0x69, 0x67, 0x68, 0x74, 0x6e, 0x65, 0x73, 0x73, 0x18, + 0x02, 0x20, 0x01, 0x28, 0x02, 0x52, 0x0a, 0x62, 0x72, 0x69, 0x67, 0x68, 0x74, 0x6e, 0x65, 0x73, + 0x73, 0x12, 0x1c, 0x0a, 0x09, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x03, + 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x22, + 0x6e, 0x0a, 0x18, 0x50, 0x61, 0x72, 0x61, 0x6c, 0x6c, 0x65, 0x6c, 0x6f, 0x67, 0x72, 0x61, 0x6d, + 0x57, 0x69, 0x64, 0x67, 0x65, 0x74, 0x53, 0x74, 0x61, 0x74, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x72, + 0x65, 0x67, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x07, 0x72, 0x65, + 0x67, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x1a, 0x0a, 0x08, 0x63, 0x68, 0x61, 0x6e, 0x6e, 0x65, 0x6c, + 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x09, 0x52, 0x08, 0x63, 0x68, 0x61, 0x6e, 0x6e, 0x65, 0x6c, + 0x73, 0x12, 0x1c, 0x0a, 0x09, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x03, + 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x22, + 0xa1, 0x05, 0x0a, 0x0a, 0x57, 0x69, 0x64, 0x67, 0x65, 0x74, 0x44, 0x61, 0x74, 0x61, 0x12, 0x0e, + 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x30, + 0x0a, 0x08, 0x73, 0x70, 0x65, 0x63, 0x74, 0x72, 0x75, 0x6d, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, + 0x32, 0x14, 0x2e, 0x53, 0x70, 0x65, 0x63, 0x74, 0x72, 0x75, 0x6d, 0x57, 0x69, 0x64, 0x67, 0x65, + 0x74, 0x53, 0x74, 0x61, 0x74, 0x65, 0x52, 0x08, 0x73, 0x70, 0x65, 0x63, 0x74, 0x72, 0x75, 0x6d, + 0x12, 0x24, 0x0a, 0x06, 0x62, 0x69, 0x6e, 0x61, 0x72, 0x79, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, + 0x32, 0x0c, 0x2e, 0x42, 0x69, 0x6e, 0x61, 0x72, 0x79, 0x53, 0x74, 0x61, 0x74, 0x65, 0x52, 0x06, + 0x62, 0x69, 0x6e, 0x61, 0x72, 0x79, 0x12, 0x27, 0x0a, 0x07, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x72, + 0x79, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x54, 0x65, 0x72, 0x6e, 0x61, 0x72, + 0x79, 0x53, 0x74, 0x61, 0x74, 0x65, 0x52, 0x07, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x72, 0x79, 0x12, + 0x2d, 0x0a, 0x09, 0x68, 0x69, 0x73, 0x74, 0x6f, 0x67, 0x72, 0x61, 0x6d, 0x18, 0x05, 0x20, 0x01, + 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x48, 0x69, 0x73, 0x74, 0x6f, 0x67, 0x72, 0x61, 0x6d, 0x53, 0x74, + 0x61, 0x74, 0x65, 0x52, 0x09, 0x68, 0x69, 0x73, 0x74, 0x6f, 0x67, 0x72, 0x61, 0x6d, 0x12, 0x36, + 0x0a, 0x0c, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x49, 0x6d, 0x61, 0x67, 0x65, 0x18, 0x06, + 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x49, 0x6d, + 0x61, 0x67, 0x65, 0x53, 0x74, 0x61, 0x74, 0x65, 0x52, 0x0c, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x78, + 0x74, 0x49, 0x6d, 0x61, 0x67, 0x65, 0x12, 0x21, 0x0a, 0x05, 0x63, 0x68, 0x6f, 0x72, 0x64, 0x18, + 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x43, 0x68, 0x6f, 0x72, 0x64, 0x53, 0x74, 0x61, + 0x74, 0x65, 0x52, 0x05, 0x63, 0x68, 0x6f, 0x72, 0x64, 0x12, 0x21, 0x0a, 0x05, 0x74, 0x61, 0x62, + 0x6c, 0x65, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x54, 0x61, 0x62, 0x6c, 0x65, + 0x53, 0x74, 0x61, 0x74, 0x65, 0x52, 0x05, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x12, 0x39, 0x0a, 0x0d, + 0x72, 0x6f, 0x69, 0x51, 0x75, 0x61, 0x6e, 0x74, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x18, 0x09, 0x20, + 0x01, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x52, 0x4f, 0x49, 0x51, 0x75, 0x61, 0x6e, 0x74, 0x54, 0x61, + 0x62, 0x6c, 0x65, 0x53, 0x74, 0x61, 0x74, 0x65, 0x52, 0x0d, 0x72, 0x6f, 0x69, 0x51, 0x75, 0x61, + 0x6e, 0x74, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x12, 0x2d, 0x0a, 0x09, 0x76, 0x61, 0x72, 0x69, 0x6f, + 0x67, 0x72, 0x61, 0x6d, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x56, 0x61, 0x72, + 0x69, 0x6f, 0x67, 0x72, 0x61, 0x6d, 0x53, 0x74, 0x61, 0x74, 0x65, 0x52, 0x09, 0x76, 0x61, 0x72, + 0x69, 0x6f, 0x67, 0x72, 0x61, 0x6d, 0x12, 0x30, 0x0a, 0x08, 0x72, 0x67, 0x62, 0x75, 0x50, 0x6c, + 0x6f, 0x74, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x52, 0x47, 0x42, 0x55, 0x50, + 0x6c, 0x6f, 0x74, 0x57, 0x69, 0x64, 0x67, 0x65, 0x74, 0x53, 0x74, 0x61, 0x74, 0x65, 0x52, 0x08, + 0x72, 0x67, 0x62, 0x75, 0x50, 0x6c, 0x6f, 0x74, 0x12, 0x42, 0x0a, 0x0e, 0x73, 0x69, 0x6e, 0x67, + 0x6c, 0x65, 0x41, 0x78, 0x69, 0x73, 0x52, 0x47, 0x42, 0x55, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x0b, + 0x32, 0x1a, 0x2e, 0x53, 0x69, 0x6e, 0x67, 0x6c, 0x65, 0x41, 0x78, 0x69, 0x73, 0x52, 0x47, 0x42, + 0x55, 0x57, 0x69, 0x64, 0x67, 0x65, 0x74, 0x53, 0x74, 0x61, 0x74, 0x65, 0x52, 0x0e, 0x73, 0x69, + 0x6e, 0x67, 0x6c, 0x65, 0x41, 0x78, 0x69, 0x73, 0x52, 0x47, 0x42, 0x55, 0x12, 0x34, 0x0a, 0x09, + 0x72, 0x67, 0x62, 0x75, 0x49, 0x6d, 0x61, 0x67, 0x65, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x0b, 0x32, + 0x16, 0x2e, 0x52, 0x47, 0x42, 0x55, 0x49, 0x6d, 0x61, 0x67, 0x65, 0x73, 0x57, 0x69, 0x64, 0x67, + 0x65, 0x74, 0x53, 0x74, 0x61, 0x74, 0x65, 0x52, 0x09, 0x72, 0x67, 0x62, 0x75, 0x49, 0x6d, 0x61, + 0x67, 0x65, 0x12, 0x3f, 0x0a, 0x0d, 0x70, 0x61, 0x72, 0x61, 0x6c, 0x6c, 0x65, 0x6c, 0x6f, 0x67, + 0x72, 0x61, 0x6d, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x50, 0x61, 0x72, 0x61, + 0x6c, 0x6c, 0x65, 0x6c, 0x6f, 0x67, 0x72, 0x61, 0x6d, 0x57, 0x69, 0x64, 0x67, 0x65, 0x74, 0x53, + 0x74, 0x61, 0x74, 0x65, 0x52, 0x0d, 0x70, 0x61, 0x72, 0x61, 0x6c, 0x6c, 0x65, 0x6c, 0x6f, 0x67, + 0x72, 0x61, 0x6d, 0x42, 0x0a, 0x5a, 0x08, 0x2e, 0x3b, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x73, 0x62, + 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -2422,7 +2491,7 @@ func file_widget_data_proto_rawDescGZIP() []byte { return file_widget_data_proto_rawDescData } -var file_widget_data_proto_msgTypes = make([]protoimpl.MessageInfo, 26) +var file_widget_data_proto_msgTypes = make([]protoimpl.MessageInfo, 27) var file_widget_data_proto_goTypes = []interface{}{ (*VisibleROI)(nil), // 0: VisibleROI (*SpectrumXRFLineState)(nil), // 1: SpectrumXRFLineState @@ -2433,52 +2502,53 @@ var file_widget_data_proto_goTypes = []interface{}{ (*ChordState)(nil), // 6: ChordState (*BinaryState)(nil), // 7: BinaryState (*TernaryState)(nil), // 8: TernaryState - (*TableState)(nil), // 9: TableState - (*ROIQuantTableState)(nil), // 10: ROIQuantTableState - (*VariogramState)(nil), // 11: VariogramState - (*MapLayerVisibility)(nil), // 12: MapLayerVisibility - (*ROILayerVisibility)(nil), // 13: ROILayerVisibility - (*ContextImageState)(nil), // 14: ContextImageState - (*AnnotationPoint)(nil), // 15: AnnotationPoint - (*FullScreenAnnotationItem)(nil), // 16: FullScreenAnnotationItem - (*AnnotationDisplayState)(nil), // 17: AnnotationDisplayState - (*ROIDisplayState)(nil), // 18: ROIDisplayState - (*RGBUPlotWidgetState)(nil), // 19: RGBUPlotWidgetState - (*SingleAxisRGBUWidgetState)(nil), // 20: SingleAxisRGBUWidgetState - (*RGBUImagesWidgetState)(nil), // 21: RGBUImagesWidgetState - (*ParallelogramWidgetState)(nil), // 22: ParallelogramWidgetState - (*WidgetData)(nil), // 23: WidgetData - nil, // 24: ROIDisplayState.RoiColoursEntry - nil, // 25: ROIDisplayState.RoiShapesEntry - (*ElementLine)(nil), // 26: ElementLine + (*VisibleROIAndQuant)(nil), // 9: VisibleROIAndQuant + (*TableState)(nil), // 10: TableState + (*ROIQuantTableState)(nil), // 11: ROIQuantTableState + (*VariogramState)(nil), // 12: VariogramState + (*MapLayerVisibility)(nil), // 13: MapLayerVisibility + (*ROILayerVisibility)(nil), // 14: ROILayerVisibility + (*ContextImageState)(nil), // 15: ContextImageState + (*AnnotationPoint)(nil), // 16: AnnotationPoint + (*FullScreenAnnotationItem)(nil), // 17: FullScreenAnnotationItem + (*AnnotationDisplayState)(nil), // 18: AnnotationDisplayState + (*ROIDisplayState)(nil), // 19: ROIDisplayState + (*RGBUPlotWidgetState)(nil), // 20: RGBUPlotWidgetState + (*SingleAxisRGBUWidgetState)(nil), // 21: SingleAxisRGBUWidgetState + (*RGBUImagesWidgetState)(nil), // 22: RGBUImagesWidgetState + (*ParallelogramWidgetState)(nil), // 23: ParallelogramWidgetState + (*WidgetData)(nil), // 24: WidgetData + nil, // 25: ROIDisplayState.RoiColoursEntry + nil, // 26: ROIDisplayState.RoiShapesEntry + (*ElementLine)(nil), // 27: ElementLine } var file_widget_data_proto_depIdxs = []int32{ - 26, // 0: SpectrumXRFLineState.lineInfo:type_name -> ElementLine + 27, // 0: SpectrumXRFLineState.lineInfo:type_name -> ElementLine 3, // 1: SpectrumWidgetState.spectrumLines:type_name -> SpectrumLines 0, // 2: HistogramState.visibleROIs:type_name -> VisibleROI 0, // 3: BinaryState.visibleROIs:type_name -> VisibleROI 0, // 4: TernaryState.visibleROIs:type_name -> VisibleROI - 0, // 5: TableState.visibleROIs:type_name -> VisibleROI + 9, // 5: TableState.visibleROIs:type_name -> VisibleROIAndQuant 0, // 6: VariogramState.visibleROIs:type_name -> VisibleROI - 12, // 7: ContextImageState.mapLayers:type_name -> MapLayerVisibility - 13, // 8: ContextImageState.roiLayers:type_name -> ROILayerVisibility - 15, // 9: FullScreenAnnotationItem.points:type_name -> AnnotationPoint - 16, // 10: AnnotationDisplayState.savedAnnotations:type_name -> FullScreenAnnotationItem - 24, // 11: ROIDisplayState.roiColours:type_name -> ROIDisplayState.RoiColoursEntry - 25, // 12: ROIDisplayState.roiShapes:type_name -> ROIDisplayState.RoiShapesEntry + 13, // 7: ContextImageState.mapLayers:type_name -> MapLayerVisibility + 14, // 8: ContextImageState.roiLayers:type_name -> ROILayerVisibility + 16, // 9: FullScreenAnnotationItem.points:type_name -> AnnotationPoint + 17, // 10: AnnotationDisplayState.savedAnnotations:type_name -> FullScreenAnnotationItem + 25, // 11: ROIDisplayState.roiColours:type_name -> ROIDisplayState.RoiColoursEntry + 26, // 12: ROIDisplayState.roiShapes:type_name -> ROIDisplayState.RoiShapesEntry 4, // 13: WidgetData.spectrum:type_name -> SpectrumWidgetState 7, // 14: WidgetData.binary:type_name -> BinaryState 8, // 15: WidgetData.ternary:type_name -> TernaryState 5, // 16: WidgetData.histogram:type_name -> HistogramState - 14, // 17: WidgetData.contextImage:type_name -> ContextImageState + 15, // 17: WidgetData.contextImage:type_name -> ContextImageState 6, // 18: WidgetData.chord:type_name -> ChordState - 9, // 19: WidgetData.table:type_name -> TableState - 10, // 20: WidgetData.roiQuantTable:type_name -> ROIQuantTableState - 11, // 21: WidgetData.variogram:type_name -> VariogramState - 19, // 22: WidgetData.rgbuPlot:type_name -> RGBUPlotWidgetState - 20, // 23: WidgetData.singleAxisRGBU:type_name -> SingleAxisRGBUWidgetState - 21, // 24: WidgetData.rgbuImage:type_name -> RGBUImagesWidgetState - 22, // 25: WidgetData.parallelogram:type_name -> ParallelogramWidgetState + 10, // 19: WidgetData.table:type_name -> TableState + 11, // 20: WidgetData.roiQuantTable:type_name -> ROIQuantTableState + 12, // 21: WidgetData.variogram:type_name -> VariogramState + 20, // 22: WidgetData.rgbuPlot:type_name -> RGBUPlotWidgetState + 21, // 23: WidgetData.singleAxisRGBU:type_name -> SingleAxisRGBUWidgetState + 22, // 24: WidgetData.rgbuImage:type_name -> RGBUImagesWidgetState + 23, // 25: WidgetData.parallelogram:type_name -> ParallelogramWidgetState 26, // [26:26] is the sub-list for method output_type 26, // [26:26] is the sub-list for method input_type 26, // [26:26] is the sub-list for extension type_name @@ -2602,7 +2672,7 @@ func file_widget_data_proto_init() { } } file_widget_data_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*TableState); i { + switch v := v.(*VisibleROIAndQuant); i { case 0: return &v.state case 1: @@ -2614,7 +2684,7 @@ func file_widget_data_proto_init() { } } file_widget_data_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ROIQuantTableState); i { + switch v := v.(*TableState); i { case 0: return &v.state case 1: @@ -2626,7 +2696,7 @@ func file_widget_data_proto_init() { } } file_widget_data_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*VariogramState); i { + switch v := v.(*ROIQuantTableState); i { case 0: return &v.state case 1: @@ -2638,7 +2708,7 @@ func file_widget_data_proto_init() { } } file_widget_data_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*MapLayerVisibility); i { + switch v := v.(*VariogramState); i { case 0: return &v.state case 1: @@ -2650,7 +2720,7 @@ func file_widget_data_proto_init() { } } file_widget_data_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ROILayerVisibility); i { + switch v := v.(*MapLayerVisibility); i { case 0: return &v.state case 1: @@ -2662,7 +2732,7 @@ func file_widget_data_proto_init() { } } file_widget_data_proto_msgTypes[14].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ContextImageState); i { + switch v := v.(*ROILayerVisibility); i { case 0: return &v.state case 1: @@ -2674,7 +2744,7 @@ func file_widget_data_proto_init() { } } file_widget_data_proto_msgTypes[15].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*AnnotationPoint); i { + switch v := v.(*ContextImageState); i { case 0: return &v.state case 1: @@ -2686,7 +2756,7 @@ func file_widget_data_proto_init() { } } file_widget_data_proto_msgTypes[16].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*FullScreenAnnotationItem); i { + switch v := v.(*AnnotationPoint); i { case 0: return &v.state case 1: @@ -2698,7 +2768,7 @@ func file_widget_data_proto_init() { } } file_widget_data_proto_msgTypes[17].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*AnnotationDisplayState); i { + switch v := v.(*FullScreenAnnotationItem); i { case 0: return &v.state case 1: @@ -2710,7 +2780,7 @@ func file_widget_data_proto_init() { } } file_widget_data_proto_msgTypes[18].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ROIDisplayState); i { + switch v := v.(*AnnotationDisplayState); i { case 0: return &v.state case 1: @@ -2722,7 +2792,7 @@ func file_widget_data_proto_init() { } } file_widget_data_proto_msgTypes[19].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*RGBUPlotWidgetState); i { + switch v := v.(*ROIDisplayState); i { case 0: return &v.state case 1: @@ -2734,7 +2804,7 @@ func file_widget_data_proto_init() { } } file_widget_data_proto_msgTypes[20].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*SingleAxisRGBUWidgetState); i { + switch v := v.(*RGBUPlotWidgetState); i { case 0: return &v.state case 1: @@ -2746,7 +2816,7 @@ func file_widget_data_proto_init() { } } file_widget_data_proto_msgTypes[21].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*RGBUImagesWidgetState); i { + switch v := v.(*SingleAxisRGBUWidgetState); i { case 0: return &v.state case 1: @@ -2758,7 +2828,7 @@ func file_widget_data_proto_init() { } } file_widget_data_proto_msgTypes[22].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ParallelogramWidgetState); i { + switch v := v.(*RGBUImagesWidgetState); i { case 0: return &v.state case 1: @@ -2770,6 +2840,18 @@ func file_widget_data_proto_init() { } } file_widget_data_proto_msgTypes[23].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*ParallelogramWidgetState); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_widget_data_proto_msgTypes[24].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*WidgetData); i { case 0: return &v.state @@ -2788,7 +2870,7 @@ func file_widget_data_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_widget_data_proto_rawDesc, NumEnums: 0, - NumMessages: 26, + NumMessages: 27, NumExtensions: 0, NumServices: 0, }, From 9b1b269011fa8272ac49547a38b4f4fb296b3d1c Mon Sep 17 00:00:00 2001 From: Peter Nemere Date: Tue, 11 Jun 2024 16:09:55 +1000 Subject: [PATCH 6/7] Auto-sharing of auto-triggered quant --- api/quantification/create.go | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/api/quantification/create.go b/api/quantification/create.go index 2e36f6e3..7b78c88b 100644 --- a/api/quantification/create.go +++ b/api/quantification/create.go @@ -18,6 +18,7 @@ package quantification import ( + "context" "encoding/json" "fmt" "path" @@ -25,16 +26,20 @@ import ( "strings" "sync" + "github.com/pixlise/core/v4/api/dbCollections" "github.com/pixlise/core/v4/api/filepaths" "github.com/pixlise/core/v4/api/job" "github.com/pixlise/core/v4/api/piquant" "github.com/pixlise/core/v4/api/quantification/quantRunner" "github.com/pixlise/core/v4/api/services" + "github.com/pixlise/core/v4/api/specialUserIds" "github.com/pixlise/core/v4/api/ws/wsHelpers" "github.com/pixlise/core/v4/core/fileaccess" "github.com/pixlise/core/v4/core/logger" "github.com/pixlise/core/v4/core/utils" protos "github.com/pixlise/core/v4/generated-protos" + "go.mongodb.org/mongo-driver/bson" + "go.mongodb.org/mongo-driver/mongo/options" ) // JobParamsFileName - File name of job params file @@ -382,7 +387,25 @@ func (r *quantNodeRunner) triggerPiquantNodes(wg *sync.WaitGroup) { }, } - ownerItem := wsHelpers.MakeOwnerForWrite(r.jobId, protos.ObjectType_OT_QUANTIFICATION, r.quantStartSettings.RequestorUserId, now) + // If we've got a special import that's done by the internal user, we read the owner entry from DB scan auto share table (ScanAutoShareName) + var ownerItem *protos.OwnershipItem + if r.quantStartSettings.RequestorUserId == specialUserIds.PIXLISESystemUserId { + coll := svcs.MongoDB.Collection(dbCollections.ScanAutoShareName) + autoShareResult := coll.FindOne(context.TODO(), bson.D{{Key: "_id", Value: r.quantStartSettings.RequestorUserId}}, options.FindOne()) + if autoShareResult.Err() != nil { + svcs.Log.Errorf("Failed to read auto-share info for quantification triggered by %v. Quant won't be shared", r.quantStartSettings.RequestorUserId) + } else { + err := autoShareResult.Decode(ownerItem) + if err != nil { + svcs.Log.Errorf("Failed to decode auto-share info for quantification triggered by %v: %v", r.quantStartSettings.RequestorUserId, err) + ownerItem = nil + } + } + } + + if ownerItem == nil { + ownerItem = wsHelpers.MakeOwnerForWrite(r.jobId, protos.ObjectType_OT_QUANTIFICATION, r.quantStartSettings.RequestorUserId, now) + } err = writeQuantAndOwnershipToDB(summary, ownerItem, svcs.MongoDB) if err != nil { From ae1608858fcb351d839dca56c19e4dd0a5e7b714 Mon Sep 17 00:00:00 2001 From: Peter Nemere Date: Tue, 11 Jun 2024 22:13:38 +1000 Subject: [PATCH 7/7] Fix auto-quant auto-share --- api/quantification/create.go | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/api/quantification/create.go b/api/quantification/create.go index 7b78c88b..57a9d2ee 100644 --- a/api/quantification/create.go +++ b/api/quantification/create.go @@ -388,25 +388,25 @@ func (r *quantNodeRunner) triggerPiquantNodes(wg *sync.WaitGroup) { } // If we've got a special import that's done by the internal user, we read the owner entry from DB scan auto share table (ScanAutoShareName) - var ownerItem *protos.OwnershipItem + ownerItem := wsHelpers.MakeOwnerForWrite(r.jobId, protos.ObjectType_OT_QUANTIFICATION, r.quantStartSettings.RequestorUserId, now) if r.quantStartSettings.RequestorUserId == specialUserIds.PIXLISESystemUserId { coll := svcs.MongoDB.Collection(dbCollections.ScanAutoShareName) autoShareResult := coll.FindOne(context.TODO(), bson.D{{Key: "_id", Value: r.quantStartSettings.RequestorUserId}}, options.FindOne()) if autoShareResult.Err() != nil { svcs.Log.Errorf("Failed to read auto-share info for quantification triggered by %v. Quant won't be shared", r.quantStartSettings.RequestorUserId) } else { - err := autoShareResult.Decode(ownerItem) + autoEntry := &protos.ScanAutoShareEntry{} + err := autoShareResult.Decode(autoEntry) if err != nil { svcs.Log.Errorf("Failed to decode auto-share info for quantification triggered by %v: %v", r.quantStartSettings.RequestorUserId, err) - ownerItem = nil + } else { + svcs.Log.Errorf("Found scan auto-share entry for quantification requestor \"%v\". Sharing accordingly.", r.quantStartSettings.RequestorUserId) + ownerItem.Viewers = autoEntry.Viewers + ownerItem.Editors = autoEntry.Editors } } } - if ownerItem == nil { - ownerItem = wsHelpers.MakeOwnerForWrite(r.jobId, protos.ObjectType_OT_QUANTIFICATION, r.quantStartSettings.RequestorUserId, now) - } - err = writeQuantAndOwnershipToDB(summary, ownerItem, svcs.MongoDB) if err != nil { r.completeJobState(false, fmt.Sprintf("Failed to write quantification and ownership to DB: %v. Id: %v", err, r.jobId), quantOutPath, piquantLogList)