Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Refractor MagneticFieldSensor to extend abstract class #2

Draft
wants to merge 2 commits into
base: magnetic
Choose a base branch
from
Draft

Refractor MagneticFieldSensor to extend abstract class #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8d4b8c9
Refractor MagneticFieldSensor to extend abstract class
bartmathijssen Jan 17, 2020
caa7806
Add Dutch translations
bartmathijssen Jan 17, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions appinventor/appengine/src/com/google/appinventor/client/OdeMessages_nl.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1550,3 +1550,12 @@ drawingAndAnimationComponentPallette=Animatie
extensionComponentPallette=Uitbreiding
ShowListsAsJsonProperties=ToonLijstAlsJson
TutorialURLProperties=HandleidingURL
XstrengthProperties=XSterkte
YstrengthProperties=YSterkte
ZstrengthProperties=ZSterkte
MagneticChangedEvents=MagnetischVeldGewijzigd
xStrengthParams=xSterkte
yStrengthParams=ySterkte
zStrengthParams=zSterkte
absoluteStrengthParams=absoluteSterkte
AbsoluteStrengthProperties=AbsoluteSterkte
184 changes: 41 additions & 143 deletions ...nventor/components/src/com/google/appinventor/components/runtime/MagneticFieldSensor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,156 +6,54 @@

package com.google.appinventor.components.runtime;

import android.hardware.Sensor;
import android.hardware.SensorEvent;
import android.hardware.SensorEventListener;
import android.hardware.SensorManager;

import com.google.appinventor.components.annotations.DesignerComponent;
import com.google.appinventor.components.annotations.DesignerProperty;
import com.google.appinventor.components.annotations.PropertyCategory;
import com.google.appinventor.components.annotations.SimpleEvent;
import com.google.appinventor.components.annotations.SimpleObject;
import com.google.appinventor.components.annotations.SimpleProperty;
import com.google.appinventor.components.common.ComponentCategory;
import com.google.appinventor.components.common.YaVersion;

@DesignerComponent(
category = ComponentCategory.SENSORS,
description = "<p>Non-visible component that measures the ambient geomagnetic field for all three physical axes (x, y, z) in Tesla https://en.wikipedia.org/wiki/Tesla_(unit). </p>",
iconName = "images/magneticSensor.png",
nonVisible = true,
version = YaVersion.MAGNETICFIELDSENSOR_COMPONENT_VERSION)
@DesignerComponent(version = YaVersion.MAGNETICFIELDSENSOR_COMPONENT_VERSION,
description = "<p>Non-visible component that measures the ambient geomagnetic field for all three physical axes (x, y, z) in Tesla https://en.wikipedia.org/wiki/Tesla_(unit).</p>",
category = ComponentCategory.SENSORS,
nonVisible = true,
iconName = "images/magneticSensor.png")
@SimpleObject

public class MagneticFieldSensor extends AndroidNonvisibleComponent implements SensorEventListener, Deleteable, OnPauseListener, OnResumeListener, OnStopListener, SensorComponent {
private double absoluteStrength;
private boolean enabled = true;
private boolean listening;
private Sensor magneticSensor;
private final SensorManager sensorManager;
private float xStrength;
private float yStrength;
private float zStrength;

public MagneticFieldSensor(ComponentContainer container) {
super(container.$form());
form.registerForOnResume(this);
form.registerForOnStop(this);
form.registerForOnPause(this);
sensorManager = (SensorManager) container.$context().getSystemService("sensor");
magneticSensor = sensorManager.getDefaultSensor(2);
startListening();
}

@SimpleProperty(category = PropertyCategory.BEHAVIOR)
public boolean Available() {
return sensorManager.getSensorList(2).size() > 0;
}

@SimpleProperty(category = PropertyCategory.BEHAVIOR)
public float MaximumRange() {
return magneticSensor.getMaximumRange();
}

@SimpleProperty(category = PropertyCategory.BEHAVIOR)
public boolean Enabled() {
return enabled;
}

@DesignerProperty(defaultValue = "True", editorType = "boolean")
@SimpleProperty
public void Enabled(boolean localEnabled) {
if (enabled != localEnabled) {
enabled = localEnabled;
}
if (enabled) {
startListening();
} else {
stopListening();
}
}

@SimpleEvent(description = "Indicates that the magnetic sensor data has changed. ")
public void MagneticChanged(float xStrength, float yStrength, float zStrength, double absoluteStrength) {
EventDispatcher.dispatchEvent(this, "MagneticChanged", xStrength, yStrength, zStrength, absoluteStrength);
}

@SimpleProperty(category = PropertyCategory.BEHAVIOR)
public double AbsoluteStrength() {
return absoluteStrength;
}

@SimpleProperty(category = PropertyCategory.BEHAVIOR)
public float XStrength() {
return xStrength;
}

@SimpleProperty(category = PropertyCategory.BEHAVIOR)
public float YStrength() {
return yStrength;
}

@SimpleProperty(category = PropertyCategory.BEHAVIOR)
public float ZStrength() {
return zStrength;
}

private Sensor getMagneticSensor() {
Sensor sensor = sensorManager.getDefaultSensor(2);
return sensor != null ? sensor : sensorManager.getDefaultSensor(2);
}

public void onResume() {
if (enabled) {
startListening();
}
}

public void onStop() {
if (enabled) {
stopListening();
}
}

public void onDelete() {
if (enabled) {
stopListening();
}
}

public void onPause() {
stopListening();
}

private void startListening() {
if (!listening && sensorManager != null && magneticSensor != null) {
sensorManager.registerListener(this, magneticSensor, 3);
listening = true;
}
}

private void stopListening() {
if (listening && sensorManager != null) {
sensorManager.unregisterListener(this);
listening = false;
xStrength = 0.0f;
yStrength = 0.0f;
zStrength = 0.0f;
}
}

public void onSensorChanged(SensorEvent sensorEvent) {
if (enabled && sensorEvent.sensor.getType() == 2) {
float[] values = (float[]) sensorEvent.values.clone();
xStrength = sensorEvent.values[0];
yStrength = sensorEvent.values[1];
zStrength = sensorEvent.values[2];
absoluteStrength = Math.sqrt((double) (((xStrength * xStrength) + (yStrength * yStrength)) + (zStrength * zStrength)));
MagneticChanged(xStrength, yStrength, zStrength, absoluteStrength);
}
}

public void onAccuracyChanged(Sensor sensor, int i) {
}
public class MagneticFieldSensor extends MultipleValueSensor {
private float xStrength;
private float yStrength;
private float zStrength;

public MagneticFieldSensor(ComponentContainer container, int sensorType) {
super(container, sensorType);
}

@Override
protected void onValuesChanged(float[] values) {
xStrength = values[0];
yStrength = values[1];
zStrength = values[2];
MagneticChanged(xStrength, yStrength, zStrength);
}

@SimpleEvent
public void MagneticChanged(float xStrength, float yStrength, float zStrength) {
EventDispatcher.dispatchEvent(this, "MagneticChanged", xStrength, yStrength, zStrength);
}

@SimpleProperty(category = PropertyCategory.BEHAVIOR)
public float Xstrength() {
return xStrength;
}

@SimpleProperty(category = PropertyCategory.BEHAVIOR)
public float Ystrength() {
return yStrength;
}

@SimpleProperty(category = PropertyCategory.BEHAVIOR)
public float Zstrength() {
return zStrength;
}
}
34 changes: 34 additions & 0 deletions ...nventor/components/src/com/google/appinventor/components/runtime/MultipleValueSensor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
// -*- mode: java; c-basic-offset: 2; -*-
// Copyright 2020 MIT, All rights reserved
// Released under the Apache License, Version 2.0
// http://www.apache.org/licenses/LICENSE-2.0


package com.google.appinventor.components.runtime;

import com.google.appinventor.components.annotations.SimpleObject;

import android.hardware.SensorEvent;

@SimpleObject
public abstract class MultipleValueSensor extends SensorBase {
protected float[] values; // most recent values read

public MultipleValueSensor(ComponentContainer container, int sensorType) {
super(container, sensorType);
}

@Override
public void onSensorChanged(SensorEvent sensorEvent) {
if (enabled && sensorEvent.sensor.getType() == sensorType) {
values = sensorEvent.values;
onValuesChanged(values);
}
}

protected abstract void onValuesChanged(float[] values);

protected float getValueAtIndex(int index) {
return values[index];
}
}
Loading