X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=vv%2FvvToolCreator.h;h=a67329a50a5fada587155d46261b66d90c5ef949;hb=64eaced5840fd6ed00ac023a74dc2e36d3c8add1;hp=e2d108af8835a6ad9ab6647dbfed8405171ca714;hpb=0a85e47a06c7d046d06a4645b724c4e81b19998d;p=clitk.git
diff --git a/vv/vvToolCreator.h b/vv/vvToolCreator.h
index e2d108a..a67329a 100644
--- a/vv/vvToolCreator.h
+++ b/vv/vvToolCreator.h
@@ -1,30 +1,20 @@
/*=========================================================================
+ Program: vv http://www.creatis.insa-lyon.fr/rio/vv
- Program: vv
- Module: $RCSfile: vvToolCreator.h,v $
- Language: C++
- Date: $Date: 2010/02/24 11:43:37 $
- Version: $Revision: 1.1 $
- 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.
-
- 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 .
-
- =========================================================================*/
+ It is distributed under dual licence
+ - BSD See included LICENSE.txt file
+ - CeCILL-B http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html
+===========================================================================**/
#ifndef VVTOOLCREATOR_H
#define VVTOOLCREATOR_H
@@ -34,24 +24,28 @@
template
class vvToolCreator: public vvToolCreatorBase {
public:
- vvToolCreator(QString name):vvToolCreatorBase(name) {;}
+ static vvToolCreator *&GetInstance();
virtual void InsertToolInMenu(vvMainWindowBase * m);
virtual void MenuSpecificToolSlot() { CreateTool(); }
+private:
+ vvToolCreator():vvToolCreatorBase(mToolCreatorName) {;}
static vvToolCreator * mSingleton;
+ static const QString mToolCreatorName;
};
//------------------------------------------------------------------------------
//------------------------------------------------------------------------------
-#define CREATOR(CLASSNAME) vvToolCreator::mSingleton
+#define CREATOR(CLASSNAME) vvToolCreator::GetInstance()
//------------------------------------------------------------------------------
//------------------------------------------------------------------------------
-#define ADD_TOOL(NAME) \
- template<> \
- vvToolCreator * vvToolCreator::mSingleton = \
- new vvToolCreator(#NAME);
+// Initiliazes the static parameters and creates a dummy pointer (required for windows)
+#define ADD_TOOL(NAME) \
+ template<> const QString vvToolCreator::mToolCreatorName = #NAME; \
+ template<> vvToolCreator *vvToolCreator::mSingleton = NULL; \
+ const vvToolCreator *dummy##NAME = vvToolCreator::GetInstance();
//------------------------------------------------------------------------------
#include "vvToolCreator.txx"