[Qcell-commitlogs] SF.net SVN: qcell: [222] trunk/qcell

[<le...@us...>]

Revision: 222
          http://svn.sourceforge.net/qcell/?rev=222&view=rev
Author:   lessm
Date:     2007-01-21 10:35:01 -0800 (Sun, 21 Jan 2007)

Log Message:
-----------
- some changes in ElementalRulesWidget and work now

Modified Paths:
--------------
    trunk/qcell/basesources/Calculator.cpp
    trunk/qcell/basesources/simulationwindow.cpp
    trunk/qcell/visgui/ElementalRulesWidget.cpp
    trunk/qcell/visgui/ElementalRulesWidget.h

Modified: trunk/qcell/basesources/Calculator.cpp
===================================================================
--- trunk/qcell/basesources/Calculator.cpp	2007-01-21 18:17:50 UTC (rev 221)
+++ trunk/qcell/basesources/Calculator.cpp	2007-01-21 18:35:01 UTC (rev 222)
@@ -256,7 +256,6 @@
 					case baseDataTypes::BOOL:
 					case baseDataTypes::CHAR:
 					case baseDataTypes::SHORT:
-					    /// @todo BUUUUMMM babol
 					case baseDataTypes::INT:
 						*((int *)temp) = localfunction->resolve(neighbourhood->valuesToVector_i());
 						break;

Modified: trunk/qcell/basesources/simulationwindow.cpp
===================================================================
--- trunk/qcell/basesources/simulationwindow.cpp	2007-01-21 18:17:50 UTC (rev 221)
+++ trunk/qcell/basesources/simulationwindow.cpp	2007-01-21 18:35:01 UTC (rev 222)
@@ -250,6 +250,7 @@
 	SYMBOL symbol;
 	QTableWidgetItem *item;
 	QProgressDialog progresDialog;
+	table2D->blockSignals(1);
 	if(forceUpdate)
 	{
 		progresDialog.setLabelText("Generating view pleas wait...");
@@ -356,6 +357,7 @@
 				progresDialog.setValue(y);
 		}
 	}
+	table2D->blockSignals(0);
 }
 
 void simulationWindow::update2DGraph(void)
@@ -379,6 +381,7 @@
 	QString tmpString;
 	SYMBOL symbol;
 	QTableWidgetItem *item;
+	table1D->blockSignals(1);
 	if(table1D->columnCount()!= renderer->getStorage()->getSizeX())
 	{
 
@@ -466,11 +469,13 @@
 			}
 		}
 	}
+	table1D->blockSignals(0);
 }
 
 void simulationWindow::update1DTableMem(void)
 {
 	QTableWidgetItem *item, *memItem;
+	table1DMem->blockSignals(1);
 	table1DMem->setRowCount(table1DMem->rowCount()+1);
 	for(int x=0;x<renderer->getStorage()->getSizeX();++x)
 	{
@@ -480,6 +485,7 @@
 	}
 	if(table1DMem->rowCount()>30)
 		table1DMem->removeRow(0);
+	table1DMem->blockSignals(0);
 }
 
 void simulationWindow::updateSymbolTable(void)

Modified: trunk/qcell/visgui/ElementalRulesWidget.cpp
===================================================================
--- trunk/qcell/visgui/ElementalRulesWidget.cpp	2007-01-21 18:17:50 UTC (rev 221)
+++ trunk/qcell/visgui/ElementalRulesWidget.cpp	2007-01-21 18:35:01 UTC (rev 222)
@@ -10,10 +10,10 @@
 ElementalRulesWidget::ElementalRulesWidget()
 {
     setupUi(this);
-    treeWidget->setColumnCount(2);
+    rulesTree->setColumnCount(2);
     QStringList labels;
     labels << tr("Rule") << tr("Occur");
-    treeWidget->setHeaderLabels(labels);
+    rulesTree->setHeaderLabels(labels);
 }
 
 void ElementalRulesWidget::addRule(int id, QVector<int> coordinates)
@@ -28,16 +28,12 @@
     // Add top-level id
     QTreeWidgetItem* item = new QTreeWidgetItem(QStringList(QString::number(id)));
     item->addChild(new QTreeWidgetItem(values));
-    treeWidget->addTopLevelItem(item);
+    rulesTree->addTopLevelItem(item);
 }
 
 void ElementalRulesWidget::addOccurance(int id, QVector<int> coordinates)
 {
-    QTreeWidgetItem* item = treeWidget->findItems(
-	    QString::number(id),
-	    Qt::MatchExactly)
-	.first();
-
+    QTreeWidgetItem* item = rulesTree->findItems( QString::number(id), Qt::MatchExactly).first();
     QStringList values("-");
     values << parseCoordinates(coordinates);
     item->addChild(new QTreeWidgetItem(values));

Modified: trunk/qcell/visgui/ElementalRulesWidget.h
===================================================================
--- trunk/qcell/visgui/ElementalRulesWidget.h	2007-01-21 18:17:50 UTC (rev 221)
+++ trunk/qcell/visgui/ElementalRulesWidget.h	2007-01-21 18:35:01 UTC (rev 222)
@@ -9,9 +9,10 @@
 #ifndef __ELEMENTALRULESWIDGET_H__
 #define __ELEMENTALRULESWIDGET_H__
 
-#include "ui_ElementalRules.h"
 #include <QDockWidget>
 #include <QStringList>
+#include <QTreeWidgetItem>
+#include "ui_ElementalRulesWidget.h"
 
 class ElementalRulesWidget: public QWidget, public Ui::ElementalRulesForm
 {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.