migracja 14 - poprawione przesuwanie rectangli, teraz pora na polygony

mudiaTest · Jun 4, 2013 · 3406211 · 3406211
1 parent cd0c0dd
commit 3406211
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 10 deletions.
diff --git a/.gitignore b/.gitignore
@@ -70,4 +70,5 @@ Migracja/obj/x86/Debug/WindowsApplication.pdb
 Migracja/Ras2Vec.v11.suo
 *.cache
 *.manifest
-*.Cache
+*.Cache
+Migracja/_ReSharper.Migracja/*
diff --git a/Migracja/ImageCrooper.cs b/Migracja/ImageCrooper.cs
@@ -186,8 +186,9 @@ public override Bitmap GetCroppedImage(float aScale)
                 {
                     for (int y = 0; y < rect.Height; y++)
                     {
-
-                        graphics.FillRectangle(new SolidBrush(vectArr[x][y].color), (x) * aScale + resultRect.X, (y) * aScale + resultRect.Y, aScale, aScale);
+                        int sourceX = x + rect.X;
+                        int sourceY = y + rect.Y;
+                        graphics.FillRectangle(new SolidBrush(vectArr[sourceX][sourceY].color), (x) * aScale + resultRect.X, (y) * aScale + resultRect.Y, aScale, aScale);
                         if (settings.Edges() && aScale >= 4)
                             graphics.DrawRectangle(new Pen(Color.Red), (x) * aScale + resultRect.X, (y) * aScale + resultRect.Y, aScale, aScale);
                         //graphics.DrawRectangle(localPen, x/**aScale*/, y/**aScale*/, /*aScale, aScale*/ 100, 100);
@@ -265,6 +266,7 @@ public override Bitmap GetCroppedImage(float aScale)
                                     System.Drawing.GraphicsUnit.Pixel);*/
 
                 return result;
+
         }
     }
 }
diff --git a/Migracja/Migracja.sln b/Migracja/Migracja.sln
@@ -1,18 +1,18 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 2012
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Migracja", "Migracja\Migracja.csproj", "{33A85B94-0337-411C-BCCB-465A43FD1C23}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Migracja", "Migracja.csproj", "{D279C4B9-6771-409D-8180-B56155EE957B}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
+		Debug|x86 = Debug|x86
+		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{33A85B94-0337-411C-BCCB-465A43FD1C23}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{33A85B94-0337-411C-BCCB-465A43FD1C23}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{33A85B94-0337-411C-BCCB-465A43FD1C23}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{33A85B94-0337-411C-BCCB-465A43FD1C23}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D279C4B9-6771-409D-8180-B56155EE957B}.Debug|x86.ActiveCfg = Debug|x86
+		{D279C4B9-6771-409D-8180-B56155EE957B}.Debug|x86.Build.0 = Debug|x86
+		{D279C4B9-6771-409D-8180-B56155EE957B}.Release|x86.ActiveCfg = Release|x86
+		{D279C4B9-6771-409D-8180-B56155EE957B}.Release|x86.Build.0 = Release|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/Migracja/Migracja.v11.suo b/Migracja/Migracja.v11.suo