Menu
▾
▴
[Qcell-commitlogs] SF.net SVN: qcell: [254] trunk/qcell
|
From: <le...@us...> - 2007-01-24 23:33:23
|
Revision: 254
http://svn.sourceforge.net/qcell/?rev=254&view=rev
Author: lessm
Date: 2007-01-24 15:33:20 -0800 (Wed, 24 Jan 2007)
Log Message:
-----------
- Neighbourhood Window updated
- some problems with LocalFunction and Neighbourhood resolved
Modified Paths:
--------------
trunk/qcell/baseheaders/Renderer.h
trunk/qcell/baseheaders/basetools.ui
trunk/qcell/basesources/Neighbourhood.cpp
trunk/qcell/basesources/Renderer.cpp
trunk/qcell/basesources/basetools.cpp
trunk/qcell/basesources/simulationwindow.cpp
trunk/qcell/visgui/MainWindow.cpp
Modified: trunk/qcell/baseheaders/Renderer.h
===================================================================
--- trunk/qcell/baseheaders/Renderer.h 2007-01-24 20:54:46 UTC (rev 253)
+++ trunk/qcell/baseheaders/Renderer.h 2007-01-24 23:33:20 UTC (rev 254)
@@ -73,6 +73,7 @@
QVector<int> maskValue;
bool showValues;
+ QString textureName;
protected:
void initializeGL();
@@ -148,6 +149,7 @@
void maskSet(int x, int y, int z);
void showCellValues(bool show = 1);
+ void setTextureName(QString name);
protected slots:
void resizeDataEvent(void);
Modified: trunk/qcell/baseheaders/basetools.ui
===================================================================
--- trunk/qcell/baseheaders/basetools.ui 2007-01-24 20:54:46 UTC (rev 253)
+++ trunk/qcell/baseheaders/basetools.ui 2007-01-24 23:33:20 UTC (rev 254)
@@ -256,16 +256,14 @@
<height>110</height>
</size>
</property>
+ <property name="rowCount" >
+ <number>1</number>
+ </property>
<row>
<property name="text" >
<string>1</string>
</property>
</row>
- <row>
- <property name="text" >
- <string>2</string>
- </property>
- </row>
<column>
<property name="text" >
<string>Value</string>
Modified: trunk/qcell/basesources/Neighbourhood.cpp
===================================================================
--- trunk/qcell/basesources/Neighbourhood.cpp 2007-01-24 20:54:46 UTC (rev 253)
+++ trunk/qcell/basesources/Neighbourhood.cpp 2007-01-24 23:33:20 UTC (rev 254)
@@ -495,11 +495,11 @@
QVector<NContainer> ng = getNeighbours();
int sx = maxv[0] - minv[0], sy = maxv[1] - minv[1], sz = maxv[2] - minv[2];
- if(minv[0]<0)
+ //if(minv[0]<0)
sx++;
- if(minv[1]<0)
+ //if(minv[1]<0)
sy++;
- if(minv[2]<0)
+ //if(minv[2]<0)
sz++;
switch(getDimension())
Modified: trunk/qcell/basesources/Renderer.cpp
===================================================================
--- trunk/qcell/basesources/Renderer.cpp 2007-01-24 20:54:46 UTC (rev 253)
+++ trunk/qcell/basesources/Renderer.cpp 2007-01-24 23:33:20 UTC (rev 254)
@@ -158,7 +158,7 @@
void Renderer::generateObserver(void)
{
glEnable(GL_TEXTURE_2D);
- observerTexture = bindTexture(QPixmap(QString("./observer.png")), GL_TEXTURE_2D);
+ observerTexture = bindTexture(QPixmap(textureName), GL_TEXTURE_2D);
glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_NEAREST);
@@ -795,11 +795,12 @@
{
glPushMatrix();
- glTranslatef(mx + (float)localObserverCoords[0] * 2.0f , my + (storage.getSizeY() - (float)localObserverCoords[1]) * 2.0f, mz + (float)localObserverCoords[2] * 2.0f);
+ glTranslatef(mx + (float)localObserverCoords[0] * 2.0f , my + (sy - (float)localObserverCoords[1]) * 2.0f, mz + (float)localObserverCoords[2] * 2.0f);
glRotatef(rotation[2], 0.0f, 0.0f, -1.0f);
glRotatef(rotation[1], 0.0f, -1.0f, 0.0f);
glRotatef(rotation[0], -1.0f, 0.0f, 0.0f);
+ glDisable(GL_DEPTH_TEST);
glBlendFunc(GL_ONE, GL_ONE);
glEnable(GL_BLEND);
glDisable(GL_LIGHTING);
@@ -808,6 +809,7 @@
glDisable(GL_TEXTURE_2D);
glEnable(GL_LIGHTING);
glDisable(GL_BLEND);
+ glEnable(GL_DEPTH_TEST);
glPopMatrix();
}
if(showValues)
@@ -1032,6 +1034,11 @@
showValues = show;
}
+void Renderer::setTextureName(QString name)
+{
+ textureName = name;
+}
+
void Renderer::setOrtoPerspective(bool noClear)
{
float aspect = (float)width()/(float)height();
Modified: trunk/qcell/basesources/basetools.cpp
===================================================================
--- trunk/qcell/basesources/basetools.cpp 2007-01-24 20:54:46 UTC (rev 253)
+++ trunk/qcell/basesources/basetools.cpp 2007-01-24 23:33:20 UTC (rev 254)
@@ -20,6 +20,10 @@
connect(ui.LocalViewButton, SIGNAL(clicked(bool)), SLOT(modeChangeLocalView()));
connect(ui.valueTable, SIGNAL(cellClicked(int, int)), SLOT(updateSelectedSymbol(int, int)));
+
+ ui.valueTable->setRowCount(2);
+ ui.valueTable->setItem(0, 0, new QTableWidgetItem("0"));
+ ui.valueTable->setItem(1, 0, new QTableWidgetItem("1"));
}
BaseTools::~BaseTools()
Modified: trunk/qcell/basesources/simulationwindow.cpp
===================================================================
--- trunk/qcell/basesources/simulationwindow.cpp 2007-01-24 20:54:46 UTC (rev 253)
+++ trunk/qcell/basesources/simulationwindow.cpp 2007-01-24 23:33:20 UTC (rev 254)
@@ -499,16 +499,18 @@
{
QTableWidgetItem *item, *memItem;
table1DMem->blockSignals(1);
- table1DMem->setRowCount(table1DMem->rowCount()+1);
+ table1DMem->insertRow(0);
for(int x=0;x<renderer->getStorage()->getSizeX();++x)
{
item = table1D->item(0, x);
memItem = new QTableWidgetItem(*item);
- table1DMem->setItem(table1DMem->rowCount() - 1, x, memItem);
+ table1DMem->setItem(0, x, memItem);
}
+ table1DMem->blockSignals(0);
if(table1DMem->rowCount()>30)
- table1DMem->removeRow(0);
- table1DMem->blockSignals(0);
+ {
+ table1DMem->removeRow(table1DMem->rowCount()-1);
+ }
}
void simulationWindow::updateSymbolTable(void)
@@ -610,6 +612,7 @@
ui.view3D->setLayout(new QVBoxLayout(ui.view3D));
renderer = new Renderer(ui.view3D);
+ renderer->setTextureName("./observer.png");
ui.view3D->layout()->addWidget(renderer);
// renderer->resize(ui.view3D->width(), ui.view3D->height());
@@ -725,8 +728,10 @@
ui.NeighbourhoodTab->setLayout(new QVBoxLayout(ui.NeighbourhoodTab));
nRrenderer = new Renderer(ui.NeighbourhoodTab);
+ nRrenderer->setTextureName("./zeropoint.png");
ui.NeighbourhoodTab->layout()->addWidget(nRrenderer);
nRrenderer->showCellValues();
+ nRrenderer->showSymbol(0);
}
simulationWindow::~simulationWindow()
Modified: trunk/qcell/visgui/MainWindow.cpp
===================================================================
--- trunk/qcell/visgui/MainWindow.cpp 2007-01-24 20:54:46 UTC (rev 253)
+++ trunk/qcell/visgui/MainWindow.cpp 2007-01-24 23:33:20 UTC (rev 254)
@@ -1217,6 +1217,7 @@
void MainWindow::setupNeighbourhood()
{
+ QVector<int> nStartPos;
// Pass Neighbourhood to Calculator
calc.setNeighbourhood(neighbourhood);
@@ -1229,6 +1230,9 @@
*(sw->getNeighbourhoodEditor()->getStorage()) = neighbourhood->toCalculationData();
sw->getNeighbourhoodEditor()->setTranslation(0.0f, 0.0f, -10.0f);
sw->getNeighbourhoodEditor()->setSymbolColor(1, QColor(128, 128, 128));
+ nStartPos = neighbourhood->getMinNeighbourhoodValues();
+ sw->getNeighbourhoodEditor()->setObserverPosition(-nStartPos[0], -nStartPos[1], -nStartPos[2]);
+ sw->getNeighbourhoodEditor()->showObserver(1);
//***************************************************
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
