X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali%2Finternal%2Fevent%2Fevents%2Ftouch-data-impl.h;h=19e56a282367096925830a120e8775908123da1a;hb=f329cb924a9525c4e268872c993d66fbec822b97;hp=fb7589fe535ecc40be74c612b315a210c8dd28f8;hpb=bb3f70201ea74ca57fb3c2415693cdc6bd899fdc;p=platform%2Fcore%2Fuifw%2Fdali-core.git

diff --git a/dali/internal/event/events/touch-data-impl.h b/dali/internal/event/events/touch-data-impl.h
old mode 100644
new mode 100755
index fb7589f..19e56a2
--- a/dali/internal/event/events/touch-data-impl.h
+++ b/dali/internal/event/events/touch-data-impl.h
@@ -2,7 +2,7 @@
 #define __DALI_INTERNAL_TOUCH_DATA_H__
 
 /*
- * Copyright (c) 2016 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2017 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.
@@ -22,8 +22,8 @@
 #include <dali/public-api/common/vector-wrapper.h>
 #include <dali/public-api/events/point-state.h>
 #include <dali/public-api/events/touch-data.h>
-#include <dali/public-api/events/touch-point.h>
 #include <dali/public-api/object/base-object.h>
+#include <dali/integration-api/events/point.h>
 
 namespace Dali
 {
@@ -34,6 +34,9 @@ struct Vector2;
 namespace Internal
 {
 
+class TouchData;
+typedef IntrusivePtr< TouchData > TouchDataPtr;
+
 /**
  * @copydoc Dali::TouchData
  */
@@ -55,6 +58,15 @@ public:
   TouchData( unsigned long time );
 
   /**
+   * @brief Clones the TouchData object.
+   *
+   * Required because base class copy constructor is not implemented.
+   * @param[in]  other  The TouchData to clone from.
+   * @return A new TouchData object which is has the same touch point data.
+   */
+  static TouchDataPtr Clone( const TouchData& other );
+
+  /**
    * @brief Destructor
    */
   ~TouchData();
@@ -69,44 +81,74 @@ public:
   /**
    * @copydoc Dali::TouchData::GetPointCount()
    */
-  size_t GetPointCount() const;
+  std::size_t GetPointCount() const;
 
   /**
    * @copydoc Dali::TouchData::GetDeviceId()
    */
-  int32_t GetDeviceId( size_t point ) const;
+  int32_t GetDeviceId( std::size_t point ) const;
 
   /**
    * @copydoc Dali::TouchData::GetGetState()
    */
-  PointState::Type GetState( size_t point  ) const;
+  PointState::Type GetState( std::size_t point  ) const;
 
   /**
    * @copydoc Dali::TouchData::GetHitActor()
    */
-  Dali::Actor GetHitActor( size_t point ) const;
+  Dali::Actor GetHitActor( std::size_t point ) const;
 
   /**
    * @copydoc Dali::TouchData::GetLocalPosition()
    */
-  const Vector2& GetLocalPosition( size_t point ) const;
+  const Vector2& GetLocalPosition( std::size_t point ) const;
 
   /**
    * @copydoc Dali::TouchData::GetScreenPosition()
    */
-  const Vector2& GetScreenPosition( size_t point ) const;
+  const Vector2& GetScreenPosition( std::size_t point ) const;
+
+  /**
+   * @copydoc Dali::TouchData::GetRadius()
+   */
+  float GetRadius( std::size_t point ) const;
+
+  /**
+   * @copydoc Dali::TouchData::GetEllipseRadius()
+   */
+  const Vector2& GetEllipseRadius( std::size_t point ) const;
+
+  /**
+   * @copydoc Dali::TouchData::GetPressure()
+   */
+  float GetPressure( std::size_t point ) const;
+
+  /**
+   * @copydoc Dali::TouchData::GetAngle()
+   */
+  Degree GetAngle( std::size_t point ) const;
+
+  /**
+   * @brief Returns a const reference to a point at the index requested.
+   *
+   * The first point in the set is always the primary point (i.e. the first point touched in a multi-touch event).
+   *
+   * @param[in]  point  The index of the required Point.
+   * @return A const reference to the Point at the position requested
+   * @note point should be less than the value returned by GetPointCount(). Will assert if out of range.
+   */
+  const Integration::Point& GetPoint( std::size_t point ) const;
 
   /**
    * @brief Returns a reference to a point at the index requested.
    *
    * The first point in the set is always the primary point (i.e. the first point touched in a multi-touch event).
    *
-   * @SINCE_1_1.36
    * @param[in]  point  The index of the required Point.
    * @return A reference to the Point at the position requested
    * @note point should be less than the value returned by GetPointCount(). Will assert if out of range.
    */
-  const TouchPoint& GetPoint( size_t point ) const;
+  Integration::Point& GetPoint( std::size_t point );
 
   // Setters
 
@@ -114,14 +156,29 @@ public:
    * @brief Adds a point to this touch event handler.
    * @param[in]  point  The point to add to the touch event handler.
    */
-  void AddPoint( const TouchPoint& point );
+  void AddPoint( const Integration::Point& point );
+
+  /**
+   * @brief Get the device class the mouse/touch event originated from
+   *
+   * @return The device class
+   */
+  Device::Class::Type GetDeviceClass( std::size_t point ) const;
 
   /**
-   * @brief Overwrites the internal container with the point container specified.
+   * @brief Get the device subclass the mouse/touch event originated from
    *
-   * @param[in]  points  The point container.
+   * @return The device subclass
    */
-  void SetPoints( const TouchPointContainer& points );
+  Device::Subclass::Type GetDeviceSubclass( std::size_t point ) const;
+
+  /**
+   * @brief Get mouse's button value (ex: right/left button)
+   *
+   * @return The value of mouse button
+   */
+  MouseButton::Type GetMouseButton( std::size_t point ) const;
+
 
 private:
 
@@ -131,8 +188,10 @@ private:
   /// Undefined
   TouchData& operator=( const TouchData& other );
 
-  TouchPointContainer mPoints;   ///< Container of the points for this touch event.
-  unsigned long       mTime;     ///< The time (in ms) that the touch event occurred.
+private:
+
+  std::vector< Integration::Point > mPoints; ///< Container of the points for this touch event.
+  unsigned long mTime; ///< The time (in ms) that the touch event occurred.
 };
 
 } // namespace Internal