From db3faf3195c84f987dea55d8116565a732d1b668 Mon Sep 17 00:00:00 2001
From: srit <srit>
Date: Mon, 26 Apr 2010 16:24:02 +0000
Subject: [PATCH] Corrected tool mechanism for windows: static data members
 seem to be initialized only at first instantiation and not as startup (as is
 the case with linux gcc) => dummy global. Reimplemented singleton with
 private constructor and pointer member.

---
 vv/vvToolBase.h      | 10 +++++-----
 vv/vvToolCreator.h   | 16 ++++++++++------
 vv/vvToolCreator.txx |  9 +++++++++
 3 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/vv/vvToolBase.h b/vv/vvToolBase.h
index e1d9b9d..f28fc8b 100644
--- a/vv/vvToolBase.h
+++ b/vv/vvToolBase.h
@@ -29,11 +29,11 @@ public:
   vvToolBase(vvMainWindowBase * m);
   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; }
 
   void AddImage(vvImage::Pointer image,std::string filename) {
     CREATOR(ToolType)->GetMainWindow()->AddImage(image,filename); 
diff --git a/vv/vvToolCreator.h b/vv/vvToolCreator.h
index 5859a2f..2ebd8e0 100644
--- a/vv/vvToolCreator.h
+++ b/vv/vvToolCreator.h
@@ -24,24 +24,28 @@
 template<class ToolType>
 class vvToolCreator: public vvToolCreatorBase {
 public:
-  vvToolCreator(QString name):vvToolCreatorBase(name) {;}
+  static vvToolCreator<ToolType> *&GetInstance();
   virtual void InsertToolInMenu(vvMainWindowBase * m);
   virtual void MenuSpecificToolSlot() { CreateTool<ToolType>(); }
+private:
+  vvToolCreator():vvToolCreatorBase(mToolCreatorName) {;}
   static vvToolCreator<ToolType> * mSingleton;
+  static const QString mToolCreatorName;
 };
 //------------------------------------------------------------------------------
 
 
 //------------------------------------------------------------------------------
-#define CREATOR(CLASSNAME) vvToolCreator<CLASSNAME>::mSingleton
+#define CREATOR(CLASSNAME) vvToolCreator<CLASSNAME>::GetInstance()
 //------------------------------------------------------------------------------
 
 
 //------------------------------------------------------------------------------
-#define ADD_TOOL(NAME)                                          \
-  template<>                                                    \
-  vvToolCreator<NAME> * vvToolCreator<NAME>::mSingleton =       \
-    new vvToolCreator<NAME>(#NAME);
+// Initiliazes the static parameters and creates a dummy pointer (required for windows)
+#define ADD_TOOL(NAME)                                                           \
+  template<> const QString        vvToolCreator<NAME>::mToolCreatorName = #NAME; \
+  template<> vvToolCreator<NAME> *vvToolCreator<NAME>::mSingleton       = NULL;  \
+  const vvToolCreator<NAME> *dummy##NAME = vvToolCreator<NAME>::GetInstance();
 //------------------------------------------------------------------------------
 
 #include "vvToolCreator.txx"
diff --git a/vv/vvToolCreator.txx b/vv/vvToolCreator.txx
index 33fd9e0..47b526c 100644
--- a/vv/vvToolCreator.txx
+++ b/vv/vvToolCreator.txx
@@ -33,3 +33,12 @@ void vvToolCreator<ToolType>::InsertToolInMenu(vvMainWindowBase * m) {
   vvToolCreatorBase::InsertToolInMenu(mMainWindow); 
 }
 //------------------------------------------------------------------------------
+
+//------------------------------------------------------------------------------
+template<class ToolType>
+vvToolCreator<ToolType>* & vvToolCreator<ToolType>::GetInstance() { 
+  if(!mSingleton)
+    mSingleton = new vvToolCreator<ToolType>;
+  return mSingleton;
+}
+//------------------------------------------------------------------------------
-- 
2.45.1