[TBT][DALi][Added TC according to HQ] 42/96742/1
authorJahangir <ja.alam@samsung.com>
Thu, 10 Nov 2016 16:17:35 +0000 (11:17 -0500)
committerJahangir <ja.alam@samsung.com>
Thu, 10 Nov 2016 16:25:40 +0000 (11:25 -0500)
Change-Id: Icd3a110b2d8ea37ab5d2667f5582df64636c9ce3

44 files changed:
release/binary-armv7l/org.tizen.tbtcoreapp-1.0.0-arm.tpk
release/binary-armv7l/org.tizen.tbtcoreapp-dali-1.0.0-arm.tpk
release/binary-x86/org.tizen.tbtcoreapp-1.0.0-i386.tpk
release/binary-x86/org.tizen.tbtcoreapp-dali-1.0.0-i386.tpk
tbtcoreapp-dali/.cproject
tbtcoreapp-dali/.rds_delta
tbtcoreapp-dali/.sdk_delta.info
tbtcoreapp-dali/.sign/.manifest.tmp
tbtcoreapp-dali/.sign/author-signature.xml
tbtcoreapp-dali/.sign/signature1.xml
tbtcoreapp-dali/inc/view/tbt-dali-actor-view.h
tbtcoreapp-dali/inc/view/tbt-dali-app-view.h
tbtcoreapp-dali/inc/view/tbt-dali-gesture-detector-view.h [deleted file]
tbtcoreapp-dali/inc/view/tbt-dali-long-press-gesture-double-view.h [new file with mode: 0644]
tbtcoreapp-dali/inc/view/tbt-dali-long-press-gesture-multiple-view.h [new file with mode: 0644]
tbtcoreapp-dali/inc/view/tbt-dali-long-press-gesture-single-view.h [new file with mode: 0644]
tbtcoreapp-dali/inc/view/tbt-dali-pan-gesture-angle-direction-view.h [new file with mode: 0644]
tbtcoreapp-dali/inc/view/tbt-dali-pan-gesture-double-view.h [new file with mode: 0644]
tbtcoreapp-dali/inc/view/tbt-dali-pan-gesture-single-view.h [new file with mode: 0644]
tbtcoreapp-dali/inc/view/tbt-dali-pinch-gesture-single-view.h [new file with mode: 0644]
tbtcoreapp-dali/inc/view/tbt-dali-tap-gesture-multiple-view.h [new file with mode: 0644]
tbtcoreapp-dali/inc/view/tbt-dali-tap-gesture-single-view.h [new file with mode: 0644]
tbtcoreapp-dali/src/tbtcoreapp-dali.cpp
tbtcoreapp-dali/src/view/tbt-dali-actor-view.cpp
tbtcoreapp-dali/src/view/tbt-dali-app-view.cpp
tbtcoreapp-dali/src/view/tbt-dali-gesture-detector-view.cpp [deleted file]
tbtcoreapp-dali/src/view/tbt-dali-long-press-gesture-double-view.cpp [new file with mode: 0644]
tbtcoreapp-dali/src/view/tbt-dali-long-press-gesture-multiple-view.cpp [new file with mode: 0644]
tbtcoreapp-dali/src/view/tbt-dali-long-press-gesture-single-view.cpp [new file with mode: 0644]
tbtcoreapp-dali/src/view/tbt-dali-pan-gesture-angle-direction-view.cpp [new file with mode: 0644]
tbtcoreapp-dali/src/view/tbt-dali-pan-gesture-double-view.cpp [new file with mode: 0644]
tbtcoreapp-dali/src/view/tbt-dali-pan-gesture-single-view.cpp [new file with mode: 0644]
tbtcoreapp-dali/src/view/tbt-dali-pinch-gesture-single-view.cpp [new file with mode: 0644]
tbtcoreapp-dali/src/view/tbt-dali-scroll-view.cpp
tbtcoreapp-dali/src/view/tbt-dali-stage-view.cpp
tbtcoreapp-dali/src/view/tbt-dali-tap-gesture-muliple-view.cpp [new file with mode: 0644]
tbtcoreapp-dali/src/view/tbt-dali-tap-gesture-single-view.cpp [new file with mode: 0644]
tbtcoreapp-dali/src/view/tbt-dali-touch-data-view.cpp
tbtcoreapp/.cproject
tbtcoreapp/.sdk_delta.info
tbtcoreapp/inc/model/tbt-info.h
tbtcoreapp/inc/utils/app_module_config.h
tbtcoreapp/src/model/tbt-list.c
tbtcoreapp/src/view/tbt-genlist-view.c

index 64639afab1a810c1ccbee96bcd7080614049fce0..222b27bbdec39e5d472865ef63e41017f4540861 100644 (file)
Binary files a/release/binary-armv7l/org.tizen.tbtcoreapp-1.0.0-arm.tpk and b/release/binary-armv7l/org.tizen.tbtcoreapp-1.0.0-arm.tpk differ
index be45a6d8612fe46020959e5e613cb80bd2c02aea..25d5402500b0f60581b619c41f9a3b52b604df1b 100644 (file)
Binary files a/release/binary-armv7l/org.tizen.tbtcoreapp-dali-1.0.0-arm.tpk and b/release/binary-armv7l/org.tizen.tbtcoreapp-dali-1.0.0-arm.tpk differ
index 84027078dbc976141007a18a10da4ff6de19d7ac..cc76e97b8c7baa7e43e198412c4b45fbe2d8c608 100644 (file)
Binary files a/release/binary-x86/org.tizen.tbtcoreapp-1.0.0-i386.tpk and b/release/binary-x86/org.tizen.tbtcoreapp-1.0.0-i386.tpk differ
index ad30fe473b38df9bd50868098d9373f46c188ec2..38471f0c2ce4a057c65e8744ff2e76e27755ba29 100644 (file)
Binary files a/release/binary-x86/org.tizen.tbtcoreapp-dali-1.0.0-i386.tpk and b/release/binary-x86/org.tizen.tbtcoreapp-dali-1.0.0-i386.tpk differ
index 438b55e0d919760a957cd9855c4e54ce88c9188f..6dba1fb8e5bab3ffc3dbf18d0a2feb4a2370e4e3 100644 (file)
@@ -16,7 +16,7 @@
                                </extensions>
                        </storageModule>
                        <storageModule moduleId="cdtBuildSystem" version="4.0.0">
-                               <configuration artifactName="tbtcoreapp-dali" buildArtefactType="org.tizen.nativecore.buildArtefactType.app" buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug,org.eclipse.cdt.build.core.buildArtefactType=org.tizen.nativecore.buildArtefactType.app" description="" errorParsers="org.eclipse.cdt.core.MakeErrorParser;org.eclipse.cdt.core.GCCErrorParser;" id="org.tizen.nativecore.config.sbi.gcc45.app.debug.466175231" name="Debug" parent="org.tizen.nativecore.config.sbi.gcc45.app.debug">
+                               <configuration artifactName="tbtcoreapp-dali" buildArtefactType="org.tizen.nativecore.buildArtefactType.app" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.tizen.nativecore.buildArtefactType.app,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug" description="" errorParsers="org.eclipse.cdt.core.MakeErrorParser;org.eclipse.cdt.core.GCCErrorParser;" id="org.tizen.nativecore.config.sbi.gcc45.app.debug.466175231" name="Debug" parent="org.tizen.nativecore.config.sbi.gcc45.app.debug">
                                        <folderInfo id="org.tizen.nativecore.config.sbi.gcc45.app.debug.466175231." name="/" resourcePath="">
                                                <toolChain id="org.tizen.nativecore.toolchain.sbi.gcc45.app.debug.1705847341" name="Tizen Native Toolchain" superClass="org.tizen.nativecore.toolchain.sbi.gcc45.app.debug">
                                                        <targetPlatform binaryParser="org.eclipse.cdt.core.ELF" id="org.tizen.nativeide.target.sbi.gnu.platform.base.1056239826" osList="linux,win32" superClass="org.tizen.nativeide.target.sbi.gnu.platform.base"/>
                                                                <option id="sbi.gnu.cpp.compiler.option.frameworks_inc.core.371309271" name="Tizen-Frameworks-Include-Path" superClass="sbi.gnu.cpp.compiler.option.frameworks_inc.core" valueType="includePath">
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/libxml2&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/EGL&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/GLES&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/GLES2&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/GLES3&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/KHR&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/SDL2&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/appcore-agent&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/appfw&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/attach-panel&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/storage&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/system&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/telephony&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/tzsh&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/ui&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/vulkan&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/web&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/widget_service&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/widget_viewer_evas&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/wifi-direct&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/yaca&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/lib/dbus-1.0/include&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/lib/glib-2.0/include&quot;"/>
                                                                </option>
                                                                <option id="sbi.gnu.c.compiler.option.frameworks_inc.core.451609871" name="Tizen-Frameworks-Include-Path" superClass="sbi.gnu.c.compiler.option.frameworks_inc.core" valueType="includePath">
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/libxml2&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/EGL&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/GLES&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/GLES2&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/GLES3&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/KHR&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/SDL2&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/appcore-agent&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/appfw&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/attach-panel&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/storage&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/system&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/telephony&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/tzsh&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/ui&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/vulkan&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/web&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/widget_service&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/widget_viewer_evas&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/wifi-direct&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/yaca&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/lib/dbus-1.0/include&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/lib/glib-2.0/include&quot;"/>
                                                                </option>
                                                                        <listOptionValue builtIn="false" value="${TC_LINKER_MISC}"/>
                                                                        <listOptionValue builtIn="false" value="${RS_LINKER_MISC}"/>
                                                                        <listOptionValue builtIn="false" value="-pie -lpthread "/>
-                                                                       <listOptionValue builtIn="false" value="-Xlinker -rpath=&quot;/home/developer/sdk_tools/lib&quot;"/>
                                                                        <listOptionValue builtIn="false" value="--sysroot=&quot;${SBI_SYSROOT}&quot;"/>
                                                                        <listOptionValue builtIn="false" value="-Xlinker --version-script=&quot;${PROJ_PATH}/.exportMap&quot;"/>
                                                                        <listOptionValue builtIn="false" value="-L&quot;${SBI_SYSROOT}/usr/lib&quot;"/>
                                </extensions>
                        </storageModule>
                        <storageModule moduleId="cdtBuildSystem" version="4.0.0">
-                               <configuration artifactName="org.tizen.tbtcoreapp-dali" buildArtefactType="org.tizen.nativecore.buildArtefactType.app" buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.release,org.eclipse.cdt.build.core.buildArtefactType=org.tizen.nativecore.buildArtefactType.app" description="" errorParsers="org.eclipse.cdt.core.MakeErrorParser;org.eclipse.cdt.core.GCCErrorParser;" id="org.tizen.nativecore.config.sbi.gcc45.app.release.738115821" name="Release" parent="org.tizen.nativecore.config.sbi.gcc45.app.release">
+                               <configuration artifactName="org.tizen.tbtcoreapp-dali" buildArtefactType="org.tizen.nativecore.buildArtefactType.app" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.tizen.nativecore.buildArtefactType.app,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.release" description="" errorParsers="org.eclipse.cdt.core.MakeErrorParser;org.eclipse.cdt.core.GCCErrorParser;" id="org.tizen.nativecore.config.sbi.gcc45.app.release.738115821" name="Release" parent="org.tizen.nativecore.config.sbi.gcc45.app.release">
                                        <folderInfo id="org.tizen.nativecore.config.sbi.gcc45.app.release.738115821." name="/" resourcePath="">
                                                <toolChain id="org.tizen.nativecore.toolchain.sbi.gcc45.app.release.1902710295" name="Tizen Native Toolchain" superClass="org.tizen.nativecore.toolchain.sbi.gcc45.app.release">
                                                        <targetPlatform binaryParser="org.eclipse.cdt.core.ELF" id="org.tizen.nativeide.target.sbi.gnu.platform.base.634076986" osList="linux,win32" superClass="org.tizen.nativeide.target.sbi.gnu.platform.base"/>
                                                                <option id="sbi.gnu.cpp.compiler.option.frameworks_inc.core.1966404811" name="Tizen-Frameworks-Include-Path" superClass="sbi.gnu.cpp.compiler.option.frameworks_inc.core" valueType="includePath">
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/libxml2&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/EGL&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/GLES&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/GLES2&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/GLES3&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/KHR&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/SDL2&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/appcore-agent&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/appfw&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/attach-panel&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/storage&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/system&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/telephony&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/tzsh&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/ui&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/vulkan&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/web&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/widget_service&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/widget_viewer_evas&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/wifi-direct&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/yaca&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/lib/dbus-1.0/include&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/lib/glib-2.0/include&quot;"/>
                                                                </option>
                                                                <option id="sbi.gnu.c.compiler.option.frameworks_inc.core.627649823" name="Tizen-Frameworks-Include-Path" superClass="sbi.gnu.c.compiler.option.frameworks_inc.core" valueType="includePath">
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/libxml2&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/EGL&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/GLES&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/GLES2&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/GLES3&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/KHR&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/SDL2&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/appcore-agent&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/appfw&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/attach-panel&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/storage&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/system&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/telephony&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/tzsh&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/ui&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/vulkan&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/web&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/widget_service&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/widget_viewer_evas&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/wifi-direct&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/yaca&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/lib/dbus-1.0/include&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/lib/glib-2.0/include&quot;"/>
                                                                </option>
                                                                        <listOptionValue builtIn="false" value="${TC_LINKER_MISC}"/>
                                                                        <listOptionValue builtIn="false" value="${RS_LINKER_MISC}"/>
                                                                        <listOptionValue builtIn="false" value="-pie -lpthread "/>
-                                                                       <listOptionValue builtIn="false" value="-Xlinker -rpath=&quot;/home/developer/sdk_tools/lib&quot;"/>
                                                                        <listOptionValue builtIn="false" value="--sysroot=&quot;${SBI_SYSROOT}&quot;"/>
                                                                        <listOptionValue builtIn="false" value="-Xlinker --version-script=&quot;${PROJ_PATH}/.exportMap&quot;"/>
                                                                        <listOptionValue builtIn="false" value="-L&quot;${SBI_SYSROOT}/usr/lib&quot;"/>
index 68afa541dd1ac39132716a24c78e2c3b70347693..1727f301425ffa502097883133da05c81d6cf8ea 100644 (file)
@@ -4,3 +4,26 @@
 author-signature.xml
 signature1.xml
 bin/tbtcoreapp-dali
+res/dali-toolkit-test-theme_720x1280.json
+res/images/Default_home.png
+res/images/customTextFieldBgImage.jpg
+res/images/gallery-medium-1.jpg
+res/images/gallery-medium-10.jpg
+res/images/gallery-medium-11.jpg
+res/images/gallery-medium-12.jpg
+res/images/gallery-medium-13.jpg
+res/images/gallery-medium-14.jpg
+res/images/gallery-medium-2.jpg
+res/images/gallery-medium-3.jpg
+res/images/gallery-medium-4.jpg
+res/images/gallery-medium-5.jpg
+res/images/gallery-medium-6.jpg
+res/images/gallery-medium-7.jpg
+res/images/gallery-medium-8.jpg
+res/images/gallery-medium-9.jpg
+res/images/innerButtonSelected.png
+res/images/innerButtonUnselected.png
+res/images/text-field-bg.9.png
+res/images/top-bar.png
+shared/res/tbtcoreapp-dali.png
+tizen-manifest.xml
index bf2301cb8f9b5d6fbc3fc9fd9be41875c0e88242..23e34c50fe526ab22494344d517738c80f00be4a 100644 (file)
Binary files a/tbtcoreapp-dali/.sdk_delta.info and b/tbtcoreapp-dali/.sdk_delta.info differ
index 1368cf1b10fa5ea57b37853fbe3483048884c5bf..10744a4989f8185fa475e2881c2da1b0f437895d 100644 (file)
@@ -1,4 +1,4 @@
-bin/tbtcoreapp-dali__DEL__FWyvPfqgfssOkfEMJ12Ojkek1k7uEO1rRuj5bGNAPNU=
+bin/tbtcoreapp-dali__DEL__vIs1vm+NfHeJ41pE8IswvjYoqOV03bj6+tgQPeccsMo=
 res/dali-toolkit-test-theme_720x1280.json__DEL__DCzB9UIk8miYUX+Ll21N0W0mefzt37DPTsrTRPo4PfE=
 res/images/Default_home.png__DEL__G5tVggT06pLAhU2qhwPAmVTMSNTBF3T5sqkIydsMt44=
 res/images/customTextFieldBgImage.jpg__DEL__tRuXc9qO5C064IhIkuWVtgw2OiQ1R6sCYm0KA+AbmGU=
@@ -22,4 +22,4 @@ res/images/text-field-bg.9.png__DEL__MB7LhGWONfE9F3kWbkkHJNgQ4SIfT3U+WND+9+siVpU
 res/images/top-bar.png__DEL__gvQ+T+R9lVRmJmRoRaYoeIHhzxEwsXgRSr4wjnbEokM=
 shared/res/tbtcoreapp-dali.png__DEL__1d0oEZHqPn+QzNzGIHwj9ODby6x9ggFs9uOsav6jPNs=
 tizen-manifest.xml__DEL__jVCHDxVZ/eHQqLpBXF33+IyKIcQTWevk9pMnSecwrsE=
-author-signature.xml__DEL__Fn8W8MQveXlwDKIR98cZUgmGilvrLqA7ldWn5XjpTWI=
+author-signature.xml__DEL__UIwebnLktoZqXAe2HOZvindIa5c1iHNHKtxUBinePjI=
index 49b83ceb1b4fd954ad791ae93b3dfb550df0f3a2..3d37fa5a0400fb73461e7f980475ccdfb08d9ac7 100644 (file)
@@ -4,7 +4,7 @@
 <SignatureMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"></SignatureMethod>
 <Reference URI="bin%2Ftbtcoreapp-dali">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>FWyvPfqgfssOkfEMJ12Ojkek1k7uEO1rRuj5bGNAPNU=</DigestValue>
+<DigestValue>vIs1vm+NfHeJ41pE8IswvjYoqOV03bj6+tgQPeccsMo=</DigestValue>
 </Reference>
 <Reference URI="res%2Fdali-toolkit-test-theme_720x1280.json">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
 </Reference>
 </SignedInfo>
 <SignatureValue>
-IzTrn/hel9oCkkujQaXdBzMmKNoirMS/J0sLcoZec53fuqPB+ChdtSfjxaGRy0SjOfvZ8w2d0gma
-AqrXggJRgiL9mPx6hcQD4CdBec4S1f2lyuFI+IPUueq6KCPwMPkqjo5KIfmABh9OeFY1CMo6KmS9
-8AjMSAhKabl2auB1g/o=
+bRPdZqpTPQ2mP0xx/CyLCTfdrRTyQNM0RdBPnhGET8rM32SW0WHajGQchWdod9jrqyhGQntPmz3M
++CTwLixzTZIKVeXBMqNbeFTxdCQpx98zUK+yuTgHkhnJXhWQep+Zs1onIq7BnnjR60RoXfNysbwM
+zj4PRJ5H9c7NMtoALP4=
 </SignatureValue>
 <KeyInfo>
 <X509Data>
 <X509Certificate>
-MIIClTCCAX2gAwIBAgIGAVaU7TxzMA0GCSqGSIb3DQEBBQUAMFYxGjAYBgNVBAoMEVRpemVuIEFz
+MIICkzCCAXugAwIBAgIGAVgqf55jMA0GCSqGSIb3DQEBBQUAMFYxGjAYBgNVBAoMEVRpemVuIEFz
 c29jaWF0aW9uMRowGAYDVQQLDBFUaXplbiBBc3NvY2lhdGlvbjEcMBoGA1UEAwwTVGl6ZW4gRGV2
-ZWxvcGVycyBDQTAeFw0xMjExMDEwMDAwMDBaFw0xOTAxMDEwMDAwMDBaMBExDzANBgNVBAMMBmF1
-dGhvcjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAl7hQZEvuy8qFP+j/h/AKXAaO/H1Kv98w
-iDuu35EgiBkQwm0LkhY29csiO8ii5dN/8qKaYs7f6rUlfmROXm13QLSOPCadEzt8lm7Z4oPCXWl1
-1guSBLiPubuuH3HFg4PkPG/Mg0RcUD4UiuqUgYFEdRoPFarq3dpGpXEHkvvCE4ECAwEAAaMyMDAw
-DAYDVR0TAQH/BAIwADALBgNVHQ8EBAMCB4AwEwYDVR0lBAwwCgYIKwYBBQUHAwMwDQYJKoZIhvcN
-AQEFBQADggEBADNLE1In6hcib8Rrv7HSRrs7FJoOby3AWILQZv5afg/wWQ2IfjqzZcMh1x7RLlyQ
-F+u2fXf0mPEXt038uoOkmXPOZ9AWcxshHEczjy6DTkyYSFq55QsCRxt6A3K3jggAOKmPK1wufXPj
-xy4dvDsS3hqfyLnYGKODrdHS0Y2qmj3hoOPFEl3wbYqd3/Zd8jD7aq2uMVjDNfsPpY9sPtK58isQ
-0DfTWtJ2FEOUHrVj/gncF3kYL+khSuFbvS+wa4nC2Td7/Kj0YW7G7XnxMOQSFdIGDbfOeHSWYHCD
-sOa76yXPmbUSkk98oTeSd9KAzkEiJo12yj8T0KH3PKmJ4Aux2/A=
+ZWxvcGVycyBDQTAeFw0xMjExMDEwMDAwMDBaFw0xOTAxMDEwMDAwMDBaMA8xDTALBgNVBAMMBHRl
+c3QwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAIHnHARWWGpYuPhkonFdVmCFP7fy8kzMiGYV
+ijU1llWA6p2lzd1VFVfkGFEqQlPYYrlJS0zdHbT46QzZAwSB0rSpDwjJp3ieukcCcGRH93TIXLn+
+SltiGQQL2dsA67QsglXAyMLBy5DpftchXdAThPK/hrCdDVy+aE/l8VNnZ6TrAgMBAAGjMjAwMAwG
+A1UdEwEB/wQCMAAwCwYDVR0PBAQDAgeAMBMGA1UdJQQMMAoGCCsGAQUFBwMDMA0GCSqGSIb3DQEB
+BQUAA4IBAQCMrIoL+OaDhYIJUzzYirjJ3B5x0ibKvPTs1+c6Z2Dk2YO9g9/5s5lQMjCf7gkB0G8q
+l0PLVIeduxVtH/X8KbQJvunTuf7L2Lio8XbJ9dg0lB36SQBwFNz7MjBWa86e3lLfmoMBbJbfDo6J
+Cc5H/8Mu3wgumtxu1j6iaZQ4TZEI7zXDx8c9kHuhhIfAI0QtXf0ZVUYlVNryT8pFcCtTC8TRz07B
+8RsDycdlkpSVMYdR9oa2Yq7ve6a/DadtZ3l07tRIvQK5it/fW9p51m/BWuQgyb0XLElCJgBLzV+y
+3VakY+lPFqk6RzLaj8vmxcKu9gpilemVtGR59rteviKRdW4H
 </X509Certificate>
 <X509Certificate>
 MIIDOTCCAiGgAwIBAgIBATANBgkqhkiG9w0BAQUFADBYMRowGAYDVQQKDBFUaXplbiBBc3NvY2lh
index 1d8c0553e1168e0eaf7c8275a3af53d88bad4e81..278dae7d9c86f5af113de0913cc433728e39e632 100644 (file)
@@ -4,11 +4,11 @@
 <SignatureMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"></SignatureMethod>
 <Reference URI="author-signature.xml">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>Fn8W8MQveXlwDKIR98cZUgmGilvrLqA7ldWn5XjpTWI=</DigestValue>
+<DigestValue>UIwebnLktoZqXAe2HOZvindIa5c1iHNHKtxUBinePjI=</DigestValue>
 </Reference>
 <Reference URI="bin%2Ftbtcoreapp-dali">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>FWyvPfqgfssOkfEMJ12Ojkek1k7uEO1rRuj5bGNAPNU=</DigestValue>
+<DigestValue>vIs1vm+NfHeJ41pE8IswvjYoqOV03bj6+tgQPeccsMo=</DigestValue>
 </Reference>
 <Reference URI="res%2Fdali-toolkit-test-theme_720x1280.json">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
 </Reference>
 </SignedInfo>
 <SignatureValue>
-Q0Eyl1XVAMv4eK0ofMzMSfv6uhE6zLS5wNJBe09HXHH6WMa65+g20uQXXkQWE7od4XmF7nEuQpky
-Hq1BI9StyQW3GxtC8JdZUyMxrn95QsRQ6VRI2GUil4x/3MO8yFVzr29LbhBDhmXmKjVhKC7QaTzG
-Dx9eW3GTrZ0/+O0vTuQ=
+mdQYlwY6tlPgarPJHiGuJjBXgwiGVqNjbHeuK18/oLxKjFfPYsNdHB3OUQ08JZT5fjokfi4o1GZE
+uvqTRB0tHy5oSg7kcheZfvgvCfzTXN7xZat24EgQOHNLLAKyDdUJKLn4jb1kSly7aVB80rjVOVar
+hAP3aYBMfP/vcNzW5Pw=
 </SignatureValue>
 <KeyInfo>
 <X509Data>
index 6dead4168568052be6509565ae673dabbe414e26..375c6aa992903830685c6b578b617293812d992b 100644 (file)
@@ -56,6 +56,7 @@ private:
        TextLabel txtHovered;
        TextLabel txtHoveredData;
        TextLabel txtWheel;
+       TextLabel txtWheelData;
        //button
        PushButton btnButton;
 };
index 473ffcc9c57c54eba71e27c14be34339390b42aa..2f83bc21746f52b7ef6ca586110dac4ea454ef95 100644 (file)
@@ -64,9 +64,9 @@ public:
        void OnTerminate(Application& app);
        void OnPause(Application& app);
        void OnIdle();
-       void OnApplicationBatteryLowSignalCallback(Application& app);
+       //void OnApplicationBatteryLowSignalCallback(Application& app);
        void OnApplicationLanguageChangedSignalCallback(Application&);
-       void OnApplicationMemoryLowSignalCallback(Application& app);
+       //void OnApplicationMemoryLowSignalCallback(Application& app);
        void OnApplicationRegionChangedSignalCallback(Application& app);
        void OnApplicationResetSignalCallback(Application& app);
        void OnApplicationResumeSignalCallback(Application& app);
diff --git a/tbtcoreapp-dali/inc/view/tbt-dali-gesture-detector-view.h b/tbtcoreapp-dali/inc/view/tbt-dali-gesture-detector-view.h
deleted file mode 100644 (file)
index 6a35564..0000000
+++ /dev/null
@@ -1,55 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
- *
- *  Licensed under the Apache License, Version 2.0 (the License);
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- *******************************************************************************/
-/**
- * @file       tbt-dali-gesture-detector-view.h
- * @brief      To test functionality of dali gesture-detector
- *
- * @author     Jahangir Alam(ja.alam@samsung.com)
- * @date       July, 2016
- * @credit
- *
- */
-
-#ifndef __TBT_MODULE_APP_DALI_GESTURE_DETECTOR
-#define __TBT_MODULE_APP_DALI_GESTURE_DETECTOR
-#include <dali.h>
-
-#include "utils/logger.h"
-#include "utils/config.h"
-#include "utils/ui-utils.h"
-#include "utils/dali-ui-utils.h"
-
-class TBTDaliGestureDetectorView: public UiUtils {
-
-private:
-       //testlabel
-       TextLabel lblLongPress;
-       TextLabel lblPinch;
-       TextLabel lblpan;
-
-       LongPressGestureDetector longpressgesture;
-       PinchGestureDetector pinchgesture;
-       PanGestureDetector panGesture;
-public:
-       TBTDaliGestureDetectorView(Application& mApplication, app_control_h _control);
-       //signal
-       void OnLongPressGestureDetector(Actor actor, const LongPressGesture& gesture);
-       void OnPinchGestureDetector(Actor actor, const PinchGesture& gesture);
-       void OnPanGestureDetector(Actor actor, const PanGesture& gesture);
-};
-
-#endif // __TBT_MODULE_APP_DALI_GESTURE_DETECTOR
-
diff --git a/tbtcoreapp-dali/inc/view/tbt-dali-long-press-gesture-double-view.h b/tbtcoreapp-dali/inc/view/tbt-dali-long-press-gesture-double-view.h
new file mode 100644 (file)
index 0000000..5b0fc82
--- /dev/null
@@ -0,0 +1,54 @@
+/*******************************************************************************
+ * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the License);
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *******************************************************************************/
+/**
+ * @file       tbt-dali-long-press-gesture-double-view.h
+ * @brief      To test functionality of dali long press gesture and detector
+ *
+ * @author     Jahangir Alam(ja.alam@samsung.com)
+ * @date       October, 2016
+ * @credit
+ *
+ */
+
+#ifndef __TBT_MODULE_APP_DALI_LONG_PRESS_GESTURE_DOUBLE
+#define __TBT_MODULE_APP_DALI_LONG_PRESS_GESTURE_DOUBLE
+#include <dali.h>
+
+#include "utils/logger.h"
+#include "utils/config.h"
+#include "utils/ui-utils.h"
+#include "utils/dali-ui-utils.h"
+
+class TBTDaliLongPressGestureDoubleView: public UiUtils {
+
+private:
+
+       //testlabel
+       TextLabel lblLongPress;
+       TextLabel lblPressData;
+
+       LongPressGestureDetector longpressgesturedetector;
+
+       unsigned int touchesRequired;
+
+public:
+       TBTDaliLongPressGestureDoubleView(Application& mApplication, app_control_h _control);
+       //signal
+       void OnLongPressGestureDetector(Actor actor, const LongPressGesture& gesture);
+};
+
+#endif // __TBT_MODULE_APP_DALI_LONG_PRESS_GESTURE_DOUBLE
+
diff --git a/tbtcoreapp-dali/inc/view/tbt-dali-long-press-gesture-multiple-view.h b/tbtcoreapp-dali/inc/view/tbt-dali-long-press-gesture-multiple-view.h
new file mode 100644 (file)
index 0000000..d11dbae
--- /dev/null
@@ -0,0 +1,55 @@
+/*******************************************************************************
+ * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the License);
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *******************************************************************************/
+/**
+ * @file       tbt-dali-long-press-gesture-multiple-view.h
+ * @brief      To test functionality of dali long press gesture and detector
+ *
+ * @author     Jahangir Alam(ja.alam@samsung.com)
+ * @date       October, 2016
+ * @credit
+ *
+ */
+
+#ifndef __TBT_MODULE_APP_DALI_LONG_PRESS_GESTURE_MULTIPLE
+#define __TBT_MODULE_APP_DALI_LONG_PRESS_GESTURE_MULTIPLE
+#include <dali.h>
+
+#include "utils/logger.h"
+#include "utils/config.h"
+#include "utils/ui-utils.h"
+#include "utils/dali-ui-utils.h"
+
+class TBTDaliLongPressGestureMultipleView: public UiUtils {
+
+private:
+
+       //testlabel
+       TextLabel lblLongPress;
+       TextLabel lblPressData;
+
+       LongPressGestureDetector longpressgesturedetector;
+
+       unsigned int minTouchesRequired;
+       unsigned int maxTouchesRequired;
+
+public:
+       TBTDaliLongPressGestureMultipleView(Application& mApplication, app_control_h _control);
+       //signal
+       void OnLongPressGestureDetector(Actor actor, const LongPressGesture& gesture);
+};
+
+#endif // __TBT_MODULE_APP_DALI_LONG_PRESS_GESTURE_MULTIPLE
+
diff --git a/tbtcoreapp-dali/inc/view/tbt-dali-long-press-gesture-single-view.h b/tbtcoreapp-dali/inc/view/tbt-dali-long-press-gesture-single-view.h
new file mode 100644 (file)
index 0000000..1e69255
--- /dev/null
@@ -0,0 +1,57 @@
+/*******************************************************************************
+ * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the License);
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *******************************************************************************/
+/**
+ * @file       tbt-dali-long-press-gesture-single-view.h
+ * @brief      To test functionality of dali long press gesture and detector
+ *
+ * @author     Jahangir Alam(ja.alam@samsung.com)
+ * @date       July, 2016
+ * @credit
+ *
+ */
+
+#ifndef __TBT_MODULE_APP_DALI_LONG_PRESS_GESTURE_SINGLE
+#define __TBT_MODULE_APP_DALI_LONG_PRESS_GESTURE_SINGLE
+#include <dali.h>
+
+#include "utils/logger.h"
+#include "utils/config.h"
+#include "utils/ui-utils.h"
+#include "utils/dali-ui-utils.h"
+
+class TBTDaliLongPressGestureSingleView: public UiUtils {
+
+private:
+
+       //testlabel
+       TextLabel lblLongPress;
+       TextLabel lblPressData;
+       //TextLabel lblpan;
+
+       LongPressGestureDetector longpressgesturedetector;
+
+       unsigned int touchesRequired;
+
+public:
+       TBTDaliLongPressGestureSingleView(Application& mApplication, app_control_h _control);
+       //signal
+       void OnLongPressGestureDetector(Actor actor, const LongPressGesture& gesture);
+       //void OnPinchGestureDetector(Actor actor, const PinchGesture& gesture);
+       //void OnPanGestureDetector(Actor actor, const PanGesture& gesture);
+};
+
+#endif // __TBT_MODULE_APP_DALI_LONG_PRESS_GESTURE_SINGLE
+
diff --git a/tbtcoreapp-dali/inc/view/tbt-dali-pan-gesture-angle-direction-view.h b/tbtcoreapp-dali/inc/view/tbt-dali-pan-gesture-angle-direction-view.h
new file mode 100644 (file)
index 0000000..d2f2b63
--- /dev/null
@@ -0,0 +1,63 @@
+/*******************************************************************************
+ * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the License);
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *******************************************************************************/
+/**
+ * @file       tbt-dali-pan-gesture-angle-direction-view.h
+ * @brief      To test functionality of dali pan gesture and detector
+ *
+ * @author     Jahangir Alam(ja.alam@samsung.com)
+ * @date       October, 2016
+ * @credit
+ *
+ */
+
+#ifndef __TBT_MODULE_APP_PAN_PRESS_GESTURE_ANGLE_DIRECTION
+#define __TBT_MODULE_APP_PAN_PRESS_GESTURE_ANGLE_DIRECTION
+#include <dali.h>
+
+#include "utils/logger.h"
+#include "utils/config.h"
+#include "utils/ui-utils.h"
+#include "utils/dali-ui-utils.h"
+#include "utils/constrants.h"
+
+class TBTDaliPanGestureAngleDirectionView: public UiUtils {
+
+private:
+
+       //testlabel
+       TextLabel lblPan;
+       TextLabel lblPressData;
+       PushButton btnAddremove;
+       //TextLabel lblpan;
+
+       PanGestureDetector pangesturedetector;
+
+       unsigned int mintouchesRequired;
+       unsigned int maxtouchesRequired;
+       float fSetAngle;
+       float fSetThreshold;
+       bool flag;
+
+public:
+       TBTDaliPanGestureAngleDirectionView(Application& mApplication, app_control_h _control);
+       //signal
+       void OnPanGestureDetector(Actor actor, const PanGesture& gesture);
+       void setUnset();
+       bool OnSetunSetButtonClick(Button button);
+};
+
+#endif // __TBT_MODULE_APP_PAN_PRESS_GESTURE_ANGLE_DIRECTION
+
diff --git a/tbtcoreapp-dali/inc/view/tbt-dali-pan-gesture-double-view.h b/tbtcoreapp-dali/inc/view/tbt-dali-pan-gesture-double-view.h
new file mode 100644 (file)
index 0000000..7232ecb
--- /dev/null
@@ -0,0 +1,56 @@
+/*******************************************************************************
+ * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the License);
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *******************************************************************************/
+/**
+ * @file       tbt-dali-pan-gesture-double-view.h
+ * @brief      To test functionality of dali pan gesture and detector
+ *
+ * @author     Jahangir Alam(ja.alam@samsung.com)
+ * @date       October, 2016
+ * @credit
+ *
+ */
+
+#ifndef __TBT_MODULE_APP_PAN_PRESS_GESTURE_DOUBLE
+#define __TBT_MODULE_APP_PAN_PRESS_GESTURE_DOUBLE
+#include <dali.h>
+
+#include "utils/logger.h"
+#include "utils/config.h"
+#include "utils/ui-utils.h"
+#include "utils/dali-ui-utils.h"
+
+class TBTDaliPanGestureDoubleView: public UiUtils {
+
+private:
+
+       //testlabel
+       TextLabel lblPan;
+       TextLabel lblPressData;
+       //TextLabel lblpan;
+
+       PanGestureDetector pangesturedetector;
+
+       unsigned int mintouchesRequired;
+       unsigned int maxtouchesRequired;
+
+public:
+       TBTDaliPanGestureDoubleView(Application& mApplication, app_control_h _control);
+       //signal
+       void OnPanGestureDetector(Actor actor, const PanGesture& gesture);
+};
+
+#endif // __TBT_MODULE_APP_PAN_PRESS_GESTURE_DOUBLE
+
diff --git a/tbtcoreapp-dali/inc/view/tbt-dali-pan-gesture-single-view.h b/tbtcoreapp-dali/inc/view/tbt-dali-pan-gesture-single-view.h
new file mode 100644 (file)
index 0000000..fecccba
--- /dev/null
@@ -0,0 +1,56 @@
+/*******************************************************************************
+ * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the License);
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *******************************************************************************/
+/**
+ * @file       tbt-dali-pan-gesture-single-view.h
+ * @brief      To test functionality of dali pan gesture and detector
+ *
+ * @author     Jahangir Alam(ja.alam@samsung.com)
+ * @date       October, 2016
+ * @credit
+ *
+ */
+
+#ifndef __TBT_MODULE_APP_PAN_PRESS_GESTURE_SINGLE
+#define __TBT_MODULE_APP_PAN_PRESS_GESTURE_SINGLE
+#include <dali.h>
+
+#include "utils/logger.h"
+#include "utils/config.h"
+#include "utils/ui-utils.h"
+#include "utils/dali-ui-utils.h"
+
+class TBTDaliPanGestureSingleView: public UiUtils {
+
+private:
+
+       //testlabel
+       TextLabel lblPan;
+       TextLabel lblPressData;
+       //TextLabel lblpan;
+
+       PanGestureDetector pangesturedetector;
+
+       unsigned int mintouchesRequired;
+       unsigned int maxtouchesRequired;
+
+public:
+       TBTDaliPanGestureSingleView(Application& mApplication, app_control_h _control);
+       //signal
+       void OnPanGestureDetector(Actor actor, const PanGesture& gesture);
+};
+
+#endif // __TBT_MODULE_APP_PAN_PRESS_GESTURE_SINGLE
+
diff --git a/tbtcoreapp-dali/inc/view/tbt-dali-pinch-gesture-single-view.h b/tbtcoreapp-dali/inc/view/tbt-dali-pinch-gesture-single-view.h
new file mode 100644 (file)
index 0000000..e41fc58
--- /dev/null
@@ -0,0 +1,53 @@
+/*******************************************************************************
+ * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the License);
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *******************************************************************************/
+/**
+ * @file       tbt-dali-pinch-gesture-single-view.h
+ * @brief      To test functionality of dali pinch gesture and detector
+ *
+ * @author     Jahangir Alam(ja.alam@samsung.com)
+ * @date       November, 2016
+ * @credit
+ *
+ */
+
+#ifndef __TBT_MODULE_APP_DALI_PINCH_GESTURE_SINGLE
+#define __TBT_MODULE_APP_DALI_PINCH_GESTURE_SINGLE
+#include <dali.h>
+
+#include "utils/logger.h"
+#include "utils/config.h"
+#include "utils/ui-utils.h"
+#include "utils/dali-ui-utils.h"
+
+class TBTDaliPinchGestureSingleView: public UiUtils {
+
+private:
+
+       //testlabel
+       TextLabel lblPinch;
+       TextLabel lblPinchData;
+       //TextLabel lblpan;
+
+       PinchGestureDetector pinchgesturedetector;
+
+public:
+       TBTDaliPinchGestureSingleView(Application& mApplication, app_control_h _control);
+       //signal
+       void OnPinchGestureDetector(Actor actor, const PinchGesture& gesture);
+};
+
+#endif // __TBT_MODULE_APP_DALI_PINCH_GESTURE_SINGLE
+
diff --git a/tbtcoreapp-dali/inc/view/tbt-dali-tap-gesture-multiple-view.h b/tbtcoreapp-dali/inc/view/tbt-dali-tap-gesture-multiple-view.h
new file mode 100644 (file)
index 0000000..f12393e
--- /dev/null
@@ -0,0 +1,55 @@
+/*******************************************************************************
+ * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the License);
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *******************************************************************************/
+/**
+ * @file       tbt-dali-tap-gesture-multiple-view.h
+ * @brief      To test functionality of dali tap gesture and detector
+ *
+ * @author     Jahangir Alam(ja.alam@samsung.com)
+ * @date       November, 2016
+ * @credit
+ *
+ */
+
+#ifndef __TBT_MODULE_APP_DALI_TAP_GESTURE_MULTIPLE
+#define __TBT_MODULE_APP_DALI_TAP_GESTURE_MULTIPLE
+#include <dali.h>
+
+#include "utils/logger.h"
+#include "utils/config.h"
+#include "utils/ui-utils.h"
+#include "utils/dali-ui-utils.h"
+
+class TBTDaliTapGestureMultipleView: public UiUtils {
+
+private:
+
+       //testlabel
+       TextLabel lblTap;
+       TextLabel lblTapData;
+
+       TapGestureDetector tapgesturedetector;
+
+       unsigned int minTabRequired;
+       unsigned int maxTabRequired;
+
+public:
+       TBTDaliTapGestureMultipleView(Application& mApplication, app_control_h _control);
+       //signal
+       void OnTapGestureDetector(Actor actor, const TapGesture& gesture);
+};
+
+#endif // __TBT_MODULE_APP_DALI_TAP_GESTURE_MULTIPLE
+
diff --git a/tbtcoreapp-dali/inc/view/tbt-dali-tap-gesture-single-view.h b/tbtcoreapp-dali/inc/view/tbt-dali-tap-gesture-single-view.h
new file mode 100644 (file)
index 0000000..7807d8d
--- /dev/null
@@ -0,0 +1,56 @@
+/*******************************************************************************
+ * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the License);
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *******************************************************************************/
+/**
+ * @file       tbt-dali-tap-gesture-single-view.h
+ * @brief      To test functionality of dali tap gesture and detector
+ *
+ * @author     Jahangir Alam(ja.alam@samsung.com)
+ * @date       November, 2016
+ * @credit
+ *
+ */
+
+#ifndef __TBT_MODULE_APP_DALI_TAP_GESTURE_SINGLE
+#define __TBT_MODULE_APP_DALI_TAP_GESTURE_SINGLE
+#include <dali.h>
+
+#include "utils/logger.h"
+#include "utils/config.h"
+#include "utils/ui-utils.h"
+#include "utils/dali-ui-utils.h"
+
+class TBTDaliTapGestureSingleView: public UiUtils {
+
+private:
+
+       //testlabel
+       TextLabel lblTap;
+       TextLabel lblTapData;
+       //TextLabel lblpan;
+
+       TapGestureDetector tapgesturedetector;
+
+       unsigned int minTabRequired;
+       unsigned int maxTabRequired;
+
+public:
+       TBTDaliTapGestureSingleView(Application& mApplication, app_control_h _control);
+       //signal
+       void OnTapGestureDetector(Actor actor, const TapGesture& gesture);
+};
+
+#endif // __TBT_MODULE_APP_DALI_TAP_GESTURE_SINGLE
+
index 30a289938a09b61ab9a4430662e55e295899f84e..621279a5865aeff05ce9c4f2235ece2ef1b3acf6 100644 (file)
 #include "view/tbt-dali-text-control-view.h"
 #include "view/tbt-dali-keyboard-focus-manager-view.h"
 #include "view/tbt-dali-accessibility-manager-view.h"
-#include "view/tbt-dali-gesture-detector-view.h"
+#include "view/tbt-dali-long-press-gesture-single-view.h"
+#include "view/tbt-dali-long-press-gesture-double-view.h"
+#include "view/tbt-dali-long-press-gesture-multiple-view.h"
+#include "view/tbt-dali-pan-gesture-single-view.h"
+#include "view/tbt-dali-pan-gesture-double-view.h"
+#include "view/tbt-dali-pan-gesture-angle-direction-view.h"
+#include "view/tbt-dali-pinch-gesture-single-view.h"
+#include "view/tbt-dali-tap-gesture-single-view.h"
+#include "view/tbt-dali-tap-gesture-multiple-view.h"
 #include "view/tbt-dali-style-manager-view.h"
 #include "view/tbt-dali-app-view.h"
 
@@ -138,9 +146,41 @@ public:
                        {
                                parentView = new TBTDaliAccessibilityManagerView(mApplication, _control);
                        }
-                       else if(strcmp(moduleName, "TBT_APP_DALI_GESTURE_DETECTOR") == 0)
+                       else if(strcmp(moduleName, "TBT_APP_DALI_LONG_PRESS_GESTURE_SINGLE") == 0)
                        {
-                               parentView = new TBTDaliGestureDetectorView(mApplication, _control);
+                               parentView = new TBTDaliLongPressGestureSingleView(mApplication, _control);
+                       }
+                       else if(strcmp(moduleName, "TBT_APP_DALI_LONG_PRESS_GESTURE_DOUBLE") == 0)
+                       {
+                               parentView = new TBTDaliLongPressGestureDoubleView(mApplication, _control);
+                       }
+                       else if(strcmp(moduleName, "TBT_APP_DALI_LONG_PRESS_GESTURE_MULTIPLE") == 0)
+                       {
+                               parentView = new TBTDaliLongPressGestureMultipleView(mApplication, _control);
+                       }
+                       else if(strcmp(moduleName, "TBT_APP_DALI_PAN_GESTURE_SINGLE") == 0)
+                       {
+                               parentView = new TBTDaliPanGestureSingleView(mApplication, _control);
+                       }
+                       else if(strcmp(moduleName, "TBT_APP_DALI_PAN_GESTURE_DOUBLE") == 0)
+                       {
+                               parentView = new TBTDaliPanGestureDoubleView(mApplication, _control);
+                       }
+                       else if(strcmp(moduleName, "TBT_APP_DALI_PAN_GESTURE_ANGLE_DIRECTION") == 0)
+                       {
+                               parentView = new TBTDaliPanGestureAngleDirectionView(mApplication, _control);
+                       }
+                       else if(strcmp(moduleName, "TBT_APP_DALI_PINCH_GESTURE_SINGLE") == 0)
+                       {
+                               parentView = new TBTDaliPinchGestureSingleView(mApplication, _control);
+                       }
+                       else if(strcmp(moduleName, "TBT_APP_DALI_TAP_GESTURE_SINGLE") == 0)
+                       {
+                               parentView = new TBTDaliTapGestureSingleView(mApplication, _control);
+                       }
+                       else if(strcmp(moduleName, "TBT_APP_DALI_TAP_GESTURE_MULIPLE") == 0)
+                       {
+                               parentView = new TBTDaliTapGestureMultipleView(mApplication, _control);
                        }
                        else if(strcmp(moduleName, "TBT_APP_DALI_STYLE_MANAGER") == 0)
                        {
index de1c9e7482fcbeaa863b6573bd1051db45b81c59..481f9fa7ad6da122fb7cacdd0bd036f967102bc6 100644 (file)
@@ -126,8 +126,9 @@ TBTDaliActorView::TBTDaliActorView(Application& mApplication, app_control_h _con
        ctl["lbl1"]="Touched signal not call";
        ctl["lbl2"]="Touched event data";
        ctl["lbl3"]="Hover signal not call";
-       ctl["lbl4"]="Hover data";
+       ctl["lbl4"]="Hover event data";
        ctl["lbl5"]="Wheel signal not call";
+       ctl["lbl6"]="Wheel event data";
 
        Property::Map size;
        size["lbl1"]=Vector2(bodySize.width, TEXTLABEL_HEIGHT * bodySize.height);
@@ -135,6 +136,7 @@ TBTDaliActorView::TBTDaliActorView(Application& mApplication, app_control_h _con
        size["lbl3"]=Vector2(bodySize.width, TEXTLABEL_HEIGHT * bodySize.height);
        size["lbl4"]=Vector2(bodySize.width, 2*TEXTLABEL_HEIGHT * bodySize.height);
        size["lbl5"]=Vector2(bodySize.width, TEXTLABEL_HEIGHT * bodySize.height);
+       size["lbl6"]=Vector2(bodySize.width, 2*TEXTLABEL_HEIGHT * bodySize.height);
 
        CreateLabelList(ctl,size);//create textlabel list
        txtTouched=TextLabel::DownCast(ctlBody.GetChildAt(0));
@@ -142,6 +144,7 @@ TBTDaliActorView::TBTDaliActorView(Application& mApplication, app_control_h _con
        txtHovered=TextLabel::DownCast(ctlBody.GetChildAt(2));
        txtHoveredData=TextLabel::DownCast(ctlBody.GetChildAt(3));
        txtWheel=TextLabel::DownCast(ctlBody.GetChildAt(4));
+       txtWheelData=TextLabel::DownCast(ctlBody.GetChildAt(5));
 
        Vector2 buttonSize=Vector2(bodySize.width, BUTTON_HEIGHT*bodySize.height);
        Vector2 position=Vector2(0.0f, bodySize.height - (buttonSize.height + VERTICAL_SPACE*bodySize.height));
@@ -166,7 +169,7 @@ bool TBTDaliActorView::cbTouchedSignal(Actor actor, const TouchEvent& event)
        txt.append(IntToString(pointcount));
 
        //getpoint by index
-       TouchPoint touchpoint=event.GetPoint(0);
+       TouchPoint touchpoint=event.GetPoint(pointcount-1);
        //device id
        int deviceId=touchpoint.deviceId;
        txt.append(" DeviceId: ");
@@ -212,6 +215,14 @@ bool TBTDaliActorView::cbTouchedSignal(Actor actor, const TouchEvent& event)
        txt.append(", Touch list count: ");
        txt.append(IntToString(touchcontainer.size()));
 
+       TouchPoint touchPoint1(pointcount-1, TouchPoint::Started, 100.0f, 100.0f);
+       if(touchPoint1.deviceId != pointcount-1)
+               DBG("device id mismatch for touch point");
+
+       TouchPoint touchPoint2(pointcount-1, TouchPoint::Started, 100.0f, 100.0f, 200.0f, 200.0f);
+       if(touchPoint2.deviceId != pointcount-1)
+               DBG("device id mismatch for touch point");
+
        this->txtTouchEventData.SetProperty( TextLabel::Property::TEXT, txt );
        this->txtTouchEventData.SetProperty( TextLabel::Property::POINT_SIZE, 7.0f );
        this->txtTouchEventData.SetProperty(TextLabel::Property::TEXT_COLOR,Color::CYAN);
@@ -225,19 +236,20 @@ bool TBTDaliActorView::cbHoveredSignal(Actor actor, const HoverEvent& event)
        this->txtHovered.SetProperty( TextLabel::Property::TEXT, "Hover Signal is Called" );
        this->txtHovered.SetProperty(TextLabel::Property::TEXT_COLOR,Color::GREEN);
 
-       TouchPoint touchpoint=event.GetPoint(0);
        std::string txt="";
-
-       //device id
-       int deviceId=touchpoint.deviceId;
-       txt.append("DeviceId: ");
-       txt.append(IntToString(deviceId));
        //touch point count
        int touchcount=event.GetPointCount();
        if(touchcount<1)
                DBG("Unable to get GetPointCount");
-       txt.append("Point count: ");
+       txt.append("Point count: ");
        txt.append(IntToString(touchcount));
+       TouchPoint touchpoint=event.GetPoint(touchcount-1);
+
+
+       //device id
+       int deviceId=touchpoint.deviceId;
+       txt.append("DeviceId: ");
+       txt.append(IntToString(deviceId));
 
        //
        Actor hitActor=touchpoint.hitActor;
@@ -284,6 +296,48 @@ bool TBTDaliActorView::cbWheelEventSignal(Actor actor, const WheelEvent& event)
        DBG("In cbWheelEventSignal");
        this->txtWheel.SetProperty( TextLabel::Property::TEXT, "Wheel Signal is Called" );
        this->txtWheel.SetProperty(TextLabel::Property::TEXT_COLOR,Color::GREEN);
+
+       string txt;
+       if(event.IsAltModifier())
+       {
+               DBG("Is alt modified");
+               txt.append("\n  Alt Modifier: Yes");
+       }
+       else
+               txt.append("\n  Alt Modifier: No");
+
+       if(event.IsCtrlModifier())
+       {
+               DBG("Is ctrl modified");
+               txt.append("\n  Ctrl Modifier: Yes");
+       }
+       else
+               txt.append("\n  Ctrl Modifier: No");
+
+       if(event.IsShiftModifier())
+       {
+               DBG("Is Shift modified");
+               txt.append("\n  Shift Modifier: Yes");
+       }
+       else
+               txt.append("  Shift Modifier: No");
+
+       WheelEvent wheelevent1;
+       WheelEvent wheelevent2(WheelEvent::MOUSE_WHEEL,1,DALI_KEY_SHIFT_LEFT,Vector2(100.0f,100.0f),1,12121212);
+       if(wheelevent2.direction != 1)
+               DBG("wheel event constructor failed");
+
+       txt.append("\n  Wheel direction: ");
+       txt.append(IntToString(event.direction));
+
+       if(event.type == WheelEvent::MOUSE_WHEEL)
+               txt.append("\n  Wheel type: MOUSE_WHEEL");
+       if(event.type == WheelEvent::CUSTOM_WHEEL)
+               txt.append("\n  Wheel type: CUSTOM_WHEEL");
+
+       this->txtWheelData.SetProperty( TextLabel::Property::TEXT, txt );
+       this->txtWheelData.SetProperty( TextLabel::Property::POINT_SIZE, 7.0f );
+       this->txtWheelData.SetProperty(TextLabel::Property::TEXT_COLOR,Color::CYAN);
        return true;
 }
 bool TBTDaliActorView::cbButtonClicked(Button button)
index 78fd6bf35de6ff240ee17a7af8944622c286e7c1..8b9b115f2057bb2ee14ccb9fa7e0eb0eddbbe7e5 100644 (file)
@@ -42,25 +42,25 @@ TBTDaliAppView::TBTDaliAppView(Application& mApplication, app_control_h _control
        Property::Map ctl;
        Property::Map size;
 
-       ctl["lbl1"]="  Terminate signal not call";
+       //ctl["lbl1"]="  Terminate signal not call";
        ctl["lbl2"]="  Pause signal not call";
        ctl["lbl3"]="  Idle signal not call";
        ctl["lbl4"]="  AppControl signal not call";
-       ctl["lbl5"]="  Battery low signal not call";
+       //ctl["lbl5"]="  Battery low signal not call";
        ctl["lbl6"]="  Language changed signal not call";
-       ctl["lbl7"]="  Memory low signal not call";
+       //ctl["lbl7"]="  Memory low signal not call";
        ctl["lbl8"]="  Region changed signal not call";
        //ctl["lbl9"]="  Reset signal not call";
        ctl["lbl10"]="  Resume signal not call";
        //ctl["lbl11"]="  Resize signal not call";
 
-       size["lbl1"]=Vector2(bodySize.width, TEXTLABEL_HEIGHT * bodySize.height);
+       //size["lbl1"]=Vector2(bodySize.width, TEXTLABEL_HEIGHT * bodySize.height);
        size["lbl2"]=Vector2(bodySize.width, TEXTLABEL_HEIGHT * bodySize.height);
        size["lbl3"]=Vector2(bodySize.width, TEXTLABEL_HEIGHT * bodySize.height);
        size["lbl4"]=Vector2(bodySize.width, TEXTLABEL_HEIGHT * bodySize.height);
-       size["lbl5"]=Vector2(bodySize.width, TEXTLABEL_HEIGHT * bodySize.height);
+       //size["lbl5"]=Vector2(bodySize.width, TEXTLABEL_HEIGHT * bodySize.height);
        size["lbl6"]=Vector2(bodySize.width, TEXTLABEL_HEIGHT * bodySize.height);
-       size["lbl7"]=Vector2(bodySize.width, TEXTLABEL_HEIGHT * bodySize.height);
+       //size["lbl7"]=Vector2(bodySize.width, TEXTLABEL_HEIGHT * bodySize.height);
        size["lbl8"]=Vector2(bodySize.width, TEXTLABEL_HEIGHT * bodySize.height);
        //size["lbl9"]=Vector2(bodySize.width, TEXTLABEL_HEIGHT * bodySize.height);
        size["lbl10"]=Vector2(bodySize.width, TEXTLABEL_HEIGHT * bodySize.height);
@@ -68,24 +68,24 @@ TBTDaliAppView::TBTDaliAppView(Application& mApplication, app_control_h _control
 
        CreateLabelList(ctl,size);//create textlabel list
 
-       lblTerminateSignal=TextLabel::DownCast(ctlBody.GetChildAt(0));
-       lblPauseSignal=TextLabel::DownCast(ctlBody.GetChildAt(1));
-       lblIdleSignal=TextLabel::DownCast(ctlBody.GetChildAt(2));
-       lblAppControlSignal=TextLabel::DownCast(ctlBody.GetChildAt(3));
-       lblBatteryLowSignal=TextLabel::DownCast(ctlBody.GetChildAt(4));
-       lblLanguageChangedSignal=TextLabel::DownCast(ctlBody.GetChildAt(5));
-       lblMemoryLowSignal=TextLabel::DownCast(ctlBody.GetChildAt(6));
-       lblRegionChangedSignal=TextLabel::DownCast(ctlBody.GetChildAt(7));
+       //lblTerminateSignal=TextLabel::DownCast(ctlBody.GetChildAt(0));
+       lblPauseSignal=TextLabel::DownCast(ctlBody.GetChildAt(0));
+       lblIdleSignal=TextLabel::DownCast(ctlBody.GetChildAt(1));
+       lblAppControlSignal=TextLabel::DownCast(ctlBody.GetChildAt(2));
+       //lblBatteryLowSignal=TextLabel::DownCast(ctlBody.GetChildAt(4));
+       lblLanguageChangedSignal=TextLabel::DownCast(ctlBody.GetChildAt(3));
+       //lblMemoryLowSignal=TextLabel::DownCast(ctlBody.GetChildAt(6));
+       lblRegionChangedSignal=TextLabel::DownCast(ctlBody.GetChildAt(4));
        //lblResetSignal=TextLabel::DownCast(ctlBody.GetChildAt(8));
-       lblResumeSignal=TextLabel::DownCast(ctlBody.GetChildAt(8));
+       lblResumeSignal=TextLabel::DownCast(ctlBody.GetChildAt(5));
        //lblResizeSignal=TextLabel::DownCast(ctlBody.GetChildAt(10));
 
        mApplication.TerminateSignal().Connect( this, &TBTDaliAppView::OnTerminate);
        mApplication.PauseSignal().Connect( this, &TBTDaliAppView::OnPause );
        mApplication.AddIdle( MakeCallback( this, &TBTDaliAppView::OnIdle ) );
-       mApplication.BatteryLowSignal().Connect( this, &TBTDaliAppView::OnApplicationBatteryLowSignalCallback );
+       //mApplication.BatteryLowSignal().Connect( this, &TBTDaliAppView::OnApplicationBatteryLowSignalCallback );
        mApplication.LanguageChangedSignal().Connect(this, &TBTDaliAppView::OnApplicationLanguageChangedSignalCallback );
-       mApplication.MemoryLowSignal().Connect(this, &TBTDaliAppView::OnApplicationMemoryLowSignalCallback);
+       //mApplication.MemoryLowSignal().Connect(this, &TBTDaliAppView::OnApplicationMemoryLowSignalCallback);
        mApplication.RegionChangedSignal().Connect(this, &TBTDaliAppView::OnApplicationRegionChangedSignalCallback);
        //mApplication.ResetSignal().Connect(this, &TBTDaliAppView::OnApplicationResetSignalCallback);
        mApplication.ResumeSignal().Connect(this, &TBTDaliAppView::OnApplicationResumeSignalCallback);
@@ -94,7 +94,7 @@ TBTDaliAppView::TBTDaliAppView(Application& mApplication, app_control_h _control
        stage.ContextLostSignal().Connect(this,&TBTDaliAppView::onContextLost);
        stage.ContextRegainedSignal().Connect(this,&TBTDaliAppView::onContextRegain);
 
-       lblAppControlSignal.SetProperty(TextLabel::Property::TEXT,"  App control signal called");
+       lblAppControlSignal.SetProperty(TextLabel::Property::TEXT,"    App control signal called");
        lblAppControlSignal.SetProperty(TextLabel::Property::TEXT_COLOR,Color::GREEN);
        lblAppControlSignal.SetProperty(TextLabel::Property::POINT_SIZE,8);
 }
@@ -136,9 +136,9 @@ bool TBTDaliAppView::resizeButtonClicked(Button)
 void TBTDaliAppView::OnTerminate(Application& app)
 {
        DBG("DaliTestController::OnTerminate");
-       lblTerminateSignal.SetProperty(TextLabel::Property::TEXT,"    Terminate signal called");
-       lblTerminateSignal.SetProperty(TextLabel::Property::TEXT_COLOR,Color::GREEN);
-       lblTerminateSignal.SetProperty(TextLabel::Property::POINT_SIZE, 8);
+//     lblTerminateSignal.SetProperty(TextLabel::Property::TEXT,"    Terminate signal called");
+//     lblTerminateSignal.SetProperty(TextLabel::Property::TEXT_COLOR,Color::GREEN);
+//     lblTerminateSignal.SetProperty(TextLabel::Property::POINT_SIZE, 8);
 }
 void TBTDaliAppView::OnPause(Application& app)
 {
@@ -155,13 +155,13 @@ void TBTDaliAppView::OnIdle()
        lblIdleSignal.SetProperty(TextLabel::Property::TEXT_COLOR,Color::GREEN);
        lblIdleSignal.SetProperty(TextLabel::Property::POINT_SIZE, 8);
 }
-void TBTDaliAppView::OnApplicationBatteryLowSignalCallback(Application& app)
-{
-       DBG("DaliTestController::OnApplicationBatteryLowSignalCallback");
-       lblBatteryLowSignal.SetProperty(TextLabel::Property::TEXT,"    Battery signal called");
-       lblBatteryLowSignal.SetProperty(TextLabel::Property::TEXT_COLOR,Color::GREEN);
-       lblBatteryLowSignal.SetProperty(TextLabel::Property::POINT_SIZE, 8);
-}
+//void TBTDaliAppView::OnApplicationBatteryLowSignalCallback(Application& app)
+//{
+//     DBG("DaliTestController::OnApplicationBatteryLowSignalCallback");
+//     lblBatteryLowSignal.SetProperty(TextLabel::Property::TEXT,"    Battery signal called");
+//     lblBatteryLowSignal.SetProperty(TextLabel::Property::TEXT_COLOR,Color::GREEN);
+//     lblBatteryLowSignal.SetProperty(TextLabel::Property::POINT_SIZE, 8);
+//}
 void TBTDaliAppView::OnApplicationLanguageChangedSignalCallback(Application&)
 {
        DBG("DaliTestController::OnApplicationLanguageChangedSignalCallback");
@@ -169,13 +169,13 @@ void TBTDaliAppView::OnApplicationLanguageChangedSignalCallback(Application&)
        lblLanguageChangedSignal.SetProperty(TextLabel::Property::TEXT_COLOR,Color::GREEN);
        lblLanguageChangedSignal.SetProperty(TextLabel::Property::POINT_SIZE, 8);
 }
-void TBTDaliAppView::OnApplicationMemoryLowSignalCallback(Application& app)
-{
-       DBG("DaliTestController::OnApplicationMemoryLowSignalCallback");
-       lblMemoryLowSignal.SetProperty(TextLabel::Property::TEXT,"    Memory low signal called");
-       lblMemoryLowSignal.SetProperty(TextLabel::Property::TEXT_COLOR,Color::GREEN);
-       lblMemoryLowSignal.SetProperty(TextLabel::Property::POINT_SIZE, 8);
-}
+//void TBTDaliAppView::OnApplicationMemoryLowSignalCallback(Application& app)
+//{
+//     DBG("DaliTestController::OnApplicationMemoryLowSignalCallback");
+//     lblMemoryLowSignal.SetProperty(TextLabel::Property::TEXT,"    Memory low signal called");
+//     lblMemoryLowSignal.SetProperty(TextLabel::Property::TEXT_COLOR,Color::GREEN);
+//     lblMemoryLowSignal.SetProperty(TextLabel::Property::POINT_SIZE, 8);
+//}
 void TBTDaliAppView::OnApplicationRegionChangedSignalCallback(Application& app)
 {
        DBG("DaliTestController::OnApplicationRegionChangedSignalCallback");
diff --git a/tbtcoreapp-dali/src/view/tbt-dali-gesture-detector-view.cpp b/tbtcoreapp-dali/src/view/tbt-dali-gesture-detector-view.cpp
deleted file mode 100644 (file)
index 5140b4d..0000000
+++ /dev/null
@@ -1,91 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
- *
- *  Licensed under the Apache License, Version 2.0 (the License);
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- *******************************************************************************/
-/**
- * @file       tbt-dali-gesture-detector-view.cpp
- * @brief      To test functionality of dali gesture detector
- *
- * @author     Jahangir Alam(ja.alam@samsung.com)
- * @date       July, 2016
- * @credit
- *
- */
-
-#include "view/tbt-dali-gesture-detector-view.h"
-
-TBTDaliGestureDetectorView::TBTDaliGestureDetectorView(Application& mApplication, app_control_h _control) :
-       UiUtils(mApplication, _control) {
-
-       Init("Gesture Detector");//initialize the common view
-       mInfoText=std::string("")+
-                       "\nTo perform the test:"
-                       "\n1.   Run DALi Gesture Detector."
-                       "\n2.   Perform the long press, pinch and pan gesture."
-                       "\n3.   If the corresponding event signals mgs"
-                       " are changed then press <color value='green'><b>Pass</b></color>. "
-                       "Otherwise, press <color value='red'><b>Fail</b></color>";
-
-       Stage stage = Stage::GetCurrent();
-       Vector2 stageSize = stage.GetSize();
-
-       Property::Map ctl;
-       ctl["lbl1"]="Long press gesture detector signal not call";
-       ctl["lbl2"]="Pinch gesture detector signal not call";
-       ctl["lbl3"]="Pan gesture detector signal not call";
-
-       Property::Map size;
-       size["lbl1"]=Vector2(bodySize.width, TEXTLABEL_HEIGHT * bodySize.height);
-       size["lbl2"]=Vector2(bodySize.width, TEXTLABEL_HEIGHT * bodySize.height);
-       size["lbl3"]=Vector2(bodySize.width, TEXTLABEL_HEIGHT * bodySize.height);
-
-       CreateLabelList(ctl,size);//create textlabel list
-       lblLongPress=TextLabel::DownCast(ctlBody.GetChildAt(0));
-       lblPinch=TextLabel::DownCast(ctlBody.GetChildAt(1));
-       lblpan=TextLabel::DownCast(ctlBody.GetChildAt(2));
-
-       longpressgesture=LongPressGestureDetector::New();
-       longpressgesture.Attach(ctlBody);
-       longpressgesture.DetectedSignal().Connect(this, &TBTDaliGestureDetectorView::OnLongPressGestureDetector);
-
-       pinchgesture=PinchGestureDetector::New();
-       pinchgesture.Attach(ctlBody);
-       pinchgesture.DetectedSignal().Connect(this, &TBTDaliGestureDetectorView::OnPinchGestureDetector);
-
-       panGesture=PanGestureDetector::New();
-       panGesture.Attach(ctlBody);
-       panGesture.DetectedSignal().Connect(this, &TBTDaliGestureDetectorView::OnPanGestureDetector);
-}
-void TBTDaliGestureDetectorView::OnLongPressGestureDetector(Actor actor, const LongPressGesture& gesture)
-{
-       DBG("In TBTDaliGestureDetectorView::OnLongPressGestureDetector");
-       lblLongPress.SetProperty(TextLabel::Property::TEXT,"  Long press gesture detector signal called");
-       lblLongPress.SetProperty(TextLabel::Property::TEXT_COLOR,Color::GREEN);
-       lblLongPress.SetProperty(TextLabel::Property::POINT_SIZE,9);
-}
-void TBTDaliGestureDetectorView::OnPinchGestureDetector(Actor actor, const PinchGesture& gesture)
-{
-       DBG("In TBTDaliGestureDetectorView::OnPinchGestureDetector");
-       lblPinch.SetProperty(TextLabel::Property::TEXT,"  Pinch gesture detector signal called");
-       lblPinch.SetProperty(TextLabel::Property::TEXT_COLOR,Color::GREEN);
-       lblPinch.SetProperty(TextLabel::Property::POINT_SIZE,9);
-}
-
-void TBTDaliGestureDetectorView::OnPanGestureDetector(Actor actor, const PanGesture& gesture)
-{
-       DBG("In TBTDaliGestureDetectorView::OnPanGestureDetector");
-       lblpan.SetProperty(TextLabel::Property::TEXT,"  Pan gesture detector signal called");
-       lblpan.SetProperty(TextLabel::Property::TEXT_COLOR,Color::GREEN);
-       lblpan.SetProperty(TextLabel::Property::POINT_SIZE,9);
-}
diff --git a/tbtcoreapp-dali/src/view/tbt-dali-long-press-gesture-double-view.cpp b/tbtcoreapp-dali/src/view/tbt-dali-long-press-gesture-double-view.cpp
new file mode 100644 (file)
index 0000000..0cd9208
--- /dev/null
@@ -0,0 +1,120 @@
+/*******************************************************************************
+ * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the License);
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *******************************************************************************/
+/**
+ * @file       tbt-dali-long-press-gesture-double-view.cpp
+ * @brief      To test functionality of dali gesture detector
+ *
+ * @author     Jahangir Alam(ja.alam@samsung.com)
+ * @date       October, 2016
+ * @credit
+ *
+ */
+
+#include "view/tbt-dali-long-press-gesture-double-view.h"
+
+TBTDaliLongPressGestureDoubleView::TBTDaliLongPressGestureDoubleView(Application& mApplication, app_control_h _control) :
+       UiUtils(mApplication, _control) {
+
+       Init("Long Press Gesture Double Touch");//initialize the common view
+       mInfoText=std::string("")+
+                       "\nTo perform the test:"
+                       "\n1.   Run DALi Long Press Gesture Double Touch."
+                       "\n2.   Perform the long press gesture with double touch"
+                       "\n3.   If the corresponding event signals mgs and touch data"
+                       " are changed then press <color value='green'><b>Pass</b></color>. "
+                       "Otherwise, press <color value='red'><b>Fail</b></color>";
+
+       Stage stage = Stage::GetCurrent();
+
+       Property::Map ctl;
+       ctl["lbl1"]="Long press gesture detector signal not call";
+       ctl["lbl2"]="";
+       //ctl["lbl3"]="Pan gesture detector signal not call";
+
+       Property::Map size;
+       size["lbl1"]=Vector2(bodySize.width, TEXTLABEL_HEIGHT * bodySize.height);
+       size["lbl2"]=Vector2(bodySize.width, 5*TEXTLABEL_HEIGHT * bodySize.height);
+       //size["lbl3"]=Vector2(bodySize.width, TEXTLABEL_HEIGHT * bodySize.height);
+
+       CreateLabelList(ctl,size);//create textlabel list
+       lblLongPress=TextLabel::DownCast(ctlBody.GetChildAt(0));
+       lblPressData=TextLabel::DownCast(ctlBody.GetChildAt(1));
+       //lblpan=TextLabel::DownCast(ctlBody.GetChildAt(2));
+
+       touchesRequired=2;
+       longpressgesturedetector=LongPressGestureDetector::New(touchesRequired);
+       longpressgesturedetector.Attach(ctlBody);
+       longpressgesturedetector.DetectedSignal().Connect(this, &TBTDaliLongPressGestureDoubleView::OnLongPressGestureDetector);
+}
+void TBTDaliLongPressGestureDoubleView::OnLongPressGestureDetector(Actor actor, const LongPressGesture& gesture)
+{
+       DBG("In TBTDaliLongPressGestureDoubleView::OnLongPressGestureDetector");
+       string txt;
+
+       lblLongPress.SetProperty(TextLabel::Property::TEXT,"  Long press gesture detector signal called");
+       lblLongPress.SetProperty(TextLabel::Property::TEXT_COLOR,Color::GREEN);
+       lblLongPress.SetProperty(TextLabel::Property::POINT_SIZE,9);
+
+       LongPressGesture gestureCpy(gesture);
+       LongPressGesture gestureAss=gesture;
+
+       if(gestureCpy.numberOfTouches != gestureAss.numberOfTouches)
+               DBG("LongPressGesture copy constructor and assignment operation not work properly.");
+
+       //touch count
+       if(gestureCpy.numberOfTouches != touchesRequired)
+               DBG(" number Of touches mismatch");
+       txt.append("\n  #of touch fingers= ");
+       txt.append(IntToString(gestureCpy.numberOfTouches));
+
+       DBG("Number of touch = %d",gestureCpy.numberOfTouches);
+       //screen touch point
+       txt.append("\n  Screen coordinate (x,y)= ");
+       txt.append(FloatToString(gestureCpy.screenPoint.x));
+       txt.append(","+FloatToString(gestureCpy.screenPoint.y));
+       //local actor touch point
+       txt.append("\n  Local actor coordinate (x,y)= ");
+       txt.append(FloatToString(gestureCpy.localPoint.x));
+       txt.append(","+FloatToString(gestureCpy.localPoint.y));
+
+       LongPressGestureDetector longpressgesturedetectorCopy(longpressgesturedetector);
+       LongPressGestureDetector longpressgesturedetectorAssign=longpressgesturedetector;
+
+       if(longpressgesturedetectorCopy.GetMaximumTouchesRequired() != longpressgesturedetectorAssign.GetMaximumTouchesRequired())
+               DBG("Maximum touch required mismatch");
+       if(longpressgesturedetectorCopy.GetMinimumTouchesRequired() != longpressgesturedetectorAssign.GetMinimumTouchesRequired())
+               DBG("Minimum touch required mismatch");
+
+       //get min touch point
+       int min=longpressgesturedetector.GetMinimumTouchesRequired();
+       if(min != touchesRequired)
+               DBG("Minimum touches required mismatch");
+       txt.append("\n  Minimum Touches Required= ");
+       txt.append(IntToString(min));
+
+       //get max touch point
+       int max=longpressgesturedetector.GetMaximumTouchesRequired();
+       if(max != touchesRequired)
+               DBG("Maximum touches required mismatch");
+       txt.append("\n  Maximum Touches Required= ");
+       txt.append(IntToString(max));
+
+       lblPressData.SetProperty(TextLabel::Property::TEXT_COLOR,Color::GREEN);
+       lblPressData.SetProperty(TextLabel::Property::POINT_SIZE,9);
+       lblPressData.SetProperty(TextLabel::Property::TEXT,txt);
+
+       longpressgesturedetector.SetTouchesRequired(touchesRequired);
+}
diff --git a/tbtcoreapp-dali/src/view/tbt-dali-long-press-gesture-multiple-view.cpp b/tbtcoreapp-dali/src/view/tbt-dali-long-press-gesture-multiple-view.cpp
new file mode 100644 (file)
index 0000000..72c391e
--- /dev/null
@@ -0,0 +1,121 @@
+/*******************************************************************************
+ * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the License);
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *******************************************************************************/
+/**
+ * @file       tbt-dali-long-press-gesture-multiple-view.cpp
+ * @brief      To test functionality of dali gesture detector
+ *
+ * @author     Jahangir Alam(ja.alam@samsung.com)
+ * @date       October, 2016
+ * @credit
+ *
+ */
+
+#include "view/tbt-dali-long-press-gesture-multiple-view.h"
+
+TBTDaliLongPressGestureMultipleView::TBTDaliLongPressGestureMultipleView(Application& mApplication, app_control_h _control) :
+       UiUtils(mApplication, _control) {
+
+       Init("Long Press Gesture Multiple Touch");//initialize the common view
+       mInfoText=std::string("")+
+                       "\nTo perform the test:"
+                       "\n1.   Run DALi Long Press Gesture Multiple Touches."
+                       "\n2.   Perform the long press gesture with multiple fingers"
+                       "\n3.   If the corresponding event signals mgs and touch data"
+                       " are changed then press <color value='green'><b>Pass</b></color>. "
+                       "Otherwise, press <color value='red'><b>Fail</b></color>";
+
+       Stage stage = Stage::GetCurrent();
+
+       Property::Map ctl;
+       ctl["lbl1"]="Long press gesture detector signal not call";
+       ctl["lbl2"]="";
+       //ctl["lbl3"]="Pan gesture detector signal not call";
+
+       Property::Map size;
+       size["lbl1"]=Vector2(bodySize.width, TEXTLABEL_HEIGHT * bodySize.height);
+       size["lbl2"]=Vector2(bodySize.width, 5*TEXTLABEL_HEIGHT * bodySize.height);
+       //size["lbl3"]=Vector2(bodySize.width, TEXTLABEL_HEIGHT * bodySize.height);
+
+       CreateLabelList(ctl,size);//create textlabel list
+       lblLongPress=TextLabel::DownCast(ctlBody.GetChildAt(0));
+       lblPressData=TextLabel::DownCast(ctlBody.GetChildAt(1));
+       //lblpan=TextLabel::DownCast(ctlBody.GetChildAt(2));
+
+       minTouchesRequired=1;
+       maxTouchesRequired=3;
+       longpressgesturedetector=LongPressGestureDetector::New(minTouchesRequired,maxTouchesRequired);
+       longpressgesturedetector.Attach(ctlBody);
+       longpressgesturedetector.DetectedSignal().Connect(this, &TBTDaliLongPressGestureMultipleView::OnLongPressGestureDetector);
+}
+void TBTDaliLongPressGestureMultipleView::OnLongPressGestureDetector(Actor actor, const LongPressGesture& gesture)
+{
+       DBG("In TBTDaliLongPressGestureMultipleView::OnLongPressGestureDetector");
+       string txt;
+
+       lblLongPress.SetProperty(TextLabel::Property::TEXT,"  Long press gesture detector signal called");
+       lblLongPress.SetProperty(TextLabel::Property::TEXT_COLOR,Color::GREEN);
+       lblLongPress.SetProperty(TextLabel::Property::POINT_SIZE,9);
+
+       LongPressGesture gestureCpy(gesture);
+       LongPressGesture gestureAss=gesture;
+
+       if(gestureCpy.numberOfTouches != gestureAss.numberOfTouches)
+               DBG("LongPressGesture copy constructor and assignment operation not work properly.");
+
+       //touch count
+       if(gestureCpy.numberOfTouches <1 && gestureCpy.numberOfTouches > 3)
+               DBG(" number Of touches mismatch");
+       txt.append("\n  #of touch fingers= ");
+       txt.append(IntToString(gestureCpy.numberOfTouches));
+
+       DBG("Number of touch = %d",gestureCpy.numberOfTouches);
+       //screen touch point
+       txt.append("\n  Screen coordinate (x,y)= ");
+       txt.append(FloatToString(gestureCpy.screenPoint.x));
+       txt.append(","+FloatToString(gestureCpy.screenPoint.y));
+       //local actor touch point
+       txt.append("\n  Local actor coordinate (x,y)= ");
+       txt.append(FloatToString(gestureCpy.localPoint.x));
+       txt.append(","+FloatToString(gestureCpy.localPoint.y));
+
+       LongPressGestureDetector longpressgesturedetectorCopy(longpressgesturedetector);
+       LongPressGestureDetector longpressgesturedetectorAssign=longpressgesturedetector;
+
+       if(longpressgesturedetectorCopy.GetMaximumTouchesRequired() != longpressgesturedetectorAssign.GetMaximumTouchesRequired())
+               DBG("Maximum touch required mismatch");
+       if(longpressgesturedetectorCopy.GetMinimumTouchesRequired() != longpressgesturedetectorAssign.GetMinimumTouchesRequired())
+               DBG("Minimum touch required mismatch");
+
+       //get min touch point
+       int min=longpressgesturedetector.GetMinimumTouchesRequired();
+       if(min != minTouchesRequired)
+               DBG("Minimum touches required mismatch");
+       txt.append("\n  Minimum Touches Required= ");
+       txt.append(IntToString(min));
+
+       //get max touch point
+       int max=longpressgesturedetector.GetMaximumTouchesRequired();
+       if(max != maxTouchesRequired)
+               DBG("Maximum touches required mismatch");
+       txt.append("\n  Maximum Touches Required= ");
+       txt.append(IntToString(max));
+
+       lblPressData.SetProperty(TextLabel::Property::TEXT_COLOR,Color::GREEN);
+       lblPressData.SetProperty(TextLabel::Property::POINT_SIZE,9);
+       lblPressData.SetProperty(TextLabel::Property::TEXT,txt);
+
+       longpressgesturedetector.SetTouchesRequired(minTouchesRequired,maxTouchesRequired);
+}
diff --git a/tbtcoreapp-dali/src/view/tbt-dali-long-press-gesture-single-view.cpp b/tbtcoreapp-dali/src/view/tbt-dali-long-press-gesture-single-view.cpp
new file mode 100644 (file)
index 0000000..31e3bc8
--- /dev/null
@@ -0,0 +1,148 @@
+/*******************************************************************************
+ * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the License);
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *******************************************************************************/
+/**
+ * @file       tbt-dali-long-press-gesture-single-view.cpp
+ * @brief      To test functionality of dali gesture detector
+ *
+ * @author     Jahangir Alam(ja.alam@samsung.com)
+ * @date       July, 2016
+ * @credit
+ *
+ */
+
+#include "view/tbt-dali-long-press-gesture-single-view.h"
+
+TBTDaliLongPressGestureSingleView::TBTDaliLongPressGestureSingleView(Application& mApplication, app_control_h _control) :
+       UiUtils(mApplication, _control) {
+
+       Init("Long Press Gesture Single Touch");//initialize the common view
+       mInfoText=std::string("")+
+                       "\nTo perform the test:"
+                       "\n1.   Run DALi Long Press Gesture Single Touch."
+                       "\n2.   Perform the long press gesture with single touch"
+                       "\n3.   If the corresponding event signals mgs and touch data"
+                       " are changed then press <color value='green'><b>Pass</b></color>. "
+                       "Otherwise, press <color value='red'><b>Fail</b></color>";
+
+       Stage stage = Stage::GetCurrent();
+
+       Property::Map ctl;
+       ctl["lbl1"]="Long press gesture detector signal not call";
+       ctl["lbl2"]="";
+       //ctl["lbl3"]="Pan gesture detector signal not call";
+
+       Property::Map size;
+       size["lbl1"]=Vector2(bodySize.width, TEXTLABEL_HEIGHT * bodySize.height);
+       size["lbl2"]=Vector2(bodySize.width, 5*TEXTLABEL_HEIGHT * bodySize.height);
+       //size["lbl3"]=Vector2(bodySize.width, TEXTLABEL_HEIGHT * bodySize.height);
+
+       CreateLabelList(ctl,size);//create textlabel list
+       lblLongPress=TextLabel::DownCast(ctlBody.GetChildAt(0));
+       lblPressData=TextLabel::DownCast(ctlBody.GetChildAt(1));
+       //lblpan=TextLabel::DownCast(ctlBody.GetChildAt(2));
+
+       touchesRequired=1;
+       longpressgesturedetector=LongPressGestureDetector::New();
+       longpressgesturedetector.Attach(ctlBody);
+       longpressgesturedetector.DetectedSignal().Connect(this, &TBTDaliLongPressGestureSingleView::OnLongPressGestureDetector);
+
+//     pinchgesture=PinchGestureDetector::New();
+//     pinchgesture.Attach(ctlBody);
+//     pinchgesture.DetectedSignal().Connect(this, &TBTDaliGestureDetectorView::OnPinchGestureDetector);
+//
+//     panGesture=PanGestureDetector::New();
+//     panGesture.Attach(ctlBody);
+//     panGesture.DetectedSignal().Connect(this, &TBTDaliGestureDetectorView::OnPanGestureDetector);
+}
+void TBTDaliLongPressGestureSingleView::OnLongPressGestureDetector(Actor actor, const LongPressGesture& gesture)
+{
+       DBG("In TBTDaliLongPressGestureSingleView::OnLongPressGestureDetector");
+       string txt;
+
+       lblLongPress.SetProperty(TextLabel::Property::TEXT,"  Long press gesture detector signal called");
+       lblLongPress.SetProperty(TextLabel::Property::TEXT_COLOR,Color::GREEN);
+       lblLongPress.SetProperty(TextLabel::Property::POINT_SIZE,9);
+
+       LongPressGesture gestureCpy(gesture);
+       LongPressGesture gestureAss(Gesture::Started);
+       gestureAss=gesture;
+
+       if(gestureCpy.numberOfTouches != gestureAss.numberOfTouches)
+               DBG("LongPressGesture copy constructor and assignment operation not work properly.");
+
+       //touch count
+       if(gestureCpy.numberOfTouches != touchesRequired)
+               DBG(" number Of touches mismatch");
+       txt.append("\n  #of touch fingers= ");
+       txt.append(IntToString(gestureCpy.numberOfTouches));
+
+       DBG("Number of touch = %d",gestureCpy.numberOfTouches);
+       //screen touch point
+       txt.append("\n  Screen coordinate (x,y)= ");
+       txt.append(FloatToString(gestureCpy.screenPoint.x));
+       txt.append(","+FloatToString(gestureCpy.screenPoint.y));
+       //local actor touch point
+       txt.append("\n  Local actor coordinate (x,y)= ");
+       txt.append(FloatToString(gestureCpy.localPoint.x));
+       txt.append(","+FloatToString(gestureCpy.localPoint.y));
+
+       BaseHandle handle( longpressgesturedetector );
+       LongPressGestureDetector downCast=LongPressGestureDetector::DownCast(handle);
+
+       LongPressGestureDetector longpressgesturedetectorCopy(longpressgesturedetector);
+       LongPressGestureDetector longpressgesturedetectorAssign;
+       longpressgesturedetectorAssign=longpressgesturedetector;
+
+       if(longpressgesturedetectorCopy.GetMaximumTouchesRequired() != longpressgesturedetectorAssign.GetMaximumTouchesRequired())
+               DBG("Maximum touch required mismatch");
+       if(longpressgesturedetectorCopy.GetMinimumTouchesRequired() != longpressgesturedetectorAssign.GetMinimumTouchesRequired())
+               DBG("Minimum touch required mismatch");
+
+       //get min touch point
+       int min=downCast.GetMinimumTouchesRequired();
+       if(min != touchesRequired)
+               DBG("Minimum touches required mismatch");
+       txt.append("\n  Minimum Touches Required= ");
+       txt.append(IntToString(min));
+
+       //get max touch point
+       int max=downCast.GetMaximumTouchesRequired();
+       if(max != touchesRequired)
+               DBG("Maximum touches required mismatch");
+       txt.append("\n  Maximum Touches Required= ");
+       txt.append(IntToString(max));
+
+       lblPressData.SetProperty(TextLabel::Property::TEXT_COLOR,Color::GREEN);
+       lblPressData.SetProperty(TextLabel::Property::POINT_SIZE,9);
+       lblPressData.SetProperty(TextLabel::Property::TEXT,txt);
+
+       longpressgesturedetector.SetTouchesRequired(touchesRequired);
+}
+//void TBTDaliLongPressGestureView::OnPinchGestureDetector(Actor actor, const PinchGesture& gesture)
+//{
+//     DBG("In TBTDaliLongPressGestureView::OnPinchGestureDetector");
+//     lblPinch.SetProperty(TextLabel::Property::TEXT,"  Pinch gesture detector signal called");
+//     lblPinch.SetProperty(TextLabel::Property::TEXT_COLOR,Color::GREEN);
+//     lblPinch.SetProperty(TextLabel::Property::POINT_SIZE,9);
+//}
+//
+//void TBTDaliLongPressGestureView::OnPanGestureDetector(Actor actor, const PanGesture& gesture)
+//{
+//     DBG("In TBTDaliLongPressGestureView::OnPanGestureDetector");
+//     lblpan.SetProperty(TextLabel::Property::TEXT,"  Pan gesture detector signal called");
+//     lblpan.SetProperty(TextLabel::Property::TEXT_COLOR,Color::GREEN);
+//     lblpan.SetProperty(TextLabel::Property::POINT_SIZE,9);
+//}
diff --git a/tbtcoreapp-dali/src/view/tbt-dali-pan-gesture-angle-direction-view.cpp b/tbtcoreapp-dali/src/view/tbt-dali-pan-gesture-angle-direction-view.cpp
new file mode 100644 (file)
index 0000000..e20f2fa
--- /dev/null
@@ -0,0 +1,152 @@
+/*******************************************************************************
+ * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the License);
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *******************************************************************************/
+/**
+ * @file       tbt-dali-pan-gesture-angle-direction-view.cpp
+ * @brief      To test functionality of dali pan gesture and detector
+ *
+ * @author     Jahangir Alam(ja.alam@samsung.com)
+ * @date       October, 2016
+ * @credit
+ *
+ */
+
+#include "view/tbt-dali-pan-gesture-angle-direction-view.h"
+
+TBTDaliPanGestureAngleDirectionView::TBTDaliPanGestureAngleDirectionView(Application& mApplication, app_control_h _control) :
+       UiUtils(mApplication, _control) {
+
+       Init("Pan Gesture With Angle and Direction");//initialize the common view
+       mInfoText=std::string("")+
+                       "\nTo perform the test:"
+                       "\n1.   Run DALi Pan Gesture Angle and Direction."
+                       "\n2.   Perform the pan gesture with right diagonal"
+                       "\n3.   Add/Remove angle and direction of pan gesture"
+                       "\n4.   If the corresponding event signals mgs and touch data"
+                       " are changed then press <color value='green'><b>Pass</b></color>. "
+                       "Otherwise, press <color value='red'><b>Fail</b></color>";
+       flag=false;
+
+       Stage stage = Stage::GetCurrent();
+
+       Property::Map ctl;
+       ctl["lbl1"]="Pan gesture detector signal not call";
+       ctl["lbl2"]="";
+       //ctl["lbl3"]="Pan gesture detector signal not call";
+
+       Property::Map size;
+       size["lbl1"]=Vector2(bodySize.width, TEXTLABEL_HEIGHT * bodySize.height);
+       size["lbl2"]=Vector2(bodySize.width, 5*TEXTLABEL_HEIGHT * bodySize.height);
+       //size["lbl3"]=Vector2(bodySize.width, TEXTLABEL_HEIGHT * bodySize.height);
+
+       CreateLabelList(ctl,size);//create textlabel list
+       lblPan=TextLabel::DownCast(ctlBody.GetChildAt(0));
+       lblPressData=TextLabel::DownCast(ctlBody.GetChildAt(1));
+       //lblpan=TextLabel::DownCast(ctlBody.GetChildAt(2));
+
+       mintouchesRequired=1;
+       maxtouchesRequired=1;
+
+       pangesturedetector=PanGestureDetector::New();
+       //set max min touch required
+       pangesturedetector.SetMinimumTouchesRequired(mintouchesRequired);
+       pangesturedetector.SetMaximumTouchesRequired(maxtouchesRequired);
+       fSetAngle = -0.25f;
+       fSetThreshold = 0.25f;
+
+       pangesturedetector.Attach(ctlBody);
+       pangesturedetector.DetectedSignal().Connect(this, &TBTDaliPanGestureAngleDirectionView::OnPanGestureDetector);
+
+       //button
+       btnAddremove=PushButton::New();
+       btnAddremove.SetAnchorPoint(AnchorPoint::BOTTOM_CENTER);
+       btnAddremove.SetParentOrigin(ParentOrigin::BOTTOM_CENTER);
+       btnAddremove.SetPosition(0.0f, -10.0f);
+       btnAddremove.ClickedSignal().Connect(this, &TBTDaliPanGestureAngleDirectionView::OnSetunSetButtonClick);
+       btnAddremove.SetProperty(Button::Property::UNSELECTED_COLOR, selectedColor);
+       btnAddremove.SetProperty(Button::Property::SELECTED_COLOR, unSelectedColor);
+       btnAddremove.SetSize(this->bodySize.width, BUTTON_HEIGHT * bodySize.height);
+       this->ctlBody.Add(btnAddremove);
+       if(flag==false)
+               btnAddremove.SetLabelText("Remove Angle & Direction");
+       setUnset();
+}
+void TBTDaliPanGestureAngleDirectionView::setUnset()
+{
+       DBG("In TBTDaliPanGestureAngleDirectionView::setUnset");
+       Radian angle = Radian( Math::PI * ( fSetAngle ) );
+       Radian threshold = Radian( Math::PI * ( fSetThreshold ) );
+       if(flag==false)
+       {
+               DBG("flag==false");
+               pangesturedetector.AddAngle(angle,threshold);
+               pangesturedetector.AddDirection( PanGestureDetector::DIRECTION_LEFT, Radian( Math::PI * 0.25 ) );
+               flag=true;
+               btnAddremove.SetLabelText("Remove Angle & Direction");
+       }
+       else
+       {
+               DBG("flag==true");
+               pangesturedetector.RemoveAngle(angle);
+               pangesturedetector.RemoveDirection(PanGestureDetector::DIRECTION_LEFT);
+               pangesturedetector.ClearAngles();
+               flag=false;
+               btnAddremove.SetLabelText("Add Angle & Direction");
+       }
+}
+void TBTDaliPanGestureAngleDirectionView::OnPanGestureDetector(Actor actor, const PanGesture& gesture)
+{
+       DBG("In TBTDaliPanGestureAngleDirectionView::OnPanGestureDetector");
+       lblPan.SetProperty(TextLabel::Property::TEXT,"  Pan gesture detector signal called");
+       lblPan.SetProperty(TextLabel::Property::TEXT_COLOR,Color::GREEN);
+       lblPan.SetProperty(TextLabel::Property::POINT_SIZE,9);
+
+       string txt;
+
+       //check  min touch required
+       unsigned int min=pangesturedetector.GetMinimumTouchesRequired();
+       txt.append("\n  Min Touch Required: ");
+       txt.append(IntToString(min));
+       if(mintouchesRequired != min)
+               DBG("Min touch required mismatch with set value (set value=%d, get value=%d)",mintouchesRequired,min);
+
+       //check max touch required
+       unsigned int max=pangesturedetector.GetMaximumTouchesRequired();
+       txt.append("\n  Max Touch Required: ");
+       txt.append(IntToString(max));
+       if(maxtouchesRequired != max)
+               DBG("Max touch required mismatch with set value (set value=%d, get value=%d)",maxtouchesRequired,max);
+
+       //get angle
+
+       size_t i=pangesturedetector.GetAngleCount();
+       PanGestureDetector::AngleThresholdPair angle = pangesturedetector.GetAngle( i-1 );
+       float value=fabs( (angle.first - ( Radian( Math::PI * ( fSetAngle ) ) ) ) );
+       txt.append("\n  Pan Angle: ");
+               txt.append(FloatToString(value));
+
+
+       lblPressData.SetProperty(TextLabel::Property::TEXT, txt);
+       lblPressData.SetProperty(TextLabel::Property::TEXT_COLOR,Color::GREEN);
+       lblPressData.SetProperty(TextLabel::Property::POINT_SIZE,9);
+}
+bool TBTDaliPanGestureAngleDirectionView::OnSetunSetButtonClick(Button button)
+{
+       DBG("In TBTDaliPanGestureAngleDirectionView::OnSetunSetButtonClick");
+
+       setUnset();
+
+       return true;
+}
diff --git a/tbtcoreapp-dali/src/view/tbt-dali-pan-gesture-double-view.cpp b/tbtcoreapp-dali/src/view/tbt-dali-pan-gesture-double-view.cpp
new file mode 100644 (file)
index 0000000..ec089d1
--- /dev/null
@@ -0,0 +1,108 @@
+/*******************************************************************************
+ * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the License);
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *******************************************************************************/
+/**
+ * @file       tbt-dali-pan-gesture-double-view.cpp
+ * @brief      To test functionality of dali pan gesture and detector
+ *
+ * @author     Jahangir Alam(ja.alam@samsung.com)
+ * @date       October, 2016
+ * @credit
+ *
+ */
+
+#include "view/tbt-dali-pan-gesture-double-view.h"
+
+TBTDaliPanGestureDoubleView::TBTDaliPanGestureDoubleView(Application& mApplication, app_control_h _control) :
+       UiUtils(mApplication, _control) {
+
+       Init("Pan Gesture Double Touch");//initialize the common view
+       mInfoText=std::string("")+
+                       "\nTo perform the test:"
+                       "\n1.   Run DALi Pan Gesture Double Touch."
+                       "\n2.   Perform the pan gesture with double touch"
+                       "\n3.   If the corresponding event signals mgs and touch data"
+                       " are changed then press <color value='green'><b>Pass</b></color>. "
+                       "Otherwise, press <color value='red'><b>Fail</b></color>";
+
+       Stage stage = Stage::GetCurrent();
+
+       Property::Map ctl;
+       ctl["lbl1"]="Pan gesture detector signal not call";
+       ctl["lbl2"]="";
+       //ctl["lbl3"]="Pan gesture detector signal not call";
+
+       Property::Map size;
+       size["lbl1"]=Vector2(bodySize.width, TEXTLABEL_HEIGHT * bodySize.height);
+       size["lbl2"]=Vector2(bodySize.width, 5*TEXTLABEL_HEIGHT * bodySize.height);
+       //size["lbl3"]=Vector2(bodySize.width, TEXTLABEL_HEIGHT * bodySize.height);
+
+       CreateLabelList(ctl,size);//create textlabel list
+       lblPan=TextLabel::DownCast(ctlBody.GetChildAt(0));
+       lblPressData=TextLabel::DownCast(ctlBody.GetChildAt(1));
+       //lblpan=TextLabel::DownCast(ctlBody.GetChildAt(2));
+
+       mintouchesRequired=2;
+       maxtouchesRequired=5;
+
+       pangesturedetector=PanGestureDetector::New();
+       //set max min touch required
+       pangesturedetector.SetMinimumTouchesRequired(mintouchesRequired);
+       pangesturedetector.SetMaximumTouchesRequired(maxtouchesRequired);
+
+       pangesturedetector.Attach(ctlBody);
+       pangesturedetector.DetectedSignal().Connect(this, &TBTDaliPanGestureDoubleView::OnPanGestureDetector);
+}
+void TBTDaliPanGestureDoubleView::OnPanGestureDetector(Actor actor, const PanGesture& gesture)
+{
+       DBG("In TBTDaliPanGestureDoubleView::OnPanGestureDetector");
+       lblPan.SetProperty(TextLabel::Property::TEXT,"  Pan gesture detector signal called");
+       lblPan.SetProperty(TextLabel::Property::TEXT_COLOR,Color::GREEN);
+       lblPan.SetProperty(TextLabel::Property::POINT_SIZE,9);
+
+       string txt;
+
+       //check  min touch required
+       unsigned int min=pangesturedetector.GetMinimumTouchesRequired();
+       txt.append("\n  Min Touch Required: ");
+       txt.append(IntToString(min));
+       if(mintouchesRequired != min)
+               DBG("Min touch required mismatch with set value (set value=%d, get value=%d)",mintouchesRequired,min);
+
+       //check max touch required
+       unsigned int max=pangesturedetector.GetMaximumTouchesRequired();
+       txt.append("\n  Max Touch Required: ");
+       txt.append(IntToString(max));
+       if(maxtouchesRequired != max)
+               DBG("Max touch required mismatch with set value (set value=%d, get value=%d)",maxtouchesRequired,max);
+
+       //set pan properties
+
+       PanGesture pan(Gesture::Started);
+       pan.velocity=Vector2(100.0f,100.0f);
+       pan.screenVelocity=Vector2(100.0f,100.0f);
+       pan.position=Vector2(100.0f,100.0f);
+       pan.screenPosition=Vector2(100.0f,100.0f);
+       pan.numberOfTouches=2;
+
+       BaseHandle handle( pangesturedetector );
+       PanGestureDetector downCast=PanGestureDetector::DownCast(handle);
+
+       downCast.SetPanGestureProperties(pan);
+
+       lblPressData.SetProperty(TextLabel::Property::TEXT, txt);
+       lblPressData.SetProperty(TextLabel::Property::TEXT_COLOR,Color::GREEN);
+       lblPressData.SetProperty(TextLabel::Property::POINT_SIZE,9);
+}
diff --git a/tbtcoreapp-dali/src/view/tbt-dali-pan-gesture-single-view.cpp b/tbtcoreapp-dali/src/view/tbt-dali-pan-gesture-single-view.cpp
new file mode 100644 (file)
index 0000000..b53cef1
--- /dev/null
@@ -0,0 +1,147 @@
+/*******************************************************************************
+ * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the License);
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *******************************************************************************/
+/**
+ * @file       tbt-dali-pan-gesture-single-view.cpp
+ * @brief      To test functionality of dali pan gesture and detector
+ *
+ * @author     Jahangir Alam(ja.alam@samsung.com)
+ * @date       October, 2016
+ * @credit
+ *
+ */
+
+#include "view/tbt-dali-pan-gesture-single-view.h"
+
+TBTDaliPanGestureSingleView::TBTDaliPanGestureSingleView(Application& mApplication, app_control_h _control) :
+       UiUtils(mApplication, _control) {
+
+       Init("Pan Gesture Single Touch");//initialize the common view
+       mInfoText=std::string("")+
+                       "\nTo perform the test:"
+                       "\n1.   Run DALi Pan Gesture Single Touch."
+                       "\n2.   Perform the pan gesture with single touch"
+                       "\n3.   If the corresponding event signals mgs and touch data"
+                       " are changed then press <color value='green'><b>Pass</b></color>. "
+                       "Otherwise, press <color value='red'><b>Fail</b></color>";
+
+       Stage stage = Stage::GetCurrent();
+
+       Property::Map ctl;
+       ctl["lbl1"]="Pan gesture detector signal not call";
+       ctl["lbl2"]="";
+       //ctl["lbl3"]="Pan gesture detector signal not call";
+
+       Property::Map size;
+       size["lbl1"]=Vector2(bodySize.width, TEXTLABEL_HEIGHT * bodySize.height);
+       size["lbl2"]=Vector2(bodySize.width, 5*TEXTLABEL_HEIGHT * bodySize.height);
+       //size["lbl3"]=Vector2(bodySize.width, TEXTLABEL_HEIGHT * bodySize.height);
+
+       CreateLabelList(ctl,size);//create textlabel list
+       lblPan=TextLabel::DownCast(ctlBody.GetChildAt(0));
+       lblPressData=TextLabel::DownCast(ctlBody.GetChildAt(1));
+       //lblpan=TextLabel::DownCast(ctlBody.GetChildAt(2));
+
+       mintouchesRequired=1;
+       maxtouchesRequired=1;
+
+       pangesturedetector=PanGestureDetector::New();
+       pangesturedetector.Attach(ctlBody);
+       pangesturedetector.DetectedSignal().Connect(this, &TBTDaliPanGestureSingleView::OnPanGestureDetector);
+}
+void TBTDaliPanGestureSingleView::OnPanGestureDetector(Actor actor, const PanGesture& gesture)
+{
+       DBG("In TBTDaliPanGestureSingleView::OnPanGestureDetector");
+       lblPan.SetProperty(TextLabel::Property::TEXT,"  Pan gesture detector signal called");
+       lblPan.SetProperty(TextLabel::Property::TEXT_COLOR,Color::GREEN);
+       lblPan.SetProperty(TextLabel::Property::POINT_SIZE,9);
+
+       string txt;
+
+       //copy constructor and assignment operator
+
+       PanGestureDetector copy(pangesturedetector);
+       PanGestureDetector assign;
+       assign=pangesturedetector;
+
+       if(copy.GetMinimumTouchesRequired() != mintouchesRequired | copy.GetMaximumTouchesRequired() != maxtouchesRequired)
+               DBG("Pan gesture copy constructor failed.");
+       if(assign.GetMinimumTouchesRequired() != mintouchesRequired | assign.GetMaximumTouchesRequired() != maxtouchesRequired)
+               DBG("Pan gesture assignment operator failed.");
+
+       //check default min touch
+       unsigned int min=pangesturedetector.GetMinimumTouchesRequired();
+       if(mintouchesRequired != min)
+               DBG("Default min touch required is not 1 get value is %d",min);
+       txt.append("\n  Min Touch Required: ");
+       txt.append(IntToString(min));
+
+       //check default max touch
+       unsigned int max=pangesturedetector.GetMaximumTouchesRequired();
+       if(maxtouchesRequired != max)
+               DBG("Default max touch required is not 1 get value is %d",max);
+       txt.append("\n  Max Touch Required: ");
+       txt.append(IntToString(max));
+
+       //set max min touch required
+       pangesturedetector.SetMinimumTouchesRequired(mintouchesRequired);
+       pangesturedetector.SetMaximumTouchesRequired(maxtouchesRequired);
+
+       min=pangesturedetector.GetMinimumTouchesRequired();
+       if(mintouchesRequired != min)
+               DBG("Min touch required mismatch with set value (set value=%d, get value=%d)",mintouchesRequired,min);
+       max=pangesturedetector.GetMaximumTouchesRequired();
+       if(maxtouchesRequired != max)
+               DBG("Max touch required mismatch with set value (set value=%d, get value=%d)",maxtouchesRequired,max);
+
+       //Pan Gesture
+
+       //check copy,default constructor & assignment operator
+       PanGesture copyPan(gesture);
+       PanGesture assignPan(Gesture::Started);
+       assignPan=gesture;
+
+       PanGesture defaultPan;
+       defaultPan=gesture;
+
+       float speed=gesture.GetSpeed();
+
+       if(speed != copyPan.GetSpeed())
+               DBG("Pan gesture copy constructor failed.");
+       if(speed != assignPan.GetSpeed())
+               DBG("Pan gesture assignment operator failed.");
+       if(speed != defaultPan.GetSpeed())
+               DBG("Pan gesture default constructor failed.");
+
+       //speed
+       txt.append("\n  Gesture speed: ");
+       txt.append(FloatToString(speed));
+       //distance
+       float distance=gesture.GetDistance();
+       txt.append("\n  Gesture distance: ");
+       txt.append(FloatToString(distance));
+       //screen speed
+       float screenSpeed=gesture.GetScreenSpeed();
+       txt.append("\n  Gesture screen speed: ");
+       txt.append(FloatToString(screenSpeed));
+       //
+       float screenDistance=gesture.GetScreenDistance();
+       txt.append("\n  Gesture screen distance: ");
+       txt.append(FloatToString(screenDistance));
+
+       lblPressData.SetProperty(TextLabel::Property::TEXT, txt);
+       lblPressData.SetProperty(TextLabel::Property::TEXT_COLOR,Color::GREEN);
+       lblPressData.SetProperty(TextLabel::Property::POINT_SIZE,9);
+}
diff --git a/tbtcoreapp-dali/src/view/tbt-dali-pinch-gesture-single-view.cpp b/tbtcoreapp-dali/src/view/tbt-dali-pinch-gesture-single-view.cpp
new file mode 100644 (file)
index 0000000..030265c
--- /dev/null
@@ -0,0 +1,94 @@
+/*******************************************************************************
+ * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the License);
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *******************************************************************************/
+/**
+ * @file       tbt-dali-pinch-gesture-single-view.cpp
+ * @brief      To test functionality of dali pinch gesture detector
+ *
+ * @author     Jahangir Alam(ja.alam@samsung.com)
+ * @date       November, 2016
+ * @credit
+ *
+ */
+
+#include "view/tbt-dali-pinch-gesture-single-view.h"
+
+TBTDaliPinchGestureSingleView::TBTDaliPinchGestureSingleView(Application& mApplication, app_control_h _control) :
+       UiUtils(mApplication, _control) {
+
+       Init("Pinch Gesture");//initialize the common view
+       mInfoText=std::string("")+
+                       "\nTo perform the test:"
+                       "\n1.   Run DALi Pinch Gesture."
+                       "\n2.   Perform the pinch gesture"
+                       "\n3.   If the corresponding event signals mgs and touch data"
+                       " are changed then press <color value='green'><b>Pass</b></color>. "
+                       "Otherwise, press <color value='red'><b>Fail</b></color>";
+
+       Stage stage = Stage::GetCurrent();
+
+       Property::Map ctl;
+       ctl["lbl1"]="Pinch gesture detector signal not call";
+       ctl["lbl2"]="";
+       //ctl["lbl3"]="Pan gesture detector signal not call";
+
+       Property::Map size;
+       size["lbl1"]=Vector2(bodySize.width, TEXTLABEL_HEIGHT * bodySize.height);
+       size["lbl2"]=Vector2(bodySize.width, 5*TEXTLABEL_HEIGHT * bodySize.height);
+       //size["lbl3"]=Vector2(bodySize.width, TEXTLABEL_HEIGHT * bodySize.height);
+
+       CreateLabelList(ctl,size);//create textlabel list
+       lblPinch=TextLabel::DownCast(ctlBody.GetChildAt(0));
+       lblPinchData=TextLabel::DownCast(ctlBody.GetChildAt(1));
+       //lblpan=TextLabel::DownCast(ctlBody.GetChildAt(2));
+
+       pinchgesturedetector=PinchGestureDetector::New();
+       pinchgesturedetector.Attach(ctlBody);
+       pinchgesturedetector.DetectedSignal().Connect(this, &TBTDaliPinchGestureSingleView::OnPinchGestureDetector);
+}
+void TBTDaliPinchGestureSingleView::OnPinchGestureDetector(Actor actor, const PinchGesture& gesture)
+{
+       DBG("In TBTDaliPinchGestureSingleView::OnLongPressGestureDetector");
+       string txt;
+
+       lblPinch.SetProperty(TextLabel::Property::TEXT,"  Pinch gesture detector signal called");
+       lblPinch.SetProperty(TextLabel::Property::TEXT_COLOR,Color::GREEN);
+       lblPinch.SetProperty(TextLabel::Property::POINT_SIZE,9);
+
+       BaseHandle handle( pinchgesturedetector );
+       PinchGestureDetector downCast=PinchGestureDetector::DownCast(handle);
+
+       if(!downCast)
+               DBG("Pinch gesture detector downcast failed.");
+
+       PinchGestureDetector copy(pinchgesturedetector);
+       if(copy != pinchgesturedetector)
+               DBG("Pinch gesture detector copy constructor failed.");
+
+       PinchGestureDetector assign;
+       assign=pinchgesturedetector;
+
+       if(assign != pinchgesturedetector)
+               DBG("Pinch gesture detector assignment operator failed.");
+
+       PinchGesture asignpinch(Gesture::Started);
+       asignpinch=gesture;
+
+       PinchGesture copyPinch(gesture);
+
+       lblPinchData.SetProperty(TextLabel::Property::TEXT,txt);
+       lblPinchData.SetProperty(TextLabel::Property::TEXT_COLOR,Color::GREEN);
+       lblPinchData.SetProperty(TextLabel::Property::POINT_SIZE,9);
+}
index c10de190852e1de5efb8d6ae0f3425837086b2c0..3c262b72731b676d0a3aae75f384aba56b17ee24 100644 (file)
@@ -87,10 +87,10 @@ TBTDaliScrollView::TBTDaliScrollView(Application& mApplication, app_control_h _c
        scrollView.SetMaxOvershoot(1, 1);
        scrollView.SetAxisAutoLock(true);
 
-       //scrollView.RemoveScrollingDirection( Radian(0));
+       scrollView.RemoveScrollingDirection( Radian(0));
        if(scrollView.GetAxisAutoLock() == false)
        {
-               DBG("Error");
+               DBG("Error in GetAxisAutoLock()");
        }
        scrollBar = ScrollBar::New(Toolkit::ScrollBar::Horizontal);
        scrollBar.SetParentOrigin(ParentOrigin::TOP_LEFT);
index 6afeb3a20b6a4edfea12ee87b1e4e460482dee4b..0b16e1a14c451eae13c8a4463bcf0db1d32a86bf 100644 (file)
@@ -153,6 +153,50 @@ void TBTDaliStageView::NewWindow(void)
 void TBTDaliStageView::onKeyEvent(const KeyEvent& keyevent)
 {
        DBG("In TBTDaliStageView::onKeyEvent");
+       string txt;
+       int keycode=keyevent.keyCode;
+       txt.append("keyCode: ");
+       txt.append(IntToString(keycode));
+       DBG("%s",txt.c_str());
+
+       int keymoddifier=keyevent.keyModifier;
+       txt.append("keyModifier: ");
+       txt.append(IntToString(keymoddifier));
+       DBG("%s",txt.c_str());
+
+       string keypress=keyevent.keyPressed;
+       txt.append("keyPressed: ");
+       txt.append(keypress);
+       DBG("%s",txt.c_str());
+
+       string keyname=keyevent.keyPressedName;
+       txt.append("keyPressedName: ");
+       txt.append(keyname);
+       DBG("%s",txt.c_str());
+
+       KeyEvent::State state=keyevent.state;
+
+       if(state == keyevent.Down)
+               DBG("Key Down");
+       if(state == keyevent.Up)
+               DBG("Key Up");
+
+       unsigned long int time= keyevent.time;
+       txt.append("time: ");
+       txt.append(LongToString(time));
+       DBG("%s",txt.c_str());
+
+       bool alt=keyevent.IsAltModifier();
+       if(alt)
+               DBG("Press Alt Modifier");
+       bool ctrl=keyevent.IsCtrlModifier();
+       if(ctrl)
+               DBG("Press ctrl Modifier");
+
+       bool shift=keyevent.IsShiftModifier();
+       if(shift)
+               DBG("Press shift Modifier");
+
        txtKeyEvent.SetProperty(TextLabel::Property::TEXT,"  Key event is called");
        txtKeyEvent.SetProperty(TextLabel::Property::TEXT_COLOR,Color::GREEN);
 }
diff --git a/tbtcoreapp-dali/src/view/tbt-dali-tap-gesture-muliple-view.cpp b/tbtcoreapp-dali/src/view/tbt-dali-tap-gesture-muliple-view.cpp
new file mode 100644 (file)
index 0000000..0824c3e
--- /dev/null
@@ -0,0 +1,126 @@
+/*******************************************************************************
+ * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the License);
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *******************************************************************************/
+/**
+ * @file       tbt-dali-tap-gesture-multiple-view.cpp
+ * @brief      To test functionality of dali gesture detector
+ *
+ * @author     Jahangir Alam(ja.alam@samsung.com)
+ * @date       November, 2016
+ * @credit
+ *
+ */
+
+#include "view/tbt-dali-tap-gesture-multiple-view.h"
+
+TBTDaliTapGestureMultipleView::TBTDaliTapGestureMultipleView(Application& mApplication, app_control_h _control) :
+       UiUtils(mApplication, _control) {
+
+       Init("Tap Gesture Multiple Tap");//initialize the common view
+       mInfoText=std::string("")+
+                       "\nTo perform the test:"
+                       "\n1.   Run DALi Tap Press Gesture Multiple."
+                       "\n2.   Perform the tap gesture with multiple tap"
+                       "\n3.   If the corresponding event signals mgs and touch data"
+                       " are changed then press <color value='green'><b>Pass</b></color>. "
+                       "Otherwise, press <color value='red'><b>Fail</b></color>";
+
+       Stage stage = Stage::GetCurrent();
+
+       Property::Map ctl;
+       ctl["lbl1"]="Tap gesture detector signal not call";
+       ctl["lbl2"]="";
+
+       Property::Map size;
+       size["lbl1"]=Vector2(bodySize.width, TEXTLABEL_HEIGHT * bodySize.height);
+       size["lbl2"]=Vector2(bodySize.width, 5*TEXTLABEL_HEIGHT * bodySize.height);
+       //size["lbl3"]=Vector2(bodySize.width, TEXTLABEL_HEIGHT * bodySize.height);
+
+       CreateLabelList(ctl,size);//create textlabel list
+       lblTap=TextLabel::DownCast(ctlBody.GetChildAt(0));
+       lblTapData=TextLabel::DownCast(ctlBody.GetChildAt(1));
+       //lblpan=TextLabel::DownCast(ctlBody.GetChildAt(2));
+
+       minTabRequired=2;
+       maxTabRequired=5;
+       tapgesturedetector=TapGestureDetector::New();
+       tapgesturedetector.SetMaximumTapsRequired(maxTabRequired);
+       tapgesturedetector.SetMinimumTapsRequired(minTabRequired);
+       tapgesturedetector.Attach(ctlBody);
+       tapgesturedetector.DetectedSignal().Connect(this, &TBTDaliTapGestureMultipleView::OnTapGestureDetector);
+}
+void TBTDaliTapGestureMultipleView::OnTapGestureDetector(Actor actor, const TapGesture& gesture)
+{
+       DBG("In TBTDaliTapGestureMultipleView::OnTapGestureDetector");
+       string txt;
+
+       lblTap.SetProperty(TextLabel::Property::TEXT,"  Tap gesture detector signal called");
+       lblTap.SetProperty(TextLabel::Property::TEXT_COLOR,Color::GREEN);
+       lblTap.SetProperty(TextLabel::Property::POINT_SIZE,9);
+
+       TapGesture gestureCpy(gesture);
+       TapGesture gestureAss;
+       gestureAss=gesture;
+
+       if(gestureCpy.numberOfTouches != gestureAss.numberOfTouches)
+               DBG("TapGesture copy constructor and assignment operation not work properly.");
+
+       //touch count
+       txt.append("\n  #of touch fingers= ");
+       txt.append(IntToString(gestureCpy.numberOfTouches));
+       //tap count
+       txt.append("\n  #of Tap count= ");
+       txt.append(IntToString(gestureCpy.numberOfTaps));
+
+
+       //screen touch point
+       txt.append("\n  Screen coordinate (x,y)= ");
+       txt.append(FloatToString(gestureCpy.screenPoint.x));
+       txt.append(","+FloatToString(gestureCpy.screenPoint.y));
+       //local actor touch point
+       txt.append("\n  Local actor coordinate (x,y)= ");
+       txt.append(FloatToString(gestureCpy.localPoint.x));
+       txt.append(","+FloatToString(gestureCpy.localPoint.y));
+
+       BaseHandle handle( tapgesturedetector );
+       TapGestureDetector downCast=TapGestureDetector::DownCast(handle);
+
+       TapGestureDetector tapgesturedetectorCopy(tapgesturedetector);
+       TapGestureDetector tapgesturedetectorAssign;
+       tapgesturedetectorAssign=tapgesturedetector;
+
+       if(tapgesturedetectorCopy.GetMaximumTapsRequired() != tapgesturedetectorAssign.GetMaximumTapsRequired())
+               DBG("Maximum touch required mismatch");
+       if(tapgesturedetectorCopy.GetMinimumTapsRequired() != tapgesturedetectorAssign.GetMinimumTapsRequired())
+               DBG("Minimum touch required mismatch");
+
+       //get min touch point
+       int min=downCast.GetMinimumTapsRequired();
+       if(min != minTabRequired)
+               DBG("Minimum touches required mismatch");
+       txt.append("\n  Minimum Touches Required= ");
+       txt.append(IntToString(min));
+
+       //get max touch point
+       int max=downCast.GetMaximumTapsRequired();
+       if(max != maxTabRequired)
+               DBG("Maximum touches required mismatch");
+       txt.append("\n  Maximum Touches Required= ");
+       txt.append(IntToString(max));
+
+       lblTapData.SetProperty(TextLabel::Property::TEXT_COLOR,Color::GREEN);
+       lblTapData.SetProperty(TextLabel::Property::POINT_SIZE,9);
+       lblTapData.SetProperty(TextLabel::Property::TEXT,txt);
+}
diff --git a/tbtcoreapp-dali/src/view/tbt-dali-tap-gesture-single-view.cpp b/tbtcoreapp-dali/src/view/tbt-dali-tap-gesture-single-view.cpp
new file mode 100644 (file)
index 0000000..6776522
--- /dev/null
@@ -0,0 +1,124 @@
+/*******************************************************************************
+ * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the License);
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *******************************************************************************/
+/**
+ * @file       tbt-dali-tap-gesture-single-view.cpp
+ * @brief      To test functionality of dali gesture detector
+ *
+ * @author     Jahangir Alam(ja.alam@samsung.com)
+ * @date       November, 2016
+ * @credit
+ *
+ */
+
+#include "view/tbt-dali-tap-gesture-single-view.h"
+
+TBTDaliTapGestureSingleView::TBTDaliTapGestureSingleView(Application& mApplication, app_control_h _control) :
+       UiUtils(mApplication, _control) {
+
+       Init("Tap Gesture Single Tap");//initialize the common view
+       mInfoText=std::string("")+
+                       "\nTo perform the test:"
+                       "\n1.   Run DALi Tap Press Gesture Single."
+                       "\n2.   Perform the tap gesture with single tap"
+                       "\n3.   If the corresponding event signals mgs and touch data"
+                       " are changed then press <color value='green'><b>Pass</b></color>. "
+                       "Otherwise, press <color value='red'><b>Fail</b></color>";
+
+       Stage stage = Stage::GetCurrent();
+
+       Property::Map ctl;
+       ctl["lbl1"]="Tap gesture detector signal not call";
+       ctl["lbl2"]="";
+
+       Property::Map size;
+       size["lbl1"]=Vector2(bodySize.width, TEXTLABEL_HEIGHT * bodySize.height);
+       size["lbl2"]=Vector2(bodySize.width, 5*TEXTLABEL_HEIGHT * bodySize.height);
+       //size["lbl3"]=Vector2(bodySize.width, TEXTLABEL_HEIGHT * bodySize.height);
+
+       CreateLabelList(ctl,size);//create textlabel list
+       lblTap=TextLabel::DownCast(ctlBody.GetChildAt(0));
+       lblTapData=TextLabel::DownCast(ctlBody.GetChildAt(1));
+       //lblpan=TextLabel::DownCast(ctlBody.GetChildAt(2));
+
+       minTabRequired=1;
+       maxTabRequired=1;
+       tapgesturedetector=TapGestureDetector::New(minTabRequired);
+       tapgesturedetector.Attach(ctlBody);
+       tapgesturedetector.DetectedSignal().Connect(this, &TBTDaliTapGestureSingleView::OnTapGestureDetector);
+}
+void TBTDaliTapGestureSingleView::OnTapGestureDetector(Actor actor, const TapGesture& gesture)
+{
+       DBG("In TBTDaliTapGestureSingleView::OnTapGestureDetector");
+       string txt;
+
+       lblTap.SetProperty(TextLabel::Property::TEXT,"  Tap gesture detector signal called");
+       lblTap.SetProperty(TextLabel::Property::TEXT_COLOR,Color::GREEN);
+       lblTap.SetProperty(TextLabel::Property::POINT_SIZE,9);
+
+       TapGesture gestureCpy(gesture);
+       TapGesture gestureAss;
+       gestureAss=gesture;
+
+       if(gestureCpy.numberOfTouches != gestureAss.numberOfTouches)
+               DBG("TapGesture copy constructor and assignment operation not work properly.");
+
+       //touch count
+       txt.append("\n  #of touch fingers= ");
+       txt.append(IntToString(gestureCpy.numberOfTouches));
+       //tap count
+       txt.append("\n  #of Tap count= ");
+       txt.append(IntToString(gestureCpy.numberOfTaps));
+
+
+       //screen touch point
+       txt.append("\n  Screen coordinate (x,y)= ");
+       txt.append(FloatToString(gestureCpy.screenPoint.x));
+       txt.append(","+FloatToString(gestureCpy.screenPoint.y));
+       //local actor touch point
+       txt.append("\n  Local actor coordinate (x,y)= ");
+       txt.append(FloatToString(gestureCpy.localPoint.x));
+       txt.append(","+FloatToString(gestureCpy.localPoint.y));
+
+       BaseHandle handle( tapgesturedetector );
+       TapGestureDetector downCast=TapGestureDetector::DownCast(handle);
+
+       TapGestureDetector tapgesturedetectorCopy(tapgesturedetector);
+       TapGestureDetector tapgesturedetectorAssign;
+       tapgesturedetectorAssign=tapgesturedetector;
+
+       if(tapgesturedetectorCopy.GetMaximumTapsRequired() != tapgesturedetectorAssign.GetMaximumTapsRequired())
+               DBG("Maximum touch required mismatch");
+       if(tapgesturedetectorCopy.GetMinimumTapsRequired() != tapgesturedetectorAssign.GetMinimumTapsRequired())
+               DBG("Minimum touch required mismatch");
+
+       //get min touch point
+       int min=downCast.GetMinimumTapsRequired();
+       if(min != minTabRequired)
+               DBG("Minimum touches required mismatch");
+       txt.append("\n  Minimum Touches Required= ");
+       txt.append(IntToString(min));
+
+       //get max touch point
+       int max=downCast.GetMaximumTapsRequired();
+       if(max != maxTabRequired)
+               DBG("Maximum touches required mismatch");
+       txt.append("\n  Maximum Touches Required= ");
+       txt.append(IntToString(max));
+
+       lblTapData.SetProperty(TextLabel::Property::TEXT_COLOR,Color::GREEN);
+       lblTapData.SetProperty(TextLabel::Property::POINT_SIZE,9);
+       lblTapData.SetProperty(TextLabel::Property::TEXT,txt);
+}
index 15c7d04620796789fbb81262b7a9c6172f97804d..eacc9846dc76c50152a43d6738f068404e2a0c65 100644 (file)
@@ -134,10 +134,10 @@ void TBTDaliTouchDataView::onTouchEvent(const TouchData& touchdata)
        DBG("In TBTDaliTouchDataView::onTouchEvrnt");
 
        std::string txt="";
-       txt.append("**Touch event is called** ");
+       txt.append(" **Touch event is called** ");
        //time
        unsigned long time=touchdata.GetTime()/1000;
-       txt.append("Touch time: ");
+       txt.append("\n  Touch time: ");
        int hr=(time/3600)%24;
        int sec=time%3600;
        int min=sec/60;
@@ -146,60 +146,62 @@ void TBTDaliTouchDataView::onTouchEvent(const TouchData& touchdata)
 
        //point count
        int count=touchdata.GetPointCount();
-       txt.append(", Point count: ");
+       txt.append("\n  Point count: ");
        txt.append(IntToString(count));
 
        //
-       int id=touchdata.GetDeviceId(touchdata.GetPointCount());
-       txt.append(", DeviceId: ");
+       int id=touchdata.GetDeviceId(count-1);
+       txt.append("\n  DeviceId: ");
        txt.append(IntToString(id));
 
        //state
-       txt.append(", State: ");
-       txt.append(GetTouchDataPointState(touchdata.GetState(touchdata.GetPointCount())));
+       txt.append("\n  State: ");
+       txt.append(GetTouchDataPointState(touchdata.GetState(count-1)));
 
        //HitActor
-       Actor actor=touchdata.GetHitActor(0);
+       //Actor actor=touchdata.GetHitActor(0);
 //     TableView table=TableView::DownCast(actor);
-       txt.append(", Hit Actor: ");
-       txt.append(typeid(touchdata.GetHitActor(0)).name());
+       txt.append("\n  Hit Actor: ");
+       txt.append(typeid(touchdata.GetHitActor(count-1)).name());
 
 //     txt.append(table.GetName());
 //     txt.append(", Hit Actor child count: ");
 //     txt.append(IntToString(table.GetChildCount()));
 
        //local point
-       Vector2 vec=touchdata.GetLocalPosition(0);
-       txt.append(", Local Point: ");
+       Vector2 vec=touchdata.GetLocalPosition(count-1);
+       txt.append("\n  Local Point: ");
        txt.append("X:"+FloatToString(vec.x)+" Y:"+FloatToString(vec.y));
        //screen point
-       Vector2 vec1=touchdata.GetScreenPosition(0);
-       txt.append(", Screen Point: ");
+       Vector2 vec1=touchdata.GetScreenPosition(count-1);
+       txt.append("\n  Screen Point: ");
        txt.append("X:"+FloatToString(vec1.x)+" Y:"+FloatToString(vec1.y));
 
        //radius
-       int radius=touchdata.GetRadius(0);
-       txt.append(", Radius: ");
+       int radius=touchdata.GetRadius(count-1);
+       txt.append("\n  Radius: ");
        txt.append(IntToString(radius));
 
 
        //
-       Vector2 vec2=touchdata.GetEllipseRadius(0);
-       txt.append(", Radii: ");
+       Vector2 vec2=touchdata.GetEllipseRadius(count-1);
+       txt.append("\n  Radii: ");
        txt.append("horizontal:"+FloatToString(vec2.x)+" vertical:"+FloatToString(vec2.y));
 
        //
-       float pressure=touchdata.GetPressure(0);
-       txt.append(", Pressure: ");
+       float pressure=touchdata.GetPressure(count-1);
+       txt.append("\n  Pressure: ");
        txt.append(FloatToString(pressure));
 
        //
-       Degree deg= touchdata.GetAngle(0);
-       txt.append(", Degree: ");
+       Degree deg= touchdata.GetAngle(count-1);
+       txt.append("\n  Degree: ");
        txt.append(FloatToString(deg.degree));
 
+       this->txtTouch.SetSize(this->bodySize);
        this->txtTouch.SetProperty( TextLabel::Property::TEXT, txt );
+       this->txtTouch.SetProperty( TextLabel::Property::ENABLE_MARKUP, true );
        this->txtTouch.SetProperty( TextLabel::Property::POINT_SIZE, 8.0f );
        this->txtTouch.SetProperty( TextLabel::Property::TEXT_COLOR,Color::CYAN);
-
+       this->txtTouch.SetProperty( TextLabel::Property::MULTI_LINE,true);
 }
index c169f68949f791933319879776bc783fe1ad8d84..036df829a434cf9d824db283afcd17e2931ae780 100644 (file)
@@ -16,7 +16,7 @@
                                </extensions>
                        </storageModule>
                        <storageModule moduleId="cdtBuildSystem" version="4.0.0">
-                               <configuration artifactName="tbtcoreapp" buildArtefactType="org.tizen.nativecore.buildArtefactType.app" buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug,org.eclipse.cdt.build.core.buildArtefactType=org.tizen.nativecore.buildArtefactType.app" description="" errorParsers="org.eclipse.cdt.core.MakeErrorParser;org.eclipse.cdt.core.GCCErrorParser;" id="org.tizen.nativecore.config.sbi.gcc45.app.debug.1226004669" name="Debug" parent="org.tizen.nativecore.config.sbi.gcc45.app.debug">
+                               <configuration artifactName="tbtcoreapp" buildArtefactType="org.tizen.nativecore.buildArtefactType.app" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.tizen.nativecore.buildArtefactType.app,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug" description="" errorParsers="org.eclipse.cdt.core.MakeErrorParser;org.eclipse.cdt.core.GCCErrorParser;" id="org.tizen.nativecore.config.sbi.gcc45.app.debug.1226004669" name="Debug" parent="org.tizen.nativecore.config.sbi.gcc45.app.debug">
                                        <folderInfo id="org.tizen.nativecore.config.sbi.gcc45.app.debug.1226004669." name="/" resourcePath="">
                                                <toolChain id="org.tizen.nativecore.toolchain.sbi.gcc45.app.debug.966772140" name="Tizen Native Toolchain" superClass="org.tizen.nativecore.toolchain.sbi.gcc45.app.debug">
                                                        <targetPlatform binaryParser="org.eclipse.cdt.core.ELF" id="org.tizen.nativeide.target.sbi.gnu.platform.base.1146520664" osList="linux,win32" superClass="org.tizen.nativeide.target.sbi.gnu.platform.base"/>
                                                                <option id="sbi.gnu.cpp.compiler.option.frameworks_inc.core.1151584155" name="Tizen-Frameworks-Include-Path" superClass="sbi.gnu.cpp.compiler.option.frameworks_inc.core" valueType="includePath">
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/libxml2&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/EGL&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/GLES&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/GLES2&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/GLES3&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/KHR&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/SDL2&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/appcore-agent&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/appfw&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/attach-panel&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/storage&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/system&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/telephony&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/tzsh&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/ui&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/vulkan&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/web&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/widget_service&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/widget_viewer_evas&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/wifi-direct&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/yaca&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/lib/dbus-1.0/include&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/lib/glib-2.0/include&quot;"/>
                                                                </option>
                                                                <option id="sbi.gnu.c.compiler.option.frameworks_inc.core.2054553498" name="Tizen-Frameworks-Include-Path" superClass="sbi.gnu.c.compiler.option.frameworks_inc.core" valueType="includePath">
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/libxml2&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/EGL&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/GLES&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/GLES2&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/GLES3&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/KHR&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/SDL2&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/appcore-agent&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/appfw&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/attach-panel&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/storage&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/system&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/telephony&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/tzsh&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/ui&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/vulkan&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/web&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/widget_service&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/widget_viewer_evas&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/wifi-direct&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/yaca&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/lib/dbus-1.0/include&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/lib/glib-2.0/include&quot;"/>
                                                                </option>
                                                                        <listOptionValue builtIn="false" value="${TC_LINKER_MISC}"/>
                                                                        <listOptionValue builtIn="false" value="${RS_LINKER_MISC}"/>
                                                                        <listOptionValue builtIn="false" value="-pie -lpthread "/>
-                                                                       <listOptionValue builtIn="false" value="-Xlinker -rpath=&quot;/home/developer/sdk_tools/lib&quot;"/>
                                                                        <listOptionValue builtIn="false" value="--sysroot=&quot;${SBI_SYSROOT}&quot;"/>
                                                                        <listOptionValue builtIn="false" value="-Xlinker --version-script=&quot;${PROJ_PATH}/.exportMap&quot;"/>
                                                                        <listOptionValue builtIn="false" value="-L&quot;${SBI_SYSROOT}/usr/lib&quot;"/>
                                </extensions>
                        </storageModule>
                        <storageModule moduleId="cdtBuildSystem" version="4.0.0">
-                               <configuration artifactName="tbtcoreapp" buildArtefactType="org.tizen.nativecore.buildArtefactType.app" buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.release,org.eclipse.cdt.build.core.buildArtefactType=org.tizen.nativecore.buildArtefactType.app" description="" errorParsers="org.eclipse.cdt.core.MakeErrorParser;org.eclipse.cdt.core.GCCErrorParser;" id="org.tizen.nativecore.config.sbi.gcc45.app.release.864366301" name="Release" parent="org.tizen.nativecore.config.sbi.gcc45.app.release">
+                               <configuration artifactName="tbtcoreapp" buildArtefactType="org.tizen.nativecore.buildArtefactType.app" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.tizen.nativecore.buildArtefactType.app,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.release" description="" errorParsers="org.eclipse.cdt.core.MakeErrorParser;org.eclipse.cdt.core.GCCErrorParser;" id="org.tizen.nativecore.config.sbi.gcc45.app.release.864366301" name="Release" parent="org.tizen.nativecore.config.sbi.gcc45.app.release">
                                        <folderInfo id="org.tizen.nativecore.config.sbi.gcc45.app.release.864366301." name="/" resourcePath="">
                                                <toolChain id="org.tizen.nativecore.toolchain.sbi.gcc45.app.release.100788679" name="Tizen Native Toolchain" superClass="org.tizen.nativecore.toolchain.sbi.gcc45.app.release">
                                                        <targetPlatform binaryParser="org.eclipse.cdt.core.ELF" id="org.tizen.nativeide.target.sbi.gnu.platform.base.2024417825" osList="linux,win32" superClass="org.tizen.nativeide.target.sbi.gnu.platform.base"/>
                                                                <option id="sbi.gnu.cpp.compiler.option.frameworks_inc.core.117486491" name="Tizen-Frameworks-Include-Path" superClass="sbi.gnu.cpp.compiler.option.frameworks_inc.core" valueType="includePath">
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/libxml2&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/EGL&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/GLES&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/GLES2&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/GLES3&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/KHR&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/SDL2&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/appcore-agent&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/appfw&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/attach-panel&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/storage&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/system&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/telephony&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/tzsh&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/ui&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/vulkan&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/web&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/widget_service&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/widget_viewer_evas&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/wifi-direct&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/yaca&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/lib/dbus-1.0/include&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/lib/glib-2.0/include&quot;"/>
                                                                </option>
                                                                <option id="sbi.gnu.c.compiler.option.frameworks_inc.core.1046681201" name="Tizen-Frameworks-Include-Path" superClass="sbi.gnu.c.compiler.option.frameworks_inc.core" valueType="includePath">
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/libxml2&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/EGL&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/GLES&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/GLES2&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/GLES3&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/KHR&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/SDL2&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/appcore-agent&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/appfw&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/attach-panel&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/storage&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/system&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/telephony&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/tzsh&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/ui&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/vulkan&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/web&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/widget_service&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/widget_viewer_evas&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/wifi-direct&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/yaca&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/lib/dbus-1.0/include&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/lib/glib-2.0/include&quot;"/>
                                                                </option>
                                                                        <listOptionValue builtIn="false" value="${TC_LINKER_MISC}"/>
                                                                        <listOptionValue builtIn="false" value="${RS_LINKER_MISC}"/>
                                                                        <listOptionValue builtIn="false" value="-pie -lpthread "/>
-                                                                       <listOptionValue builtIn="false" value="-Xlinker -rpath=&quot;/home/developer/sdk_tools/lib&quot;"/>
                                                                        <listOptionValue builtIn="false" value="--sysroot=&quot;${SBI_SYSROOT}&quot;"/>
                                                                        <listOptionValue builtIn="false" value="-Xlinker --version-script=&quot;${PROJ_PATH}/.exportMap&quot;"/>
                                                                        <listOptionValue builtIn="false" value="-L&quot;${SBI_SYSROOT}/usr/lib&quot;"/>
        <storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
        <storageModule moduleId="com.samsung.tizen.nativeapp.projectInfo" version="1.0.0"/>
        <storageModule moduleId="refreshScope" versionNumber="2">
-               <configuration configurationName="Release">
+               <configuration configurationName="Debug">
                        <resource resourceType="PROJECT" workspacePath="/tbtcoreapp"/>
                </configuration>
-               <configuration configurationName="Debug">
+               <configuration configurationName="Release">
                        <resource resourceType="PROJECT" workspacePath="/tbtcoreapp"/>
                </configuration>
        </storageModule>
index ca0748b11189ec9b372edda9d78e5046ec079fc5..77f5bba1e6d7f02bffaf171fb2f09ae19ebfd84f 100644 (file)
Binary files a/tbtcoreapp/.sdk_delta.info and b/tbtcoreapp/.sdk_delta.info differ
index a59ca7349fa7e216c92543be8f23c25a5fc5471a..d1769aa099ca09430b076726534d2afdb14628a2 100644 (file)
@@ -271,7 +271,23 @@ typedef enum {
 
        TBT_APP_DALI_ACCESSIBILITY_MANAGER,
 
-       TBT_APP_DALI_GESTURE_DETECTOR,
+       TBT_APP_DALI_LONG_PRESS_GESTURE_SINGLE,
+
+       TBT_APP_DALI_LONG_PRESS_GESTURE_DOUBLE,
+
+       TBT_APP_DALI_LONG_PRESS_GESTURE_MULTIPLE,
+
+       TBT_APP_DALI_PAN_GESTURE_SINGLE,
+
+       TBT_APP_DALI_PAN_GESTURE_DOUBLE,
+
+       TBT_APP_DALI_PAN_GESTURE_ANGLE_DIRECTION,
+
+       TBT_APP_DALI_PINCH_GESTURE_SINGLE,
+
+       TBT_APP_DALI_TAP_GESTURE_SINGLE,
+
+       TBT_APP_DALI_TAP_GESTURE_MULTIPLE,
 
        TBT_APP_DALI_STYLE_MANAGER,
 
index 3a16632943f6140a8ed39fc63c1228d1429129ea..c8dcb697acdfec816b06536c5c9d571f64b60fe7 100644 (file)
 #define TBT_MODULE_APP_DALI_TEXT_CONTROL
 #define TBT_MODULE_APP_DALI_KEY_BOARD_FOCUS_MANAGER
 #define TBT_MODULE_APP_DALI_ACCESSIBILITY_MANAGER
-#define TBT_MODULE_APP_DALI_GESTURE_DETECTOR
+#define TBT_MODULE_APP_DALI_LONG_PRESS_GESTURE_SINGLE
+#define TBT_MODULE_APP_DALI_LONG_PRESS_GESTURE_DOUBLE
+#define TBT_MODULE_APP_DALI_LONG_PRESS_GESTURE_MULTIPLE
+#define TBT_MODULE_APP_DALI_PAN_GESTURE_SINGLE
+#define TBT_MODULE_APP_DALI_PAN_GESTURE_DOUBLE
+#define TBT_MODULE_APP_DALI_PAN_GESTURE_ANGLE_DIRECTION
+#define TBT_MODULE_APP_DALI_PINCH_GESTURE_SINGLE
+#define TBT_MODULE_APP_DALI_TAP_GESTURE_SINGLE
+#define TBT_MODULE_APP_DALI_TAP_GESTURE_MULTIPLE
 #define TBT_MODULE_APP_DALI_STYLE_MANAGER
 #define TBT_MODULE_APP_DALI_TTS
 #define TBT_MODULE_APP_DALI_SCROLL
index 106b86dae6be0284b6041215f23ad4e5b5be2a22..45498a58f161fd2ef2ff1a169677320be6cafba6 100644 (file)
@@ -2538,15 +2538,111 @@ static tbt_info tbtapps[] =
                        .result = 0
                },
        #endif
-       #ifdef TBT_MODULE_APP_DALI_GESTURE_DETECTOR
+       #ifdef TBT_MODULE_APP_DALI_LONG_PRESS_GESTURE_SINGLE
 
                //DALi Test
                {
-                       .name = "DALi Gesture Detector",
+                       .name = "DALi Long Press Gesture Single",
                        .parent = "DALi",
-                       .apptype = TBT_APP_DALI_GESTURE_DETECTOR,
+                       .apptype = TBT_APP_DALI_LONG_PRESS_GESTURE_SINGLE,
                        .icon_name = "dummy",
-                       .info = "DALi Gesture Detector Signals",
+                       .info = "DALi Long Press Gesture Detector Signals",
+                       .result = 0
+               },
+       #endif
+       #ifdef TBT_MODULE_APP_DALI_LONG_PRESS_GESTURE_DOUBLE
+
+               //DALi Test
+               {
+                       .name = "DALi Long Press Gesture Double",
+                       .parent = "DALi",
+                       .apptype = TBT_APP_DALI_LONG_PRESS_GESTURE_DOUBLE,
+                       .icon_name = "dummy",
+                       .info = "DALi Long Press Gesture Detector Signals",
+                       .result = 0
+               },
+       #endif
+       #ifdef TBT_MODULE_APP_DALI_LONG_PRESS_GESTURE_MULTIPLE
+
+               //DALi Test
+               {
+                       .name = "DALi Long Press Gesture Multiple",
+                       .parent = "DALi",
+                       .apptype = TBT_APP_DALI_LONG_PRESS_GESTURE_MULTIPLE,
+                       .icon_name = "dummy",
+                       .info = "DALi Long Press Gesture Detector Signals",
+                       .result = 0
+               },
+       #endif
+       #ifdef TBT_MODULE_APP_DALI_PAN_GESTURE_SINGLE
+
+               //DALi Test
+               {
+                       .name = "DALi Pan Gesture Single",
+                       .parent = "DALi",
+                       .apptype = TBT_APP_DALI_PAN_GESTURE_SINGLE,
+                       .icon_name = "dummy",
+                       .info = "DALi Pan Gesture Detector Signals",
+                       .result = 0
+               },
+       #endif
+       #ifdef TBT_MODULE_APP_DALI_PAN_GESTURE_DOUBLE
+
+               //DALi Test
+               {
+                       .name = "DALi Pan Gesture Double",
+                       .parent = "DALi",
+                       .apptype = TBT_APP_DALI_PAN_GESTURE_DOUBLE,
+                       .icon_name = "dummy",
+                       .info = "DALi Pan Gesture Detector Signals",
+                       .result = 0
+               },
+       #endif
+       #ifdef TBT_MODULE_APP_DALI_PAN_GESTURE_ANGLE_DIRECTION
+
+               //DALi Test
+               {
+                       .name = "DALi Pan Gesture Angle & Direction",
+                       .parent = "DALi",
+                       .apptype = TBT_APP_DALI_PAN_GESTURE_ANGLE_DIRECTION,
+                       .icon_name = "dummy",
+                       .info = "DALi Pan Gesture Detector Signals",
+                       .result = 0
+               },
+       #endif
+       #ifdef TBT_MODULE_APP_DALI_PINCH_GESTURE_SINGLE
+
+               //DALi Test
+               {
+                       .name = "DALi Pinch Gesture Single",
+                       .parent = "DALi",
+                       .apptype = TBT_APP_DALI_PINCH_GESTURE_SINGLE,
+                       .icon_name = "dummy",
+                       .info = "DALi Pinch Gesture Detector Signals",
+                       .result = 0
+               },
+       #endif
+       #ifdef TBT_MODULE_APP_DALI_TAP_GESTURE_SINGLE
+
+               //DALi Test
+               {
+                       .name = "DALi Tap Gesture Single",
+                       .parent = "DALi",
+                       .apptype = TBT_APP_DALI_TAP_GESTURE_SINGLE,
+                       .icon_name = "dummy",
+                       .info = "DALi tap Gesture Detector Signals",
+                       .result = 0
+               },
+       #endif
+       #ifdef TBT_MODULE_APP_DALI_TAP_GESTURE_MULTIPLE
+
+               //DALi Test
+               {
+                       .name = "DALi Tap Gesture Multiple",
+                       .parent = "DALi",
+                       .apptype = TBT_APP_DALI_TAP_GESTURE_MULTIPLE,
+                       .icon_name = "dummy",
+                       .info = "DALi tap Gesture Detector Signals",
                        .result = 0
                },
        #endif
index b5930b563688852897ba1a04fe65cee1258e90b2..6409c676982829e9843685c4970d1ee51380614e 100644 (file)
@@ -1182,8 +1182,32 @@ static void _gl_item_selected_cb(void *data, Evas_Object *obj EINA_UNUSED, void
                        case TBT_APP_DALI_ACCESSIBILITY_MANAGER:
                                dali_view_add(view->navi, info, it, "TBT_APP_DALI_ACCESSIBILITY_MANAGER");
                        break;
-                       case TBT_APP_DALI_GESTURE_DETECTOR:
-                               dali_view_add(view->navi, info, it, "TBT_APP_DALI_GESTURE_DETECTOR");
+                       case TBT_APP_DALI_LONG_PRESS_GESTURE_SINGLE:
+                               dali_view_add(view->navi, info, it, "TBT_APP_DALI_LONG_PRESS_GESTURE_SINGLE");
+                       break;
+                       case TBT_APP_DALI_LONG_PRESS_GESTURE_DOUBLE:
+                               dali_view_add(view->navi, info, it, "TBT_APP_DALI_LONG_PRESS_GESTURE_DOUBLE");
+                       break;
+                       case TBT_APP_DALI_LONG_PRESS_GESTURE_MULTIPLE:
+                               dali_view_add(view->navi, info, it, "TBT_APP_DALI_LONG_PRESS_GESTURE_MULTIPLE");
+                       break;
+                       case TBT_APP_DALI_PAN_GESTURE_SINGLE:
+                               dali_view_add(view->navi, info, it, "TBT_APP_DALI_PAN_GESTURE_SINGLE");
+                       break;
+                       case TBT_APP_DALI_PAN_GESTURE_DOUBLE:
+                               dali_view_add(view->navi, info, it, "TBT_APP_DALI_PAN_GESTURE_DOUBLE");
+                       break;
+                       case TBT_APP_DALI_PAN_GESTURE_ANGLE_DIRECTION:
+                               dali_view_add(view->navi, info, it, "TBT_APP_DALI_PAN_GESTURE_ANGLE_DIRECTION");
+                       break;
+                       case TBT_APP_DALI_PINCH_GESTURE_SINGLE:
+                               dali_view_add(view->navi, info, it, "TBT_APP_DALI_PINCH_GESTURE_SINGLE");
+                       break;
+                       case TBT_APP_DALI_TAP_GESTURE_SINGLE:
+                               dali_view_add(view->navi, info, it, "TBT_APP_DALI_TAP_GESTURE_SINGLE");
+                       break;
+                       case TBT_APP_DALI_TAP_GESTURE_MULTIPLE:
+                               dali_view_add(view->navi, info, it, "TBT_APP_DALI_TAP_GESTURE_MULIPLE");
                        break;
                        case TBT_APP_DALI_STYLE_MANAGER:
                                dali_view_add(view->navi, info, it, "TBT_APP_DALI_STYLE_MANAGER");