diff --git a/Examples/ServiceExamples/Scripts/ExampleVisualRecognition.cs b/Examples/ServiceExamples/Scripts/ExampleVisualRecognition.cs index adf3f5394..66665bece 100755 --- a/Examples/ServiceExamples/Scripts/ExampleVisualRecognition.cs +++ b/Examples/ServiceExamples/Scripts/ExampleVisualRecognition.cs @@ -25,9 +25,9 @@ public class ExampleVisualRecognition : MonoBehaviour { private VisualRecognition m_VisualRecognition = new VisualRecognition(); - private string m_classifierName = "Apples_OptionalParams"; - private string m_classifierID = "ApplesClassifierNameWithSpaces_73100404"; - private string m_classifierToDelete = "unitytestclassifier2b_37849361"; + private string m_classifierName = "unity-test-classifier-example"; + private string m_classifierID = "unitytestclassifierexample_487365485"; + private string m_classifierToDelete = "unitytestclassifierexample_263072401"; private string m_imageURL = "https://upload.wikimedia.org/wikipedia/commons/e/e9/Official_portrait_of_Barack_Obama.jpg"; private string m_imageTextURL = "http://i.stack.imgur.com/ZS6nH.png"; @@ -65,37 +65,37 @@ void Start() //// Classify get //Log.Debug("ExampleVisualRecognition", "Attempting to get classify via URL"); - //if (!m_VisualRecognition.Classify(m_imageURL, OnClassify)) + //if (!m_VisualRecognition.Classify(OnClassify, m_imageURL)) // Log.Debug("ExampleVisualRecognition", "Classify image failed!"); //// Classify post image - //Log.Debug("ExampleVisualRecognition", "Attempting to classify via image on file system"); - //string imagesPath = Application.dataPath + "/Watson/Examples/ServiceExamples/TestData/visual-recognition-classifiers/obama.jpg"; - //string[] owners = { "IBM", "me" }; - //string[] classifierIDs = { "default" }; - //if (!m_VisualRecognition.Classify(OnClassify, imagesPath, owners, classifierIDs, 0.5f)) - // Log.Debug("ExampleVisualRecognition", "Classify image failed!"); + Log.Debug("ExampleVisualRecognition", "Attempting to classify via image on file system"); + string imagesPath = Application.dataPath + "/Watson/Examples/ServiceExamples/TestData/visual-recognition-classifiers/giraffe_to_classify.jpg"; + string[] owners = { "IBM", "me" }; + string[] classifierIDs = { "default", m_classifierID }; + if (!m_VisualRecognition.Classify(imagesPath, OnClassify, owners, classifierIDs, 0.5f)) + Log.Debug("ExampleVisualRecognition", "Classify image failed!"); //// Detect faces get //Log.Debug("ExampleVisualRecognition", "Attempting to detect faces via URL"); - //if (!m_VisualRecognition.DetectFaces(m_imageURL, OnDetectFaces)) + //if (!m_VisualRecognition.DetectFaces(OnDetectFaces, m_imageURL)) // Log.Debug("ExampleVisualRecogntiion", "Detect faces failed!"); //// Detect faces post image //Log.Debug("ExampleVisualRecognition", "Attempting to detect faces via image"); //string faceExamplePath = Application.dataPath + "/Watson/Examples/ServiceExamples/TestData/visual-recognition-classifiers/obama.jpg"; - //if (!m_VisualRecognition.DetectFaces(OnDetectFaces, faceExamplePath)) + //if (!m_VisualRecognition.DetectFaces(faceExamplePath, OnDetectFaces)) // Log.Debug("ExampleVisualRecognition", "Detect faces failed!"); //// Recognize text get //Log.Debug("ExampleVisualRecognition", "Attempting to recognizeText via URL"); - //if (!m_VisualRecognition.RecognizeText(m_imageTextURL, OnRecognizeText)) + //if (!m_VisualRecognition.RecognizeText(OnRecognizeText, m_imageTextURL)) // Log.Debug("ExampleVisualRecognition", "Recognize text failed!"); //// Recognize text post image //Log.Debug("ExampleVisualRecognition", "Attempting to recognizeText via image"); //string textExamplePath = Application.dataPath + "/Watson/Examples/ServiceExamples/TestData/visual-recognition-classifiers/from_platos_apology.png"; - //if (!m_VisualRecognition.RecognizeText(OnRecognizeText, textExamplePath)) + //if (!m_VisualRecognition.RecognizeText(textExamplePath, OnRecognizeText)) // Log.Debug("ExampleVisualRecognition", "Recognize text failed!"); } @@ -170,11 +170,14 @@ private void OnClassify(ClassifyTopLevelMultiple classify, string data) foreach (ClassifyTopLevelSingle image in classify.images) { Log.Debug("ExampleVisualRecognition", "\tsource_url: " + image.source_url + ", resolved_url: " + image.resolved_url); - foreach (ClassifyPerClassifier classifier in image.classifiers) + if (image.classifiers != null && image.classifiers.Length > 0) { - Log.Debug("ExampleVisualRecognition", "\t\tclassifier_id: " + classifier.classifier_id + ", name: " + classifier.name); - foreach (ClassResult classResult in classifier.classes) - Log.Debug("ExampleVisualRecognition", "\t\t\tclass: " + classResult.m_class + ", score: " + classResult.score + ", type_hierarchy: " + classResult.type_hierarchy); + foreach (ClassifyPerClassifier classifier in image.classifiers) + { + Log.Debug("ExampleVisualRecognition", "\t\tclassifier_id: " + classifier.classifier_id + ", name: " + classifier.name); + foreach (ClassResult classResult in classifier.classes) + Log.Debug("ExampleVisualRecognition", "\t\t\tclass: " + classResult.m_class + ", score: " + classResult.score + ", type_hierarchy: " + classResult.type_hierarchy); + } } } } diff --git a/Examples/ServiceExamples/ServiceExamples.unity b/Examples/ServiceExamples/ServiceExamples.unity index b4adc4f80..ac74c0a89 100755 --- a/Examples/ServiceExamples/ServiceExamples.unity +++ b/Examples/ServiceExamples/ServiceExamples.unity @@ -37,7 +37,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.3735644, g: 0.38112032, b: 0.35887682, a: 1} + m_IndirectSpecularColor: {r: 0.3735645, g: 0.38112062, b: 0.35887584, a: 1} --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 @@ -593,7 +593,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!114 &1713392458 MonoBehaviour: m_ObjectHideFlags: 0 @@ -633,7 +633,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!114 &1740459832 MonoBehaviour: m_ObjectHideFlags: 0 @@ -658,47 +658,6 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_RootOrder: 1 ---- !u!1 &1979050314 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 4 - m_Component: - - 4: {fileID: 1979050316} - - 114: {fileID: 1979050315} - m_Layer: 0 - m_Name: ExampleDialog - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!114 &1979050315 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1979050314} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e8b52562568714a48a89536c62fb978e, type: 3} - m_Name: - m_EditorClassIdentifier: - m_DialogID: 61343031353936302d333963322d346436622d393537312d333863373461656366666664 ---- !u!4 &1979050316 -Transform: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1979050314} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 1, z: -10} - m_LocalScale: {x: 1, y: 1, z: 1} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 2 --- !u!1 &2004886371 GameObject: m_ObjectHideFlags: 0 diff --git a/Scripts/Editor/ConfigEditor.cs b/Scripts/Editor/ConfigEditor.cs index 783930dfb..3cf935136 100755 --- a/Scripts/Editor/ConfigEditor.cs +++ b/Scripts/Editor/ConfigEditor.cs @@ -52,8 +52,6 @@ private class ServiceSetup URL ="https://console.ng.bluemix.net/catalog/speech-to-text/", ServiceID="SpeechToTextV1" }, new ServiceSetup() { ServiceName = "Text To Speech", ServiceAPI = "text-to-speech/api", URL ="https://console.ng.bluemix.net/catalog/text-to-speech/", ServiceID="TextToSpeechV1" }, - new ServiceSetup() { ServiceName = "Dialog", ServiceAPI = "dialog/api", - URL ="https://console.ng.bluemix.net/catalog/dialog/", ServiceID="DialogV1" }, new ServiceSetup() { ServiceName = "Language Translation (to be deprecated)", ServiceAPI = "language-translation/api", URL ="https://console.ng.bluemix.net/catalog/services/language-translation/", ServiceID="LanguageTranslationV1" }, //new ServiceSetup() { ServiceName = "Language Translator", ServiceAPI = "language-translator/api", diff --git a/Scripts/Services/VisualRecognition/VisualRecognition.cs b/Scripts/Services/VisualRecognition/VisualRecognition.cs index e7349ada7..f35a24a1d 100755 --- a/Scripts/Services/VisualRecognition/VisualRecognition.cs +++ b/Scripts/Services/VisualRecognition/VisualRecognition.cs @@ -224,7 +224,14 @@ public class VisualRecognition : IWatsonService req.Headers["Content-Type"] = "application/x-www-form-urlencoded"; req.Headers["Accept-Language"] = acceptLanguage; - if(imageData != null) + if (owners != default(string[])) + req.Parameters["owners"] = string.Join(",", owners); + if (classifierIDs != default(string[])) + req.Parameters["classifier_ids"] = string.Join(",", classifierIDs); + if (threshold != default(float)) + req.Parameters["threshold"] = threshold; + + if (imageData != null) req.Send = imageData; return connector.Send(req);