Menu
▾
▴
[Qcell-commitlogs] SF.net SVN: qcell: [321] trunk/qcell
|
From: <dhu...@us...> - 2007-02-14 17:13:56
|
Revision: 321
http://svn.sourceforge.net/qcell/?rev=321&view=rev
Author: dhubleizh
Date: 2007-02-14 09:13:48 -0800 (Wed, 14 Feb 2007)
Log Message:
-----------
- local observers coords displayed
- lot of small changes
Modified Paths:
--------------
trunk/qcell/baseheaders/basetools.h
trunk/qcell/baseheaders/basetools.ui
trunk/qcell/baseheaders/simulationwindow.h
trunk/qcell/basesources/LocalFunction.cpp
trunk/qcell/basesources/basetools.cpp
trunk/qcell/basesources/simulationwindow.cpp
trunk/qcell/visgui/MainWindow.cpp
trunk/qcell/visgui/MainWindow.h
Modified: trunk/qcell/baseheaders/basetools.h
===================================================================
--- trunk/qcell/baseheaders/basetools.h 2007-02-14 14:45:46 UTC (rev 320)
+++ trunk/qcell/baseheaders/basetools.h 2007-02-14 17:13:48 UTC (rev 321)
@@ -23,6 +23,7 @@
void unlockGUI();
void setRowCount(int count);
void setItem(int row, int column, QTableWidgetItem* item);
+ void setObserverCoords(QVector<int> coords);
protected slots:
void modeChangeSelect(void);
Modified: trunk/qcell/baseheaders/basetools.ui
===================================================================
--- trunk/qcell/baseheaders/basetools.ui 2007-02-14 14:45:46 UTC (rev 320)
+++ trunk/qcell/baseheaders/basetools.ui 2007-02-14 17:13:48 UTC (rev 321)
@@ -8,8 +8,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>154</width>
- <height>421</height>
+ <width>166</width>
+ <height>494</height>
</rect>
</property>
<property name="windowTitle" >
@@ -26,8 +26,8 @@
<widget class="QGroupBox" name="ViewModeGroup" >
<property name="sizePolicy" >
<sizepolicy>
- <hsizetype>1</hsizetype>
- <vsizetype>1</vsizetype>
+ <hsizetype>5</hsizetype>
+ <vsizetype>5</vsizetype>
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@@ -35,7 +35,7 @@
<property name="maximumSize" >
<size>
<width>16777215</width>
- <height>75</height>
+ <height>16777215</height>
</size>
</property>
<property name="title" >
@@ -99,6 +99,59 @@
</property>
</widget>
</item>
+ <item>
+ <widget class="QLabel" name="localObserversLabel" >
+ <property name="text" >
+ <string>Observers position:</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <layout class="QHBoxLayout" >
+ <property name="margin" >
+ <number>0</number>
+ </property>
+ <property name="spacing" >
+ <number>6</number>
+ </property>
+ <item>
+ <spacer>
+ <property name="orientation" >
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" >
+ <size>
+ <width>40</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item>
+ <widget class="QLabel" name="observersPosition" >
+ <property name="enabled" >
+ <bool>false</bool>
+ </property>
+ <property name="text" >
+ <string>(X,Y,Z)</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <spacer>
+ <property name="orientation" >
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" >
+ <size>
+ <width>40</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
+ </item>
</layout>
</widget>
</item>
Modified: trunk/qcell/baseheaders/simulationwindow.h
===================================================================
--- trunk/qcell/baseheaders/simulationwindow.h 2007-02-14 14:45:46 UTC (rev 320)
+++ trunk/qcell/baseheaders/simulationwindow.h 2007-02-14 17:13:48 UTC (rev 321)
@@ -46,6 +46,7 @@
void set1DTextToolsVisible(bool visible);
void setNToolsVisible(bool visible);
+ void observerChanged(QVector<int> coords);
private:
protected:
Modified: trunk/qcell/basesources/LocalFunction.cpp
===================================================================
--- trunk/qcell/basesources/LocalFunction.cpp 2007-02-14 14:45:46 UTC (rev 320)
+++ trunk/qcell/basesources/LocalFunction.cpp 2007-02-14 17:13:48 UTC (rev 321)
@@ -806,7 +806,7 @@
temp.clear();
calcVector = indexToSums(i);
foreach(tmp, calcVector)
- temp.append(tr("%1;").arg(tmp));
+ temp.append(tr("%1").arg(tmp));
out<<temp;
}
@@ -826,7 +826,7 @@
temp.clear();
calcVector = indexToFreeArgs(i);
foreach(tmp, calcVector)
- temp.append(tr("%1;").arg(tmp));
+ temp.append(tr("%1").arg(tmp));
out<<temp;
}
Modified: trunk/qcell/basesources/basetools.cpp
===================================================================
--- trunk/qcell/basesources/basetools.cpp 2007-02-14 14:45:46 UTC (rev 320)
+++ trunk/qcell/basesources/basetools.cpp 2007-02-14 17:13:48 UTC (rev 321)
@@ -131,3 +131,22 @@
ui.valueTable->setItem(row, column, item);
}
+void BaseTools::setObserverCoords(QVector<int> coords)
+{
+ QString label("(");
+ for (int i = 0; i < coords.size(); i++)
+ {
+ if (coords[i] > 0)
+ {
+ label.append(QString("%1,")
+ .arg(QString::number(coords[i]))
+ );
+ }
+ }
+ label.chop(1);
+ label.append(')');
+
+ ui.observersPosition->setText(label);
+ ui.observersPosition->setEnabled(true);
+}
+
Modified: trunk/qcell/basesources/simulationwindow.cpp
===================================================================
--- trunk/qcell/basesources/simulationwindow.cpp 2007-02-14 14:45:46 UTC (rev 320)
+++ trunk/qcell/basesources/simulationwindow.cpp 2007-02-14 17:13:48 UTC (rev 321)
@@ -294,9 +294,10 @@
QTableWidgetItem *item;
QProgressDialog progresDialog;
table2D->blockSignals(1);
+ QStringList hLabels, vLabels;
if(forceUpdate)
{
- progresDialog.setLabelText("Generating view pleas wait...");
+ progresDialog.setLabelText("Generating view, pleas wait...");
progresDialog.setMaximum(renderer->getStorage()->getSizeY());
progresDialog.show();
showProgres = 1;
@@ -308,11 +309,20 @@
table2D->setColumnCount(renderer->getStorage()->getSizeX());
table2D->setRowCount(renderer->getStorage()->getSizeY());
for(int i=0;i<renderer->getStorage()->getSizeY();++i)
- table2D->setRowHeight(i, 30);
+ {
+ table2D->setRowHeight(i, 30);
+ vLabels << QString::number(i);
+ }
for(int i=0;i<renderer->getStorage()->getSizeX();++i)
- table2D->setColumnWidth(i, 30);
+ {
+ table2D->setColumnWidth(i, 30);
+ hLabels << QString::number(i);
+ }
+ table2D->setHorizontalHeaderLabels(hLabels);
+ table2D->setVerticalHeaderLabels(vLabels);
+
for(int y=0;y<renderer->getStorage()->getSizeY();++y)
{
for(int x=0;x<renderer->getStorage()->getSizeX();++x)
@@ -520,6 +530,7 @@
}
}
}
+ table1D->setVerticalHeaderLabels(QStringList ("KB"));
table1D->blockSignals(0);
}
@@ -667,6 +678,7 @@
table1D->setItem(0, 0, &height_determiner);
table1D->setMaximumHeight((2*table1D->rowHeight(0))+ 20);
table1D->clear();
+ table1D->setVerticalHeaderLabels(QStringList ("KB"));
table1DMem = new QTableWidget(ui.view1D);
ui.view1D->layout()->addWidget(table1DMem);
@@ -678,6 +690,7 @@
symbolTable->setHorizontalHeaderItem(1, new QTableWidgetItem(tr("Char")));
symbolTable->setHorizontalHeaderItem(2, new QTableWidgetItem(tr("Color")));
symbolTable->setHorizontalHeaderItem(3, new QTableWidgetItem(tr("Model")));
+ symbolTable->setColumnHidden(3, true);
symbolTable->setHorizontalHeaderItem(4, new QTableWidgetItem(tr("Hide Flag")));
updateSymbolTable();
@@ -1123,6 +1136,7 @@
renderer->setObserverPosition(localObserverPosition[0], localObserverPosition[1], localObserverPosition[2]);
+ emit observerChanged(localObserverPosition);
localViewReinterprete();
update2DTable();
graph2DUpdateRequest = 1;
@@ -1181,6 +1195,7 @@
localObserverPosition[1] = row;
localObserverPosition[2] = 0;
renderer->setObserverPosition(localObserverPosition[0], localObserverPosition[1], localObserverPosition[2]);
+ emit observerChanged(localObserverPosition);
localViewReinterprete();
update1DTable();
graph2DUpdateRequest = 1;
@@ -1305,6 +1320,7 @@
localObserverPosition[1] = y;
localObserverPosition[2] = z;
renderer->setObserverPosition(localObserverPosition[0], localObserverPosition[1], localObserverPosition[2]);
+ emit observerChanged(localObserverPosition);
localViewReinterprete();
table2DUpdateRequest = 1;
graph2DUpdateRequest = 1;
Modified: trunk/qcell/visgui/MainWindow.cpp
===================================================================
--- trunk/qcell/visgui/MainWindow.cpp 2007-02-14 14:45:46 UTC (rev 320)
+++ trunk/qcell/visgui/MainWindow.cpp 2007-02-14 17:13:48 UTC (rev 321)
@@ -49,6 +49,9 @@
connect(sw, SIGNAL(setItem(int, int, QTableWidgetItem*)),
basetools, SLOT(setItem(int, int, QTableWidgetItem*))
);
+ connect(sw, SIGNAL(observerChanged(QVector<int>)),
+ basetools, SLOT(setObserverCoords(QVector<int>))
+ );
// View 3D Tools
dock3D = new BetterDockWidget(this);
@@ -285,15 +288,15 @@
setupEngine();
}
-void MainWindow::on_action_About_activated()
-{
- // Construct and display AboutDialog
- QDialog* dialog = new QDialog(this);
- Ui::AboutDialog* ad = new Ui::AboutDialog();
- ad->setupUi(dialog);
- // Display it modally (block MaindWindow), but discard the result
- dialog->exec();
-}
+//void MainWindow::on_action_About_activated()
+//{
+// // Construct and display AboutDialog
+// QDialog* dialog = new QDialog(this);
+// Ui::AboutDialog* ad = new Ui::AboutDialog();
+// ad->setupUi(dialog);
+// // Display it modally (block MaindWindow), but discard the result
+// dialog->exec();
+//}
void MainWindow::on_action_Quit_activated()
{
Modified: trunk/qcell/visgui/MainWindow.h
===================================================================
--- trunk/qcell/visgui/MainWindow.h 2007-02-14 14:45:46 UTC (rev 320)
+++ trunk/qcell/visgui/MainWindow.h 2007-02-14 17:13:48 UTC (rev 321)
@@ -53,7 +53,7 @@
public slots:
void interpretationChanged(bool interpret);
private slots:
- void on_action_About_activated();
+// void on_action_About_activated();
void on_action_Quit_activated();
void on_action_Neighbourhood_activated();
void on_action_Function_activated();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
