upgrade scanx

balbarak · Sep 6, 2018 · 42f7691 · 42f7691
1 parent ab2ebae
commit 42f7691
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 43 deletions.
diff --git a/src/ScanX.Core/DeviceClient.cs b/src/ScanX.Core/DeviceClient.cs
@@ -217,9 +217,7 @@ public List<DeviceProperty> GetItemDeviceConnectProperties(string id)
             IDeviceInfo device = GetDeviceById(id);
 
             var connectedDevice = device.Connect();
-
-
-
+
             foreach (IProperty item in connectedDevice.Items[1].Properties)
             {
                 result.Add(new DeviceProperty()
@@ -266,16 +264,16 @@ private void SetDeviceSettings(Device connectedDevice, ScanSetting setting)
 
             SetWIAProperty(properties, ScanSetting.WIA_ITEM_SIZE, 0);
 
-            SetWIAProperty(properties, ScanSetting.WIA_PAGE_SIZE, 0);
-
-            //SetWIAProperty(properties, ScanSetting.WIA_HORIZONTAL_EXTENT, resoultions * 2);
-
-            //SetWIAProperty(properties, ScanSetting.WIA_VERTICAL_EXTENT, resoultions * 2);
-
+            SetWIAProperty(properties, ScanSetting.WIA_PAGE_SIZE, 3);
+
             SetWIAProperty(properties, ScanSetting.WIA_HORIZONTAL_RESOLUTION, resoultions);
 
             SetWIAProperty(properties, ScanSetting.WIA_VERTICAL_RESOLUTION, resoultions);
 
+            SetWIAProperty(properties, ScanSetting.WIA_VERTICAL_EXTENT, height);
+
+            SetWIAProperty(properties, ScanSetting.WIA_HORIZONTAL_EXTENT, width);
+
             SetWIAProperty(properties, ScanSetting.WIA_COLOR_MODE, (int)setting.Color);
 
         }

diff --git a/src/ScanX.Core/Models/ScanSetting.cs b/src/ScanX.Core/Models/ScanSetting.cs
@@ -56,11 +56,7 @@ public enum PageSize
         //for more info https://www.papersizes.org/a-sizes-in-pixels.htm
         public static (int width,int height) GetA4SizeByDpi(int dpiValue)
         {
-
-            return (619, 876);
-
-            //return (1240, 1754);
-
+
             var dpi = (DPI)dpiValue;
 
             switch (dpi)

diff --git a/src/ScanX.Protocol/Properties/PublishProfiles/FolderProfile.pubxml b/src/ScanX.Protocol/Properties/PublishProfiles/FolderProfile.pubxml
@@ -17,7 +17,7 @@ by editing this MSBuild file. In order to learn more about this please visit htt
     <ProjectGuid>2ed2dff1-0aba-4723-b0ee-5353cbac218c</ProjectGuid>
     <SelfContained>true</SelfContained>
     <_IsPortable>false</_IsPortable>
-    <publishUrl>C:\Users\balba\Desktop\ScanX Protocol Published</publishUrl>
+    <publishUrl>C:\Users\b.albarrak\Documents\PublishFolders\Scanx</publishUrl>
     <DeleteExistingFiles>False</DeleteExistingFiles>
   </PropertyGroup>
 </Project>
diff --git a/src/SetupProject/SetupProject.vdproj b/src/SetupProject/SetupProject.vdproj
@@ -33,14 +33,14 @@
         }
         "Entry"
         {
-        "MsmKey" = "8:_D60D8B2E28C0248BD71080A1575D96DC"
-        "OwnerKey" = "8:_85209EC1AB1ACB5E69790C2CB4B20342"
+        "MsmKey" = "8:_CD98072E54B14024877AB98437906600"
+        "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_DD00C70405F8440AA14CAACA0D7B3FD3"
-        "OwnerKey" = "8:_UNDEFINED"
+        "MsmKey" = "8:_D60D8B2E28C0248BD71080A1575D96DC"
+        "OwnerKey" = "8:_85209EC1AB1ACB5E69790C2CB4B20342"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
@@ -247,6 +247,26 @@
             "IsDependency" = "11:TRUE"
             "IsolateTo" = "8:"
             }
+            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_CD98072E54B14024877AB98437906600"
+            {
+            "SourcePath" = "8:C:\\Users\\b.albarrak\\Documents\\PublishFolders\\Scanx\\Protocol.zip"
+            "TargetName" = "8:Protocol.zip"
+            "Tag" = "8:"
+            "Folder" = "8:_08E16D1E73EB4C11882B3A6DC60B7813"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Vital" = "11:TRUE"
+            "ReadOnly" = "11:FALSE"
+            "Hidden" = "11:FALSE"
+            "System" = "11:FALSE"
+            "Permanent" = "11:FALSE"
+            "SharedLegacy" = "11:FALSE"
+            "PackageAs" = "3:1"
+            "Register" = "3:1"
+            "Exclude" = "11:FALSE"
+            "IsDependency" = "11:FALSE"
+            "IsolateTo" = "8:"
+            }
             "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_D60D8B2E28C0248BD71080A1575D96DC"
             {
             "AssemblyRegister" = "3:1"
@@ -278,26 +298,6 @@
             "IsDependency" = "11:TRUE"
             "IsolateTo" = "8:"
             }
-            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_DD00C70405F8440AA14CAACA0D7B3FD3"
-            {
-            "SourcePath" = "8:C:\\Users\\balba\\Desktop\\ScanXPublish\\Protocol.zip"
-            "TargetName" = "8:Protocol.zip"
-            "Tag" = "8:"
-            "Folder" = "8:_08E16D1E73EB4C11882B3A6DC60B7813"
-            "Condition" = "8:"
-            "Transitive" = "11:FALSE"
-            "Vital" = "11:TRUE"
-            "ReadOnly" = "11:FALSE"
-            "Hidden" = "11:FALSE"
-            "System" = "11:FALSE"
-            "Permanent" = "11:FALSE"
-            "SharedLegacy" = "11:FALSE"
-            "PackageAs" = "3:1"
-            "Register" = "3:1"
-            "Exclude" = "11:FALSE"
-            "IsDependency" = "11:FALSE"
-            "IsolateTo" = "8:"
-            }
         }
         "FileType"
         {
@@ -387,19 +387,19 @@
         {
         "Name" = "8:Microsoft Visual Studio"
         "ProductName" = "8:ScanX"
-        "ProductCode" = "8:{3BDF528E-C6A9-4528-8384-5854BC644F1F}"
-        "PackageCode" = "8:{9B1E64C7-9078-4B49-8250-FB64CEF2990C}"
+        "ProductCode" = "8:{23A36A30-54D7-4311-8DAE-8FFA4EB15039}"
+        "PackageCode" = "8:{2CC59DA1-4A13-47FD-B811-87D0BC34198F}"
         "UpgradeCode" = "8:{17A25918-F87A-43AB-814F-5508AF7DB5B6}"
         "AspNetVersion" = "8:4.0.30319.0"
         "RestartWWWService" = "11:FALSE"
         "RemovePreviousVersions" = "11:FALSE"
         "DetectNewerInstalledVersion" = "11:TRUE"
         "InstallAllUsers" = "11:FALSE"
-        "ProductVersion" = "8:1.0.1"
+        "ProductVersion" = "8:1.0.2"
         "Manufacturer" = "8:CreaDev Solutions"
         "ARPHELPTELEPHONE" = "8:"
         "ARPHELPLINK" = "8:"
-        "Title" = "8:SetupProject"
+        "Title" = "8:Scanx Setup Project"
         "Subject" = "8:"
         "ARPCONTACT" = "8:balbarak"
         "Keywords" = "8:"