X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=vv%2FvvToolBase.h;h=b4a6cd8f9142332a082a4358b2f50d621b67b73b;hb=b29eb65e42740eaea460a8c503f3df05bb554ffe;hp=a6629504bb23329e038a9e0ffa56ca0b11fc2d3f;hpb=4ea2c946973c570cbe540a27cf44d6acdf44867c;p=clitk.git

diff --git a/vv/vvToolBase.h b/vv/vvToolBase.h
index a662950..b4a6cd8 100644
--- a/vv/vvToolBase.h
+++ b/vv/vvToolBase.h
@@ -18,6 +18,7 @@
 
 #ifndef VVTOOLBASE_H
 #define VVTOOLBASE_H
+
 #include "vvToolBaseBase.h"
 #include "vvToolCreator.h"
 
@@ -26,16 +27,22 @@ 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); }
+
+  static QIcon GetToolIcon() { return QIcon(vvToolCreator<ToolType>::GetInstance()->mToolIconFilename); }
+  static QString & GetToolName() { return vvToolCreator<ToolType>::GetInstance()->mToolName; }
 
-  void AddImage(vvImage::Pointer image,std::string filename) {
-    CREATOR(ToolType)->GetMainWindow()->AddImage(image,filename); 
+  vvSlicerManager * AddImage(vvImage::Pointer image,std::string filename) {
+    return CREATOR(ToolType)->GetMainWindow()->AddImage(image,filename); 
   }
 
   void setSender(QObject *s) { mSender = s; }