X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=inline;f=vv%2FvvToolCreatorBase.cxx;h=50a448941e8f524c0e567191f9356fa51264ff6b;hb=13048c1469b7421804addb724efe87d7e1313a80;hp=57a1d9f24b358c2584cf06ff7a31cb27fab3ed4d;hpb=0a85e47a06c7d046d06a4645b724c4e81b19998d;p=clitk.git
diff --git a/vv/vvToolCreatorBase.cxx b/vv/vvToolCreatorBase.cxx
index 57a1d9f..50a4489 100644
--- a/vv/vvToolCreatorBase.cxx
+++ b/vv/vvToolCreatorBase.cxx
@@ -1,29 +1,20 @@
/*=========================================================================
+ Program: vv http://www.creatis.insa-lyon.fr/rio/vv
- Program: vv
- Module: $RCSfile: vvToolCreatorBase.cxx,v $
- Language: C++
- Date: $Date: 2010/02/24 11:42:42 $
- Version: $Revision: 1.2 $
- Author : David Sarrut (david.sarrut@creatis.insa-lyon.fr)
+ Authors belong to:
+ - University of LYON http://www.universite-lyon.fr/
+ - Léon Bérard cancer center http://www.centreleonberard.fr
+ - CREATIS CNRS laboratory http://www.creatis.insa-lyon.fr
- Copyright (C) 2008
- Léon Bérard cancer center http://oncora1.lyon.fnclcc.fr
- CREATIS-LRMN http://www.creatis.insa-lyon.fr
+ This software is distributed WITHOUT ANY WARRANTY; without even
+ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ PURPOSE. See the copyright notices for more information.
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, version 3 of the License.
+ It is distributed under dual licence
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see .
-
- =========================================================================*/
+ - BSD See included LICENSE.txt file
+ - CeCILL-B http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html
+===========================================================================**/
#include "vvToolCreatorBase.h"
#include "vvToolManager.h"
@@ -31,26 +22,68 @@
#include
//------------------------------------------------------------------------------
-vvToolCreatorBase::vvToolCreatorBase(QString name) {
+vvToolCreatorBase::vvToolCreatorBase(QString name): mAction(NULL), mExperimental(false)
+{
+ mUseContextMenu = false;
mToolName = name;
- vvToolManager::GetInstance()->AddTool(this);
+ m_MenuName = "Tools";
+ vvToolManager::GetInstance()->AddTool(this);
+}
+//------------------------------------------------------------------------------
+
+//------------------------------------------------------------------------------
+void vvToolCreatorBase::MenuToolSlot()
+{
+ mSender = QObject::sender();
+ MenuSpecificToolSlot();
}
//------------------------------------------------------------------------------
//------------------------------------------------------------------------------
-void vvToolCreatorBase::InsertToolInMenu(vvMainWindowBase * m) {
- mMainWindow = m;
+void vvToolCreatorBase::InsertToolInMenu(vvMainWindowBase * m)
+{
+ mMainWindow = m;
+ if (mUseContextMenu) {
+ InsertToolInContextMenu();
+ return;
+ }
// Create main action
- if (mToolIconFilename == "noicon")
+ if (mToolIconFilename == "noicon")
mAction = new QAction(QString("&").append(mToolMenuName), this);
- else
- mAction = new QAction(QIcon(mToolIconFilename),
+ else
+ mAction = new QAction(QIcon(mToolIconFilename),
QString("&").append(mToolMenuName), this);
mAction->setStatusTip(mToolTip);
// Connect the action
connect(mAction, SIGNAL(triggered()), this, SLOT(MenuToolSlot()));
- mMainWindow->GetMenu()->addAction(mAction);
-}
+ if (mExperimental)
+ mMainWindow->GetExperimentalToolMenu()->addAction(mAction);
+ else {
+ mMainWindow->GetMenu(m_MenuName)->addAction(mAction);
+ }
+}
+//------------------------------------------------------------------------------
+
+
+//------------------------------------------------------------------------------
+void vvToolCreatorBase::InsertToolInContextMenu()
+{
+ mMainWindow->GetContextMenu()->addMenu(mToolMenu);
+ for(unsigned int i=0; iactions().size(); i++) {
+ mListOfActions.push_back(m->actions()[i]);
+ }
+ mUseContextMenu = true;
+}
+//------------------------------------------------------------------------------