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
Memory Leaks
[modules/superv.git]
/
src
/
SUPERVGUI
/
SUPERVGUI_ArrayView.cxx
diff --git
a/src/SUPERVGUI/SUPERVGUI_ArrayView.cxx
b/src/SUPERVGUI/SUPERVGUI_ArrayView.cxx
index 16561b0555db6329549e64ac5909e90b5859ab8d..b2b0309cdeedef948b0e6b16eb1c59efc15d1b94 100644
(file)
--- a/
src/SUPERVGUI/SUPERVGUI_ArrayView.cxx
+++ b/
src/SUPERVGUI/SUPERVGUI_ArrayView.cxx
@@
-60,7
+60,7
@@
SUPERVGUI_ArrayView::SUPERVGUI_ArrayView(SUPERVGUI_CanvasArray* theArray, SUPERV
myPopup->insertItem("Zoom", aZoomPopup);
myPopup->insertSeparator();*/
myPopup->insertItem("Zoom", aZoomPopup);
myPopup->insertSeparator();*/
- myAddStudyItem = myPopup->insertItem(tr("MSG_ADD_STUDY"),
this, SLOT(add
ToStudy()));
+ myAddStudyItem = myPopup->insertItem(tr("MSG_ADD_STUDY"),
myMain, SLOT(addDataflow
ToStudy()));
myPopup->insertItem(tr("MSG_CHANGE_INFO"), myMain, SLOT(changeInformation()));
myPopup->insertSeparator();
myPopup->insertItem(tr("MSG_CHANGE_INFO"), myMain, SLOT(changeInformation()));
myPopup->insertSeparator();
@@
-91,11
+91,6
@@
void SUPERVGUI_ArrayView::ResetView()
setWorldMatrix(m);
}
setWorldMatrix(m);
}
-void SUPERVGUI_ArrayView::addToStudy()
-{
- if (myMain->addStudy()) myMain->setAsFromStudy(true);
-}
-
void SUPERVGUI_ArrayView::changeBackground()
{
QColor aColor = QColorDialog::getColor(canvas()->backgroundColor(), this );
void SUPERVGUI_ArrayView::changeBackground()
{
QColor aColor = QColorDialog::getColor(canvas()->backgroundColor(), this );
@@
-137,7
+132,7
@@
void SUPERVGUI_ArrayView::contentsMousePressEvent(QMouseEvent* theEvent) {
}
}
}
}
- myPopup->setItemEnabled(myAddStudyItem, !myMain->is
From
Study());
+ myPopup->setItemEnabled(myAddStudyItem, !myMain->is
DataflowIn
Study());
myMain->showPopup(myPopup, theEvent);
return;
}
myMain->showPopup(myPopup, theEvent);
return;
}