Menu
▾
▴
[Qcell-commitlogs] SF.net SVN: qcell: [163] trunk/qcell
|
From: <le...@us...> - 2007-01-14 10:28:11
|
Revision: 163
http://svn.sourceforge.net/qcell/?rev=163&view=rev
Author: lessm
Date: 2007-01-14 02:28:05 -0800 (Sun, 14 Jan 2007)
Log Message:
-----------
- Text view 1D and 2D have color mode only showing symbols id
Modified Paths:
--------------
trunk/qcell/baseheaders/simulationwindow.h
trunk/qcell/baseheaders/view1dtexttools.h
trunk/qcell/baseheaders/view2dtexttools.h
trunk/qcell/basesources/simulationwindow.cpp
trunk/qcell/basesources/view1dtexttools.cpp
trunk/qcell/basesources/view2dtexttools.cpp
Modified: trunk/qcell/baseheaders/simulationwindow.h
===================================================================
--- trunk/qcell/baseheaders/simulationwindow.h 2007-01-14 00:48:22 UTC (rev 162)
+++ trunk/qcell/baseheaders/simulationwindow.h 2007-01-14 10:28:05 UTC (rev 163)
@@ -46,12 +46,10 @@
View3DTools *view3DTools;
View2DTextTools *view2DTextTools;
- bool view2DTextColorFlag;
int view2DTextInterpretationMode;
View1DTextTools *view1DTextTools;
- bool view1DTextColorFlag;
int view1DTextInterpretationMode;
char table2DUpdateRequest, table1DUpdateRequest, graph2DUpdateRequest;
@@ -90,10 +88,8 @@
void zPlaneChange(int i);
void dataUpdateRequest(void);
void dataResizeRequest(void);
- void GridView2DColor(bool flag);
void GrigView2DInterpretationMode(int mode);
- void GridView1DColor(bool flag);
void GrigView1DInterpretationMode(int mode);
void GridView1DMemClear(void);
Modified: trunk/qcell/baseheaders/view1dtexttools.h
===================================================================
--- trunk/qcell/baseheaders/view1dtexttools.h 2007-01-14 00:48:22 UTC (rev 162)
+++ trunk/qcell/baseheaders/view1dtexttools.h 2007-01-14 10:28:05 UTC (rev 163)
@@ -24,7 +24,6 @@
void memoryClearButtonClick(void);
signals:
- void colorsEnabled(bool flag);
void viewModeChenged(int mode);
void memoryClear(void);
};
Modified: trunk/qcell/baseheaders/view2dtexttools.h
===================================================================
--- trunk/qcell/baseheaders/view2dtexttools.h 2007-01-14 00:48:22 UTC (rev 162)
+++ trunk/qcell/baseheaders/view2dtexttools.h 2007-01-14 10:28:05 UTC (rev 163)
@@ -27,7 +27,7 @@
void ZPlaneSet(int zplane);
signals:
- void colorsEnabled(bool flag);
+
void viewModeChenged(int mode);
void newZPlaneSet(int zplane);
};
Modified: trunk/qcell/basesources/simulationwindow.cpp
===================================================================
--- trunk/qcell/basesources/simulationwindow.cpp 2007-01-14 00:48:22 UTC (rev 162)
+++ trunk/qcell/basesources/simulationwindow.cpp 2007-01-14 10:28:05 UTC (rev 163)
@@ -214,23 +214,28 @@
if(index>=renderer->getSymbolCount())
index = renderer->getSymbolCount() - 1;
symbol = renderer->getSymbol(index);
- if(view2DTextInterpretationMode==0)
+ switch(view2DTextInterpretationMode)
+ {
+ case 0:
item = new QTableWidgetItem(tr("%1").arg(index));
- else
+ item->setTextColor(Qt::black);
+ item->setBackgroundColor(Qt::white);
+ break;
+ case 1:
item = new QTableWidgetItem(symbol.textSybmol);
- item->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled);
- item->setTextAlignment(Qt::AlignCenter);
-
- if(view2DTextColorFlag)
- {
+ item->setTextColor(Qt::black);
+ item->setBackgroundColor(Qt::white);
+ break;
+
+ case 3:
+ item = new QTableWidgetItem(tr("%1").arg(index));
item->setBackgroundColor(symbol.color);
item->setTextColor(symbol.textColor);
+ break;
}
- else
- {
- item->setTextColor(Qt::black);
- item->setBackgroundColor(Qt::white);
- }
+
+ item->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled);
+ item->setTextAlignment(Qt::AlignCenter);
table2D->setItem(y, x, item);
}
if(forceUpdate)
@@ -249,27 +254,30 @@
index = renderer->getSymbolCount() - 1;
symbol = renderer->getSymbol(index);
item = table2D->item(y, x);
- if(view2DTextInterpretationMode==0)
+
+ switch(view2DTextInterpretationMode)
{
+ case 2:
+ case 0:
tmpString.setNum(index);
if(item->text()!=tmpString)
{
item->setText(tmpString);
needUpdate = 1;
}
- }
- else
- {
+ break;
+ case 1:
if(symbol.textSybmol!=(item->text())[0])
{
item->setText(symbol.textSybmol);
needUpdate = 1;
}
+ break;
}
+
if(needUpdate)
{
- item->setTextColor(Qt::black);
- if(view2DTextColorFlag)
+ if(view2DTextInterpretationMode==2)
{
item->setBackgroundColor(symbol.color);
item->setTextColor(symbol.textColor);
@@ -327,24 +335,26 @@
symbol = renderer->getSymbol(index);
table1D->setColumnWidth(x, 30);
table1DMem->setColumnWidth(x, 30);
- if(view1DTextInterpretationMode==0)
+ switch(view1DTextInterpretationMode)
+ {
+ case 0:
item = new QTableWidgetItem(tr("%1").arg(index));
- else
+ item->setBackgroundColor(Qt::white);
+ item->setTextColor(Qt::black);
+ break;
+ case 1:
item = new QTableWidgetItem(tr("%1").arg(symbol.textSybmol));
+ item->setBackgroundColor(Qt::white);
+ item->setTextColor(Qt::black);
+ break;
+ case 2:
+ item = new QTableWidgetItem(tr("%1").arg(index));
+ item->setBackgroundColor(symbol.color);
+ item->setTextColor(symbol.textColor);
+ break;
+ }
item->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled);
item->setTextAlignment(Qt::AlignCenter);
-
-
- if(view1DTextColorFlag)
- {
- item->setBackgroundColor(symbol.color);
- item->setTextColor(symbol.textColor);
- }
- else
- {
- item->setBackgroundColor(Qt::white);
- item->setTextColor(Qt::black);
- }
table1D->setItem(0, x, item);
}
}
@@ -358,27 +368,29 @@
index = renderer->getSymbolCount() - 1;
symbol = renderer->getSymbol(index);
item = table1D->item(0, x);
- if(view1DTextInterpretationMode==0)
+ switch(view1DTextInterpretationMode)
{
+ case 2:
+ case 0:
tmpString.setNum(index);
if(item->text()!=tmpString)
{
item->setText(tmpString);
needUpdate = 1;
}
- }
- else
- {
+ break;
+
+ case 1:
if(symbol.textSybmol!=(item->text())[0])
{
item->setText(symbol.textSybmol);
needUpdate = 1;
}
+ break;
}
if(needUpdate)
{
- item->setTextColor(Qt::black);
- if(view1DTextColorFlag)
+ if(view1DTextInterpretationMode==2)
{
item->setBackgroundColor(symbol.color);
item->setTextColor(symbol.textColor);
@@ -558,19 +570,15 @@
view3DTools = new View3DTools(this);
connect(view3DTools, SIGNAL(ViewModeUpdated(int)), SLOT(perspectiveUpdate(int)));
- view2DTextColorFlag = 0;
view2DTextInterpretationMode = 0;
view2DTextTools = new View2DTextTools(this);
connect(view2DTextTools, SIGNAL(newZPlaneSet(int)), SLOT(zPlaneChange(int)));
- connect(view2DTextTools, SIGNAL(colorsEnabled(bool)), SLOT(GridView2DColor(bool)));
connect(view2DTextTools, SIGNAL(viewModeChenged(int)), SLOT(GrigView2DInterpretationMode(int)));
- view1DTextColorFlag = 0;
view1DTextInterpretationMode = 0;
view1DTextTools = new View1DTextTools(this);
- connect(view1DTextTools, SIGNAL(colorsEnabled(bool)), SLOT(GridView1DColor(bool)));
connect(view1DTextTools, SIGNAL(viewModeChenged(int)), SLOT(GrigView1DInterpretationMode(int)));
connect(view1DTextTools, SIGNAL(memoryClear()), SLOT(GridView1DMemClear()));
}
@@ -677,24 +685,12 @@
repaint();
}
-void simulationWindow::GridView2DColor(bool flag)
-{
- view2DTextColorFlag = flag;
- update2DTable(1);
-}
-
void simulationWindow::GrigView2DInterpretationMode(int mode)
{
view2DTextInterpretationMode = mode;
update2DTable(1);
}
-void simulationWindow::GridView1DColor(bool flag)
-{
- view1DTextColorFlag = flag;
- update1DTable(1);
-}
-
void simulationWindow::GrigView1DInterpretationMode(int mode)
{
view1DTextInterpretationMode = mode;
@@ -748,10 +744,10 @@
renderer->setSymbolColor(row, color);
renderer->repaint();
- if(view1DTextColorFlag)
+ if(view1DTextInterpretationMode==2)
table1DUpdateRequest = 2;
- if(view2DTextColorFlag)
+ if(view2DTextInterpretationMode==2)
table2DUpdateRequest = 2;
graph2DUpdateRequest = 1;
@@ -802,27 +798,28 @@
changeSymbol(column, row, z_plane);
item = table2D->item(row, column);
symbol = renderer->getSymbol(selectedSymbol);
- if(view2DTextInterpretationMode==0)
+ switch(view2DTextInterpretationMode)
{
+ case 2:
+ case 0:
tmpString.setNum(selectedSymbol);
if(item->text()!=tmpString)
{
item->setText(tmpString);
needUpdate = 1;
}
- }
- else
- {
+ break;
+ case 1:
if(symbol.textSybmol!=(item->text())[0])
{
item->setText(symbol.textSybmol);
needUpdate = 1;
}
+ break;
}
if(needUpdate)
{
- item->setTextColor(Qt::black);
- if(view2DTextColorFlag)
+ if(view2DTextInterpretationMode==2)
{
item->setBackgroundColor(symbol.color);
item->setTextColor(symbol.textColor);
@@ -848,27 +845,30 @@
changeSymbol(column, 0, 0);
item = table1D->item(0, column);
symbol = renderer->getSymbol(selectedSymbol);
- if(view1DTextInterpretationMode==0)
+
+ switch(view1DTextInterpretationMode)
{
+ case 2:
+ case 0:
tmpString.setNum(selectedSymbol);
if(item->text()!=tmpString)
{
item->setText(tmpString);
needUpdate = 1;
}
- }
- else
- {
+ break;
+ case 1:
if(symbol.textSybmol!=(item->text())[0])
{
item->setText(symbol.textSybmol);
needUpdate = 1;
}
+ break;
}
+
if(needUpdate)
{
- item->setTextColor(Qt::black);
- if(view1DTextColorFlag)
+ if(view1DTextInterpretationMode==2)
{
item->setBackgroundColor(symbol.color);
item->setTextColor(symbol.textColor);
Modified: trunk/qcell/basesources/view1dtexttools.cpp
===================================================================
--- trunk/qcell/basesources/view1dtexttools.cpp 2007-01-14 00:48:22 UTC (rev 162)
+++ trunk/qcell/basesources/view1dtexttools.cpp 2007-01-14 10:28:05 UTC (rev 163)
@@ -21,16 +21,21 @@
void View1DTextTools::ColorsClick(void)
{
- if(ui.ColorsButton->isChecked())
- emit colorsEnabled(1);
- else
- emit colorsEnabled(0);
+ ui.ValuesButton->setChecked(0);
+ ui.SymbolsButton->setChecked(0);
+ ui.ColorsButton->setChecked(1);
+ if(textMode!=2)
+ {
+ textMode = 2;
+ emit viewModeChenged(2);
+ }
}
void View1DTextTools::ValuesClick(void)
{
ui.ValuesButton->setChecked(1);
ui.SymbolsButton->setChecked(0);
+ ui.ColorsButton->setChecked(0);
if(textMode!=0)
{
textMode = 0;
@@ -42,6 +47,7 @@
{
ui.ValuesButton->setChecked(0);
ui.SymbolsButton->setChecked(1);
+ ui.ColorsButton->setChecked(0);
if(textMode!=1)
{
textMode = 1;
Modified: trunk/qcell/basesources/view2dtexttools.cpp
===================================================================
--- trunk/qcell/basesources/view2dtexttools.cpp 2007-01-14 00:48:22 UTC (rev 162)
+++ trunk/qcell/basesources/view2dtexttools.cpp 2007-01-14 10:28:05 UTC (rev 163)
@@ -41,16 +41,21 @@
void View2DTextTools::ColorsClick(void)
{
- if(ui.ColorsButton->isChecked())
- emit colorsEnabled(1);
- else
- emit colorsEnabled(0);
+ ui.ValuesButton->setChecked(0);
+ ui.SymbolsButton->setChecked(0);
+ ui.ColorsButton->setChecked(1);
+ if(textMode!=2)
+ {
+ textMode = 2;
+ emit viewModeChenged(2);
+ }
}
void View2DTextTools::ValuesClick(void)
{
ui.ValuesButton->setChecked(1);
ui.SymbolsButton->setChecked(0);
+ ui.ColorsButton->setChecked(0);
if(textMode!=0)
{
textMode = 0;
@@ -62,6 +67,7 @@
{
ui.ValuesButton->setChecked(0);
ui.SymbolsButton->setChecked(1);
+ ui.ColorsButton->setChecked(0);
if(textMode!=1)
{
textMode = 1;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
