From d0eb877b1d067c10bb8b1892318406caee627646 Mon Sep 17 00:00:00 2001 From: Frederic Cervenansky Date: Thu, 27 Aug 2009 11:58:49 +0000 Subject: [PATCH] *** empty log message *** --- src2/creaImageIOWxDescriptorPanel.cpp | 6 +++--- src2/creaImageIOWxDescriptorPanel.h | 5 ++++- src2/creaImageIOWxGimmickView.cpp | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src2/creaImageIOWxDescriptorPanel.cpp b/src2/creaImageIOWxDescriptorPanel.cpp index f37554b..d5bb0f6 100644 --- a/src2/creaImageIOWxDescriptorPanel.cpp +++ b/src2/creaImageIOWxDescriptorPanel.cpp @@ -8,8 +8,8 @@ namespace creaImageIO { // CTor -WxDescriptorPanel::WxDescriptorPanel(wxWindow *parent) - : wxDialog(parent, -1,_T("Descriptor Creation"), wxDefaultPosition, wxSize(550,550)) + WxDescriptorPanel::WxDescriptorPanel(wxWindow *parent, const std::string path) + : wxDialog(parent, -1,_T("Descriptor Creation"), wxDefaultPosition, wxSize(550,550)) , m_path(path) { @@ -553,7 +553,7 @@ WxDescriptorPanel::WxDescriptorPanel(wxWindow *parent) std::string wc("*.dscp"); wxFileDialog* FD = new wxFileDialog( 0, _T("Select file"), - _T(""), + crea::std2wx(m_path), _T(""), crea::std2wx(wc), style, diff --git a/src2/creaImageIOWxDescriptorPanel.h b/src2/creaImageIOWxDescriptorPanel.h index 2f95e81..626c44d 100644 --- a/src2/creaImageIOWxDescriptorPanel.h +++ b/src2/creaImageIOWxDescriptorPanel.h @@ -39,7 +39,7 @@ namespace creaImageIO { public: WxDescriptorPanel(); - WxDescriptorPanel(wxWindow *parent); + WxDescriptorPanel(wxWindow *parent, const std::string path); ~WxDescriptorPanel(); // Get file to load Descriptor @@ -141,6 +141,9 @@ namespace creaImageIO // List of added level std::map lvlist; + // DB Gimmick path + std::string m_path; + }; // class WxDescriptorPanel //===================================================================== diff --git a/src2/creaImageIOWxGimmickView.cpp b/src2/creaImageIOWxGimmickView.cpp index 522b054..ed5060d 100644 --- a/src2/creaImageIOWxGimmickView.cpp +++ b/src2/creaImageIOWxGimmickView.cpp @@ -1081,7 +1081,7 @@ namespace creaImageIO void WxGimmickView::OnCreateDB(wxCommandEvent& event) { - WxDescriptorPanel * DescriptorPan = new WxDescriptorPanel(this); + WxDescriptorPanel * DescriptorPan = new WxDescriptorPanel(this, mGimmick->GetHomeDirectory()); DescriptorPan->Layout(); if ( DescriptorPan->ShowModal() == ID_DSCP_APPLY) { -- 2.45.0