diff options
Diffstat (limited to 'Software/Android_Studio')
19 files changed, 257 insertions, 257 deletions
diff --git a/Software/Android_Studio/ColorCapture/app/build.gradle b/Software/Android_Studio/ColorCapture/app/build.gradle index facd37772..9c57418b5 100644 --- a/Software/Android_Studio/ColorCapture/app/build.gradle +++ b/Software/Android_Studio/ColorCapture/app/build.gradle @@ -6,8 +6,8 @@ android { applicationId "com.twine.colorcapture" minSdkVersion 22 targetSdkVersion 27 - versionCode 5 - versionName "1.5" + versionCode 6 + versionName "1.6" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" externalNativeBuild { cmake { diff --git a/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/mvvm/DialogBase.java b/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/mvvm/DialogBase.java index e77440810..ab78dddcb 100644 --- a/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/mvvm/DialogBase.java +++ b/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/mvvm/DialogBase.java @@ -3,6 +3,7 @@ package com.twine.colorcapture.mvvm; import android.animation.ValueAnimator; import android.app.Dialog; import android.app.DialogFragment; +import android.content.Context; import android.content.DialogInterface; import android.databinding.DataBindingUtil; import android.databinding.ViewDataBinding; @@ -68,7 +69,7 @@ public abstract class DialogBase<BindingView extends ViewDataBinding, VM extends inject(); - binding = DataBindingUtil.inflate(LayoutInflater.from(getActivity()), getLayoutId(), null, false); + binding = DataBindingUtil.inflate(inflater, getLayoutId(), null, false); rootView = binding.getRoot(); //rootView.setAlpha(0); @@ -82,6 +83,7 @@ public abstract class DialogBase<BindingView extends ViewDataBinding, VM extends vm.setCloseAction(() -> { isUserDismiss = true; + dismissed = true; dismiss(); }); @@ -124,7 +126,18 @@ public abstract class DialogBase<BindingView extends ViewDataBinding, VM extends if (dismissed) { - dismiss(); + this.getDialog().onBackPressed(); + } + } + + @Override + public void onAttach(Context context) + { + super.onAttach(context); + + if (dismissed) + { + this.getDialog().onBackPressed(); } } @@ -132,6 +145,13 @@ public abstract class DialogBase<BindingView extends ViewDataBinding, VM extends public void onStart() { super.onStart(); + + if (dismissed) + { + this.getDialog().onBackPressed(); + return; + } + //getDialog().getWindow().setBackgroundDrawableResource(android.R.color.transparent); // View group = this.getView(); diff --git a/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/navigation/AndroidNavigationProvider.java b/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/navigation/AndroidNavigationProvider.java index a5c885a59..52c96ca35 100644 --- a/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/navigation/AndroidNavigationProvider.java +++ b/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/navigation/AndroidNavigationProvider.java @@ -129,7 +129,15 @@ public class AndroidNavigationProvider extends ExtendedObject implements INaviga history.clear(); currentFragment = null; currentFragmentName = null; - isFirst = true; + } + + public void clearHistory() + { + history.clear(); + FragmentManager fm = activity.getFragmentManager(); + for(int i = 0; i < fm.getBackStackEntryCount(); ++i) { + fm.popBackStack(); + } } @Override diff --git a/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/navigation/INavigationProvider.java b/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/navigation/INavigationProvider.java index e25b7e50e..3df7ed5bc 100644 --- a/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/navigation/INavigationProvider.java +++ b/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/navigation/INavigationProvider.java @@ -63,6 +63,8 @@ public interface INavigationProvider */ void reset(); + void clearHistory(); + /** * Navigate to to the specified fragment name. * diff --git a/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/views/about/AboutFragmentVM.java b/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/views/about/AboutFragmentVM.java index d7e4a6704..b095798e1 100644 --- a/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/views/about/AboutFragmentVM.java +++ b/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/views/about/AboutFragmentVM.java @@ -30,7 +30,7 @@ public class AboutFragmentVM extends ViewModelBase<IAboutFragment> try { PackageInfo pInfo = App.getContext().getPackageManager().getPackageInfo(App.getContext().getPackageName(), 0); - version.set(Integer.toString(pInfo.versionCode)); + version.set(pInfo.versionName); } catch (PackageManager.NameNotFoundException e) { diff --git a/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/views/capture/CaptureFragment.java b/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/views/capture/CaptureFragment.java index fa8c1cde5..eefbd6466 100644 --- a/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/views/capture/CaptureFragment.java +++ b/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/views/capture/CaptureFragment.java @@ -288,7 +288,10 @@ public class CaptureFragment extends FragmentBase<FragmentCaptureBinding, Captur parameters.setFocusMode(Camera.Parameters.FOCUS_MODE_CONTINUOUS_PICTURE); - camera.setParameters(parameters); + if (!isEmulator()) + { + camera.setParameters(parameters); + } parameters = camera.getParameters(); @@ -299,8 +302,10 @@ public class CaptureFragment extends FragmentBase<FragmentCaptureBinding, Captur camera.startPreview(); isCameraStarted = true; - } catch (Exception ex) + } + catch (Exception ex) { + ex.printStackTrace(); camera.release(); camera = null; } @@ -308,6 +313,17 @@ public class CaptureFragment extends FragmentBase<FragmentCaptureBinding, Captur }); } + public static boolean isEmulator() { + return Build.FINGERPRINT.startsWith("generic") + || Build.FINGERPRINT.startsWith("unknown") + || Build.MODEL.contains("google_sdk") + || Build.MODEL.contains("Emulator") + || Build.MODEL.contains("Android SDK built for x86") + || Build.MANUFACTURER.contains("Genymotion") + || (Build.BRAND.startsWith("generic") && Build.DEVICE.startsWith("generic")) + || "google_sdk".equals(Build.PRODUCT); + } + @Override public void stopCamera() { diff --git a/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/views/capture/CaptureFragmentVM.java b/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/views/capture/CaptureFragmentVM.java index 1d92323ea..161fc3579 100644 --- a/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/views/capture/CaptureFragmentVM.java +++ b/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/views/capture/CaptureFragmentVM.java @@ -241,6 +241,8 @@ public class CaptureFragmentVM extends ViewModelBase<ICaptureFragment> implement super.onNavigatedTo(); TabStateManager.getInstance().state.set(TabState.Capture); + navigationProvider.clearHistory(); + preventDetection = false; boolean showDialog = !SettingsManager.getInstance().isWelcomeScreenShown(); diff --git a/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/views/main/MainActivity.java b/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/views/main/MainActivity.java index 2e6b70c02..153f7f139 100644 --- a/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/views/main/MainActivity.java +++ b/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/views/main/MainActivity.java @@ -5,6 +5,7 @@ import android.app.FragmentManager; import android.app.FragmentTransaction; import android.graphics.drawable.Drawable; import android.os.Bundle; +import android.support.annotation.NonNull; import android.support.v4.widget.DrawerLayout; import android.util.Log; import android.view.Gravity; @@ -31,6 +32,7 @@ import butterknife.BindView; public class MainActivity extends ActivityBase<ActivityMainBinding, MainActivityVM> implements IMainActivity { private boolean passOnCreate; + private boolean menuOpened; @Inject public INavigationProvider navigationProvider; @@ -65,8 +67,33 @@ public class MainActivity extends ActivityBase<ActivityMainBinding, MainActivity btnMenu.setOnClickListener((x) -> { - Log.d("TCC", "Clicked..."); drawerLayout.openDrawer(Gravity.START); + drawerLayout.addDrawerListener(new DrawerLayout.DrawerListener() + { + @Override + public void onDrawerSlide(@NonNull View drawerView, float slideOffset) + { + + } + + @Override + public void onDrawerOpened(@NonNull View drawerView) + { + menuOpened = true; + } + + @Override + public void onDrawerClosed(@NonNull View drawerView) + { + menuOpened = false; + } + + @Override + public void onDrawerStateChanged(int newState) + { + + } + }); }); navigationProvider.navigateTo(NavigationFragment.Capture, false, true); @@ -98,7 +125,7 @@ public class MainActivity extends ActivityBase<ActivityMainBinding, MainActivity @Override public void onBackPressed() { - if (navigationProvider.canNavigateBack()) + if (navigationProvider.canNavigateBack() && !menuOpened) { navigationProvider.navigateBack(); } diff --git a/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/views/register/RegisterFragmentVM.java b/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/views/register/RegisterFragmentVM.java index ffeda3f84..0e481c45e 100644 --- a/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/views/register/RegisterFragmentVM.java +++ b/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/views/register/RegisterFragmentVM.java @@ -78,9 +78,12 @@ public class RegisterFragmentVM extends ViewModelBase<IResultFragment> } catch (Exception ex) { - pVM.close(); - notificationProvider.showError("Registering your system", "Device registration failed.\nPlease verify your serial number.", (e) -> + invokeUI(() -> { + pVM.close(); + notificationProvider.showError("Registering your system", "Device registration failed.\nPlease verify your serial number.", (e) -> + { + }); }); Log.i("REGISTER", ex.getMessage()); } diff --git a/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/views/sendtoemail/SendToEmailFragmentVM.java b/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/views/sendtoemail/SendToEmailFragmentVM.java index 8056bcfe6..2a89f706e 100644 --- a/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/views/sendtoemail/SendToEmailFragmentVM.java +++ b/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/views/sendtoemail/SendToEmailFragmentVM.java @@ -87,10 +87,13 @@ public class SendToEmailFragmentVM extends ViewModelBase<ISendToEmailFragment> i SettingsManager.save(); } - vm.close(); - notificationProvider.showSuccess("Send to email", "Your detected color result is on its way!", (x) -> + invokeUI(() -> { - navigationProvider.navigateBack(); + vm.close(); + notificationProvider.showSuccess("Send to email", "Your detected color result is on its way!", (x) -> + { + navigationProvider.navigateBack(); + }); }); } }).build().start(); diff --git a/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/tango/pmr/tcc/DetectionInputOuterClass.java b/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/tango/pmr/tcc/DetectionInputOuterClass.java index 6e5ced99b..100ea5fbf 100644 --- a/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/tango/pmr/tcc/DetectionInputOuterClass.java +++ b/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/tango/pmr/tcc/DetectionInputOuterClass.java @@ -73,9 +73,9 @@ public final class DetectionInputOuterClass { int index); /** - * <code>double number = 10;</code> + * <code>bool PerformCLAHE = 8;</code> */ - double getNumber(); + boolean getPerformCLAHE(); } /** * Protobuf type {@code Tango.PMR.TCC.DetectionInput} @@ -97,7 +97,7 @@ public final class DetectionInputOuterClass { requestDebugImage_ = false; requestColorMatrix_ = false; benchmarks_ = java.util.Collections.emptyList(); - number_ = 0D; + performCLAHE_ = false; } @java.lang.Override @@ -167,9 +167,9 @@ public final class DetectionInputOuterClass { input.readMessage(com.twine.tango.pmr.tcc.DetectionBenchmarkOuterClass.DetectionBenchmark.parser(), extensionRegistry)); break; } - case 81: { + case 64: { - number_ = input.readDouble(); + performCLAHE_ = input.readBool(); break; } } @@ -289,13 +289,13 @@ public final class DetectionInputOuterClass { return benchmarks_.get(index); } - public static final int NUMBER_FIELD_NUMBER = 10; - private double number_; + public static final int PERFORMCLAHE_FIELD_NUMBER = 8; + private boolean performCLAHE_; /** - * <code>double number = 10;</code> + * <code>bool PerformCLAHE = 8;</code> */ - public double getNumber() { - return number_; + public boolean getPerformCLAHE() { + return performCLAHE_; } private byte memoizedIsInitialized = -1; @@ -331,8 +331,8 @@ public final class DetectionInputOuterClass { for (int i = 0; i < benchmarks_.size(); i++) { output.writeMessage(7, benchmarks_.get(i)); } - if (number_ != 0D) { - output.writeDouble(10, number_); + if (performCLAHE_ != false) { + output.writeBool(8, performCLAHE_); } unknownFields.writeTo(output); } @@ -370,9 +370,9 @@ public final class DetectionInputOuterClass { size += com.google.protobuf.CodedOutputStream .computeMessageSize(7, benchmarks_.get(i)); } - if (number_ != 0D) { + if (performCLAHE_ != false) { size += com.google.protobuf.CodedOutputStream - .computeDoubleSize(10, number_); + .computeBoolSize(8, performCLAHE_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -404,10 +404,8 @@ public final class DetectionInputOuterClass { == other.getRequestColorMatrix()); result = result && getBenchmarksList() .equals(other.getBenchmarksList()); - result = result && ( - java.lang.Double.doubleToLongBits(getNumber()) - == java.lang.Double.doubleToLongBits( - other.getNumber())); + result = result && (getPerformCLAHE() + == other.getPerformCLAHE()); result = result && unknownFields.equals(other.unknownFields); return result; } @@ -437,9 +435,9 @@ public final class DetectionInputOuterClass { hash = (37 * hash) + BENCHMARKS_FIELD_NUMBER; hash = (53 * hash) + getBenchmarksList().hashCode(); } - hash = (37 * hash) + NUMBER_FIELD_NUMBER; - hash = (53 * hash) + com.google.protobuf.Internal.hashLong( - java.lang.Double.doubleToLongBits(getNumber())); + hash = (37 * hash) + PERFORMCLAHE_FIELD_NUMBER; + hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean( + getPerformCLAHE()); hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; @@ -588,7 +586,7 @@ public final class DetectionInputOuterClass { } else { benchmarksBuilder_.clear(); } - number_ = 0D; + performCLAHE_ = false; return this; } @@ -629,7 +627,7 @@ public final class DetectionInputOuterClass { } else { result.benchmarks_ = benchmarksBuilder_.build(); } - result.number_ = number_; + result.performCLAHE_ = performCLAHE_; result.bitField0_ = to_bitField0_; onBuilt(); return result; @@ -716,8 +714,8 @@ public final class DetectionInputOuterClass { } } } - if (other.getNumber() != 0D) { - setNumber(other.getNumber()); + if (other.getPerformCLAHE() != false) { + setPerformCLAHE(other.getPerformCLAHE()); } this.mergeUnknownFields(other.unknownFields); onChanged(); @@ -1146,28 +1144,28 @@ public final class DetectionInputOuterClass { return benchmarksBuilder_; } - private double number_ ; + private boolean performCLAHE_ ; /** - * <code>double number = 10;</code> + * <code>bool PerformCLAHE = 8;</code> */ - public double getNumber() { - return number_; + public boolean getPerformCLAHE() { + return performCLAHE_; } /** - * <code>double number = 10;</code> + * <code>bool PerformCLAHE = 8;</code> */ - public Builder setNumber(double value) { + public Builder setPerformCLAHE(boolean value) { - number_ = value; + performCLAHE_ = value; onChanged(); return this; } /** - * <code>double number = 10;</code> + * <code>bool PerformCLAHE = 8;</code> */ - public Builder clearNumber() { + public Builder clearPerformCLAHE() { - number_ = 0D; + performCLAHE_ = false; onChanged(); return this; } @@ -1235,13 +1233,13 @@ public final class DetectionInputOuterClass { static { java.lang.String[] descriptorData = { "\n\024DetectionInput.proto\022\rTango.PMR.TCC\032\030D" + - "etectionBenchmark.proto\"\322\001\n\016DetectionInp" + + "etectionBenchmark.proto\"\330\001\n\016DetectionInp" + "ut\022\016\n\006Bitmap\030\001 \001(\014\022\017\n\007Columns\030\002 \001(\005\022\014\n\004R" + "ows\030\003 \001(\005\022\023\n\013TargetIndex\030\004 \001(\005\022\031\n\021Reques" + "tDebugImage\030\005 \001(\010\022\032\n\022RequestColorMatrix\030" + "\006 \001(\010\0225\n\nBenchmarks\030\007 \003(\0132!.Tango.PMR.TC" + - "C.DetectionBenchmark\022\016\n\006number\030\n \001(\001B\031\n\027" + - "com.twine.tango.pmr.tccb\006proto3" + "C.DetectionBenchmark\022\024\n\014PerformCLAHE\030\010 \001" + + "(\010B\031\n\027com.twine.tango.pmr.tccb\006proto3" }; com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = new com.google.protobuf.Descriptors.FileDescriptor. InternalDescriptorAssigner() { @@ -1261,7 +1259,7 @@ public final class DetectionInputOuterClass { internal_static_Tango_PMR_TCC_DetectionInput_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_Tango_PMR_TCC_DetectionInput_descriptor, - new java.lang.String[] { "Bitmap", "Columns", "Rows", "TargetIndex", "RequestDebugImage", "RequestColorMatrix", "Benchmarks", "Number", }); + new java.lang.String[] { "Bitmap", "Columns", "Rows", "TargetIndex", "RequestDebugImage", "RequestColorMatrix", "Benchmarks", "PerformCLAHE", }); com.twine.tango.pmr.tcc.DetectionBenchmarkOuterClass.getDescriptor(); } diff --git a/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/tango/pmr/tcc/DetectionOutputOuterClass.java b/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/tango/pmr/tcc/DetectionOutputOuterClass.java index f8c3757f5..c3090cfaa 100644 --- a/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/tango/pmr/tcc/DetectionOutputOuterClass.java +++ b/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/tango/pmr/tcc/DetectionOutputOuterClass.java @@ -19,76 +19,71 @@ public final class DetectionOutputOuterClass { com.google.protobuf.MessageOrBuilder { /** - * <code>double number = 1;</code> - */ - double getNumber(); - - /** - * <code>.Tango.PMR.TCC.DetectionColor RawColor = 2;</code> + * <code>.Tango.PMR.TCC.DetectionColor RawColor = 1;</code> */ boolean hasRawColor(); /** - * <code>.Tango.PMR.TCC.DetectionColor RawColor = 2;</code> + * <code>.Tango.PMR.TCC.DetectionColor RawColor = 1;</code> */ com.twine.tango.pmr.tcc.DetectionColorOuterClass.DetectionColor getRawColor(); /** - * <code>.Tango.PMR.TCC.DetectionColor RawColor = 2;</code> + * <code>.Tango.PMR.TCC.DetectionColor RawColor = 1;</code> */ com.twine.tango.pmr.tcc.DetectionColorOuterClass.DetectionColorOrBuilder getRawColorOrBuilder(); /** - * <code>.Tango.PMR.TCC.DetectionColor ProcessedColor = 3;</code> + * <code>.Tango.PMR.TCC.DetectionColor ProcessedColor = 2;</code> */ boolean hasProcessedColor(); /** - * <code>.Tango.PMR.TCC.DetectionColor ProcessedColor = 3;</code> + * <code>.Tango.PMR.TCC.DetectionColor ProcessedColor = 2;</code> */ com.twine.tango.pmr.tcc.DetectionColorOuterClass.DetectionColor getProcessedColor(); /** - * <code>.Tango.PMR.TCC.DetectionColor ProcessedColor = 3;</code> + * <code>.Tango.PMR.TCC.DetectionColor ProcessedColor = 2;</code> */ com.twine.tango.pmr.tcc.DetectionColorOuterClass.DetectionColorOrBuilder getProcessedColorOrBuilder(); /** - * <code>bytes DebugBitmap = 4;</code> + * <code>bytes DebugBitmap = 3;</code> */ com.google.protobuf.ByteString getDebugBitmap(); /** - * <code>repeated .Tango.PMR.TCC.DetectionColor ColorMatrix = 5;</code> + * <code>repeated .Tango.PMR.TCC.DetectionColor ColorMatrix = 4;</code> */ java.util.List<com.twine.tango.pmr.tcc.DetectionColorOuterClass.DetectionColor> getColorMatrixList(); /** - * <code>repeated .Tango.PMR.TCC.DetectionColor ColorMatrix = 5;</code> + * <code>repeated .Tango.PMR.TCC.DetectionColor ColorMatrix = 4;</code> */ com.twine.tango.pmr.tcc.DetectionColorOuterClass.DetectionColor getColorMatrix(int index); /** - * <code>repeated .Tango.PMR.TCC.DetectionColor ColorMatrix = 5;</code> + * <code>repeated .Tango.PMR.TCC.DetectionColor ColorMatrix = 4;</code> */ int getColorMatrixCount(); /** - * <code>repeated .Tango.PMR.TCC.DetectionColor ColorMatrix = 5;</code> + * <code>repeated .Tango.PMR.TCC.DetectionColor ColorMatrix = 4;</code> */ java.util.List<? extends com.twine.tango.pmr.tcc.DetectionColorOuterClass.DetectionColorOrBuilder> getColorMatrixOrBuilderList(); /** - * <code>repeated .Tango.PMR.TCC.DetectionColor ColorMatrix = 5;</code> + * <code>repeated .Tango.PMR.TCC.DetectionColor ColorMatrix = 4;</code> */ com.twine.tango.pmr.tcc.DetectionColorOuterClass.DetectionColorOrBuilder getColorMatrixOrBuilder( int index); /** - * <code>bool HasError = 6;</code> + * <code>bool HasError = 5;</code> */ boolean getHasError(); /** - * <code>string ErrorMessage = 7;</code> + * <code>string ErrorMessage = 6;</code> */ java.lang.String getErrorMessage(); /** - * <code>string ErrorMessage = 7;</code> + * <code>string ErrorMessage = 6;</code> */ com.google.protobuf.ByteString getErrorMessageBytes(); @@ -106,7 +101,6 @@ public final class DetectionOutputOuterClass { super(builder); } private DetectionOutput() { - number_ = 0D; debugBitmap_ = com.google.protobuf.ByteString.EMPTY; colorMatrix_ = java.util.Collections.emptyList(); hasError_ = false; @@ -141,12 +135,7 @@ public final class DetectionOutputOuterClass { } break; } - case 9: { - - number_ = input.readDouble(); - break; - } - case 18: { + case 10: { com.twine.tango.pmr.tcc.DetectionColorOuterClass.DetectionColor.Builder subBuilder = null; if (rawColor_ != null) { subBuilder = rawColor_.toBuilder(); @@ -159,7 +148,7 @@ public final class DetectionOutputOuterClass { break; } - case 26: { + case 18: { com.twine.tango.pmr.tcc.DetectionColorOuterClass.DetectionColor.Builder subBuilder = null; if (processedColor_ != null) { subBuilder = processedColor_.toBuilder(); @@ -172,26 +161,26 @@ public final class DetectionOutputOuterClass { break; } - case 34: { + case 26: { debugBitmap_ = input.readBytes(); break; } - case 42: { - if (!((mutable_bitField0_ & 0x00000010) == 0x00000010)) { + case 34: { + if (!((mutable_bitField0_ & 0x00000008) == 0x00000008)) { colorMatrix_ = new java.util.ArrayList<com.twine.tango.pmr.tcc.DetectionColorOuterClass.DetectionColor>(); - mutable_bitField0_ |= 0x00000010; + mutable_bitField0_ |= 0x00000008; } colorMatrix_.add( input.readMessage(com.twine.tango.pmr.tcc.DetectionColorOuterClass.DetectionColor.parser(), extensionRegistry)); break; } - case 48: { + case 40: { hasError_ = input.readBool(); break; } - case 58: { + case 50: { java.lang.String s = input.readStringRequireUtf8(); errorMessage_ = s; @@ -205,7 +194,7 @@ public final class DetectionOutputOuterClass { throw new com.google.protobuf.InvalidProtocolBufferException( e).setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000010) == 0x00000010)) { + if (((mutable_bitField0_ & 0x00000008) == 0x00000008)) { colorMatrix_ = java.util.Collections.unmodifiableList(colorMatrix_); } this.unknownFields = unknownFields.build(); @@ -225,114 +214,105 @@ public final class DetectionOutputOuterClass { } private int bitField0_; - public static final int NUMBER_FIELD_NUMBER = 1; - private double number_; - /** - * <code>double number = 1;</code> - */ - public double getNumber() { - return number_; - } - - public static final int RAWCOLOR_FIELD_NUMBER = 2; + public static final int RAWCOLOR_FIELD_NUMBER = 1; private com.twine.tango.pmr.tcc.DetectionColorOuterClass.DetectionColor rawColor_; /** - * <code>.Tango.PMR.TCC.DetectionColor RawColor = 2;</code> + * <code>.Tango.PMR.TCC.DetectionColor RawColor = 1;</code> */ public boolean hasRawColor() { return rawColor_ != null; } /** - * <code>.Tango.PMR.TCC.DetectionColor RawColor = 2;</code> + * <code>.Tango.PMR.TCC.DetectionColor RawColor = 1;</code> */ public com.twine.tango.pmr.tcc.DetectionColorOuterClass.DetectionColor getRawColor() { return rawColor_ == null ? com.twine.tango.pmr.tcc.DetectionColorOuterClass.DetectionColor.getDefaultInstance() : rawColor_; } /** - * <code>.Tango.PMR.TCC.DetectionColor RawColor = 2;</code> + * <code>.Tango.PMR.TCC.DetectionColor RawColor = 1;</code> */ public com.twine.tango.pmr.tcc.DetectionColorOuterClass.DetectionColorOrBuilder getRawColorOrBuilder() { return getRawColor(); } - public static final int PROCESSEDCOLOR_FIELD_NUMBER = 3; + public static final int PROCESSEDCOLOR_FIELD_NUMBER = 2; private com.twine.tango.pmr.tcc.DetectionColorOuterClass.DetectionColor processedColor_; /** - * <code>.Tango.PMR.TCC.DetectionColor ProcessedColor = 3;</code> + * <code>.Tango.PMR.TCC.DetectionColor ProcessedColor = 2;</code> */ public boolean hasProcessedColor() { return processedColor_ != null; } /** - * <code>.Tango.PMR.TCC.DetectionColor ProcessedColor = 3;</code> + * <code>.Tango.PMR.TCC.DetectionColor ProcessedColor = 2;</code> */ public com.twine.tango.pmr.tcc.DetectionColorOuterClass.DetectionColor getProcessedColor() { return processedColor_ == null ? com.twine.tango.pmr.tcc.DetectionColorOuterClass.DetectionColor.getDefaultInstance() : processedColor_; } /** - * <code>.Tango.PMR.TCC.DetectionColor ProcessedColor = 3;</code> + * <code>.Tango.PMR.TCC.DetectionColor ProcessedColor = 2;</code> */ public com.twine.tango.pmr.tcc.DetectionColorOuterClass.DetectionColorOrBuilder getProcessedColorOrBuilder() { return getProcessedColor(); } - public static final int DEBUGBITMAP_FIELD_NUMBER = 4; + public static final int DEBUGBITMAP_FIELD_NUMBER = 3; private com.google.protobuf.ByteString debugBitmap_; /** - * <code>bytes DebugBitmap = 4;</code> + * <code>bytes DebugBitmap = 3;</code> */ public com.google.protobuf.ByteString getDebugBitmap() { return debugBitmap_; } - public static final int COLORMATRIX_FIELD_NUMBER = 5; + public static final int COLORMATRIX_FIELD_NUMBER = 4; private java.util.List<com.twine.tango.pmr.tcc.DetectionColorOuterClass.DetectionColor> colorMatrix_; /** - * <code>repeated .Tango.PMR.TCC.DetectionColor ColorMatrix = 5;</code> + * <code>repeated .Tango.PMR.TCC.DetectionColor ColorMatrix = 4;</code> */ public java.util.List<com.twine.tango.pmr.tcc.DetectionColorOuterClass.DetectionColor> getColorMatrixList() { return colorMatrix_; } /** - * <code>repeated .Tango.PMR.TCC.DetectionColor ColorMatrix = 5;</code> + * <code>repeated .Tango.PMR.TCC.DetectionColor ColorMatrix = 4;</code> */ public java.util.List<? extends com.twine.tango.pmr.tcc.DetectionColorOuterClass.DetectionColorOrBuilder> getColorMatrixOrBuilderList() { return colorMatrix_; } /** - * <code>repeated .Tango.PMR.TCC.DetectionColor ColorMatrix = 5;</code> + * <code>repeated .Tango.PMR.TCC.DetectionColor ColorMatrix = 4;</code> */ public int getColorMatrixCount() { return colorMatrix_.size(); } /** - * <code>repeated .Tango.PMR.TCC.DetectionColor ColorMatrix = 5;</code> + * <code>repeated .Tango.PMR.TCC.DetectionColor ColorMatrix = 4;</code> */ public com.twine.tango.pmr.tcc.DetectionColorOuterClass.DetectionColor getColorMatrix(int index) { return colorMatrix_.get(index); } /** - * <code>repeated .Tango.PMR.TCC.DetectionColor ColorMatrix = 5;</code> + * <code>repeated .Tango.PMR.TCC.DetectionColor ColorMatrix = 4;</code> */ public com.twine.tango.pmr.tcc.DetectionColorOuterClass.DetectionColorOrBuilder getColorMatrixOrBuilder( int index) { return colorMatrix_.get(index); } - public static final int HASERROR_FIELD_NUMBER = 6; + public static final int HASERROR_FIELD_NUMBER = 5; private boolean hasError_; /** - * <code>bool HasError = 6;</code> + * <code>bool HasError = 5;</code> */ public boolean getHasError() { return hasError_; } - public static final int ERRORMESSAGE_FIELD_NUMBER = 7; + public static final int ERRORMESSAGE_FIELD_NUMBER = 6; private volatile java.lang.Object errorMessage_; /** - * <code>string ErrorMessage = 7;</code> + * <code>string ErrorMessage = 6;</code> */ public java.lang.String getErrorMessage() { java.lang.Object ref = errorMessage_; @@ -347,7 +327,7 @@ public final class DetectionOutputOuterClass { } } /** - * <code>string ErrorMessage = 7;</code> + * <code>string ErrorMessage = 6;</code> */ public com.google.protobuf.ByteString getErrorMessageBytes() { @@ -375,26 +355,23 @@ public final class DetectionOutputOuterClass { public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (number_ != 0D) { - output.writeDouble(1, number_); - } if (rawColor_ != null) { - output.writeMessage(2, getRawColor()); + output.writeMessage(1, getRawColor()); } if (processedColor_ != null) { - output.writeMessage(3, getProcessedColor()); + output.writeMessage(2, getProcessedColor()); } if (!debugBitmap_.isEmpty()) { - output.writeBytes(4, debugBitmap_); + output.writeBytes(3, debugBitmap_); } for (int i = 0; i < colorMatrix_.size(); i++) { - output.writeMessage(5, colorMatrix_.get(i)); + output.writeMessage(4, colorMatrix_.get(i)); } if (hasError_ != false) { - output.writeBool(6, hasError_); + output.writeBool(5, hasError_); } if (!getErrorMessageBytes().isEmpty()) { - com.google.protobuf.GeneratedMessageV3.writeString(output, 7, errorMessage_); + com.google.protobuf.GeneratedMessageV3.writeString(output, 6, errorMessage_); } unknownFields.writeTo(output); } @@ -404,32 +381,28 @@ public final class DetectionOutputOuterClass { if (size != -1) return size; size = 0; - if (number_ != 0D) { - size += com.google.protobuf.CodedOutputStream - .computeDoubleSize(1, number_); - } if (rawColor_ != null) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(2, getRawColor()); + .computeMessageSize(1, getRawColor()); } if (processedColor_ != null) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(3, getProcessedColor()); + .computeMessageSize(2, getProcessedColor()); } if (!debugBitmap_.isEmpty()) { size += com.google.protobuf.CodedOutputStream - .computeBytesSize(4, debugBitmap_); + .computeBytesSize(3, debugBitmap_); } for (int i = 0; i < colorMatrix_.size(); i++) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(5, colorMatrix_.get(i)); + .computeMessageSize(4, colorMatrix_.get(i)); } if (hasError_ != false) { size += com.google.protobuf.CodedOutputStream - .computeBoolSize(6, hasError_); + .computeBoolSize(5, hasError_); } if (!getErrorMessageBytes().isEmpty()) { - size += com.google.protobuf.GeneratedMessageV3.computeStringSize(7, errorMessage_); + size += com.google.protobuf.GeneratedMessageV3.computeStringSize(6, errorMessage_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -447,10 +420,6 @@ public final class DetectionOutputOuterClass { com.twine.tango.pmr.tcc.DetectionOutputOuterClass.DetectionOutput other = (com.twine.tango.pmr.tcc.DetectionOutputOuterClass.DetectionOutput) obj; boolean result = true; - result = result && ( - java.lang.Double.doubleToLongBits(getNumber()) - == java.lang.Double.doubleToLongBits( - other.getNumber())); result = result && (hasRawColor() == other.hasRawColor()); if (hasRawColor()) { result = result && getRawColor() @@ -480,9 +449,6 @@ public final class DetectionOutputOuterClass { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); - hash = (37 * hash) + NUMBER_FIELD_NUMBER; - hash = (53 * hash) + com.google.protobuf.Internal.hashLong( - java.lang.Double.doubleToLongBits(getNumber())); if (hasRawColor()) { hash = (37 * hash) + RAWCOLOR_FIELD_NUMBER; hash = (53 * hash) + getRawColor().hashCode(); @@ -632,8 +598,6 @@ public final class DetectionOutputOuterClass { } public Builder clear() { super.clear(); - number_ = 0D; - if (rawColorBuilder_ == null) { rawColor_ = null; } else { @@ -650,7 +614,7 @@ public final class DetectionOutputOuterClass { if (colorMatrixBuilder_ == null) { colorMatrix_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000010); + bitField0_ = (bitField0_ & ~0x00000008); } else { colorMatrixBuilder_.clear(); } @@ -682,7 +646,6 @@ public final class DetectionOutputOuterClass { com.twine.tango.pmr.tcc.DetectionOutputOuterClass.DetectionOutput result = new com.twine.tango.pmr.tcc.DetectionOutputOuterClass.DetectionOutput(this); int from_bitField0_ = bitField0_; int to_bitField0_ = 0; - result.number_ = number_; if (rawColorBuilder_ == null) { result.rawColor_ = rawColor_; } else { @@ -695,9 +658,9 @@ public final class DetectionOutputOuterClass { } result.debugBitmap_ = debugBitmap_; if (colorMatrixBuilder_ == null) { - if (((bitField0_ & 0x00000010) == 0x00000010)) { + if (((bitField0_ & 0x00000008) == 0x00000008)) { colorMatrix_ = java.util.Collections.unmodifiableList(colorMatrix_); - bitField0_ = (bitField0_ & ~0x00000010); + bitField0_ = (bitField0_ & ~0x00000008); } result.colorMatrix_ = colorMatrix_; } else { @@ -747,9 +710,6 @@ public final class DetectionOutputOuterClass { public Builder mergeFrom(com.twine.tango.pmr.tcc.DetectionOutputOuterClass.DetectionOutput other) { if (other == com.twine.tango.pmr.tcc.DetectionOutputOuterClass.DetectionOutput.getDefaultInstance()) return this; - if (other.getNumber() != 0D) { - setNumber(other.getNumber()); - } if (other.hasRawColor()) { mergeRawColor(other.getRawColor()); } @@ -763,7 +723,7 @@ public final class DetectionOutputOuterClass { if (!other.colorMatrix_.isEmpty()) { if (colorMatrix_.isEmpty()) { colorMatrix_ = other.colorMatrix_; - bitField0_ = (bitField0_ & ~0x00000010); + bitField0_ = (bitField0_ & ~0x00000008); } else { ensureColorMatrixIsMutable(); colorMatrix_.addAll(other.colorMatrix_); @@ -776,7 +736,7 @@ public final class DetectionOutputOuterClass { colorMatrixBuilder_.dispose(); colorMatrixBuilder_ = null; colorMatrix_ = other.colorMatrix_; - bitField0_ = (bitField0_ & ~0x00000010); + bitField0_ = (bitField0_ & ~0x00000008); colorMatrixBuilder_ = com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ? getColorMatrixFieldBuilder() : null; @@ -820,43 +780,17 @@ public final class DetectionOutputOuterClass { } private int bitField0_; - private double number_ ; - /** - * <code>double number = 1;</code> - */ - public double getNumber() { - return number_; - } - /** - * <code>double number = 1;</code> - */ - public Builder setNumber(double value) { - - number_ = value; - onChanged(); - return this; - } - /** - * <code>double number = 1;</code> - */ - public Builder clearNumber() { - - number_ = 0D; - onChanged(); - return this; - } - private com.twine.tango.pmr.tcc.DetectionColorOuterClass.DetectionColor rawColor_ = null; private com.google.protobuf.SingleFieldBuilderV3< com.twine.tango.pmr.tcc.DetectionColorOuterClass.DetectionColor, com.twine.tango.pmr.tcc.DetectionColorOuterClass.DetectionColor.Builder, com.twine.tango.pmr.tcc.DetectionColorOuterClass.DetectionColorOrBuilder> rawColorBuilder_; /** - * <code>.Tango.PMR.TCC.DetectionColor RawColor = 2;</code> + * <code>.Tango.PMR.TCC.DetectionColor RawColor = 1;</code> */ public boolean hasRawColor() { return rawColorBuilder_ != null || rawColor_ != null; } /** - * <code>.Tango.PMR.TCC.DetectionColor RawColor = 2;</code> + * <code>.Tango.PMR.TCC.DetectionColor RawColor = 1;</code> */ public com.twine.tango.pmr.tcc.DetectionColorOuterClass.DetectionColor getRawColor() { if (rawColorBuilder_ == null) { @@ -866,7 +800,7 @@ public final class DetectionOutputOuterClass { } } /** - * <code>.Tango.PMR.TCC.DetectionColor RawColor = 2;</code> + * <code>.Tango.PMR.TCC.DetectionColor RawColor = 1;</code> */ public Builder setRawColor(com.twine.tango.pmr.tcc.DetectionColorOuterClass.DetectionColor value) { if (rawColorBuilder_ == null) { @@ -882,7 +816,7 @@ public final class DetectionOutputOuterClass { return this; } /** - * <code>.Tango.PMR.TCC.DetectionColor RawColor = 2;</code> + * <code>.Tango.PMR.TCC.DetectionColor RawColor = 1;</code> */ public Builder setRawColor( com.twine.tango.pmr.tcc.DetectionColorOuterClass.DetectionColor.Builder builderForValue) { @@ -896,7 +830,7 @@ public final class DetectionOutputOuterClass { return this; } /** - * <code>.Tango.PMR.TCC.DetectionColor RawColor = 2;</code> + * <code>.Tango.PMR.TCC.DetectionColor RawColor = 1;</code> */ public Builder mergeRawColor(com.twine.tango.pmr.tcc.DetectionColorOuterClass.DetectionColor value) { if (rawColorBuilder_ == null) { @@ -914,7 +848,7 @@ public final class DetectionOutputOuterClass { return this; } /** - * <code>.Tango.PMR.TCC.DetectionColor RawColor = 2;</code> + * <code>.Tango.PMR.TCC.DetectionColor RawColor = 1;</code> */ public Builder clearRawColor() { if (rawColorBuilder_ == null) { @@ -928,7 +862,7 @@ public final class DetectionOutputOuterClass { return this; } /** - * <code>.Tango.PMR.TCC.DetectionColor RawColor = 2;</code> + * <code>.Tango.PMR.TCC.DetectionColor RawColor = 1;</code> */ public com.twine.tango.pmr.tcc.DetectionColorOuterClass.DetectionColor.Builder getRawColorBuilder() { @@ -936,7 +870,7 @@ public final class DetectionOutputOuterClass { return getRawColorFieldBuilder().getBuilder(); } /** - * <code>.Tango.PMR.TCC.DetectionColor RawColor = 2;</code> + * <code>.Tango.PMR.TCC.DetectionColor RawColor = 1;</code> */ public com.twine.tango.pmr.tcc.DetectionColorOuterClass.DetectionColorOrBuilder getRawColorOrBuilder() { if (rawColorBuilder_ != null) { @@ -947,7 +881,7 @@ public final class DetectionOutputOuterClass { } } /** - * <code>.Tango.PMR.TCC.DetectionColor RawColor = 2;</code> + * <code>.Tango.PMR.TCC.DetectionColor RawColor = 1;</code> */ private com.google.protobuf.SingleFieldBuilderV3< com.twine.tango.pmr.tcc.DetectionColorOuterClass.DetectionColor, com.twine.tango.pmr.tcc.DetectionColorOuterClass.DetectionColor.Builder, com.twine.tango.pmr.tcc.DetectionColorOuterClass.DetectionColorOrBuilder> @@ -967,13 +901,13 @@ public final class DetectionOutputOuterClass { private com.google.protobuf.SingleFieldBuilderV3< com.twine.tango.pmr.tcc.DetectionColorOuterClass.DetectionColor, com.twine.tango.pmr.tcc.DetectionColorOuterClass.DetectionColor.Builder, com.twine.tango.pmr.tcc.DetectionColorOuterClass.DetectionColorOrBuilder> processedColorBuilder_; /** - * <code>.Tango.PMR.TCC.DetectionColor ProcessedColor = 3;</code> + * <code>.Tango.PMR.TCC.DetectionColor ProcessedColor = 2;</code> */ public boolean hasProcessedColor() { return processedColorBuilder_ != null || processedColor_ != null; } /** - * <code>.Tango.PMR.TCC.DetectionColor ProcessedColor = 3;</code> + * <code>.Tango.PMR.TCC.DetectionColor ProcessedColor = 2;</code> */ public com.twine.tango.pmr.tcc.DetectionColorOuterClass.DetectionColor getProcessedColor() { if (processedColorBuilder_ == null) { @@ -983,7 +917,7 @@ public final class DetectionOutputOuterClass { } } /** - * <code>.Tango.PMR.TCC.DetectionColor ProcessedColor = 3;</code> + * <code>.Tango.PMR.TCC.DetectionColor ProcessedColor = 2;</code> */ public Builder setProcessedColor(com.twine.tango.pmr.tcc.DetectionColorOuterClass.DetectionColor value) { if (processedColorBuilder_ == null) { @@ -999,7 +933,7 @@ public final class DetectionOutputOuterClass { return this; } /** - * <code>.Tango.PMR.TCC.DetectionColor ProcessedColor = 3;</code> + * <code>.Tango.PMR.TCC.DetectionColor ProcessedColor = 2;</code> */ public Builder setProcessedColor( com.twine.tango.pmr.tcc.DetectionColorOuterClass.DetectionColor.Builder builderForValue) { @@ -1013,7 +947,7 @@ public final class DetectionOutputOuterClass { return this; } /** - * <code>.Tango.PMR.TCC.DetectionColor ProcessedColor = 3;</code> + * <code>.Tango.PMR.TCC.DetectionColor ProcessedColor = 2;</code> */ public Builder mergeProcessedColor(com.twine.tango.pmr.tcc.DetectionColorOuterClass.DetectionColor value) { if (processedColorBuilder_ == null) { @@ -1031,7 +965,7 @@ public final class DetectionOutputOuterClass { return this; } /** - * <code>.Tango.PMR.TCC.DetectionColor ProcessedColor = 3;</code> + * <code>.Tango.PMR.TCC.DetectionColor ProcessedColor = 2;</code> */ public Builder clearProcessedColor() { if (processedColorBuilder_ == null) { @@ -1045,7 +979,7 @@ public final class DetectionOutputOuterClass { return this; } /** - * <code>.Tango.PMR.TCC.DetectionColor ProcessedColor = 3;</code> + * <code>.Tango.PMR.TCC.DetectionColor ProcessedColor = 2;</code> */ public com.twine.tango.pmr.tcc.DetectionColorOuterClass.DetectionColor.Builder getProcessedColorBuilder() { @@ -1053,7 +987,7 @@ public final class DetectionOutputOuterClass { return getProcessedColorFieldBuilder().getBuilder(); } /** - * <code>.Tango.PMR.TCC.DetectionColor ProcessedColor = 3;</code> + * <code>.Tango.PMR.TCC.DetectionColor ProcessedColor = 2;</code> */ public com.twine.tango.pmr.tcc.DetectionColorOuterClass.DetectionColorOrBuilder getProcessedColorOrBuilder() { if (processedColorBuilder_ != null) { @@ -1064,7 +998,7 @@ public final class DetectionOutputOuterClass { } } /** - * <code>.Tango.PMR.TCC.DetectionColor ProcessedColor = 3;</code> + * <code>.Tango.PMR.TCC.DetectionColor ProcessedColor = 2;</code> */ private com.google.protobuf.SingleFieldBuilderV3< com.twine.tango.pmr.tcc.DetectionColorOuterClass.DetectionColor, com.twine.tango.pmr.tcc.DetectionColorOuterClass.DetectionColor.Builder, com.twine.tango.pmr.tcc.DetectionColorOuterClass.DetectionColorOrBuilder> @@ -1082,13 +1016,13 @@ public final class DetectionOutputOuterClass { private com.google.protobuf.ByteString debugBitmap_ = com.google.protobuf.ByteString.EMPTY; /** - * <code>bytes DebugBitmap = 4;</code> + * <code>bytes DebugBitmap = 3;</code> */ public com.google.protobuf.ByteString getDebugBitmap() { return debugBitmap_; } /** - * <code>bytes DebugBitmap = 4;</code> + * <code>bytes DebugBitmap = 3;</code> */ public Builder setDebugBitmap(com.google.protobuf.ByteString value) { if (value == null) { @@ -1100,7 +1034,7 @@ public final class DetectionOutputOuterClass { return this; } /** - * <code>bytes DebugBitmap = 4;</code> + * <code>bytes DebugBitmap = 3;</code> */ public Builder clearDebugBitmap() { @@ -1112,9 +1046,9 @@ public final class DetectionOutputOuterClass { private java.util.List<com.twine.tango.pmr.tcc.DetectionColorOuterClass.DetectionColor> colorMatrix_ = java.util.Collections.emptyList(); private void ensureColorMatrixIsMutable() { - if (!((bitField0_ & 0x00000010) == 0x00000010)) { + if (!((bitField0_ & 0x00000008) == 0x00000008)) { colorMatrix_ = new java.util.ArrayList<com.twine.tango.pmr.tcc.DetectionColorOuterClass.DetectionColor>(colorMatrix_); - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000008; } } @@ -1122,7 +1056,7 @@ public final class DetectionOutputOuterClass { com.twine.tango.pmr.tcc.DetectionColorOuterClass.DetectionColor, com.twine.tango.pmr.tcc.DetectionColorOuterClass.DetectionColor.Builder, com.twine.tango.pmr.tcc.DetectionColorOuterClass.DetectionColorOrBuilder> colorMatrixBuilder_; /** - * <code>repeated .Tango.PMR.TCC.DetectionColor ColorMatrix = 5;</code> + * <code>repeated .Tango.PMR.TCC.DetectionColor ColorMatrix = 4;</code> */ public java.util.List<com.twine.tango.pmr.tcc.DetectionColorOuterClass.DetectionColor> getColorMatrixList() { if (colorMatrixBuilder_ == null) { @@ -1132,7 +1066,7 @@ public final class DetectionOutputOuterClass { } } /** - * <code>repeated .Tango.PMR.TCC.DetectionColor ColorMatrix = 5;</code> + * <code>repeated .Tango.PMR.TCC.DetectionColor ColorMatrix = 4;</code> */ public int getColorMatrixCount() { if (colorMatrixBuilder_ == null) { @@ -1142,7 +1076,7 @@ public final class DetectionOutputOuterClass { } } /** - * <code>repeated .Tango.PMR.TCC.DetectionColor ColorMatrix = 5;</code> + * <code>repeated .Tango.PMR.TCC.DetectionColor ColorMatrix = 4;</code> */ public com.twine.tango.pmr.tcc.DetectionColorOuterClass.DetectionColor getColorMatrix(int index) { if (colorMatrixBuilder_ == null) { @@ -1152,7 +1086,7 @@ public final class DetectionOutputOuterClass { } } /** - * <code>repeated .Tango.PMR.TCC.DetectionColor ColorMatrix = 5;</code> + * <code>repeated .Tango.PMR.TCC.DetectionColor ColorMatrix = 4;</code> */ public Builder setColorMatrix( int index, com.twine.tango.pmr.tcc.DetectionColorOuterClass.DetectionColor value) { @@ -1169,7 +1103,7 @@ public final class DetectionOutputOuterClass { return this; } /** - * <code>repeated .Tango.PMR.TCC.DetectionColor ColorMatrix = 5;</code> + * <code>repeated .Tango.PMR.TCC.DetectionColor ColorMatrix = 4;</code> */ public Builder setColorMatrix( int index, com.twine.tango.pmr.tcc.DetectionColorOuterClass.DetectionColor.Builder builderForValue) { @@ -1183,7 +1117,7 @@ public final class DetectionOutputOuterClass { return this; } /** - * <code>repeated .Tango.PMR.TCC.DetectionColor ColorMatrix = 5;</code> + * <code>repeated .Tango.PMR.TCC.DetectionColor ColorMatrix = 4;</code> */ public Builder addColorMatrix(com.twine.tango.pmr.tcc.DetectionColorOuterClass.DetectionColor value) { if (colorMatrixBuilder_ == null) { @@ -1199,7 +1133,7 @@ public final class DetectionOutputOuterClass { return this; } /** - * <code>repeated .Tango.PMR.TCC.DetectionColor ColorMatrix = 5;</code> + * <code>repeated .Tango.PMR.TCC.DetectionColor ColorMatrix = 4;</code> */ public Builder addColorMatrix( int index, com.twine.tango.pmr.tcc.DetectionColorOuterClass.DetectionColor value) { @@ -1216,7 +1150,7 @@ public final class DetectionOutputOuterClass { return this; } /** - * <code>repeated .Tango.PMR.TCC.DetectionColor ColorMatrix = 5;</code> + * <code>repeated .Tango.PMR.TCC.DetectionColor ColorMatrix = 4;</code> */ public Builder addColorMatrix( com.twine.tango.pmr.tcc.DetectionColorOuterClass.DetectionColor.Builder builderForValue) { @@ -1230,7 +1164,7 @@ public final class DetectionOutputOuterClass { return this; } /** - * <code>repeated .Tango.PMR.TCC.DetectionColor ColorMatrix = 5;</code> + * <code>repeated .Tango.PMR.TCC.DetectionColor ColorMatrix = 4;</code> */ public Builder addColorMatrix( int index, com.twine.tango.pmr.tcc.DetectionColorOuterClass.DetectionColor.Builder builderForValue) { @@ -1244,7 +1178,7 @@ public final class DetectionOutputOuterClass { return this; } /** - * <code>repeated .Tango.PMR.TCC.DetectionColor ColorMatrix = 5;</code> + * <code>repeated .Tango.PMR.TCC.DetectionColor ColorMatrix = 4;</code> */ public Builder addAllColorMatrix( java.lang.Iterable<? extends com.twine.tango.pmr.tcc.DetectionColorOuterClass.DetectionColor> values) { @@ -1259,12 +1193,12 @@ public final class DetectionOutputOuterClass { return this; } /** - * <code>repeated .Tango.PMR.TCC.DetectionColor ColorMatrix = 5;</code> + * <code>repeated .Tango.PMR.TCC.DetectionColor ColorMatrix = 4;</code> */ public Builder clearColorMatrix() { if (colorMatrixBuilder_ == null) { colorMatrix_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000010); + bitField0_ = (bitField0_ & ~0x00000008); onChanged(); } else { colorMatrixBuilder_.clear(); @@ -1272,7 +1206,7 @@ public final class DetectionOutputOuterClass { return this; } /** - * <code>repeated .Tango.PMR.TCC.DetectionColor ColorMatrix = 5;</code> + * <code>repeated .Tango.PMR.TCC.DetectionColor ColorMatrix = 4;</code> */ public Builder removeColorMatrix(int index) { if (colorMatrixBuilder_ == null) { @@ -1285,14 +1219,14 @@ public final class DetectionOutputOuterClass { return this; } /** - * <code>repeated .Tango.PMR.TCC.DetectionColor ColorMatrix = 5;</code> + * <code>repeated .Tango.PMR.TCC.DetectionColor ColorMatrix = 4;</code> */ public com.twine.tango.pmr.tcc.DetectionColorOuterClass.DetectionColor.Builder getColorMatrixBuilder( int index) { return getColorMatrixFieldBuilder().getBuilder(index); } /** - * <code>repeated .Tango.PMR.TCC.DetectionColor ColorMatrix = 5;</code> + * <code>repeated .Tango.PMR.TCC.DetectionColor ColorMatrix = 4;</code> */ public com.twine.tango.pmr.tcc.DetectionColorOuterClass.DetectionColorOrBuilder getColorMatrixOrBuilder( int index) { @@ -1302,7 +1236,7 @@ public final class DetectionOutputOuterClass { } } /** - * <code>repeated .Tango.PMR.TCC.DetectionColor ColorMatrix = 5;</code> + * <code>repeated .Tango.PMR.TCC.DetectionColor ColorMatrix = 4;</code> */ public java.util.List<? extends com.twine.tango.pmr.tcc.DetectionColorOuterClass.DetectionColorOrBuilder> getColorMatrixOrBuilderList() { @@ -1313,14 +1247,14 @@ public final class DetectionOutputOuterClass { } } /** - * <code>repeated .Tango.PMR.TCC.DetectionColor ColorMatrix = 5;</code> + * <code>repeated .Tango.PMR.TCC.DetectionColor ColorMatrix = 4;</code> */ public com.twine.tango.pmr.tcc.DetectionColorOuterClass.DetectionColor.Builder addColorMatrixBuilder() { return getColorMatrixFieldBuilder().addBuilder( com.twine.tango.pmr.tcc.DetectionColorOuterClass.DetectionColor.getDefaultInstance()); } /** - * <code>repeated .Tango.PMR.TCC.DetectionColor ColorMatrix = 5;</code> + * <code>repeated .Tango.PMR.TCC.DetectionColor ColorMatrix = 4;</code> */ public com.twine.tango.pmr.tcc.DetectionColorOuterClass.DetectionColor.Builder addColorMatrixBuilder( int index) { @@ -1328,7 +1262,7 @@ public final class DetectionOutputOuterClass { index, com.twine.tango.pmr.tcc.DetectionColorOuterClass.DetectionColor.getDefaultInstance()); } /** - * <code>repeated .Tango.PMR.TCC.DetectionColor ColorMatrix = 5;</code> + * <code>repeated .Tango.PMR.TCC.DetectionColor ColorMatrix = 4;</code> */ public java.util.List<com.twine.tango.pmr.tcc.DetectionColorOuterClass.DetectionColor.Builder> getColorMatrixBuilderList() { @@ -1341,7 +1275,7 @@ public final class DetectionOutputOuterClass { colorMatrixBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3< com.twine.tango.pmr.tcc.DetectionColorOuterClass.DetectionColor, com.twine.tango.pmr.tcc.DetectionColorOuterClass.DetectionColor.Builder, com.twine.tango.pmr.tcc.DetectionColorOuterClass.DetectionColorOrBuilder>( colorMatrix_, - ((bitField0_ & 0x00000010) == 0x00000010), + ((bitField0_ & 0x00000008) == 0x00000008), getParentForChildren(), isClean()); colorMatrix_ = null; @@ -1351,13 +1285,13 @@ public final class DetectionOutputOuterClass { private boolean hasError_ ; /** - * <code>bool HasError = 6;</code> + * <code>bool HasError = 5;</code> */ public boolean getHasError() { return hasError_; } /** - * <code>bool HasError = 6;</code> + * <code>bool HasError = 5;</code> */ public Builder setHasError(boolean value) { @@ -1366,7 +1300,7 @@ public final class DetectionOutputOuterClass { return this; } /** - * <code>bool HasError = 6;</code> + * <code>bool HasError = 5;</code> */ public Builder clearHasError() { @@ -1377,7 +1311,7 @@ public final class DetectionOutputOuterClass { private java.lang.Object errorMessage_ = ""; /** - * <code>string ErrorMessage = 7;</code> + * <code>string ErrorMessage = 6;</code> */ public java.lang.String getErrorMessage() { java.lang.Object ref = errorMessage_; @@ -1392,7 +1326,7 @@ public final class DetectionOutputOuterClass { } } /** - * <code>string ErrorMessage = 7;</code> + * <code>string ErrorMessage = 6;</code> */ public com.google.protobuf.ByteString getErrorMessageBytes() { @@ -1408,7 +1342,7 @@ public final class DetectionOutputOuterClass { } } /** - * <code>string ErrorMessage = 7;</code> + * <code>string ErrorMessage = 6;</code> */ public Builder setErrorMessage( java.lang.String value) { @@ -1421,7 +1355,7 @@ public final class DetectionOutputOuterClass { return this; } /** - * <code>string ErrorMessage = 7;</code> + * <code>string ErrorMessage = 6;</code> */ public Builder clearErrorMessage() { @@ -1430,7 +1364,7 @@ public final class DetectionOutputOuterClass { return this; } /** - * <code>string ErrorMessage = 7;</code> + * <code>string ErrorMessage = 6;</code> */ public Builder setErrorMessageBytes( com.google.protobuf.ByteString value) { @@ -1507,14 +1441,14 @@ public final class DetectionOutputOuterClass { static { java.lang.String[] descriptorData = { "\n\025DetectionOutput.proto\022\rTango.PMR.TCC\032\024" + - "DetectionColor.proto\"\372\001\n\017DetectionOutput" + - "\022\016\n\006number\030\001 \001(\001\022/\n\010RawColor\030\002 \001(\0132\035.Tan" + - "go.PMR.TCC.DetectionColor\0225\n\016ProcessedCo" + - "lor\030\003 \001(\0132\035.Tango.PMR.TCC.DetectionColor" + - "\022\023\n\013DebugBitmap\030\004 \001(\014\0222\n\013ColorMatrix\030\005 \003" + - "(\0132\035.Tango.PMR.TCC.DetectionColor\022\020\n\010Has" + - "Error\030\006 \001(\010\022\024\n\014ErrorMessage\030\007 \001(\tB\031\n\027com" + - ".twine.tango.pmr.tccb\006proto3" + "DetectionColor.proto\"\352\001\n\017DetectionOutput" + + "\022/\n\010RawColor\030\001 \001(\0132\035.Tango.PMR.TCC.Detec" + + "tionColor\0225\n\016ProcessedColor\030\002 \001(\0132\035.Tang" + + "o.PMR.TCC.DetectionColor\022\023\n\013DebugBitmap\030" + + "\003 \001(\014\0222\n\013ColorMatrix\030\004 \003(\0132\035.Tango.PMR.T" + + "CC.DetectionColor\022\020\n\010HasError\030\005 \001(\010\022\024\n\014E" + + "rrorMessage\030\006 \001(\tB\031\n\027com.twine.tango.pmr" + + ".tccb\006proto3" }; com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = new com.google.protobuf.Descriptors.FileDescriptor. InternalDescriptorAssigner() { @@ -1534,7 +1468,7 @@ public final class DetectionOutputOuterClass { internal_static_Tango_PMR_TCC_DetectionOutput_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_Tango_PMR_TCC_DetectionOutput_descriptor, - new java.lang.String[] { "Number", "RawColor", "ProcessedColor", "DebugBitmap", "ColorMatrix", "HasError", "ErrorMessage", }); + new java.lang.String[] { "RawColor", "ProcessedColor", "DebugBitmap", "ColorMatrix", "HasError", "ErrorMessage", }); com.twine.tango.pmr.tcc.DetectionColorOuterClass.getDescriptor(); } diff --git a/Software/Android_Studio/ColorCapture/app/src/main/res/layout/dialog_confirm.xml b/Software/Android_Studio/ColorCapture/app/src/main/res/layout/dialog_confirm.xml index 267b16249..9d3eeac36 100644 --- a/Software/Android_Studio/ColorCapture/app/src/main/res/layout/dialog_confirm.xml +++ b/Software/Android_Studio/ColorCapture/app/src/main/res/layout/dialog_confirm.xml @@ -19,7 +19,6 @@ android:layout_height="@dimen/dialog_height" android:layout_centerVertical="true" android:layout_centerHorizontal="true" - android:elevation="10dp" android:background="@drawable/border_primary_background"> <FrameLayout diff --git a/Software/Android_Studio/ColorCapture/app/src/main/res/layout/dialog_error.xml b/Software/Android_Studio/ColorCapture/app/src/main/res/layout/dialog_error.xml index 64bfee94d..4e172c584 100644 --- a/Software/Android_Studio/ColorCapture/app/src/main/res/layout/dialog_error.xml +++ b/Software/Android_Studio/ColorCapture/app/src/main/res/layout/dialog_error.xml @@ -19,7 +19,6 @@ android:layout_height="@dimen/dialog_height" android:layout_centerVertical="true" android:layout_centerHorizontal="true" - android:elevation="10dp" android:background="@drawable/border_primary_background"> <FrameLayout diff --git a/Software/Android_Studio/ColorCapture/app/src/main/res/layout/dialog_progress.xml b/Software/Android_Studio/ColorCapture/app/src/main/res/layout/dialog_progress.xml index 0bd706518..838e439ac 100644 --- a/Software/Android_Studio/ColorCapture/app/src/main/res/layout/dialog_progress.xml +++ b/Software/Android_Studio/ColorCapture/app/src/main/res/layout/dialog_progress.xml @@ -11,6 +11,7 @@ <RelativeLayout android:layout_width="match_parent" + android:layoutDirection="ltr" android:layout_height="match_parent" android:background="@color/colorBlueMask"> @@ -18,7 +19,6 @@ android:layout_width="@dimen/dialog_width" android:layout_height="@dimen/dialog_height" android:layout_centerVertical="true" - android:elevation="10dp" android:layout_centerHorizontal="true" android:background="@drawable/border_primary_background"> diff --git a/Software/Android_Studio/ColorCapture/app/src/main/res/layout/dialog_success.xml b/Software/Android_Studio/ColorCapture/app/src/main/res/layout/dialog_success.xml index 4c099af9f..8e6bfb3fc 100644 --- a/Software/Android_Studio/ColorCapture/app/src/main/res/layout/dialog_success.xml +++ b/Software/Android_Studio/ColorCapture/app/src/main/res/layout/dialog_success.xml @@ -18,7 +18,6 @@ android:layout_width="@dimen/dialog_width" android:layout_height="@dimen/dialog_height" android:layout_centerVertical="true" - android:elevation="10dp" android:layout_centerHorizontal="true" android:background="@drawable/border_primary_background"> diff --git a/Software/Android_Studio/ColorCapture/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/Software/Android_Studio/ColorCapture/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml deleted file mode 100644 index eca70cfe5..000000000 --- a/Software/Android_Studio/ColorCapture/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android"> - <background android:drawable="@drawable/ic_launcher_background" /> - <foreground android:drawable="@drawable/ic_launcher_foreground" /> -</adaptive-icon>
\ No newline at end of file diff --git a/Software/Android_Studio/ColorCapture/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/Software/Android_Studio/ColorCapture/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml deleted file mode 100644 index eca70cfe5..000000000 --- a/Software/Android_Studio/ColorCapture/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android"> - <background android:drawable="@drawable/ic_launcher_background" /> - <foreground android:drawable="@drawable/ic_launcher_foreground" /> -</adaptive-icon>
\ No newline at end of file diff --git a/Software/Android_Studio/ColorCapture/app/src/main/res/values/colors.xml b/Software/Android_Studio/ColorCapture/app/src/main/res/values/colors.xml index 22828c302..9f9fad7c6 100644 --- a/Software/Android_Studio/ColorCapture/app/src/main/res/values/colors.xml +++ b/Software/Android_Studio/ColorCapture/app/src/main/res/values/colors.xml @@ -12,7 +12,7 @@ <color name="colorPrimaryBackground">#0e2340</color> <color name="colorDarkBackground">#07101e</color> - <color name="colorBlueMask">#EB071220</color> + <color name="colorBlueMask">#BE071220</color> <color name="colorWhiteMask">#B71D3150</color> <color name="colorGradientAccent1">#26d440</color> |