Version 1.2.

fix for Ticket#5 - Tap to focus sets wrong focus point [in ver. 1.1].
microsoft · Jan 30, 2013 · 3369508 · 3369508
1 parent e1fd464
commit 3369508
Show file tree

Hide file tree

Showing 22 changed files with 79 additions and 31 deletions.
diff --git a/CameraExplorer/AboutPage.xaml b/CameraExplorer/AboutPage.xaml
@@ -1,5 +1,5 @@
 <!--
- Copyright © 2012 Nokia Corporation. All rights reserved.
+ Copyright © 2012-2013 Nokia Corporation. All rights reserved.
  Nokia and Nokia Connecting People are registered trademarks of Nokia Corporation. 
  Other product and company names mentioned herein may be trademarks
  or trade names of their respective owners. 

diff --git a/CameraExplorer/AboutPage.xaml.cs b/CameraExplorer/AboutPage.xaml.cs
@@ -1,4 +1,12 @@
-using System;
+/*
+ * Copyright © 2012-2013 Nokia Corporation. All rights reserved.
+ * Nokia and Nokia Connecting People are registered trademarks of Nokia Corporation. 
+ * Other product and company names mentioned herein may be trademarks
+ * or trade names of their respective owners. 
+ * See LICENSE.TXT for license information.
+ */
+
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Net;

diff --git a/CameraExplorer/App.xaml b/CameraExplorer/App.xaml
@@ -1,5 +1,5 @@
 <!--
- Copyright © 2012 Nokia Corporation. All rights reserved.
+ Copyright © 2012-2013 Nokia Corporation. All rights reserved.
  Nokia and Nokia Connecting People are registered trademarks of Nokia Corporation. 
  Other product and company names mentioned herein may be trademarks
  or trade names of their respective owners. 

diff --git a/CameraExplorer/App.xaml.cs b/CameraExplorer/App.xaml.cs
@@ -1,4 +1,12 @@
-using System;
+/*
+ * Copyright © 2012-2013 Nokia Corporation. All rights reserved.
+ * Nokia and Nokia Connecting People are registered trademarks of Nokia Corporation. 
+ * Other product and company names mentioned herein may be trademarks
+ * or trade names of their respective owners. 
+ * See LICENSE.TXT for license information.
+ */
+
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Net;

diff --git a/CameraExplorer/ArrayParameter.cs b/CameraExplorer/ArrayParameter.cs
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2012 Nokia Corporation. All rights reserved.
+ * Copyright © 2012-2013 Nokia Corporation. All rights reserved.
  * Nokia and Nokia Connecting People are registered trademarks of Nokia Corporation. 
  * Other product and company names mentioned herein may be trademarks
  * or trade names of their respective owners. 

diff --git a/CameraExplorer/DataContext.cs b/CameraExplorer/DataContext.cs
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2012 Nokia Corporation. All rights reserved.
+ * Copyright © 2012-2013 Nokia Corporation. All rights reserved.
  * Nokia and Nokia Connecting People are registered trademarks of Nokia Corporation. 
  * Other product and company names mentioned herein may be trademarks
  * or trade names of their respective owners. 

diff --git a/CameraExplorer/Extensions.cs b/CameraExplorer/Extensions.cs
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2012 Nokia Corporation. All rights reserved.
+ * Copyright © 2012-2013 Nokia Corporation. All rights reserved.
  * Nokia and Nokia Connecting People are registered trademarks of Nokia Corporation. 
  * Other product and company names mentioned herein may be trademarks
  * or trade names of their respective owners. 

diff --git a/CameraExplorer/LocalizedStrings.cs b/CameraExplorer/LocalizedStrings.cs
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2012 Nokia Corporation. All rights reserved.
+ * Copyright © 2012-2013 Nokia Corporation. All rights reserved.
  * Nokia and Nokia Connecting People are registered trademarks of Nokia Corporation. 
  * Other product and company names mentioned herein may be trademarks
  * or trade names of their respective owners. 

diff --git a/CameraExplorer/MainPage.xaml b/CameraExplorer/MainPage.xaml
@@ -1,5 +1,5 @@
 <!--
- Copyright © 2012 Nokia Corporation. All rights reserved.
+ Copyright © 2012-2013 Nokia Corporation. All rights reserved.
  Nokia and Nokia Connecting People are registered trademarks of Nokia Corporation. 
  Other product and company names mentioned herein may be trademarks
  or trade names of their respective owners. 

diff --git a/CameraExplorer/MainPage.xaml.cs b/CameraExplorer/MainPage.xaml.cs
@@ -1,4 +1,12 @@
-using Microsoft.Devices;
+/*
+ * Copyright © 2012-2013 Nokia Corporation. All rights reserved.
+ * Nokia and Nokia Connecting People are registered trademarks of Nokia Corporation. 
+ * Other product and company names mentioned herein may be trademarks
+ * or trade names of their respective owners. 
+ * See LICENSE.TXT for license information.
+ */
+
+using Microsoft.Devices;
 using Microsoft.Phone.Controls;
 using Microsoft.Phone.Shell;
 using System;
@@ -232,13 +240,14 @@ private async void videoCanvas_Tap(object sender, GestureEventArgs e)
                 // Get tap coordinates as a foundation point
                 Windows.Foundation.Point tapPoint = new Windows.Foundation.Point(uiTapPoint.X, uiTapPoint.Y);
 
-                double xRatio = VideoCanvas.ActualWidth / _dataContext.Device.PreviewResolution.Width;
-                double yRatio = VideoCanvas.ActualHeight / _dataContext.Device.PreviewResolution.Height;
+
+                double xRatio = VideoCanvas.ActualHeight / _dataContext.Device.PreviewResolution.Width;
+                double yRatio = VideoCanvas.ActualWidth / _dataContext.Device.PreviewResolution.Height;
 
                 // adjust to center focus on the tap point
                 Windows.Foundation.Point displayOrigin = new Windows.Foundation.Point(
-                    tapPoint.X - _focusRegionSize.Width / 2,
-                    tapPoint.Y - _focusRegionSize.Height / 2);
+                            tapPoint.Y - _focusRegionSize.Width / 2,
+                            (VideoCanvas.ActualWidth - tapPoint.X) - _focusRegionSize.Height / 2);
 
                 // adjust for resolution difference between preview image and the canvas
                 Windows.Foundation.Point viewFinderOrigin = new Windows.Foundation.Point(displayOrigin.X / xRatio, displayOrigin.Y / yRatio);

diff --git a/CameraExplorer/OverlayTemplateSelector.cs b/CameraExplorer/OverlayTemplateSelector.cs
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2012 Nokia Corporation. All rights reserved.
+ * Copyright © 2012-2013 Nokia Corporation. All rights reserved.
  * Nokia and Nokia Connecting People are registered trademarks of Nokia Corporation. 
  * Other product and company names mentioned herein may be trademarks
  * or trade names of their respective owners. 

diff --git a/CameraExplorer/Parameter.cs b/CameraExplorer/Parameter.cs
@@ -1,4 +1,12 @@
-using System.ComponentModel;
+/*
+ * Copyright © 2012-2013 Nokia Corporation. All rights reserved.
+ * Nokia and Nokia Connecting People are registered trademarks of Nokia Corporation. 
+ * Other product and company names mentioned herein may be trademarks
+ * or trade names of their respective owners. 
+ * See LICENSE.TXT for license information.
+ */
+
+using System.ComponentModel;
 using Windows.Phone.Media.Capture;
 
 namespace CameraExplorer

diff --git a/CameraExplorer/PreviewPage.xaml b/CameraExplorer/PreviewPage.xaml
@@ -1,5 +1,5 @@
 <!--
- Copyright © 2012 Nokia Corporation. All rights reserved.
+ Copyright © 2012-2013 Nokia Corporation. All rights reserved.
  Nokia and Nokia Connecting People are registered trademarks of Nokia Corporation. 
  Other product and company names mentioned herein may be trademarks
  or trade names of their respective owners. 

diff --git a/CameraExplorer/PreviewPage.xaml.cs b/CameraExplorer/PreviewPage.xaml.cs
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2012 Nokia Corporation. All rights reserved.
+ * Copyright © 2012-2013 Nokia Corporation. All rights reserved.
  * Nokia and Nokia Connecting People are registered trademarks of Nokia Corporation. 
  * Other product and company names mentioned herein may be trademarks
  * or trade names of their respective owners. 

diff --git a/CameraExplorer/Properties/AssemblyInfo.cs b/CameraExplorer/Properties/AssemblyInfo.cs
@@ -11,7 +11,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("CameraExplorer")]
-[assembly: AssemblyCopyright("Copyright ©  2012")]
+[assembly: AssemblyCopyright("Copyright © 2012-2013 Nokia Corporation.")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -32,6 +32,6 @@
 //
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("1.1.1.0")]
-[assembly: AssemblyFileVersion("1.1.1.0")]
+[assembly: AssemblyVersion("1.2.0.0")]
+[assembly: AssemblyFileVersion("1.2.0.0")]
 [assembly: NeutralResourcesLanguageAttribute("en-US")]
diff --git a/CameraExplorer/Properties/WMAppManifest.xml b/CameraExplorer/Properties/WMAppManifest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Deployment xmlns="http://schemas.microsoft.com/windowsphone/2012/deployment" AppPlatformVersion="8.0">
   <DefaultLanguage xmlns="" code="en-US" />
-  <App xmlns="" ProductID="{94f53777-5783-47b2-9bcb-ce46ccb0f219}" Title="Camera Explorer" RuntimeType="Silverlight" Version="1.1.1.0" Genre="apps.normal" Author="Nokia" Description="" Publisher="Nokia" PublisherID="{cc336b25-5e51-419a-8c64-3c4a7a4383f4}">
+  <App xmlns="" ProductID="{94f53777-5783-47b2-9bcb-ce46ccb0f219}" Title="Camera Explorer" RuntimeType="Silverlight" Version="1.2.0.0" Genre="apps.normal" Author="Nokia" Description="" Publisher="Nokia" PublisherID="{cc336b25-5e51-419a-8c64-3c4a7a4383f4}">
     <IconPath IsRelative="true" IsResource="false">Assets\ApplicationIcon.png</IconPath>
     <Capabilities>
       <Capability Name="ID_CAP_NETWORKING" />

diff --git a/CameraExplorer/RangeParameter.cs b/CameraExplorer/RangeParameter.cs
@@ -1,4 +1,12 @@
-using Microsoft.Devices;
+/*
+ * Copyright © 2012-2013 Nokia Corporation. All rights reserved.
+ * Nokia and Nokia Connecting People are registered trademarks of Nokia Corporation. 
+ * Other product and company names mentioned herein may be trademarks
+ * or trade names of their respective owners. 
+ * See LICENSE.TXT for license information.
+ */
+
+using Microsoft.Devices;
 using Microsoft.Phone.Shell;
 using System;
 using System.Collections;

diff --git a/CameraExplorer/SettingsPage.xaml b/CameraExplorer/SettingsPage.xaml
@@ -1,5 +1,5 @@
 <!--
- Copyright © 2012 Nokia Corporation. All rights reserved.
+ Copyright © 2012-2013 Nokia Corporation. All rights reserved.
  Nokia and Nokia Connecting People are registered trademarks of Nokia Corporation. 
  Other product and company names mentioned herein may be trademarks
  or trade names of their respective owners. 

diff --git a/CameraExplorer/SettingsPage.xaml.cs b/CameraExplorer/SettingsPage.xaml.cs
@@ -1,4 +1,12 @@
-using System;
+/*
+ * Copyright © 2012-2013 Nokia Corporation. All rights reserved.
+ * Nokia and Nokia Connecting People are registered trademarks of Nokia Corporation. 
+ * Other product and company names mentioned herein may be trademarks
+ * or trade names of their respective owners. 
+ * See LICENSE.TXT for license information.
+ */
+
+using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;

diff --git a/CameraExplorer/SettingsTemplateSelector.cs b/CameraExplorer/SettingsTemplateSelector.cs
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2012 Nokia Corporation. All rights reserved.
+ * Copyright © 2012-2013 Nokia Corporation. All rights reserved.
  * Nokia and Nokia Connecting People are registered trademarks of Nokia Corporation. 
  * Other product and company names mentioned herein may be trademarks
  * or trade names of their respective owners. 

diff --git a/Licence.txt b/Licence.txt
@@ -1,4 +1,4 @@
-Copyright � 2012 Nokia Corporation. All rights reserved.
+Copyright � 2012-2013 Nokia Corporation. All rights reserved.
 Nokia and Nokia Connecting People are registered trademarks of Nokia Corporation. 
 Other product and company names mentioned herein may be trademarks or trade names
 of their respective owners.

diff --git a/release_notes.txt b/release_notes.txt
@@ -1,4 +1,4 @@
-Camera Explorer v1.1
+Camera Explorer v1.2
 ====================
 
 Camera Explorer application demonstrates the use of the new advanced
@@ -19,9 +19,7 @@ For more information on implementation and porting, visit the wiki pages:
 What's new
 ----------
 
-Version 1.1.0.0: Implemented tap-to-focus and Lens Picker integration
-
-Version 1.0.0.0: First release of the Camera Explorer
+Version 1.2.0.0: Bug fix to tap-to-focus (Ticket #5)
 
 
 1. Usage
@@ -150,5 +148,6 @@ describes the usage of PhotoCaptureDevice properties in more detail.
 8. Version history
 -------------------------------------------------------------------------------
 
+1.2.0.0 Bug fix to tap-to-focus (Ticket #5)
 1.1.0.0 Tap-to-focus and Lens Picker integration added.
 1.0.0.0 First release