Salome HOME
projects
/
modules
/
superv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Join modifications from BR_Dev_For_4_0 tag V4_1_1.
[modules/superv.git]
/
src
/
SUPERVGUI
/
SUPERVGUI_CanvasArray.cxx
diff --git
a/src/SUPERVGUI/SUPERVGUI_CanvasArray.cxx
b/src/SUPERVGUI/SUPERVGUI_CanvasArray.cxx
index 0e7dbb7967c8d5971071b864fb95a0b4cc7133c4..bbd3ffc70421f15ad1b3d31e67bd8013eb3d8930 100644
(file)
--- a/
src/SUPERVGUI/SUPERVGUI_CanvasArray.cxx
+++ b/
src/SUPERVGUI/SUPERVGUI_CanvasArray.cxx
@@
-45,7
+45,7
@@
else x += (CELL_WIDTH + CELL_SPACE); \
cell = getCellNode(aCNode); \
if (cell == NULL) { \
else x += (CELL_WIDTH + CELL_SPACE); \
cell = getCellNode(aCNode); \
if (cell == NULL) { \
- SUPERVGUI_CanvasCellNode* aNode =
new SUPERVGUI_CanvasCellNod
e(myMgr, this, myMain, aCNode); \
+ SUPERVGUI_CanvasCellNode* aNode =
SUPERVGUI_CanvasCellNode::Creat
e(myMgr, this, myMain, aCNode); \
aNode->move(x, y); \
aNode->show(); \
aNode->sync(); \
aNode->move(x, y); \
aNode->show(); \
aNode->sync(); \
@@
-67,12
+67,12
@@
SUPERV_CNode aCNodeEnd = SUPERV::CNode::_narrow(nodes->NodesName[co]->Coupled()); \
cell = getCellNode(aCNode); \
if (cell == NULL) { \
SUPERV_CNode aCNodeEnd = SUPERV::CNode::_narrow(nodes->NodesName[co]->Coupled()); \
cell = getCellNode(aCNode); \
if (cell == NULL) { \
- SUPERVGUI_CanvasCellNode* aNode =
new SUPERVGUI_CanvasCellNode(
myMgr, this, myMain, aCNode); \
+ SUPERVGUI_CanvasCellNode* aNode =
SUPERVGUI_CanvasCellNode::Create(
myMgr, this, myMain, aCNode); \
aNode->move(x, y); \
aNode->show(); \
aNode->sync(); \
y += (CELL_HEIGHT + CELL_SPACE); \
aNode->move(x, y); \
aNode->show(); \
aNode->sync(); \
y += (CELL_HEIGHT + CELL_SPACE); \
- SUPERVGUI_CanvasCellNode* aNodeEnd =
new SUPERVGUI_CanvasCellEndNode(
myMgr, this, myMain, aCNodeEnd, aNode); \
+ SUPERVGUI_CanvasCellNode* aNodeEnd =
SUPERVGUI_CanvasCellEndNode::Create(
myMgr, this, myMain, aCNodeEnd, aNode); \
aNodeEnd->move(x, y); \
aNodeEnd->show(); \
aNodeEnd->sync(); \
aNodeEnd->move(x, y); \
aNodeEnd->show(); \
aNodeEnd->sync(); \
@@
-283,7
+283,7
@@
SUPERVGUI_CanvasCellNode* SUPERVGUI_CanvasArray::getCellNode(SUPERV::CNode_ptr t
SUPERVGUI_CanvasCellNode* SUPERVGUI_CanvasArray::addNode(SUPERV_CNode node) {
Trace("SUPERVGUI_CanvasArray::addNode");
SUPERVGUI_CanvasCellNode* SUPERVGUI_CanvasArray::addNode(SUPERV_CNode node) {
Trace("SUPERVGUI_CanvasArray::addNode");
- SUPERVGUI_CanvasCellNode* n =
new SUPERVGUI_CanvasCellNode(
myMgr, this, myMain, node);
+ SUPERVGUI_CanvasCellNode* n =
SUPERVGUI_CanvasCellNode::Create(
myMgr, this, myMain, node);
n->move(nodeX, nodeY);
n->show();
update();
n->move(nodeX, nodeY);
n->show();
update();