Add Lib

Clouz · Sep 11, 2017 · 4ab2513 · 4ab2513
1 parent 48b7ee4
commit 4ab2513
Show file tree

Hide file tree

Showing 25 changed files with 44,128 additions and 33 deletions.
diff --git a/CameraBarcode.sln b/CameraBarcode.sln
@@ -1,14 +1,12 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.26228.9
+# Visual Studio 14
+VisualStudioVersion = 14.0.25420.1
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CameraBcLib", "CameraBcLib\CameraBcLib.csproj", "{59AF480E-3332-409B-9246-8AE9E1968863}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ProvaApp", "ProvaApp\ProvaApp.csproj", "{E2865F6F-2C2F-43EE-850A-74BE5B015572}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Camera_NET", "Camera_Net\Camera_NET.csproj", "{E6052609-A070-41D5-85B9-ACABA91170C5}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -23,10 +21,6 @@ Global
 		{E2865F6F-2C2F-43EE-850A-74BE5B015572}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{E2865F6F-2C2F-43EE-850A-74BE5B015572}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E2865F6F-2C2F-43EE-850A-74BE5B015572}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E6052609-A070-41D5-85B9-ACABA91170C5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E6052609-A070-41D5-85B9-ACABA91170C5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E6052609-A070-41D5-85B9-ACABA91170C5}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E6052609-A070-41D5-85B9-ACABA91170C5}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/CameraBcLib/CameraBC.xaml.cs b/CameraBcLib/CameraBC.xaml.cs
@@ -98,15 +98,6 @@ public CameraBC(int SelectedCamera = 0, int TimeScanMilliseconds = 300, Mode Loa
             }
         }
 
-        private void Window_Loaded(object sender, EventArgs e)
-        {
-            if (_CameraChoice.Devices.Count == 0)
-            {
-                MessageBox.Show("No Camera Detected", "Error", MessageBoxButton.OK, MessageBoxImage.Error);
-                this.Close();
-            }
-        }
-
         private void Window_Closed(object sender, EventArgs e)
         {
             cameraControl.CameraControl.CloseCamera();
@@ -220,12 +211,11 @@ private void initResolution()
 
         private void Window_Loaded(object sender, RoutedEventArgs e)
         {
-
-        }
-
-        private void Window_Loaded_1(object sender, RoutedEventArgs e)
-        {
-
+            if (_CameraChoice.Devices.Count == 0)
+            {
+                MessageBox.Show("No Camera Detected", "Error", MessageBoxButton.OK, MessageBoxImage.Error);
+                this.Close();
+            }
         }
     }
 

diff --git a/CameraBcLib/CameraBcLib.csproj b/CameraBcLib/CameraBcLib.csproj
@@ -31,8 +31,11 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="DirectShowLib, Version=2.1.0.1599, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\DirectShowLib.1.0.0\lib\DirectShowLib.dll</HintPath>
+    <Reference Include="Camera_NET">
+      <HintPath>..\packages\Camera_NET\Lib\Camera_NET.dll</HintPath>
+    </Reference>
+    <Reference Include="DirectShowLib-2010">
+      <HintPath>..\packages\DirectShowLib-2010\lib\DirectShowLib-2010.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />
@@ -97,12 +100,5 @@
       <Generator>MSBuild:Compile</Generator>
     </Page>
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Camera_Net\Camera_NET.csproj">
-      <Project>{e6052609-a070-41d5-85b9-acaba91170c5}</Project>
-      <Name>Camera_NET</Name>
-      <Private>True</Private>
-    </ProjectReference>
-  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
diff --git a/Camera_Net/Camera_NET.csproj b/Camera_Net/Camera_NET.csproj
@@ -98,7 +98,8 @@
   <ItemGroup>
     <Reference Include="DirectShowLib, Version=2.1.0.1599, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>packages\DirectShowLib.1.0.0\lib\DirectShowLib.dll</HintPath>
-      <Private>True</Private>
+      <SpecificVersion>False</SpecificVersion>
+      <Private>False</Private>
     </Reference>
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />

diff --git a/packages/Camera_NET/Lib/Camera_NET.dll b/packages/Camera_NET/Lib/Camera_NET.dll
diff --git a/packages/DirectShowLib-2010/lib/DirectShowLib-2010.dll b/packages/DirectShowLib-2010/lib/DirectShowLib-2010.dll
diff --git a/packages/DirectShowLib.1.0.0/DirectShowLib.1.0.0.nupkg b/packages/DirectShowLib.1.0.0/DirectShowLib.1.0.0.nupkg
diff --git a/packages/DirectShowLib.1.0.0/lib/DirectShowLib.dll b/packages/DirectShowLib.1.0.0/lib/DirectShowLib.dll
diff --git a/packages/ZXing.Net.0.16.1/ZXing.Net.0.16.1.nupkg b/packages/ZXing.Net.0.16.1/ZXing.Net.0.16.1.nupkg