X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=vv%2FvvToolBase.h;h=3cd4fbfd2acc55b466b98d435c5db46b0ee0715a;hb=58589a922e65bf0ceab2eaa27025f9dc222e0329;hp=e1d9b9dd7fc9bb774004bc17133f62cc0214a0c7;hpb=1df2c8867c511818511bbd2b0be560325a4944c5;p=clitk.git

diff --git a/vv/vvToolBase.h b/vv/vvToolBase.h
index e1d9b9d..3cd4fbf 100644
--- a/vv/vvToolBase.h
+++ b/vv/vvToolBase.h
@@ -3,7 +3,7 @@
 
   Authors belong to: 
   - University of LYON              http://www.universite-lyon.fr/
-  - Léon Bérard cancer center       http://oncora1.lyon.fnclcc.fr
+  - Léon Bérard cancer center       http://www.centreleonberard.fr
   - CREATIS CNRS laboratory         http://www.creatis.insa-lyon.fr
 
   This software is distributed WITHOUT ANY WARRANTY; without even
@@ -14,29 +14,36 @@
 
   - BSD        See included LICENSE.txt file
   - CeCILL-B   http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html
-======================================================================-====*/
+===========================================================================**/
 
 #ifndef VVTOOLBASE_H
 #define VVTOOLBASE_H
 
 #include "vvToolBaseBase.h"
 #include "vvToolCreator.h"
+#include <QIcon>
 
 //------------------------------------------------------------------------------
 template<class ToolType>
 class vvToolBase : public vvToolBaseBase {
 public:
   vvToolBase(vvMainWindowBase * m);
+  virtual ~vvToolBase() {};
+  
   static void Initialize();  // can't be virtual, must be overwritten
 
-  static void SetToolName(QString n) { vvToolCreator<ToolType>::mSingleton->mToolName = n; }
-  static void SetToolMenuName(QString n) { vvToolCreator<ToolType>::mSingleton->mToolMenuName = n; }
-  static void SetToolIconFilename(QString n) { vvToolCreator<ToolType>::mSingleton->mToolIconFilename = n; }
-  static void SetToolTip(QString n) { vvToolCreator<ToolType>::mSingleton->mToolTip = n; }
-  static void SetToolExperimental(bool exp) { vvToolCreator<ToolType>::mSingleton->mExperimental = exp; }
+  static void SetToolName(QString n) { vvToolCreator<ToolType>::GetInstance()->mToolName = n; }
+  static void SetToolMenuName(QString n) { vvToolCreator<ToolType>::GetInstance()->mToolMenuName = n; }
+  static void SetToolIconFilename(QString n) { vvToolCreator<ToolType>::GetInstance()->mToolIconFilename = n; }
+  static void SetToolTip(QString n) { vvToolCreator<ToolType>::GetInstance()->mToolTip = n; }
+  static void SetToolExperimental(bool exp) { vvToolCreator<ToolType>::GetInstance()->mExperimental = exp; }
+  static void SetToolInMenu(std::string menu) { vvToolCreator<ToolType>::GetInstance()->SetMenuName(menu); }
 
-  void AddImage(vvImage::Pointer image,std::string filename) {
-    CREATOR(ToolType)->GetMainWindow()->AddImage(image,filename); 
+  static QIcon GetToolIcon() { return QIcon(vvToolCreator<ToolType>::GetInstance()->mToolIconFilename); }
+  static QString & GetToolName() { return vvToolCreator<ToolType>::GetInstance()->mToolName; }
+
+  vvSlicerManager * AddImage(vvImage::Pointer image,std::string filename) {
+    return CREATOR(ToolType)->GetMainWindow()->AddImage(image,filename); 
   }
 
   void setSender(QObject *s) { mSender = s; }