From 6f54a7be9f93a6f77da38ea3e9c1e317a14e4277 Mon Sep 17 00:00:00 2001 From: sungmin ha Date: Fri, 6 Jul 2012 22:36:09 +0900 Subject: [PATCH] [Title]modified sensor tab name [Type]Bugfix [Module]eventinjector [Priority]Major [Jira#]S1-5208, 5206, 5207 [Redmine#] // Redmine Isuue Number [Problem] // Problem Description [Cause] // Cause Description [Solution] // Solution Description [TestCase] // Executed the test-target (How to) --- .../sensor/accelerometer/page/ManualInputAccel.java | 2 +- .../sensor/accelerometer/page/ManualInputGyro.java | 12 ++++++------ .../sensor/accelerometer/page/ManualInputMagnetic.java | 6 +++--- .../sensor/accelerometer/page/ManualInputTilt.java | 18 +++++++++--------- package/pkginfo.manifest | 4 ++-- 5 files changed, 21 insertions(+), 21 deletions(-) diff --git a/org.tizen.sensor.accelerometer/src/org/tizen/sensor/accelerometer/page/ManualInputAccel.java b/org.tizen.sensor.accelerometer/src/org/tizen/sensor/accelerometer/page/ManualInputAccel.java index 04c0b8f..dd45a8b 100644 --- a/org.tizen.sensor.accelerometer/src/org/tizen/sensor/accelerometer/page/ManualInputAccel.java +++ b/org.tizen.sensor.accelerometer/src/org/tizen/sensor/accelerometer/page/ManualInputAccel.java @@ -319,7 +319,7 @@ public class ManualInputAccel extends AbstractInjectorPage { accel_xText.setText(df.format(accel_xValue)); accel_yText.setText(df.format(accel_yValue)); accel_zText.setText(df.format(accel_zValue)); - TestSensorMessage msg = new TestSensorMessage(accel_xValue * 9.81, accel_yValue * 9.81, accel_zValue * 9.81); + TestSensorMessage msg = new TestSensorMessage(accel_xValue * 9.81, accel_yValue * -9.81, accel_zValue * -9.81); try { injectorSocket.sendSensor(SensorConstants.ACCEL_ID + msg.getMessage()); diff --git a/org.tizen.sensor.accelerometer/src/org/tizen/sensor/accelerometer/page/ManualInputGyro.java b/org.tizen.sensor.accelerometer/src/org/tizen/sensor/accelerometer/page/ManualInputGyro.java index db20197..aa405fc 100644 --- a/org.tizen.sensor.accelerometer/src/org/tizen/sensor/accelerometer/page/ManualInputGyro.java +++ b/org.tizen.sensor.accelerometer/src/org/tizen/sensor/accelerometer/page/ManualInputGyro.java @@ -86,7 +86,7 @@ public class ManualInputGyro extends AbstractInjectorPage { gyro_xSlider = formUtil.createSlider(mainComposite); setDefaultSlider(gyro_xSlider, maxSliderVal); gd = new GridData(SWT.NONE, SWT.CENTER, false, true); - gd.widthHint = 450; + gd.widthHint = 380; gyro_xSlider.setLayoutData(gd); gyro_xSlider.setSelection(gyro_forSliderVal); gyro_xSlider.addSelectionListener(new SelectionListener() { @@ -138,14 +138,14 @@ public class ManualInputGyro extends AbstractInjectorPage { gyro_xSlider.setSelection(xData); } }); - formUtil.createLabel(mainComposite, "[rad]"); + formUtil.createLabel(mainComposite, "[radians/second]"); // Y formUtil.createLabel(mainComposite, "Y : "); gyro_ySlider = formUtil.createSlider(mainComposite); setDefaultSlider(gyro_ySlider, maxSliderVal); gd = new GridData(SWT.NONE, SWT.CENTER, false, true); - gd.widthHint = 450; + gd.widthHint = 380; gyro_ySlider.setLayoutData(gd); gyro_ySlider.setSelection(gyro_forSliderVal); gyro_ySlider.addSelectionListener(new SelectionListener() { @@ -198,14 +198,14 @@ public class ManualInputGyro extends AbstractInjectorPage { } }); - formUtil.createLabel(mainComposite, "[rad]"); + formUtil.createLabel(mainComposite, "[radians/second]"); // Z formUtil.createLabel(mainComposite, "Z : "); gyro_zSlider = formUtil.createSlider(mainComposite); setDefaultSlider(gyro_zSlider, maxSliderVal); gd = new GridData(SWT.NONE, SWT.CENTER, false, true); - gd.widthHint = 450; + gd.widthHint = 380; gyro_zSlider.setLayoutData(gd); gyro_zSlider.setSelection(gyro_forSliderVal); gyro_zSlider.addSelectionListener(new SelectionListener() { @@ -259,7 +259,7 @@ public class ManualInputGyro extends AbstractInjectorPage { } }); - formUtil.createLabel(mainComposite, "[rad]"); + formUtil.createLabel(mainComposite, "[radians/second]"); Composite subComposite = formUtil.createComposite(client, 2); Button resetButton = formUtil.createButton(subComposite, "Reset", SWT.PUSH); diff --git a/org.tizen.sensor.accelerometer/src/org/tizen/sensor/accelerometer/page/ManualInputMagnetic.java b/org.tizen.sensor.accelerometer/src/org/tizen/sensor/accelerometer/page/ManualInputMagnetic.java index 350e3e1..2b33e54 100644 --- a/org.tizen.sensor.accelerometer/src/org/tizen/sensor/accelerometer/page/ManualInputMagnetic.java +++ b/org.tizen.sensor.accelerometer/src/org/tizen/sensor/accelerometer/page/ManualInputMagnetic.java @@ -135,7 +135,7 @@ public class ManualInputMagnetic extends AbstractInjectorPage { } }); - formUtil.createLabel(mainComposite, "[uT]"); + formUtil.createLabel(mainComposite, "[μT]"); // Y formUtil.createLabel(mainComposite, "Y : "); @@ -194,7 +194,7 @@ public class ManualInputMagnetic extends AbstractInjectorPage { } }); - formUtil.createLabel(mainComposite, "[uT]"); + formUtil.createLabel(mainComposite, "[μT]"); // Z formUtil.createLabel(mainComposite, "Z : "); @@ -254,7 +254,7 @@ public class ManualInputMagnetic extends AbstractInjectorPage { } }); - formUtil.createLabel(mainComposite, "[uT]"); + formUtil.createLabel(mainComposite, "[μT]"); Composite subComposite = formUtil.createComposite(client, 2); Button resetButton = formUtil.createButton(subComposite, "Reset", SWT.PUSH); diff --git a/org.tizen.sensor.accelerometer/src/org/tizen/sensor/accelerometer/page/ManualInputTilt.java b/org.tizen.sensor.accelerometer/src/org/tizen/sensor/accelerometer/page/ManualInputTilt.java index 88f1855..cc8e0ad 100644 --- a/org.tizen.sensor.accelerometer/src/org/tizen/sensor/accelerometer/page/ManualInputTilt.java +++ b/org.tizen.sensor.accelerometer/src/org/tizen/sensor/accelerometer/page/ManualInputTilt.java @@ -79,10 +79,10 @@ public class ManualInputTilt extends AbstractInjectorPage { gd.widthHint = 560; mainComposite.setLayoutData(gd); - formUtil.createLabel(mainComposite, "Azimuth axis: "); + formUtil.createLabel(mainComposite, "Azimuth : "); tilt_xSlider = formUtil.createSlider(mainComposite); gd = new GridData(SWT.NONE, SWT.CENTER, false, true); - gd.widthHint = 410; + gd.widthHint = 390; tilt_xSlider.setLayoutData(gd); setDefaultSlider(tilt_xSlider, maxSliderVal); tilt_xSlider.setSelection(tilt_forSliderVal); @@ -134,14 +134,14 @@ public class ManualInputTilt extends AbstractInjectorPage { tilt_xSlider.setSelection(xData); } }); - formUtil.createLabel(mainComposite, "\u02DA"); + formUtil.createLabel(mainComposite, "[degrees]"); // Pitch - formUtil.createLabel(mainComposite, "Pitch axis :"); + formUtil.createLabel(mainComposite, "Pitch :"); tilt_ySlider = formUtil.createSlider(mainComposite); setDefaultSlider(tilt_ySlider, maxSliderVal); gd = new GridData(SWT.NONE, SWT.CENTER, false, true); - gd.widthHint = 410; + gd.widthHint = 390; tilt_ySlider.setLayoutData(gd); tilt_ySlider.setSelection(tilt_forSliderVal); tilt_ySlider.addSelectionListener(new SelectionListener() { @@ -192,14 +192,14 @@ public class ManualInputTilt extends AbstractInjectorPage { } }); tilt_yText.setTextLimit(4); - formUtil.createLabel(mainComposite, "\u02DA"); + formUtil.createLabel(mainComposite, "[degrees]"); // Roll - formUtil.createLabel(mainComposite, "Roll axis :"); + formUtil.createLabel(mainComposite, "Roll :"); tilt_zSlider = formUtil.createSlider(mainComposite); setDefaultSlider(tilt_zSlider, maxSliderVal); gd = new GridData(SWT.NONE, SWT.CENTER, false, true); - gd.widthHint = 410; + gd.widthHint = 390; tilt_zSlider.setLayoutData(gd); tilt_zSlider.setSelection(tilt_forSliderVal); tilt_zSlider.addSelectionListener(new SelectionListener() { @@ -250,7 +250,7 @@ public class ManualInputTilt extends AbstractInjectorPage { } }); tilt_zText.setTextLimit(4); - formUtil.createLabel(mainComposite, "\u02DA"); + formUtil.createLabel(mainComposite, "[degrees]"); Composite subComposite = formUtil.createComposite(client, 2); Button resetButton = formUtil.createButton(subComposite, "Reset", SWT.PUSH); diff --git a/package/pkginfo.manifest b/package/pkginfo.manifest index 5c02e2e..f9b362b 100644 --- a/package/pkginfo.manifest +++ b/package/pkginfo.manifest @@ -1,5 +1,5 @@ Package:eventinjector-eplugin -Version:0.2.34 +Version:0.2.35 OS:linux Build-host-os:linux Maintainer:yeongkyoon Lee , sungmin Ha @@ -9,7 +9,7 @@ Install-dependency:common-eplugin[linux], base-ide-product[linux] Source:eventinjector-eplugin Package:eventinjector-eplugin -Version:0.2.34 +Version:0.2.35 OS:windows Build-host-os:linux Maintainer:yeongkyoon Lee , sungmin Ha -- 2.7.4