|
From: <le...@us...> - 2007-01-15 09:11:51
|
Revision: 174
http://svn.sourceforge.net/qcell/?rev=174&view=rev
Author: lessm
Date: 2007-01-15 01:11:48 -0800 (Mon, 15 Jan 2007)
Log Message:
-----------
- Renderer have work mode
Modified Paths:
--------------
trunk/qcell/baseheaders/Renderer.h
trunk/qcell/baseheaders/simulationwindow.h
trunk/qcell/basesources/Renderer.cpp
trunk/qcell/basesources/simulationwindow.cpp
Modified: trunk/qcell/baseheaders/Renderer.h
===================================================================
--- trunk/qcell/baseheaders/Renderer.h 2007-01-15 06:58:34 UTC (rev 173)
+++ trunk/qcell/baseheaders/Renderer.h 2007-01-15 09:11:48 UTC (rev 174)
@@ -61,6 +61,8 @@
int selectRect[4];
bool showSelectRect;
+ int workMode;
+ int editValue;
protected:
void initializeGL();
@@ -122,6 +124,10 @@
QVector<int> getSelectedCoord(void);
+ void modeSelect(void);
+ void modeEdit(void);
+ void setEditValue(int value);
+
protected slots:
void resizeDataEvent(void);
Modified: trunk/qcell/baseheaders/simulationwindow.h
===================================================================
--- trunk/qcell/baseheaders/simulationwindow.h 2007-01-15 06:58:34 UTC (rev 173)
+++ trunk/qcell/baseheaders/simulationwindow.h 2007-01-15 09:11:48 UTC (rev 174)
@@ -129,3 +129,4 @@
};
#endif // SIMULATIONWINDOW_H
+
Modified: trunk/qcell/basesources/Renderer.cpp
===================================================================
--- trunk/qcell/basesources/Renderer.cpp 2007-01-15 06:58:34 UTC (rev 173)
+++ trunk/qcell/basesources/Renderer.cpp 2007-01-15 09:11:48 UTC (rev 174)
@@ -280,6 +280,8 @@
selectOne(event->x(), event->y());
if(selectetObjects.size()>0)
{
+ if(workMode==1)
+ getStorage()->setValueAt(editValue, selectetObjects[0]);
QVector<int> sCoord = getSelectedCoord();
emit objectSelected(sCoord[0], sCoord[1], sCoord[2]);
}
@@ -393,6 +395,8 @@
numberOfSelectetObject = 0;
selectetObjects.clear();
showSelectRect = 0;
+ workMode = 0;
+ editValue = 0;
}
Renderer::~Renderer()
@@ -925,3 +929,18 @@
out[2] = index;
return out;
}
+
+void Renderer::modeSelect(void)
+{
+ workMode = 0;
+}
+
+void Renderer::modeEdit(void)
+{
+ workMode = 1;
+}
+
+void Renderer::setEditValue(int value)
+{
+ editValue = value;
+}
Modified: trunk/qcell/basesources/simulationwindow.cpp
===================================================================
--- trunk/qcell/basesources/simulationwindow.cpp 2007-01-15 06:58:34 UTC (rev 173)
+++ trunk/qcell/basesources/simulationwindow.cpp 2007-01-15 09:11:48 UTC (rev 174)
@@ -1018,6 +1018,10 @@
void simulationWindow::workModeChange(int mode)
{
workMode = mode;
+ if(mode==1)
+ renderer->modeEdit();
+ if(mode==0)
+ renderer->modeSelect();
if(mode>1)
{
if(mode==3)
@@ -1027,6 +1031,7 @@
localViewReinterprete();
getStorage()->setForeignDataPointer(localView.getDataPointer(), 1);
localViewFlag = 1;
+ renderer->modeEdit();
}
if(mode==2)
{
@@ -1057,6 +1062,7 @@
void simulationWindow::selectSymbol(int index)
{
selectedSymbol = index;
+ renderer->setEditValue(index);
}
void simulationWindow::commandExecute(int cmd)
@@ -1106,3 +1112,4 @@
renderer->repaint();
}
}
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|