Menu
▾
▴
[Qcell-commitlogs] SF.net SVN: qcell: [223] trunk/qcell
|
From: <dhu...@us...> - 2007-01-21 19:24:06
|
Revision: 223
http://svn.sourceforge.net/qcell/?rev=223&view=rev
Author: dhubleizh
Date: 2007-01-21 11:24:03 -0800 (Sun, 21 Jan 2007)
Log Message:
-----------
- more elaborate ElementalRules display
Modified Paths:
--------------
trunk/qcell/baseheaders/ElementalRules.h
trunk/qcell/basesources/Calculator.cpp
trunk/qcell/basesources/ElementalRules.cpp
trunk/qcell/visgui/ElementalRulesWidget.cpp
trunk/qcell/visgui/ElementalRulesWidget.h
trunk/qcell/visgui/MainWindow.cpp
Modified: trunk/qcell/baseheaders/ElementalRules.h
===================================================================
--- trunk/qcell/baseheaders/ElementalRules.h 2007-01-21 18:35:01 UTC (rev 222)
+++ trunk/qcell/baseheaders/ElementalRules.h 2007-01-21 19:24:03 UTC (rev 223)
@@ -18,10 +18,10 @@
{
Q_OBJECT
signals:
- void newRule(int id, QVector<int> coordinates);
+ void newRule(int id, QVector<int> neighbours, int result, QVector<int> coordinates);
void newOccurance(int id, QVector<int> coordinates);
public slots:
- void possibleRule(QVector<int> coordinates, QVector<int> neighbours, int result);
+ void possibleRule(QVector<int> coordinates, QVector<int> neighbours, int return_value);
protected:
int neighbours_count;
int index;
@@ -42,8 +42,6 @@
void setNeighoursCount(const int neighbours);
inline int getNeighbourCount();
- void addRule(QVector<int> coodrinates, QVector<int> neighbours, int return_value);
-
};
Modified: trunk/qcell/basesources/Calculator.cpp
===================================================================
--- trunk/qcell/basesources/Calculator.cpp 2007-01-21 18:35:01 UTC (rev 222)
+++ trunk/qcell/basesources/Calculator.cpp 2007-01-21 19:24:03 UTC (rev 223)
@@ -267,7 +267,7 @@
break;
}
- emit calculated(coordinates, neighbourhood->valuesToVector_i(), (int)temp);
+ emit calculated(coordinates, neighbourhood->valuesToVector_i(), (int)*temp);
memcpy(data + counter, temp, dataSize);
counter += dataSize;
}
Modified: trunk/qcell/basesources/ElementalRules.cpp
===================================================================
--- trunk/qcell/basesources/ElementalRules.cpp 2007-01-21 18:35:01 UTC (rev 222)
+++ trunk/qcell/basesources/ElementalRules.cpp 2007-01-21 19:24:03 UTC (rev 223)
@@ -13,7 +13,7 @@
index = 0;
}
-void ElementalRules::addRule(QVector<int> coordinates, QVector<int> neighbours, int return_value)
+void ElementalRules::possibleRule(QVector<int> coordinates, QVector<int> neighbours, int return_value)
{
// where do things reside
int value_index, neighbour_index, rule_index;
@@ -51,7 +51,7 @@
rules.insert(rule_index, rulePair(&return_values[value_index], &this->neighbours[neighbour_index]));
// Notify the GUI
- emit newRule(rule_index, coordinates);
+ emit newRule(rule_index, neighbours, return_value, coordinates);
}
// If both were present
else
@@ -72,8 +72,3 @@
rules_mask.insert(rule_index, coordinates);
}
-void ElementalRules::possibleRule(QVector<int> coordinates, QVector<int> neighbours, int result)
-{
- addRule(coordinates, neighbours, result);
-}
-
Modified: trunk/qcell/visgui/ElementalRulesWidget.cpp
===================================================================
--- trunk/qcell/visgui/ElementalRulesWidget.cpp 2007-01-21 18:35:01 UTC (rev 222)
+++ trunk/qcell/visgui/ElementalRulesWidget.cpp 2007-01-21 19:24:03 UTC (rev 223)
@@ -16,17 +16,20 @@
rulesTree->setHeaderLabels(labels);
}
-void ElementalRulesWidget::addRule(int id, QVector<int> coordinates)
+void ElementalRulesWidget::addRule(int id, QVector<int> neighbrous, int result, QVector<int> coordinates)
{
// Values to be added
QStringList values;
- values << "-";
+ values << QString();
// Add coordinates
values << parseCoordinates(coordinates);
// Add top-level id
- QTreeWidgetItem* item = new QTreeWidgetItem(QStringList(QString::number(id)));
+ QStringList rule(QString::number(id));
+ rule <<
+ QString("%1 => %2").arg(parseCoordinates(neighbrous)).arg(QString::number(result));
+ QTreeWidgetItem* item = new QTreeWidgetItem(rule);
item->addChild(new QTreeWidgetItem(values));
rulesTree->addTopLevelItem(item);
}
@@ -34,7 +37,7 @@
void ElementalRulesWidget::addOccurance(int id, QVector<int> coordinates)
{
QTreeWidgetItem* item = rulesTree->findItems( QString::number(id), Qt::MatchExactly).first();
- QStringList values("-");
+ 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:35:01 UTC (rev 222)
+++ trunk/qcell/visgui/ElementalRulesWidget.h 2007-01-21 19:24:03 UTC (rev 223)
@@ -20,7 +20,7 @@
protected:
QString parseCoordinates(QVector<int> coordinates);
public slots:
- void addRule(int id, QVector<int> coordinates);
+ void addRule(int id, QVector<int> neighbours, int result, QVector<int> coordinates);
void addOccurance(int id, QVector<int> coordinates);
public:
ElementalRulesWidget();
Modified: trunk/qcell/visgui/MainWindow.cpp
===================================================================
--- trunk/qcell/visgui/MainWindow.cpp 2007-01-21 18:35:01 UTC (rev 222)
+++ trunk/qcell/visgui/MainWindow.cpp 2007-01-21 19:24:03 UTC (rev 223)
@@ -395,8 +395,8 @@
connect(&calc, SIGNAL(calculated(QVector<int>, QVector<int>, int)),
elemental_rules, SLOT(possibleRule(QVector<int>, QVector<int>, int))
);
- connect(elemental_rules, SIGNAL(newRule(int, QVector<int>)),
- ((ElementalRulesWidget*)elemental_dock->widget()), SLOT(addRule(int, QVector<int>))
+ connect(elemental_rules, SIGNAL(newRule(int, QVector<int>, int, QVector<int>)),
+ ((ElementalRulesWidget*)elemental_dock->widget()), SLOT(addRule(int, QVector<int>, int, QVector<int>))
);
connect(elemental_rules, SIGNAL(newOccurance(int, QVector<int>)),
((ElementalRulesWidget*)elemental_dock->widget()), SLOT(addOccurance(int, QVector<int>))
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
