From: Eduardo Davila Date: Mon, 9 Nov 2009 18:30:02 +0000 (+0000) Subject: *** empty log message *** X-Git-Tag: CREATOOLS.2-0-3~100 X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=b818afb24157d3474ecb598a98d92667745a6aa3;p=creaImageIO.git *** empty log message *** --- diff --git a/appli/TestGimmickReaderDialog/main.cxx b/appli/TestGimmickReaderDialog/main.cxx index d5d3550..7cb25b5 100644 --- a/appli/TestGimmickReaderDialog/main.cxx +++ b/appli/TestGimmickReaderDialog/main.cxx @@ -16,6 +16,8 @@ int main(int argc, char* argv[]) std::vector 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 eb89c66..bef92de 100644 --- 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 58b4c96..5ec96f8 100644 --- 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 c6eb5a3..13c2495 100644 --- 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 5b575d6..f2c18d9 100644 --- a/src2/creaImageIOGimmickReaderDialog.cpp +++ b/src2/creaImageIOGimmickReaderDialog.cpp @@ -9,6 +9,8 @@ namespace creaImageIO { bool GimmickReaderDialog(std::vector& 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 09a70f1..b5a86ab 100644 --- a/src2/creaImageIOGimmickReaderDialog.h +++ b/src2/creaImageIOGimmickReaderDialog.h @@ -16,6 +16,8 @@ namespace creaImageIO */ bool CREAIMAGEIO_EXPORT GimmickReaderDialog (std::vector& 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 f01f0bf..e317bcb 100644 --- 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(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 21da84f..f1100c6 100644 --- 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 7fe2b41..b2e38b5 100644 --- 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(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 4b3e6b6..2572065 100644 --- 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,