Change-Id: I5e347693c752389c27a7ce75b09d29603971ddf2
Signed-off-by: dongsug.song <dongsug.song@samsung.com>
<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
- <DefineConstants>$(DefineConstants);DEBUG_ON</DefineConstants>
</PropertyGroup>
<ItemGroup>
</PropertyGroup>
<ItemGroup>
[CallerFilePath] string file = null
)
{
[CallerFilePath] string file = null
)
{
- Tizen.Log.Fatal("NUI", $"{msg} (at {DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.fffffff")} line {lineNum} of {caller} in {file})" );
+ Tizen.Log.Fatal("NUI", $"{msg} (at line {lineNum} of {caller} in {file})" );
}
public static void Error(string msg,
}
public static void Error(string msg,
[CallerFilePath] string file = null
)
{
[CallerFilePath] string file = null
)
{
- Tizen.Log.Fatal("NUI", $"[ERROR] {msg} (at {DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.fffffff")} line {lineNum} of {caller} in {file})" );
+ Tizen.Log.Fatal("NUI", $"[ERROR] {msg} (at line {lineNum} of {caller} in {file})" );
RefObject refObj = baseHandle.GetObjectPtr();
IntPtr refCptr = (IntPtr)RefObject.getCPtr(refObj);
RefObject refObj = baseHandle.GetObjectPtr();
IntPtr refCptr = (IntPtr)RefObject.getCPtr(refObj);
- NUILog.Debug("________Storing ref object cptr in control map Hex: {0:X}" + refCptr);
+ NUILog.Debug("Storing ref object cptr in control map Hex: {0:X}" + refCptr);
if (!Instance._controlMap.ContainsKey(refCptr))
{
if (!Instance._controlMap.ContainsKey(refCptr))
{
- Tizen.Log.Debug("NUI", "Value set to " + value);
+ NUILog.Debug("Value set to " + value);
_currentValue = value;
// Make sure no invalid value is accepted
_currentValue = value;
// Make sure no invalid value is accepted
- Tizen.Log.Debug("NUI", "TextColor set to " + value.R + "," + value.G + "," + value.B);
+ NUILog.Debug("TextColor set to " + value.R + "," + value.G + "," + value.B);
_textColor = value;
_textField.TextColor = _textColor;
_textColor = value;
_textField.TextColor = _textColor;
Tizen.NUI.PropertyType daliType;
if (_daliPropertyTypeLookup.TryGetValue(cSharpTypeName, out daliType))
{
Tizen.NUI.PropertyType daliType;
if (_daliPropertyTypeLookup.TryGetValue(cSharpTypeName, out daliType))
{
-#if DEBUG_ON
- Tizen.Log.Debug("NUI", "mapped " + cSharpTypeName + " to dAli type " + daliType);
-#endif
+ NUILog.Debug("mapped " + cSharpTypeName + " to dAli type " + daliType);
+
return daliType;
}
else
{
return daliType;
}
else
{
-#if DEBUG_ON
- Tizen.Log.Debug("NUI", "Failed to find a mapping between C# property" + cSharpTypeName + " and DALi type");
-#endif
+ NUILog.Debug("Failed to find a mapping between C# property" + cSharpTypeName + " and DALi type");
+
return PropertyType.None;
}
}
return PropertyType.None;
}
}
private static IntPtr CreateControl(IntPtr cPtrControlName)
{
string controlName = System.Runtime.InteropServices.Marshal.PtrToStringAnsi(cPtrControlName);
private static IntPtr CreateControl(IntPtr cPtrControlName)
{
string controlName = System.Runtime.InteropServices.Marshal.PtrToStringAnsi(cPtrControlName);
-#if DEBUG_ON
- Tizen.Log.Debug("NUI", "Create controlled called from C++ create a " + controlName);
-#endif
+
+ NUILog.Debug("Create controlled called from C++ create a " + controlName);
+
Func<CustomView> controlConstructor;
// find the control constructor
Func<CustomView> controlConstructor;
// find the control constructor
private static void SetProperty(IntPtr controlPtr, IntPtr propertyName, IntPtr propertyValue)
{
string name = System.Runtime.InteropServices.Marshal.PtrToStringAnsi(propertyName);
private static void SetProperty(IntPtr controlPtr, IntPtr propertyName, IntPtr propertyValue)
{
string name = System.Runtime.InteropServices.Marshal.PtrToStringAnsi(propertyName);
-#if DEBUG_ON
- Tizen.Log.Debug("NUI", "SetControlProperty called for:" + name);
-#endif
- Instance.SetPropertyValue(controlPtr, name, propertyValue);
+ NUILog.Debug("SetControlProperty called for:" + name);
+
+ Instance.SetPropertyValue(controlPtr, name, propertyValue);
}
/// <since_tizen> 3 </since_tizen>
}
/// <since_tizen> 3 </since_tizen>
// If the Scriptable attribute exists, then register it with the type registry.
if (attr is ScriptableProperty)
{
// If the Scriptable attribute exists, then register it with the type registry.
if (attr is ScriptableProperty)
{
-#if DEBUG_ON
- Tizen.Log.Debug("NUI", "Got a DALi JSON scriptable property = " + propertyInfo.Name + ", of type " + propertyInfo.PropertyType.Name);
-#endif
+ NUILog.Debug("Got a DALi JSON scriptable property = " + propertyInfo.Name + ", of type " + propertyInfo.PropertyType.Name);
+
// first get the attribute type, ( default, or animatable)
ScriptableProperty scriptableProp = attr as ScriptableProperty;
// first get the attribute type, ( default, or animatable)
ScriptableProperty scriptableProp = attr as ScriptableProperty;
TypeRegistration.RegisterProperty(viewType.ToString(), propertyInfo.Name, propertyIndex, propertyType, _setPropertyCallback, _getPropertyCallback);
}
}
TypeRegistration.RegisterProperty(viewType.ToString(), propertyInfo.Name, propertyIndex, propertyType, _setPropertyCallback, _getPropertyCallback);
}
}
-#if DEBUG_ON
- Tizen.Log.Debug("NUI", "property name = " + propertyInfo.Name);
-#endif
+ NUILog.Debug("property name = " + propertyInfo.Name);
private void SetPropertyValue(IntPtr refObjectPtr, string propertyName, IntPtr propertyValuePtr)
{
// Get the C# control that maps to the C++ control
private void SetPropertyValue(IntPtr refObjectPtr, string propertyName, IntPtr propertyValuePtr)
{
// Get the C# control that maps to the C++ control
-#if DEBUG_ON
- Tizen.Log.Debug("NUI", "SetPropertyValue refObjectPtr = {0:X}" + refObjectPtr);
-#endif
+ NUILog.Debug("SetPropertyValue refObjectPtr = {0:X}" + refObjectPtr);
+
PropertyValue propValue = new PropertyValue(propertyValuePtr, false);
// Get the C# control that maps to the C++ control
PropertyValue propValue = new PropertyValue(propertyValuePtr, false);
// Get the C# control that maps to the C++ control
{
if (_preFocusChangeEventHandler == null)
{
{
if (_preFocusChangeEventHandler == null)
{
-#if DEBUG_ON
- Tizen.Log.Debug("NUI", "con1) PreFocusChangeSignal().Empty = " + PreFocusChangeSignal().Empty());
- Tizen.Log.Debug("NUI", "con2) PreFocusChangeSignal().GetConnectionCount = " + PreFocusChangeSignal().GetConnectionCount());
-#endif
_preFocusChangeCallback = OnPreFocusChange;
PreFocusChangeSignal().Connect(_preFocusChangeCallback);
_preFocusChangeCallback = OnPreFocusChange;
PreFocusChangeSignal().Connect(_preFocusChangeCallback);
-#if DEBUG_ON
- Tizen.Log.Debug("NUI", "con3) PreFocusChangeSignal().Empty = " + PreFocusChangeSignal().Empty());
- Tizen.Log.Debug("NUI", "con4) PreFocusChangeSignal().GetConnectionCount = " + PreFocusChangeSignal().GetConnectionCount());
-#endif
}
_preFocusChangeEventHandler += value;
}
}
_preFocusChangeEventHandler += value;
}
_preFocusChangeEventHandler -= value;
if (_preFocusChangeEventHandler == null && PreFocusChangeSignal().Empty() == false)
{
_preFocusChangeEventHandler -= value;
if (_preFocusChangeEventHandler == null && PreFocusChangeSignal().Empty() == false)
{
-#if DEBUG_ON
- Tizen.Log.Debug("NUI", "discon1) PreFocusChangeSignal().Empty = " + PreFocusChangeSignal().Empty());
- Tizen.Log.Debug("NUI", "discon2) PreFocusChangeSignal().GetConnectionCount = " + PreFocusChangeSignal().GetConnectionCount());
-#endif
PreFocusChangeSignal().Disconnect(_preFocusChangeCallback);
PreFocusChangeSignal().Disconnect(_preFocusChangeCallback);
-#if DEBUG_ON
- Tizen.Log.Debug("NUI", "discon3) PreFocusChangeSignal().Empty = " + PreFocusChangeSignal().Empty());
- Tizen.Log.Debug("NUI", "discon4) PreFocusChangeSignal().GetConnectionCount = " + PreFocusChangeSignal().GetConnectionCount());
-#endif