Merge lp:~fredoust/sudoku-app/fix-bug-1196468 into lp:sudoku-app

[Frédéric Delgado]

[Dinko Osmankovic (dinko-metalac)]

review: Approve

=== modified file 'components/SudokuBlocksGrid.qml'
--- components/SudokuBlocksGrid.qml	2013-07-03 05:51:44 +0000
+++ components/SudokuBlocksGrid.qml	2013-07-03 17:17:28 +0000
@@ -145,7 +145,7 @@
         print("Theme updated " + String(newColorScheme));
     }
 
-    function createNewGame(difficulty) {        
+    function createNewGame(difficulty) {
         for (var i = 0; i < 9; i++) {
             for (var j = 0; j < 9; j++) {
                 /*if (i % 3 == 0 && i != 0 && !alreadyCreated)
@@ -307,6 +307,7 @@
                                 grid.setValue(column,row, 0);
                                 buttonsGrid.itemAt(currentX).buttonColor = defaultColor;
                                 buttonsGrid.itemAt(currentX).boldText = false;
+                                buttonsGrid.redrawGrid()
                                 PopupUtils.close(dialogue)
                             }
                         }
@@ -338,6 +339,7 @@
 
                                         //print (row, column)
                                         grid.setValue(column, row, index+1);
+                                        /*
                                         //print(grid)
                                         var testField = grid.cellConflicts(column,row)
                                         //print (testField)
@@ -347,6 +349,8 @@
                                             buttonsGrid.itemAt(currentX).buttonColor = defaultColor;
                                             buttonsGrid.itemAt(currentX).boldText = false;
                                         }
+                                        */
+                                        buttonsGrid.redrawGrid()
 
                                         PopupUtils.close(dialogue)
 
@@ -365,7 +369,8 @@
                             size: units.gu(5)
                             anchors.left: parent.left;
                             onTriggered: {
-                                  PopupUtils.close(dialogue)
+                                 buttonsGrid.redrawGrid()
+                                PopupUtils.close(dialogue)
                             }
                         }
 

=== modified file 'components/SudokuButtonsGrid.qml'
--- components/SudokuButtonsGrid.qml	2013-07-01 11:02:52 +0000
+++ components/SudokuButtonsGrid.qml	2013-07-03 17:17:28 +0000
@@ -10,6 +10,33 @@
     model: 81
     objectName: "buttonsGrid";
 
+    function redrawGrid()
+    {
+        console.log("on redraw grid")
+        for(var i=0; i < model; i++)
+        {
+            var row = Math.floor(i/9);
+            var column = i%9;
+
+
+            if(buttonsGrid.itemAt(i).enabled)
+            {
+                var testField = grid.cellConflicts(column,row)
+                //print (testField)
+
+                if (testField == true)
+                {
+                    console.log("index "+i+" row/col "+row+"/"+column)
+                    buttonsGrid.itemAt(i).buttonColor = defaultNotAllowedColor;
+                }
+                else {
+                    buttonsGrid.itemAt(i).buttonColor = defaultColor;
+                    buttonsGrid.itemAt(currentX).boldText = false;
+                }
+            }
+        }
+    }
+
     SudokuButton {
         id: gridButton;
         buttonText: "0";

=== modified file 'js/SudokuCU.js'
--- js/SudokuCU.js	2013-07-01 11:02:52 +0000
+++ js/SudokuCU.js	2013-07-03 17:17:28 +0000
@@ -159,21 +159,26 @@
         if(value == 0)
             return false;
 
+         console.log("test for "+value)
         for(var i = 0; i < 9; i++)
         {
+            console.log("test with col"+this.rows[i][column])
             if(i != row && this.rows[i][column] == value)
             {
+                console.log("find row")
                 return true;
             }
 
+           // console.log("test with row"+this.rows[row][i])
             if(i != column && this.rows[row][i] == value)
             {
+                console.log("find col")
                 return true;
             }
         }
-
+        console.log("ok cellconflicts")
         //At this point, everything else is checked as valid except the 3x3 grid
-        return !this._miniGridValid(column, row);
+        return !this._miniGridValidFor(column, row, value);
     },
 
     /**
@@ -204,9 +209,54 @@
                 if(value == 0)
                     continue;
 
-                //if(App.Utils.arrayContains(numbers, value))
-                //    return false;
-                if (numbers.indexOf(value) != -1)
+                console.log("test minigrid "+value)
+
+                //if(App.Utils.arrayContains(numbers, value))
+                //    return false;
+                if (numbers.indexOf(value) != -1 )
+                    return false;
+
+                numbers.push(value);
+            }
+        }
+
+        return true;
+    },
+
+    /**
+     * Checks if the inner 3x3 grid a cell resides in is valid for a specific value
+     * @method
+     * @private
+     * @param {Number} column
+     * @param {Number} row
+     * @param {Number} value to test
+     * @return {Boolean}
+     */
+    _miniGridValidFor: function(column, row, val) {
+        //Determine 3x3 grid position
+        var mgX = Math.floor(column / 3);
+        var mgY = Math.floor(row / 3);
+
+        var startCol = mgX * 3;
+        var startRow = mgY * 3;
+
+        var endCol = (mgX + 1) * 3;
+        var endRow = (mgY + 1) * 3;
+
+        var numbers = [];
+        for(var r = startRow; r < endRow; r++)
+        {
+            for(var c = startCol; c < endCol; c++)
+            {
+                var value = this.rows[r][c];
+                if(value == 0)
+                    continue;
+
+                console.log("test minigrid "+value)
+
+                //if(App.Utils.arrayContains(numbers, value))
+                //    return false;
+                if (numbers.indexOf(value) != -1 && value == val)
                     return false;
 
                 numbers.push(value);