Corrected a serious mistake in filtering dialogs

app/Widgets/FilterChoice.cpp

@@ -119,7 +119,7 @@ void FilterChoice::initUI()
         QTableWidgetItem* item = new QTableWidgetItem("1");
         item->setTextAlignment(Qt::AlignHCenter);
         item->setFlags(Qt::ItemIsSelectable|Qt::ItemIsEnabled);
-        _filterView->setItem(i, j, item);
+        _filterView->setItem(j, i, item);
       }
     }
 
@@ -202,13 +202,13 @@ QStringList FilterChoice::initFilters() {
 //              (*f)[w][h] = QString::fromStdString(word).toInt();
                 f->setPixelAt(w, h, QString::fromStdString(word).toDouble());
 
-              if(h == f->getHeight() - 1)
+              if(w == f->getWidth() - 1)
               {
-                h = 0;
-                w++;
+                w = 0;
+                h++;
               }
               else
-                h++;
+                w++;
             }
           }
           temp.push_back(f);
@@ -368,35 +368,35 @@ void FilterChoice::updateDisplay()
   }
   _filterView->setRowCount(height);
   _filterView->setColumnCount(width);
-  for(unsigned int i = 0; i < height; i++)
+  for(unsigned int j = 0; j < height; j++)
   {
-    for(unsigned int j = 0; j < width; j++)
+    for(unsigned int i = 0; i < width; i++)
     {
       QTableWidgetItem* item = new QTableWidgetItem("");
       item->setFlags(Qt::ItemIsSelectable|Qt::ItemIsEnabled);
-      _filterView->setItem(i, j, item);
+        _filterView->setItem(j, i, item);
     }
   }
   
   height = 0;
   for(unsigned int i = 0; i < filters.size(); i++)
   {
-    for(unsigned int j = height; j < filters[i]->getWidth() + height; j++)
+    for(unsigned int j = 0; j < filters[i]->getHeight(); j++)
     {
-      for(unsigned int k = 0; k < filters[i]->getHeight(); k++)
+      for(unsigned int k = 0; k < filters[i]->getWidth(); k++)
       {
 //        int value = (*filters[i])[j - height][k];
-        double value = filters[i]->getPixelAt(j - height, k);
+        double value = filters[i]->getPixelAt(k, j);
         QTableWidgetItem* item = new QTableWidgetItem(QString::number(value));
         item->setTextAlignment(Qt::AlignHCenter);
         item->setFlags(Qt::ItemIsSelectable|Qt::ItemIsEnabled);
-        _filterView->setItem(j, k, item);
+        _filterView->setItem(height + j, k, item);
         _filterView->setColumnWidth(k, _filterView->rowHeight(0));
       }
     }
     
-    height += filters[i]->getWidth();
-    for(unsigned int k = 0; k < filters[i]->getHeight(); k++)
+    height += filters[i]->getHeight();
+    for(unsigned int k = 0; k < filters[i]->getWidth(); k++)
     {
       QTableWidgetItem* item = new QTableWidgetItem("");
       item->setFlags(Qt::ItemIsSelectable|Qt::ItemIsEnabled);

app/Widgets/FilterEditor.cpp

@@ -197,9 +197,9 @@ void FilterEditor::saveXML(vector<Filter*> filtersToSave)
     valuesNode.setAttribute("height", QString::number(height));
 
     QString s = "";
-    for(int w = 0; w < width; w++)
+    for(int h = 0; h < height; h++)
     {
-      for(int h = 0; h < height; h++)
+      for(int w = 0; w < width; w++)
       {
         s += QString::number(filterToSave->getPixelAt(w, h));
         if(w != width - 1 || h != height - 1)

app/Widgets/FilterEditorItem.cpp

@@ -123,9 +123,11 @@ imagein::algorithm::Filter* FilterEditorItem::validFilter()
     for(int h = 0; h < _height; h++)
     {
       double i;
-      QTableWidgetItem* item = _filter->item(w, h);
-      if(!item)
+      QTableWidgetItem* item = _filter->item(h, w);
+      if(!item) {
+          cout << "item " << w << ":" << h << " not set !" << endl;
         ok = false;
+      }
       else
         i = item->text().toDouble(&ok);