[Tizen] fix Text low quality issue caused by Color value check 36/151336/3
authordongsug.song <dongsug.song@samsung.com>
Wed, 20 Sep 2017 12:04:59 +0000 (21:04 +0900)
committerdongsug.song <dongsug.song@samsung.com>
Thu, 21 Sep 2017 08:35:13 +0000 (17:35 +0900)
Change-Id: I21c948221d509fb95da0ace2cc70cd0dc013ed02
Signed-off-by: dongsug.song <dongsug.song@samsung.com>
NUISamples/examples/color-test.cs [new file with mode: 0755]
NUISamples/examples/visuals-example.cs
NUISamples/examples/widget-view-test.cs
Tizen.NUI/src/public/Color.cs
Tizen.NUI/src/public/RelativeVector2.cs
Tizen.NUI/src/public/RelativeVector3.cs
Tizen.NUI/src/public/RelativeVector4.cs

diff --git a/NUISamples/examples/color-test.cs b/NUISamples/examples/color-test.cs
new file mode 100755 (executable)
index 0000000..f553d19
--- /dev/null
@@ -0,0 +1,89 @@
+using Tizen.NUI;
+using Tizen.NUI.BaseComponents;
+
+namespace ColorTest
+{
+    internal class Example : NUIApplication
+    {
+        View mainView;
+        TextLabel title;
+
+        public Example() : base("", WindowMode.Transparent)
+        {
+        }
+
+        Size2D screenSize;
+        int pixelSize;
+
+        protected override void OnCreate()
+        {
+            base.OnCreate();
+
+            Window.Instance.BackgroundColor = Color.Transparent;
+            Window.Instance.KeyEvent += Instance_KeyEvent;
+
+            screenSize = Window.Instance.Size;
+            pixelSize = screenSize.Width / 10;
+
+            mainView = new View();
+            mainView.Size2D = screenSize;
+            mainView.BackgroundColor = new Color(0.0f, 0.0f, 0.0f, 1.0f);
+            mainView.PivotPoint = PivotPoint.TopLeft;
+            mainView.Position = new Position(0, 0, 0);
+            Window.Instance.GetDefaultLayer().Add(mainView);
+
+            title = new TextLabel("Ambient is the new off");
+            title.PivotPoint = PivotPoint.TopLeft;
+            title.Size2D = new Size2D(screenSize.Width, screenSize.Height / 2);
+            title.Position = new Position(0, 0, 0);
+            //title.TextColor = new Color(1.0f, 1.0f, 1.0f, 1.0f);
+            title.TextColor = new Color(255.0f, 255.0f, 255.0f, 255.0f);
+            title.PixelSize = pixelSize;
+            title.HorizontalAlignment = HorizontalAlignment.Center;
+            title.VerticalAlignment = VerticalAlignment.Center;
+            title.MultiLine = true;
+
+            mainView.Add(title);
+        }
+
+        private void Instance_KeyEvent(object sender, Window.KeyEventArgs e)
+        {
+            NUILog.Debug("State=" + e.Key.State.ToString() + " Pressed=" + e.Key.KeyPressedName + " Time=" + e.Key.Time);
+
+            if (e.Key.State == Key.StateType.Down && (e.Key.KeyPressedName == "BackSpace" || e.Key.KeyPressedName == "XF86Back"))
+            {
+                Exit();
+            }
+
+            if (e.Key.State == Key.StateType.Down)
+            {
+                if (e.Key.KeyPressedName == "Left")
+                {
+                    mainView.Remove(title);
+                    title.Dispose();
+                    title = null;
+
+                    mainView = new View();
+                    mainView.Size2D = screenSize;
+                    mainView.BackgroundColor = new Color(0.0f, 0.0f, 0.0f, 1.0f);
+                    mainView.PivotPoint = PivotPoint.TopLeft;
+                    mainView.Position = new Position(0, 0, 0);
+                    Window.Instance.GetDefaultLayer().Add(mainView);
+
+                    title = new TextLabel("Ambient is the new off");
+                    title.PivotPoint = PivotPoint.TopLeft;
+                    title.Size2D = new Size2D(screenSize.Width, screenSize.Height / 2);
+                    title.Position = new Position(0, 0, 0);
+                    //title.TextColor = new Color(1.0f, 1.0f, 1.0f, 1.0f);
+                    title.TextColor = new Color(255.0f, 255.0f, 255.0f, 255.0f);
+                    title.PixelSize = pixelSize;
+                    title.HorizontalAlignment = HorizontalAlignment.Center;
+                    title.VerticalAlignment = VerticalAlignment.Center;
+                    title.MultiLine = true;
+
+                    mainView.Add(title);
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
index 559971d..8c0a724 100755 (executable)
@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright (c) 2017 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
index 9a2fbfa..521e376 100755 (executable)
-using System;\r
-using Tizen.NUI;\r
-using Tizen.NUI.UIComponents;\r
-using Tizen.NUI.BaseComponents;\r
-\r
-namespace WidgetViewTest\r
-{\r
-    class Example : NUIApplication\r
-    {\r
-        private PushButton _widgetButton;\r
-        private PushButton _deletedButton;\r
-        private WidgetView _widgetView;\r
-        private WidgetViewManager _widgetViewManager;\r
-        private View _container;\r
-        private string _instanceID;\r
-\r
-        protected override void OnCreate()\r
-        {\r
-            base.OnCreate();\r
-            Initialize();\r
-        }\r
-\r
-        protected override void OnTerminate()\r
-        {\r
-            //This function is called when the app exit normally.\r
-            base.OnTerminate();\r
-        }\r
-\r
-        public void Initialize()\r
-        {\r
-            Window window = Window.Instance;\r
-            window.BackgroundColor = Color.White;\r
-\r
-            Tizen.Log.Debug("NUI", "### DP1");\r
-            Layer layer = new Layer();\r
-            layer.Behavior = Layer.LayerBehavior.Layer3D;\r
-            window.AddLayer(layer);\r
-            Tizen.Log.Debug("NUI", "### DP2");\r
-            _container = new View();\r
-            _container.ParentOrigin = ParentOrigin.Center;\r
-            _container.PivotPoint = PivotPoint.Center;\r
-            _container.Size2D = new Size2D(400, 400);\r
-            Tizen.Log.Debug("NUI", "### DP3");\r
-            _widgetButton = new PushButton();\r
-            _widgetButton.LabelText = "Widget";\r
-            _widgetButton.ParentOrigin = ParentOrigin.BottomLeft;\r
-            _widgetButton.PivotPoint = PivotPoint.BottomLeft;\r
-            _widgetButton.PositionUsesAnchorPoint = true;\r
-            _widgetButton.Size2D = new Size2D(200, 100);\r
-            window.Add(_widgetButton);\r
-            _widgetButton.Clicked += (obj, e) =>\r
-            {\r
-                _widgetView = _widgetViewManager.AddWidget("widget-efl.example", "", 450, 700, -1);\r
-                //_widgetView.PositionUsesPivotPoint = true;\r
-                //_widgetView.ParentOrigin = ParentOrigin.Center;\r
-                _widgetView.PivotPoint = PivotPoint.TopLeft;\r
-                _widgetView.PositionUsesAnchorPoint = true;\r
-                _widgetView.BackgroundColor = Color.Yellow;\r
-                _widgetView.WidgetAdded += (sender, eargs) =>\r
-                {\r
-                    _widgetButton.LabelText = "Quit";\r
-                    window.Add(_widgetView);\r
-                };\r
-                _widgetView.WidgetDeleted += (sender, eargs) =>\r
-                {\r
-                    window.Remove(_widgetView);\r
-                    _widgetButton.LabelText = "Button";\r
-                };\r
-                _instanceID = _widgetView.InstanceID;\r
-                return false;\r
-            };\r
-\r
-            _deletedButton = new PushButton();\r
-            _deletedButton.LabelText = "Buton";\r
-            _deletedButton.ParentOrigin = ParentOrigin.BottomRight;\r
-            _deletedButton.PivotPoint = PivotPoint.BottomRight;\r
-            _deletedButton.PositionUsesAnchorPoint = true;\r
-            _deletedButton.Size2D = new Size2D(200, 100);\r
-            window.Add(_deletedButton);\r
-            _deletedButton.Clicked += (obj, e) =>\r
-            {\r
-                OnTerminate();\r
-                return true;\r
-            };\r
-\r
-            layer.Add(_container);\r
-            Tizen.Log.Debug("NUI", "### widget view manager create start");\r
-            _widgetViewManager = new WidgetViewManager(this, "org.tizen.example.NUISamples.TizenTV");\r
-            if (!_widgetViewManager)\r
-            {\r
-                Tizen.Log.Fatal("NUI", "### Widget is not enabled!");\r
-            }\r
-\r
-            Tizen.Log.Debug("NUI", "### widget view manager create sucess");\r
-        }\r
-\r
-        [STAThread]\r
-        static void _Main(string[] args)\r
-        {\r
-            Example example = new Example();\r
-            example.Run(args);\r
-        }\r
-    }\r
-}\r
-\r
+using System;
+using Tizen.NUI;
+using Tizen.NUI.UIComponents;
+using Tizen.NUI.BaseComponents;
+
+namespace WidgetViewTest
+{
+    class Example : NUIApplication
+    {
+        private PushButton _widgetButton;
+        private PushButton _deletedButton;
+        private WidgetView _widgetView;
+        private WidgetViewManager _widgetViewManager;
+        private View _container;
+        private string _instanceID;
+
+        protected override void OnCreate()
+        {
+            base.OnCreate();
+            Initialize();
+        }
+
+        protected override void OnTerminate()
+        {
+            //This function is called when the app exit normally.
+            base.OnTerminate();
+        }
+
+        public void Initialize()
+        {
+            Window window = Window.Instance;
+            window.BackgroundColor = Color.White;
+
+            Tizen.Log.Debug("NUI", "### DP1");
+            Layer layer = new Layer();
+            layer.Behavior = Layer.LayerBehavior.Layer3D;
+            window.AddLayer(layer);
+            Tizen.Log.Debug("NUI", "### DP2");
+            _container = new View();
+            _container.ParentOrigin = ParentOrigin.Center;
+            _container.PivotPoint = PivotPoint.Center;
+            _container.Size2D = new Size2D(400, 400);
+            Tizen.Log.Debug("NUI", "### DP3");
+            _widgetButton = new PushButton();
+            _widgetButton.LabelText = "Widget";
+            _widgetButton.ParentOrigin = ParentOrigin.BottomLeft;
+            _widgetButton.PivotPoint = PivotPoint.BottomLeft;
+            _widgetButton.PositionUsesAnchorPoint = true;
+            _widgetButton.Size2D = new Size2D(200, 100);
+            window.Add(_widgetButton);
+            _widgetButton.Clicked += (obj, e) =>
+            {
+                _widgetView = _widgetViewManager.AddWidget("widget-efl.example", "", 450, 700, -1);
+                //_widgetView.PositionUsesPivotPoint = true;
+                //_widgetView.ParentOrigin = ParentOrigin.Center;
+                _widgetView.PivotPoint = PivotPoint.TopLeft;
+                _widgetView.PositionUsesAnchorPoint = true;
+                _widgetView.BackgroundColor = Color.Yellow;
+                _widgetView.WidgetAdded += (sender, eargs) =>
+                {
+                    _widgetButton.LabelText = "Quit";
+                    window.Add(_widgetView);
+                };
+                _widgetView.WidgetDeleted += (sender, eargs) =>
+                {
+                    window.Remove(_widgetView);
+                    _widgetButton.LabelText = "Button";
+                };
+                _instanceID = _widgetView.InstanceID;
+                return false;
+            };
+
+            _deletedButton = new PushButton();
+            _deletedButton.LabelText = "Buton";
+            _deletedButton.ParentOrigin = ParentOrigin.BottomRight;
+            _deletedButton.PivotPoint = PivotPoint.BottomRight;
+            _deletedButton.PositionUsesAnchorPoint = true;
+            _deletedButton.Size2D = new Size2D(200, 100);
+            window.Add(_deletedButton);
+            _deletedButton.Clicked += (obj, e) =>
+            {
+                OnTerminate();
+                return true;
+            };
+
+            layer.Add(_container);
+            Tizen.Log.Debug("NUI", "### widget view manager create start");
+            _widgetViewManager = new WidgetViewManager(this, "org.tizen.example.NUISamples.TizenTV");
+            if (!_widgetViewManager)
+            {
+                Tizen.Log.Fatal("NUI", "### Widget is not enabled!");
+            }
+
+            Tizen.Log.Debug("NUI", "### widget view manager create sucess");
+        }
+
+        [STAThread]
+        static void _Main(string[] args)
+        {
+            Example example = new Example();
+            example.Run(args);
+        }
+    }
+}
+
index c579fa7..d5b77bd 100755 (executable)
@@ -115,8 +115,7 @@ namespace Tizen.NUI
         public static Color operator +(Color arg1, Color arg2)
         {
             Color result = arg1.Add(arg2);
-            ValueCheck(result);
-            return result;
+            return ValueCheck(result);
         }
 
         /// <summary>
@@ -128,8 +127,7 @@ namespace Tizen.NUI
         public static Color operator -(Color arg1, Color arg2)
         {
             Color result = arg1.Subtract(arg2);
-            ValueCheck(result);
-            return result;
+            return ValueCheck(result);
         }
 
         /// <summary>
@@ -140,8 +138,7 @@ namespace Tizen.NUI
         public static Color operator -(Color arg1)
         {
             Color result = arg1.Subtract();
-            ValueCheck(result);
-            return result;
+            return ValueCheck(result);
         }
 
         /// <summary>
@@ -153,15 +150,13 @@ namespace Tizen.NUI
         public static Color operator *(Color arg1, Color arg2)
         {
             Color result = arg1.Multiply(arg2);
-            ValueCheck(result);
-            return result;
+            return ValueCheck(result);
         }
 
         public static Color operator*(Color arg1, float arg2)
         {
             Color result = arg1.Multiply(arg2);
-            ValueCheck(result);
-            return result;
+            return ValueCheck(result);
         }
 
         /// <summary>
@@ -173,15 +168,13 @@ namespace Tizen.NUI
         public static Color operator /(Color arg1, Color arg2)
         {
             Color result = arg1.Divide(arg2);
-            ValueCheck(result);
-            return result;
+            return ValueCheck(result);
         }
 
         public static Color operator/(Color arg1, float arg2)
         {
             Color result = arg1.Divide(arg2);
-            ValueCheck(result);
-            return result;
+            return ValueCheck(result);
         }
 
         /// <summary>
@@ -220,12 +213,8 @@ namespace Tizen.NUI
         /// <param name="g">The green component.</param>
         /// <param name="b">The blue component.</param>
         /// <param name="a">The alpha component.</param>
-        public Color(float r, float g, float b, float a) : this(NDalicPINVOKE.new_Vector4__SWIG_1(r, g, b, a), true)
+        public Color(float r, float g, float b, float a) : this(NDalicPINVOKE.new_Vector4__SWIG_1(ValueCheck(r), ValueCheck(g), ValueCheck(b), ValueCheck(a)), true)
         {
-            ValueCheck(ref r);
-            ValueCheck(ref g);
-            ValueCheck(ref b);
-            ValueCheck(ref a);
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
         }
 
@@ -233,12 +222,8 @@ namespace Tizen.NUI
         /// The conversion constructor from an array of four floats.
         /// </summary>
         /// <param name="array">array Array of R,G,B,A.</param>
-        public Color(float[] array) : this(NDalicPINVOKE.new_Vector4__SWIG_2(array), true)
+        public Color(float[] array) : this(NDalicPINVOKE.new_Vector4__SWIG_2(ValueCheck(array)), true)
         {
-            ValueCheck(ref array[0]);
-            ValueCheck(ref array[1]);
-            ValueCheck(ref array[2]);
-            ValueCheck(ref array[3]);
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
         }
 
@@ -375,8 +360,7 @@ namespace Tizen.NUI
         {
             set
             {
-                ValueCheck(ref value);
-                NDalicPINVOKE.Vector4_r_set(swigCPtr, value);
+                NDalicPINVOKE.Vector4_r_set(swigCPtr, ValueCheck(value));
                 if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
             }
             get
@@ -394,8 +378,7 @@ namespace Tizen.NUI
         {
             set
             {
-                ValueCheck(ref value);
-                NDalicPINVOKE.Vector4_g_set(swigCPtr, value);
+                NDalicPINVOKE.Vector4_g_set(swigCPtr, ValueCheck(value));
                 if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
             }
             get
@@ -413,8 +396,7 @@ namespace Tizen.NUI
         {
             set
             {
-                ValueCheck(ref value);
-                NDalicPINVOKE.Vector4_b_set(swigCPtr, value);
+                NDalicPINVOKE.Vector4_b_set(swigCPtr, ValueCheck(value));
                 if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
             }
             get
@@ -432,8 +414,7 @@ namespace Tizen.NUI
         {
             set
             {
-                ValueCheck(ref value);
-                NDalicPINVOKE.Vector4_a_set(swigCPtr, value);
+                NDalicPINVOKE.Vector4_a_set(swigCPtr, ValueCheck(value));
                 if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
             }
             get
@@ -507,62 +488,82 @@ namespace Tizen.NUI
             return new Color(vec.R, vec.G, vec.B, vec.A);
         }
 
-        internal static void ValueCheck(Color color)
+        internal static Color ValueCheck(Color color)
         {
             if (color.R < 0.0f)
             {
                 color.R = 0.0f;
-                Tizen.Log.Fatal("NUI", "The value of Result is invalid! Should be between [0, 1].");
+                NUILog.Error( "The value of Result is invalid! Should be between [0, 1].");
             }
             else if (color.R > 1.0f)
             {
                 color.R = 1.0f;
-                Tizen.Log.Fatal("NUI", "The value of Result is invalid! Should be between [0, 1].");
+                NUILog.Error( "The value of Result is invalid! Should be between [0, 1].");
             }
             if (color.G < 0.0f)
             {
                 color.G = 0.0f;
-                Tizen.Log.Fatal("NUI", "The value of Result is invalid! Should be between [0, 1].");
+                NUILog.Error( "The value of Result is invalid! Should be between [0, 1].");
             }
             else if (color.G > 1.0f)
             {
                 color.G = 1.0f;
-                Tizen.Log.Fatal("NUI", "The value of Result is invalid! Should be between [0, 1].");
+                NUILog.Error( "The value of Result is invalid! Should be between [0, 1].");
             }
             if (color.B < 0.0f)
             {
                 color.B = 0.0f;
-                Tizen.Log.Fatal("NUI", "The value of Result is invalid! Should be between [0, 1].");
+                NUILog.Error( "The value of Result is invalid! Should be between [0, 1].");
             }
             else if (color.B > 1.0f)
             {
                 color.B = 1.0f;
-                Tizen.Log.Fatal("NUI", "The value of Result is invalid! Should be between [0, 1].");
+                NUILog.Error( "The value of Result is invalid! Should be between [0, 1].");
             }
             if (color.A < 0.0f)
             {
                 color.A = 0.0f;
-                Tizen.Log.Fatal("NUI", "The value of Result is invalid! Should be between [0, 1].");
+                NUILog.Error( "The value of Result is invalid! Should be between [0, 1].");
             }
             else if (color.A > 1.0f)
             {
                 color.A = 1.0f;
-                Tizen.Log.Fatal("NUI", "The value of Result is invalid! Should be between [0, 1].");
+                NUILog.Error( "The value of Result is invalid! Should be between [0, 1].");
             }
+            return color;
         }
 
-        internal static void ValueCheck(ref float value)
+        internal static float ValueCheck(float value)
         {
             if (value < 0.0f)
             {
                 value = 0.0f;
-                Tizen.Log.Fatal("NUI", "The value of Parameters is invalid! Should be between [0, 1].");
+                NUILog.Error( "The value of Parameters is invalid! Should be between [0, 1].");
             }
             else if (value > 1.0f)
             {
                 value = 1.0f;
-                Tizen.Log.Fatal("NUI", "The value of Parameters is invalid! Should be between [0, 1].");
+                NUILog.Error( "The value of Parameters is invalid! Should be between [0, 1].");
             }
+            return value;
+        }
+
+        internal static float[] ValueCheck(float[] arr)
+        {
+            for(int i = 0; i < arr.Length; i++)
+            {
+                if (arr[i] < 0.0f)
+                {
+                    arr[i] = 0.0f;
+                    NUILog.Error( "The value of Parameters is invalid! Should be between [0, 1].");
+                }
+                else if (arr[i] > 1.0f)
+                {
+                    arr[i] = 1.0f;
+                    NUILog.Error( "The value of Parameters is invalid! Should be between [0, 1].");
+                }
+            }
+            return arr;
         }
 
     }
index 7719403..ceefc73 100755 (executable)
@@ -112,8 +112,7 @@ namespace Tizen.NUI
         public static RelativeVector2 operator +(RelativeVector2 arg1, RelativeVector2 arg2)
         {
             RelativeVector2 result = arg1.Add(arg2);
-            ValueCheck(result);
-            return result;
+            return ValueCheck(result);
         }
 
         /// <summary>
@@ -125,8 +124,7 @@ namespace Tizen.NUI
         public static RelativeVector2 operator -(RelativeVector2 arg1, RelativeVector2 arg2)
         {
             RelativeVector2 result = arg1.Subtract(arg2);
-            ValueCheck(result);
-            return result;
+            return ValueCheck(result);
         }
 
         /// <summary>
@@ -138,8 +136,7 @@ namespace Tizen.NUI
         public static RelativeVector2 operator *(RelativeVector2 arg1, RelativeVector2 arg2)
         {
             RelativeVector2 result = arg1.Multiply(arg2);
-            ValueCheck(result);
-            return result;
+            return ValueCheck(result);
         }
 
         /// <summary>
@@ -151,8 +148,7 @@ namespace Tizen.NUI
         public static RelativeVector2 operator *(RelativeVector2 arg1, float arg2)
         {
             RelativeVector2 result = arg1.Multiply(arg2);
-            ValueCheck(result);
-            return result;
+            return ValueCheck(result);
         }
 
         /// <summary>
@@ -164,8 +160,7 @@ namespace Tizen.NUI
         public static RelativeVector2 operator /(RelativeVector2 arg1, RelativeVector2 arg2)
         {
             RelativeVector2 result = arg1.Divide(arg2);
-            ValueCheck(result);
-            return result;
+            return ValueCheck(result);
         }
 
         /// <summary>
@@ -177,8 +172,7 @@ namespace Tizen.NUI
         public static RelativeVector2 operator /(RelativeVector2 arg1, float arg2)
         {
             RelativeVector2 result = arg1.Divide(arg2);
-            ValueCheck(result);
-            return result;
+            return ValueCheck(result);
         }
 
 
@@ -218,10 +212,8 @@ namespace Tizen.NUI
         /// </summary>
         /// <param name="x">The x component.</param>
         /// <param name="y">The y component.</param>
-        public RelativeVector2(float x, float y) : this(NDalicPINVOKE.new_Vector2__SWIG_1(x, y), true)
+        public RelativeVector2(float x, float y) : this(NDalicPINVOKE.new_Vector2__SWIG_1(ValueCheck(x), ValueCheck(y)), true)
         {
-            ValueCheck(x);
-            ValueCheck(y);
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
         }
 
@@ -325,8 +317,7 @@ namespace Tizen.NUI
         {
             set
             {
-                ValueCheck(value);
-                NDalicPINVOKE.Vector2_X_set(swigCPtr, value);
+                NDalicPINVOKE.Vector2_X_set(swigCPtr, ValueCheck(value));
                 if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
             }
             get
@@ -344,8 +335,7 @@ namespace Tizen.NUI
         {
             set
             {
-                ValueCheck(value);
-                NDalicPINVOKE.Vector2_Y_set(swigCPtr, value);
+                NDalicPINVOKE.Vector2_Y_set(swigCPtr, ValueCheck(value));
                 if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
             }
             get
@@ -367,47 +357,47 @@ namespace Tizen.NUI
         /// </summary>
         public static implicit operator RelativeVector2(Vector2 vec)
         {
-            ValueCheck(vec.X);
-            ValueCheck(vec.Y);
-            return new RelativeVector2(vec.X, vec.Y);
+            return new RelativeVector2(ValueCheck(vec.X), ValueCheck(vec.Y));
         }
 
-        internal static void ValueCheck(RelativeVector2 relativeVector2)
+        internal static RelativeVector2 ValueCheck(RelativeVector2 relativeVector2)
         {
             if(relativeVector2.X < 0.0f)
             {
                 relativeVector2.X = 0.0f;
-                Tizen.Log.Fatal("NUI", "The value of Result is invalid! Should be between [0, 1].");
+                NUILog.Error( "The value of Result is invalid! Should be between [0, 1].");
             }
             else if(relativeVector2.X > 1.0f)
             {
                 relativeVector2.X = 1.0f;
-                Tizen.Log.Fatal("NUI", "The value of Result is invalid! Should be between [0, 1].");
+                NUILog.Error( "The value of Result is invalid! Should be between [0, 1].");
             }
             if(relativeVector2.Y < 0.0f)
             {
                 relativeVector2.Y = 0.0f;
-                Tizen.Log.Fatal("NUI", "The value of Result is invalid! Should be between [0, 1].");
+                NUILog.Error( "The value of Result is invalid! Should be between [0, 1].");
             }
             else if(relativeVector2.Y > 1.0f)
             {
                 relativeVector2.Y = 1.0f;
-                Tizen.Log.Fatal("NUI", "The value of Result is invalid! Should be between [0, 1].");
+                NUILog.Error( "The value of Result is invalid! Should be between [0, 1].");
             }
+            return relativeVector2;
         }
 
-        internal static void ValueCheck(float value)
+        internal static float ValueCheck(float value)
         {
             if(value < 0.0f)
             {
                 value = 0.0f;
-                Tizen.Log.Fatal("NUI", "The value of Parameters is invalid! Should be between [0, 1].");
+                NUILog.Error( "The value of Parameters is invalid! Should be between [0, 1].");
             }
             else if(value > 1.0f)
             {
                 value = 1.0f;
-                Tizen.Log.Fatal("NUI", "The value of Parameters is invalid! Should be between [0, 1].");
+                NUILog.Error( "The value of Parameters is invalid! Should be between [0, 1].");
             }
+            return value;
         }
     }
 
index 46d7e8f..ae0f4a6 100755 (executable)
@@ -112,8 +112,7 @@ namespace Tizen.NUI
         public static RelativeVector3 operator +(RelativeVector3 arg1, RelativeVector3 arg2)
         {
             RelativeVector3 result = arg1.Add(arg2);
-            ValueCheck(result);
-            return result;
+            return ValueCheck(result);
         }
 
         /// <summary>
@@ -125,8 +124,7 @@ namespace Tizen.NUI
         public static RelativeVector3 operator -(RelativeVector3 arg1, RelativeVector3 arg2)
         {
             RelativeVector3 result = arg1.Subtract(arg2);
-            ValueCheck(result);
-            return result;
+            return ValueCheck(result);
         }
 
         /// <summary>
@@ -138,8 +136,7 @@ namespace Tizen.NUI
         public static RelativeVector3 operator *(RelativeVector3 arg1, RelativeVector3 arg2)
         {
             RelativeVector3 result = arg1.Multiply(arg2);
-            ValueCheck(result);
-            return result;
+            return ValueCheck(result);
         }
 
         /// <summary>
@@ -151,8 +148,7 @@ namespace Tizen.NUI
         public static RelativeVector3 operator *(RelativeVector3 arg1, float arg2)
         {
             RelativeVector3 result = arg1.Multiply(arg2);
-            ValueCheck(result);
-            return result;
+            return ValueCheck(result);
         }
 
         /// <summary>
@@ -164,8 +160,7 @@ namespace Tizen.NUI
         public static RelativeVector3 operator /(RelativeVector3 arg1, RelativeVector3 arg2)
         {
             RelativeVector3 result = arg1.Divide(arg2);
-            ValueCheck(result);
-            return result;
+            return ValueCheck(result);
         }
 
         /// <summary>
@@ -177,8 +172,7 @@ namespace Tizen.NUI
         public static RelativeVector3 operator /(RelativeVector3 arg1, float arg2)
         {
             RelativeVector3 result = arg1.Divide(arg2);
-            ValueCheck(result);
-            return result;
+            return ValueCheck(result);
         }
 
 
@@ -219,11 +213,8 @@ namespace Tizen.NUI
         /// <param name="x">The x component.</param>
         /// <param name="y">The y component.</param>
         /// <param name="z">The z component.</param>
-        public RelativeVector3(float x, float y, float z) : this(NDalicPINVOKE.new_Vector3__SWIG_1(x, y, z), true)
+        public RelativeVector3(float x, float y, float z) : this(NDalicPINVOKE.new_Vector3__SWIG_1(ValueCheck(x), ValueCheck(y), ValueCheck(z)), true)
         {
-            ValueCheck(x);
-            ValueCheck(y);
-            ValueCheck(z);
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
         }
 
@@ -327,8 +318,7 @@ namespace Tizen.NUI
         {
             set
             {
-                ValueCheck(value);
-                NDalicPINVOKE.Vector3_X_set(swigCPtr, value);
+                NDalicPINVOKE.Vector3_X_set(swigCPtr, ValueCheck(value));
                 if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
             }
             get
@@ -346,8 +336,7 @@ namespace Tizen.NUI
         {
             set
             {
-                ValueCheck(value);
-                NDalicPINVOKE.Vector3_Y_set(swigCPtr, value);
+                NDalicPINVOKE.Vector3_Y_set(swigCPtr, ValueCheck(value));
                 if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
             }
             get
@@ -365,8 +354,7 @@ namespace Tizen.NUI
         {
             set
             {
-                 ValueCheck(value);
-                NDalicPINVOKE.Vector3_Z_set(swigCPtr, value);
+                NDalicPINVOKE.Vector3_Z_set(swigCPtr, ValueCheck(value));
                 if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
             }
             get
@@ -388,58 +376,57 @@ namespace Tizen.NUI
         /// </summary>
         public static implicit operator RelativeVector3(Vector3 vec)
         {
-            ValueCheck(vec.X);
-            ValueCheck(vec.Y);
-            ValueCheck(vec.Z);
-            return new RelativeVector3(vec.X, vec.Y, vec.Z);
+            return new RelativeVector3(ValueCheck(vec.X), ValueCheck(vec.Y), ValueCheck(vec.Z));
         }
 
-        internal static void ValueCheck(RelativeVector3 relativeVector3)
+        internal static RelativeVector3 ValueCheck(RelativeVector3 relativeVector3)
         {
             if(relativeVector3.X < 0.0f)
             {
                 relativeVector3.X = 0.0f;
-                Tizen.Log.Fatal("NUI", "The value of Result is invalid! Should be between [0, 1].");
+                NUILog.Error( "The value of Result is invalid! Should be between [0, 1].");
             }
             else if(relativeVector3.X > 1.0f)
             {
                 relativeVector3.X = 1.0f;
-                Tizen.Log.Fatal("NUI", "The value of Result is invalid! Should be between [0, 1].");
+                NUILog.Error( "The value of Result is invalid! Should be between [0, 1].");
             }
             if(relativeVector3.Y < 0.0f)
             {
                 relativeVector3.Y = 0.0f;
-                Tizen.Log.Fatal("NUI", "The value of Result is invalid! Should be between [0, 1].");
+                NUILog.Error( "The value of Result is invalid! Should be between [0, 1].");
             }
             else if(relativeVector3.Y > 1.0f)
             {
                 relativeVector3.Y = 1.0f;
-                Tizen.Log.Fatal("NUI", "The value of Result is invalid! Should be between [0, 1].");
+                NUILog.Error( "The value of Result is invalid! Should be between [0, 1].");
             }
             if(relativeVector3.Z < 0.0f)
             {
                 relativeVector3.Z = 0.0f;
-                Tizen.Log.Fatal("NUI", "The value of Result is invalid! Should be between [0, 1].");
+                NUILog.Error( "The value of Result is invalid! Should be between [0, 1].");
             }
             else if(relativeVector3.Z > 1.0f)
             {
                 relativeVector3.Z = 1.0f;
-                Tizen.Log.Fatal("NUI", "The value of Result is invalid! Should be between [0, 1].");
+                NUILog.Error( "The value of Result is invalid! Should be between [0, 1].");
             }
+            return relativeVector3;
         }
 
-        internal static void ValueCheck(float value)
+        internal static float ValueCheck(float value)
         {
             if(value < 0.0f)
             {
                 value = 0.0f;
-                Tizen.Log.Fatal("NUI", "The value of Parameters is invalid! Should be between [0, 1].");
+                NUILog.Error( "The value of Parameters is invalid! Should be between [0, 1].");
             }
             else if(value > 1.0f)
             {
                 value = 1.0f;
-                Tizen.Log.Fatal("NUI", "The value of Parameters is invalid! Should be between [0, 1].");
+                NUILog.Error( "The value of Parameters is invalid! Should be between [0, 1].");
             }
+            return value;
         }
     }
 
index ee226cb..1111bc8 100755 (executable)
@@ -112,8 +112,7 @@ namespace Tizen.NUI
         public static RelativeVector4 operator +(RelativeVector4 arg1, RelativeVector4 arg2)
         {
             RelativeVector4 result = arg1.Add(arg2);
-            ValueCheck(result);
-            return result;
+            return ValueCheck(result);
         }
 
         /// <summary>
@@ -125,8 +124,7 @@ namespace Tizen.NUI
         public static RelativeVector4 operator -(RelativeVector4 arg1, RelativeVector4 arg2)
         {
             RelativeVector4 result = arg1.Subtract(arg2);
-            ValueCheck(result);
-            return result;
+            return ValueCheck(result);
         }
 
         /// <summary>
@@ -138,8 +136,7 @@ namespace Tizen.NUI
         public static RelativeVector4 operator *(RelativeVector4 arg1, RelativeVector4 arg2)
         {
             RelativeVector4 result = arg1.Multiply(arg2);
-            ValueCheck(result);
-            return result;
+            return ValueCheck(result);
         }
 
         /// <summary>
@@ -151,8 +148,7 @@ namespace Tizen.NUI
         public static RelativeVector4 operator *(RelativeVector4 arg1, float arg2)
         {
             RelativeVector4 result = arg1.Multiply(arg2);
-            ValueCheck(result);
-            return result;
+            return ValueCheck(result);
         }
 
         /// <summary>
@@ -164,8 +160,7 @@ namespace Tizen.NUI
         public static RelativeVector4 operator /(RelativeVector4 arg1, RelativeVector4 arg2)
         {
             RelativeVector4 result = arg1.Divide(arg2);
-            ValueCheck(result);
-            return result;
+            return ValueCheck(result);
         }
 
         /// <summary>
@@ -177,8 +172,7 @@ namespace Tizen.NUI
         public static RelativeVector4 operator /(RelativeVector4 arg1, float arg2)
         {
             RelativeVector4 result = arg1.Divide(arg2);
-            ValueCheck(result);
-            return result;
+            return ValueCheck(result);
         }
 
 
@@ -220,12 +214,8 @@ namespace Tizen.NUI
         /// <param name="y">The y component.</param>
         /// <param name="z">The z component.</param>
         /// <param name="w">The w component.</param>
-        public RelativeVector4(float x, float y, float z, float w) : this(NDalicPINVOKE.new_Vector4__SWIG_1(x, y, z, w), true)
+        public RelativeVector4(float x, float y, float z, float w) : this(NDalicPINVOKE.new_Vector4__SWIG_1(ValueCheck(x), ValueCheck(y),ValueCheck(z), ValueCheck(w)), true)
         {
-            ValueCheck(x);
-            ValueCheck(y);
-            ValueCheck(z);
-            ValueCheck(W);
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
         }
 
@@ -328,8 +318,7 @@ namespace Tizen.NUI
         {
             set
             {
-                ValueCheck(value);
-                NDalicPINVOKE.Vector4_X_set(swigCPtr, value);
+                NDalicPINVOKE.Vector4_X_set(swigCPtr, ValueCheck(value));
                 if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
             }
             get
@@ -347,8 +336,7 @@ namespace Tizen.NUI
         {
             set
             {
-                ValueCheck(value);
-                NDalicPINVOKE.Vector4_Y_set(swigCPtr, value);
+                NDalicPINVOKE.Vector4_Y_set(swigCPtr, ValueCheck(value));
                 if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
             }
             get
@@ -366,8 +354,7 @@ namespace Tizen.NUI
         {
             set
             {
-                ValueCheck(value);
-                NDalicPINVOKE.Vector4_Z_set(swigCPtr, value);
+                NDalicPINVOKE.Vector4_Z_set(swigCPtr, ValueCheck(value));
                 if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
             }
             get
@@ -385,8 +372,7 @@ namespace Tizen.NUI
         {
             set
             {
-                ValueCheck(value);
-                NDalicPINVOKE.Vector4_W_set(swigCPtr, value);
+                NDalicPINVOKE.Vector4_W_set(swigCPtr, ValueCheck(value));
                 if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
             }
             get
@@ -408,73 +394,70 @@ namespace Tizen.NUI
         /// </summary>
         public static implicit operator RelativeVector4(Vector4 vec)
         {
-            ValueCheck(vec.X);
-            ValueCheck(vec.Y);
-            ValueCheck(vec.Z);
-            ValueCheck(vec.W);
-            return new RelativeVector4(vec.X, vec.Y, vec.Z, vec.W);
+            return new RelativeVector4(ValueCheck(vec.X), ValueCheck(vec.Y), ValueCheck(vec.Z), ValueCheck(vec.W));
         }
 
-        internal static void ValueCheck(RelativeVector4 relativeVector4)
+        internal static RelativeVector4 ValueCheck(RelativeVector4 relativeVector4)
         {
             if(relativeVector4.X < 0.0f)
             {
                 relativeVector4.X = 0.0f;
-                Tizen.Log.Fatal("NUI", "The value of Result is invalid! Should be between [0, 1].");
+                NUILog.Error( "The value of Result is invalid! Should be between [0, 1].");
             }
             else if(relativeVector4.X > 1.0f)
             {
                 relativeVector4.X = 1.0f;
-                Tizen.Log.Fatal("NUI", "The value of Result is invalid! Should be between [0, 1].");
+                NUILog.Error( "The value of Result is invalid! Should be between [0, 1].");
             }
             if(relativeVector4.Y < 0.0f)
             {
                 relativeVector4.Y = 0.0f;
-                Tizen.Log.Fatal("NUI", "The value of Result is invalid! Should be between [0, 1].");
+                NUILog.Error( "The value of Result is invalid! Should be between [0, 1].");
             }
             else if(relativeVector4.Y > 1.0f)
             {
                 relativeVector4.Y = 1.0f;
-                Tizen.Log.Fatal("NUI", "The value of Result is invalid! Should be between [0, 1].");
+                NUILog.Error( "The value of Result is invalid! Should be between [0, 1].");
             }
             if(relativeVector4.Z < 0.0f)
             {
                 relativeVector4.Z = 0.0f;
-                Tizen.Log.Fatal("NUI", "The value of Result is invalid! Should be between [0, 1].");
+                NUILog.Error( "The value of Result is invalid! Should be between [0, 1].");
             }
             else if(relativeVector4.Z > 1.0f)
             {
                 relativeVector4.Z = 1.0f;
-                Tizen.Log.Fatal("NUI", "The value of Result is invalid! Should be between [0, 1].");
+                NUILog.Error( "The value of Result is invalid! Should be between [0, 1].");
             }
             if(relativeVector4.W < 0.0f)
             {
                 relativeVector4.W = 0.0f;
-                Tizen.Log.Fatal("NUI", "The value of Result is invalid! Should be between [0, 1].");
+                NUILog.Error( "The value of Result is invalid! Should be between [0, 1].");
             }
             else if(relativeVector4.W > 1.0f)
             {
                 relativeVector4.W = 1.0f;
-                Tizen.Log.Fatal("NUI", "The value of Result is invalid! Should be between [0, 1].");
+                NUILog.Error( "The value of Result is invalid! Should be between [0, 1].");
             }
+            return relativeVector4;
         }
 
-        internal static void ValueCheck(float value)
+        internal static float ValueCheck(float value)
         {
             if(value < 0.0f)
             {
                 value = 0.0f;
-                Tizen.Log.Fatal("NUI", "The value of Parameters is invalid! Should be between [0, 1].");
+                NUILog.Error( "The value of Parameters is invalid! Should be between [0, 1].");
             }
             else if(value > 1.0f)
             {
                 value = 1.0f;
-                Tizen.Log.Fatal("NUI", "The value of Parameters is invalid! Should be between [0, 1].");
+                NUILog.Error( "The value of Parameters is invalid! Should be between [0, 1].");
             }
+            return value;
         }
 
     }
-
 }