*** empty log message ***

diff --git a/appli/TestGimmickReaderDialog/main.cxx b/appli/TestGimmickReaderDialog/main.cxx
index d5d355015c6e2e5d2ce374dc32c8635a3970e13e..7cb25b52656011a9d48d0b927100d3d0329820da 100644 (file)
--- a/appli/TestGimmickReaderDialog/main.cxx
+++ b/appli/TestGimmickReaderDialog/main.cxx
@@ -16,6 +16,8 @@ int main(int argc, char* argv[])
   std::vector<vtkImageData*> images;
   bool r = creaImageIO::GimmickReaderDialog(images,
                                            "GimmickReaderDialog test",
+                                               "localdatabase_Descriptor.dscp",
+                                       "Local Database",
                                            0,0,800,800,2,3,3,1);
   
   if (r)

diff --git a/appli/TestWxGimmickReaderDialog/main.cxx b/appli/TestWxGimmickReaderDialog/main.cxx
index eb89c66742f88d166cba3647481acfc9f8a7d5d0..bef92dece3bc05e0418acf22998f6a624042707b 100644 (file)
--- a/appli/TestWxGimmickReaderDialog/main.cxx
+++ b/appli/TestWxGimmickReaderDialog/main.cxx
@@ -35,6 +35,8 @@ bool myApp::OnInit( )
    creaImageIO::WxGimmickReaderDialog w(
                     0,
                    -1,
+                                  "localdatabase_Descriptor.dscp",
+                                  "Local Database",
                    _T("Select image(s)        - Gimmick! (c) CREATIS-LRMN 2008"),
                    wxDefaultPosition,
                    wxSize(810,750),

diff --git a/src2/creaImageIOGimmick.cpp b/src2/creaImageIOGimmick.cpp
index 58b4c96fca4079ea5d5dcc7c46e77fbc2d9de575..5ec96f8120c5c0e1bcb8f4fb69d7a9015fdfbcec 100644 (file)
--- a/src2/creaImageIOGimmick.cpp
+++ b/src2/creaImageIOGimmick.cpp
@@ -49,7 +49,7 @@ namespace creaImageIO
   //==============================================================
   
   //==============================================================
-  void Gimmick::Initialize(const std::string& i_namedescp, const std::string i_namedb)
+  void Gimmick::Initialize(const std::string i_namedescp, const std::string i_namedb)
   {
          mLocalDescpName = i_namedescp;
          mLocalDBName = i_namedb;

diff --git a/src2/creaImageIOGimmick.h b/src2/creaImageIOGimmick.h
index c6eb5a36f9b9d71e4258436628cef56af1de86a9..13c2495ca645faf6ab1a7c2d766f1b4a0e0a11bb 100644 (file)
--- a/src2/creaImageIOGimmick.h
+++ b/src2/creaImageIOGimmick.h
@@ -103,7 +103,7 @@ namespace creaImageIO
     void Initialize();
 
        /// Initializes with the local database descriptor in the path given (read/creates databases, etc.)
-       void Initialize(const std::string& namedescp, const std::string namedb = "Local Database");
+       void Initialize(const std::string namedescp, const std::string namedb = "Local Database");
     
     /// Finalize (closes databases, etc.)
     void Finalize();

diff --git a/src2/creaImageIOGimmickReaderDialog.cpp b/src2/creaImageIOGimmickReaderDialog.cpp
index 5b575d6d29613fb071f656a568625fab42dc76c0..f2c18d941135492c0f7041a1f8a9daffa5e75ca2 100644 (file)
--- a/src2/creaImageIOGimmickReaderDialog.cpp
+++ b/src2/creaImageIOGimmickReaderDialog.cpp
@@ -9,6 +9,8 @@ namespace creaImageIO
 {
 
   bool GimmickReaderDialog(std::vector<vtkImageData*>& images,
+                          const std::string i_namedescp , 
+                          const std::string i_namedb ,
                           const std::string& title,
                           int posx, 
                           int posy,
@@ -23,6 +25,8 @@ namespace creaImageIO
     
     creaImageIO::WxGimmickReaderDialog w(0,
                                         -1,
+                                        i_namedescp,
+                                        i_namedb,
                                         crea::std2wx(title),
                                         wxPoint(posx,posy),
                                         wxSize(sizex,sizey),

diff --git a/src2/creaImageIOGimmickReaderDialog.h b/src2/creaImageIOGimmickReaderDialog.h
index 09a70f17d5885b692888246e2fad3aa7c3e0cea6..b5a86ab27ac9f18210ad2c5fea88941112611c01 100644 (file)
--- a/src2/creaImageIOGimmickReaderDialog.h
+++ b/src2/creaImageIOGimmickReaderDialog.h
@@ -16,6 +16,8 @@ namespace creaImageIO
    */
   bool CREAIMAGEIO_EXPORT GimmickReaderDialog
   (std::vector<vtkImageData*>& images,
+   const std::string i_namedescp , 
+   const std::string i_namedb = "Local Database",
    const std::string& title = "Select images",
    int posx = 0, int posy = 0,
    int sizex = 1200, int sizey = 800,

diff --git a/src2/creaImageIOWxGimmickPanel.cpp b/src2/creaImageIOWxGimmickPanel.cpp
index f01f0bff457e7c1354270c1302e00e68865fe9c3..e317bcbe869f928734194b8de77a86be4399d83f 100644 (file)
--- a/src2/creaImageIOWxGimmickPanel.cpp
+++ b/src2/creaImageIOWxGimmickPanel.cpp
@@ -8,6 +8,8 @@ namespace creaImageIO
                                               wxWindowID id,
                                               const wxPoint& pos,
                                               const wxSize& size,
+                                                  const std::string i_namedescp , 
+                                                  const std::string i_namedb ,
                                               int threads)
  :   wxPanel( parent, 
                  id, 
@@ -30,7 +32,7 @@ namespace creaImageIO
     try {
       
                mGimmick = boost::shared_ptr<Gimmick>(new Gimmick());
-      mGimmick->Initialize();
+          mGimmick->Initialize(i_namedescp,i_namedb);
      
       int min_dim = GIMMICK_2D_IMAGE_SELECTION;
          int max_dim = GIMMICK_3D_IMAGE_SELECTION;

diff --git a/src2/creaImageIOWxGimmickPanel.h b/src2/creaImageIOWxGimmickPanel.h
index 21da84f0ab3f193909854f16034e9faec7ae99d2..f1100c65d5d27eae980187f9244982289600d1e9 100644 (file)
--- a/src2/creaImageIOWxGimmickPanel.h
+++ b/src2/creaImageIOWxGimmickPanel.h
@@ -25,6 +25,8 @@ namespace creaImageIO
                   const wxWindowID id,
                   const wxPoint& pos, 
                   const wxSize& size,
+                  const std::string i_namedescp , 
+                  const std::string i_namedb = _T("Local Database"),
                   int threads = 0);
     
     ~WxGimmickPanel();

diff --git a/src2/creaImageIOWxGimmickReaderDialog.cpp b/src2/creaImageIOWxGimmickReaderDialog.cpp
index 7fe2b411dda7479f0b5c3ec4205aa29459b46e13..b2e38b5cb4e530942917329eb18bb1df080fcc51 100644 (file)
--- a/src2/creaImageIOWxGimmickReaderDialog.cpp
+++ b/src2/creaImageIOWxGimmickReaderDialog.cpp
@@ -10,10 +10,12 @@ namespace creaImageIO
   // CTor
   WxGimmickReaderDialog::WxGimmickReaderDialog(wxWindow *parent, 
                                               wxWindowID id,
+                                                  const std::string i_namedescp , 
+                                                  const std::string i_namedb ,
                                               wxString title,
                                               const wxPoint& pos,
                                               const wxSize& size,
-                                              int min_dim,
+                                                  int min_dim,
                                               int max_dim,
                                               int output_dim,
                                               int threads)
@@ -39,7 +41,7 @@ namespace creaImageIO
     try {
       
                mGimmick = boost::shared_ptr<Gimmick>(new Gimmick());
-      mGimmick->Initialize();
+      mGimmick->Initialize(i_namedescp,i_namedb);
     
       
       mView = new WxGimmickView(mGimmick,

diff --git a/src2/creaImageIOWxGimmickReaderDialog.h b/src2/creaImageIOWxGimmickReaderDialog.h
index 4b3e6b663cec6ba2aef2c2a11e0b0a2c1426f869..2572065a314893347a1788c62988e7848e9b4601 100644 (file)
--- a/src2/creaImageIOWxGimmickReaderDialog.h
+++ b/src2/creaImageIOWxGimmickReaderDialog.h
@@ -20,6 +20,8 @@ namespace creaImageIO
     WxGimmickReaderDialog();
     WxGimmickReaderDialog(wxWindow *parent,
                          const wxWindowID id,
+                         const std::string i_namedescp , 
+                         const std::string i_namedb ,
                          wxString title,
                          const wxPoint& pos,
                          const wxSize& size,