gbrainy r342 - trunk/src

[jmas svn gnome org]

Author: jmas
Date: Fri May 16 17:48:20 2008
New Revision: 342
URL: http://svn.gnome.org/viewvc/gbrainy?rev=342&view=rev

Log:
2008-05-16 Jordi Mas <jmas softcatala org>

	* MemoryCountDots.cs: Better question
	* PuzzleCountSeries.cs: Better questions
	* PuzzleFigures.cs: Better question
	* PuzzlePencil.cs: Better question
	* PuzzleClocks.cs: Better question
	* PuzzleMostInCommon.cs: Better question
	* MemoryIndications.cs: Better question
	* PuzzleSquareDots.cs: Better question
	* PuzzleCountCircles.cs: Language fixes
	* PuzzleTetris.cs: Better question
	* PuzzleSquareSheets.cs: Better question
	* PuzzleFigurePattern.cs: True rectangle figure fix
	* PuzzleLines.cs: Better question
	* MemoryColouredFigures.cs: Better question
	* PuzzleBuildTriangle.cs: Better question
	* PuzzleEquation.cs: Better question
	* PuzzleMissingSlice.cs: Better question
	* PuzzleOstracism.cs: Better question
	* PuzzleExtraCircle.cs: Language fixes
	* PuzzleQuadrilaterals.cs: Fixes to equal length figure
	* PuzzleMissingPiece.cs: Better question
	* PuzzleNextFigure.cs: Better question
	* MemoryFigures.cs: Better question
	* PuzzleBalance.cs: New tip
	* CalculationFractions.cs: Better question



Modified:
   trunk/src/CalculationFractions.cs
   trunk/src/ChangeLog
   trunk/src/MemoryColouredFigures.cs
   trunk/src/MemoryCountDots.cs
   trunk/src/MemoryFigures.cs
   trunk/src/MemoryIndications.cs
   trunk/src/PuzzleBalance.cs
   trunk/src/PuzzleBuildTriangle.cs
   trunk/src/PuzzleClocks.cs
   trunk/src/PuzzleCountCircles.cs
   trunk/src/PuzzleCountSeries.cs
   trunk/src/PuzzleEquation.cs
   trunk/src/PuzzleExtraCircle.cs
   trunk/src/PuzzleFigurePattern.cs
   trunk/src/PuzzleFigures.cs
   trunk/src/PuzzleLines.cs
   trunk/src/PuzzleMissingPiece.cs
   trunk/src/PuzzleMissingSlice.cs
   trunk/src/PuzzleMostInCommon.cs
   trunk/src/PuzzleNextFigure.cs
   trunk/src/PuzzleOstracism.cs
   trunk/src/PuzzlePencil.cs
   trunk/src/PuzzleQuadrilaterals.cs
   trunk/src/PuzzleSquareDots.cs
   trunk/src/PuzzleSquareSheets.cs
   trunk/src/PuzzleTetris.cs

Modified: trunk/src/CalculationFractions.cs
==============================================================================
--- trunk/src/CalculationFractions.cs	(original)
+++ trunk/src/CalculationFractions.cs	Fri May 16 17:48:20 2008
@@ -63,7 +63,7 @@
 	}
 
 	public override string Question {
-		get {return String.Format (Catalog.GetString ("What is the result of the given operation? (you can answer using a fraction or a number)"));} 
+		get {return String.Format (Catalog.GetString ("What is the result of the given operation? You can answer using either a fraction or a number."));} 
 	}
 
 	private int Factor {

Modified: trunk/src/MemoryColouredFigures.cs
==============================================================================
--- trunk/src/MemoryColouredFigures.cs	(original)
+++ trunk/src/MemoryColouredFigures.cs	Fri May 16 17:48:20 2008
@@ -50,7 +50,7 @@
 	}
 
 	public override string MemoryQuestion {
-		get { return Catalog.GetString ("Which of these figures was previously shown (A, B, C or D)?");}
+		get { return Catalog.GetString ("Which of these figures was previously shown? Answer A, B, C or D.");}
 	}
 
 	public override void Initialize ()

Modified: trunk/src/MemoryCountDots.cs
==============================================================================
--- trunk/src/MemoryCountDots.cs	(original)
+++ trunk/src/MemoryCountDots.cs	Fri May 16 17:48:20 2008
@@ -41,7 +41,7 @@
 	}
 
 	public override string MemoryQuestion {
-		get { return String.Format(Catalog.GetString ("How many {0} dots were in the previous image (answer using numbers)?"),
+		get { return String.Format(Catalog.GetString ("How many {0} dots were in the previous image? Answer using numbers."),
 						palette.Name(0)); }
 	}
 

Modified: trunk/src/MemoryFigures.cs
==============================================================================
--- trunk/src/MemoryFigures.cs	(original)
+++ trunk/src/MemoryFigures.cs	Fri May 16 17:48:20 2008
@@ -54,7 +54,7 @@
 
 	public override string MemoryQuestion {
 		get { 
-			return Catalog.GetString ("In which cell is the other figure like the one shown below (answer the cell number)?" );}
+			return Catalog.GetString ("In which cell is the other figure like the one shown below? Answer the cell number." );}
 	}
 
 	public override void Initialize ()

Modified: trunk/src/MemoryIndications.cs
==============================================================================
--- trunk/src/MemoryIndications.cs	(original)
+++ trunk/src/MemoryIndications.cs	Fri May 16 17:48:20 2008
@@ -157,7 +157,7 @@
 
 	public override string MemoryQuestion {
 		get { 
-			return String.Format (Catalog.GetString ("Which of the following graphics represent the indications previously given (A, B, C or D)?"));}
+			return String.Format (Catalog.GetString ("Which of the following graphics represent the indications previously given? Answer A, B, C or D."));}
 	}
 
 	public override void Initialize ()

Modified: trunk/src/PuzzleBalance.cs
==============================================================================
--- trunk/src/PuzzleBalance.cs	(original)
+++ trunk/src/PuzzleBalance.cs	Fri May 16 17:48:20 2008
@@ -59,6 +59,10 @@
 		}
 	}
 
+	public override string Tip {
+		get { return Catalog.GetString ("Every diamond counts as two triangles.");}
+	}
+
 	public override void Initialize ()
 	{
 		int ans = 0;

Modified: trunk/src/PuzzleBuildTriangle.cs
==============================================================================
--- trunk/src/PuzzleBuildTriangle.cs	(original)
+++ trunk/src/PuzzleBuildTriangle.cs	Fri May 16 17:48:20 2008
@@ -49,7 +49,7 @@
 	}
 
 	public override string Question {
-		get {return Catalog.GetString ("Which three pieces can you use together to build a triangle (e.g.: ABE)?");} 
+		get {return Catalog.GetString ("Which three pieces can you use together to build a triangle? Answer using the three figure names, e.g.: ABE.");} 
 	}
 
 	public override string Tip {

Modified: trunk/src/PuzzleClocks.cs
==============================================================================
--- trunk/src/PuzzleClocks.cs	(original)
+++ trunk/src/PuzzleClocks.cs	Fri May 16 17:48:20 2008
@@ -35,7 +35,7 @@
 	}
 
 	public override string Question {
-		get {return Catalog.GetString ("To what number should the large handle of the last clock point (A, B, C or D)?");} 
+		get {return Catalog.GetString ("To what number should the large handle of the last clock point? Answer A, B, C or D.");} 
 	}
 
 	public override string Answer {

Modified: trunk/src/PuzzleCountCircles.cs
==============================================================================
--- trunk/src/PuzzleCountCircles.cs	(original)
+++ trunk/src/PuzzleCountCircles.cs	Fri May 16 17:48:20 2008
@@ -46,11 +46,11 @@
 	}
 
 	public override string Question {
-		get {return Catalog.GetString ("How many circles can you count?");} 
+		get {return Catalog.GetString ("How many circles do you count?");} 
 	}
 
 	public override string Tip {
-		get { return Catalog.GetString ("It is an easy exercise if you use a systematic way of counting the circles.");}
+		get { return Catalog.GetString ("It is an easy exercise if you systematically count the circles.");}
 	}
 
 	public override void Initialize ()

Modified: trunk/src/PuzzleCountSeries.cs
==============================================================================
--- trunk/src/PuzzleCountSeries.cs	(original)
+++ trunk/src/PuzzleCountSeries.cs	Fri May 16 17:48:20 2008
@@ -55,17 +55,17 @@
 		switch ((GameType) random.Next ((int) GameType.Length))
 		{
 			case GameType.HowManyNines:
-				question = Catalog.GetString ("How many numbers 9 are needed to represent the numbers between 10 to 100?");
+				question = Catalog.GetString ("How many numbers \"9\" are required to represent the numbers between 10 to 100?");
 				right_answer = "19";
 				break;
 
 			case GameType.HowManyBiggerDigits:
-				question = Catalog.GetString ("How many numbers of two digits have the first digit bigger than the second (e.g.: 20 and 21)?");
+				question = Catalog.GetString ("How many two digit numbers occur where the first digit is larger than the second (e.g.: 20 and 21)?");
 				right_answer = "45";
 				break;
 
 			case GameType.HowManySmallerDigits:
-				question = Catalog.GetString ("How many numbers of two digits have the first digit smaller than the second (e.g.: 12 and 13)?");
+				question = Catalog.GetString ("How many two digit numbers occur where the first digit is smaller than the second (e.g.: 12 and 13)?");
 				right_answer = "36";
 				break;
 		}

Modified: trunk/src/PuzzleEquation.cs
==============================================================================
--- trunk/src/PuzzleEquation.cs	(original)
+++ trunk/src/PuzzleEquation.cs	Fri May 16 17:48:20 2008
@@ -37,7 +37,7 @@
 	public override string Answer {
 		get { 
 			string answer = base.Answer + " ";
-			answer += Catalog.GetString ("The order of arithmetical operations is always: exponents and roots, multiplication and division, addition and subtraction");
+			answer += Catalog.GetString ("The order of arithmetical operations is always as follows: exponents and roots, multiplication and division, addition and subtraction.");
 			return answer;
 		}
 	}

Modified: trunk/src/PuzzleExtraCircle.cs
==============================================================================
--- trunk/src/PuzzleExtraCircle.cs	(original)
+++ trunk/src/PuzzleExtraCircle.cs	Fri May 16 17:48:20 2008
@@ -39,17 +39,17 @@
 	}
 
 	public override string Question {
-		get {return Catalog.GetString ("Which is the circle that does not belong to the group (A, B, C or D)?. It is not a sequence of elements.");} 
+		get {return Catalog.GetString ("Which circle does not belong to the group? It is not a sequence of elements. Answer A, B, C or D.");} 
 	}
 
 	public override string Tip {
-		get { return Catalog.GetString ("All the circles share a common property except for one.");}
+		get { return Catalog.GetString ("All circles share a common property except for one.");}
 	}
 
 	public override string Answer {
 		get { 
 			string answer = base.Answer + " ";
-			answer += String.Format (Catalog.GetString ("In all the circles the color slices follow the same order except for this one."));
+			answer += String.Format (Catalog.GetString ("In all circles the color slices follow the same order except for this one."));
 			return answer;
 		}
 	}

Modified: trunk/src/PuzzleFigurePattern.cs
==============================================================================
--- trunk/src/PuzzleFigurePattern.cs	(original)
+++ trunk/src/PuzzleFigurePattern.cs	Fri May 16 17:48:20 2008
@@ -38,7 +38,7 @@
 	}
 
 	public override string Question {
-		get {return Catalog.GetString ("What figure should replace the question mark (A, B or C)?");} 
+		get {return Catalog.GetString ("What figure should replace the question mark? Answer A, B or C");} 
 	}
 
 	public override string Tip {
@@ -99,6 +99,7 @@
 		double org_x = DrawAreaX + 0.1;
 		double x = org_x, y = 0.08;
 		double figure_size = 0.13, space_x = 0.1, space_y = 0.2;
+		double x45, y45, x135, y135, offset;
 
 		gr.Scale (area_width, area_height);
 		DrawBackground (gr);
@@ -140,8 +141,25 @@
 		x += figure_size + space_x;
 		DrawRotatedCross (gr, x, y, figure_size);
 
+		// Rotated rectangle
 		x += figure_size + space_x;
-		gr.DrawDiamond (x, y, figure_size);
+		x45 = figure_size * Math.Cos (45 * Math.PI / 180);
+		y45 = figure_size * Math.Sin (45 * Math.PI / 180);
+		x135 = figure_size * Math.Cos (135 * Math.PI / 180);
+		y135 = figure_size * Math.Sin (135 * Math.PI / 180);
+		offset = - 0.03;
+		// Down-right
+		gr.MoveTo (x + figure_size / 2, y + offset);
+		gr.LineTo (x + figure_size / 2 + x45, y + offset + y45);
+		// Up right
+		gr.LineTo ((x + figure_size / 2 + x45) + x135, (y + offset +  y45) + y135);
+		gr.Stroke ();
+		// Down left
+		gr.MoveTo (x + figure_size / 2, y + offset);
+		gr.LineTo (x + figure_size / 2 + x135, y + offset + y135);
+		// Up left
+		gr.LineTo (x + figure_size / 2 + x135 + x45, y + offset + y135 + y45);
+		gr.Stroke ();
 
 		y += space_y;
 		x = org_x;

Modified: trunk/src/PuzzleFigures.cs
==============================================================================
--- trunk/src/PuzzleFigures.cs	(original)
+++ trunk/src/PuzzleFigures.cs	Fri May 16 17:48:20 2008
@@ -39,7 +39,7 @@
 	}
 
 	public override string Question {
-		get {return Catalog.GetString ("What is the next logical sequence of objects?");} 
+		get {return Catalog.GetString ("What is the next logical sequence of objects in the last column? See below the convention when giving the answer.");} 
 	}
 
 

Modified: trunk/src/PuzzleLines.cs
==============================================================================
--- trunk/src/PuzzleLines.cs	(original)
+++ trunk/src/PuzzleLines.cs	Fri May 16 17:48:20 2008
@@ -32,7 +32,7 @@
 	}
 
 	public override string Question {
-		get {return Catalog.GetString ("How many lines do you count of in the figures below? (consider a line a segment between two points with no crossing lines)");} 
+		get {return Catalog.GetString ("How many lines do you count of in the figures below? Consider a line a segment between two points with no crossing lines.");} 
 	}
 
 	public override string Answer {
@@ -44,7 +44,7 @@
 	}
 
 	public override string Tip {
-		get { return Catalog.GetString ("It is an easy exercise if you use a systematic way of counting the lines.");}
+		get { return Catalog.GetString ("It is an easy exercise if you systematically count the lines.");}
 	}
 
 	public override void Initialize ()

Modified: trunk/src/PuzzleMissingPiece.cs
==============================================================================
--- trunk/src/PuzzleMissingPiece.cs	(original)
+++ trunk/src/PuzzleMissingPiece.cs	Fri May 16 17:48:20 2008
@@ -33,7 +33,7 @@
 	}
 
 	public override string Question {
-		get {return Catalog.GetString ("Which square completes the figure below (A, B or C)?");} 
+		get {return Catalog.GetString ("Which square completes the figure below? Answer A, B or C.");} 
 	}
 
 	public override string Tip {

Modified: trunk/src/PuzzleMissingSlice.cs
==============================================================================
--- trunk/src/PuzzleMissingSlice.cs	(original)
+++ trunk/src/PuzzleMissingSlice.cs	Fri May 16 17:48:20 2008
@@ -59,7 +59,7 @@
 	}
 
 	public override string Question {
-		get {return Catalog.GetString ("Some slices have a common property. Which is the missing slice in the circle below (A, B, C)?");} 
+		get {return Catalog.GetString ("Some slices have a common property. Which is the missing slice in the circle below? Answer A, B or C.");} 
 	}
 
 	public override string Tip {

Modified: trunk/src/PuzzleMostInCommon.cs
==============================================================================
--- trunk/src/PuzzleMostInCommon.cs	(original)
+++ trunk/src/PuzzleMostInCommon.cs	Fri May 16 17:48:20 2008
@@ -72,7 +72,7 @@
 	}
 
 	public override string Question {
-		get {return Catalog.GetString ("Which of the possible answers have the most in common with the four given figures  (A, B, C or D)?");} 
+		get {return Catalog.GetString ("Which of the possible answers have the most in common with the four given figures? Answer A, B, C or D.");} 
 	}
 
 	public override string Tip {

Modified: trunk/src/PuzzleNextFigure.cs
==============================================================================
--- trunk/src/PuzzleNextFigure.cs	(original)
+++ trunk/src/PuzzleNextFigure.cs	Fri May 16 17:48:20 2008
@@ -48,7 +48,7 @@
 	}
 
 	public override string Question {
-		get {return Catalog.GetString ("Which is the next logical figure in the sequence (A, B, or C)?");} 
+		get {return Catalog.GetString ("Which is the next logical figure in the sequence? Answer A, B or C.");} 
 	}
 
 

Modified: trunk/src/PuzzleOstracism.cs
==============================================================================
--- trunk/src/PuzzleOstracism.cs	(original)
+++ trunk/src/PuzzleOstracism.cs	Fri May 16 17:48:20 2008
@@ -39,7 +39,7 @@
 	}
 
 	public override string Question {
-		get {return Catalog.GetString ("Which equation does not belong to the group (A, B, C, D or E)?");} 
+		get {return Catalog.GetString ("Which equation does not belong to the group? Answer A, B, C, D or E.");} 
 	}
 
 

Modified: trunk/src/PuzzlePencil.cs
==============================================================================
--- trunk/src/PuzzlePencil.cs	(original)
+++ trunk/src/PuzzlePencil.cs	Fri May 16 17:48:20 2008
@@ -34,7 +34,7 @@
 	}
 
 	public override string Question {
-		get {return Catalog.GetString ("Which of the following figures cannot be drawn without crossing any previous lines nor lifting the pencil (A, B, C, D or E)?");} 
+		get {return Catalog.GetString ("Which of the following figures cannot be drawn without crossing any previous lines nor lifting the pencil? Answer A, B, C, D or E.");} 
 	}
 
 	public override void Initialize ()

Modified: trunk/src/PuzzleQuadrilaterals.cs
==============================================================================
--- trunk/src/PuzzleQuadrilaterals.cs	(original)
+++ trunk/src/PuzzleQuadrilaterals.cs	Fri May 16 17:48:20 2008
@@ -42,7 +42,7 @@
 	}
 
 	public override string Question {
-		get {return Catalog.GetString ("Which of the following figures does not belong to the group (A, B, C, D, E or F)?");} 
+		get {return Catalog.GetString ("Which of the following figures does not belong to the group? Answer A, B, C, D, E or F.");} 
 	}
 
 	public override string Answer {
@@ -71,11 +71,19 @@
 	{
 		switch (figure) {
 		case Figures.FigureA:
+			double x105, y105;
+
+			x105 = figure_size * Math.Cos (105 * Math.PI / 180);
+			y105 = figure_size * Math.Sin (105 * Math.PI / 180);
+			gr.MoveTo (x, y);
+			gr.LineTo (x + x105, y + y105);
+			gr.LineTo (x + x105 + figure_size, y + y105);
+			gr.Stroke ();
+			gr.MoveTo (x + figure_size, y);
+			gr.LineTo (x + figure_size + x105, y + y105);
+			gr.Stroke ();
 			gr.MoveTo (x, y);
 			gr.LineTo (x + figure_size, y);
-			gr.LineTo (x + figure_size * 0.6, y + figure_size + 0.02);
-			gr.LineTo (x - figure_size * 0.4, y + figure_size + 0.02);
-			gr.LineTo (x, y);
 			break;
 
 		case Figures.FigureB:
@@ -103,7 +111,7 @@
 			gr.LineTo (x + figure_size - 0.04, y);
 			gr.LineTo (x + figure_size - 0.04, y + figure_size);
 			gr.LineTo (x , y + figure_size);
-			gr.LineTo (x + 0.03, y);
+			gr.LineTo (x + 0.03, y);;
 			break;
 
 		case Figures.FigureF:

Modified: trunk/src/PuzzleSquareDots.cs
==============================================================================
--- trunk/src/PuzzleSquareDots.cs	(original)
+++ trunk/src/PuzzleSquareDots.cs	Fri May 16 17:48:20 2008
@@ -88,7 +88,7 @@
 	}
 
 	public override string Question {
-		get {return Catalog.GetString ("What is the letter of the figure that represents the next logical figure in the sequence (A, B or C)?");} 
+		get {return Catalog.GetString ("What is the letter of the figure that represents the next logical figure in the sequence? Answer A, B or C.");} 
 	}
 
 	public override void Initialize ()

Modified: trunk/src/PuzzleSquareSheets.cs
==============================================================================
--- trunk/src/PuzzleSquareSheets.cs	(original)
+++ trunk/src/PuzzleSquareSheets.cs	Fri May 16 17:48:20 2008
@@ -29,7 +29,7 @@
 	}
 
 	public override string Question {
-		get {return Catalog.GetString ("What is the minimum number of square sheets of paper of any size required to create the figure? (lines indicate frontiers between different sheets)");} 
+		get {return Catalog.GetString ("What is the minimum number of square sheets of paper of any size required to create the figure? Lines indicate frontiers between different sheets.");} 
 	}
 
 	public override string Tip {

Modified: trunk/src/PuzzleTetris.cs
==============================================================================
--- trunk/src/PuzzleTetris.cs	(original)
+++ trunk/src/PuzzleTetris.cs	Fri May 16 17:48:20 2008
@@ -32,7 +32,7 @@
 	}
 
 	public override string Question {
-		get {return Catalog.GetString ("What figure completes the sequence below (A, B or C)?");} 
+		get {return Catalog.GetString ("What figure completes the sequence below? Answer A, B or C.");} 
 	}
 
 	public override string Answer {