mBottomPanel->SetSizer(mbottom_sizer);
// Splitting
+ /// \TODO fix warning: unused variable hsize
int hsize = size.GetHeight();
int top_minsize = 450;
new wxProgressDialog(_T("Adding file(s)"),
_T(""),
1000,
- this,
+// this,
+ NULL,
wxPD_ELAPSED_TIME |
// wxPD_ESTIMATED_TIME |
// wxPD_REMAINING_TIME |
new wxProgressDialog(_T("Adding directory"),
_T(""),
NumberFilesToAdd(dirname,recurse),
- this,
+
+//EED this,
+ NULL,
+
wxPD_ELAPSED_TIME |
wxPD_SMOOTH |
// wxPD_ESTIMATED_TIME |
bool WxGimmickView::isNeedRecursive(std::string i_name)
{
boost::filesystem::directory_iterator iter(i_name), end_iter;
- bool bfindir = false;
+ //bool bfindir = false;
for(; iter != end_iter; ++iter)
{
if(boost::filesystem::is_directory(*iter))
//=================================================
void WxGimmickView::AddDir(std::string dirName)
{
- mProgressDialog = new wxProgressDialog(_T("Adding directory"),_T(""),1000,this,wxPD_ELAPSED_TIME |wxPD_CAN_ABORT );
+ mProgressDialog = new wxProgressDialog(_T("Adding directory"),_T(""),1000,
+
+//EED this,
+ NULL,
+
+ wxPD_ELAPSED_TIME |wxPD_CAN_ABORT );
mCurrentDirectory = crea::std2wx(dirName);
mGimmick->AddDir(crea::wx2std(mNotebook->GetPageText(mNotebook->GetSelection())),dirName,true);
mProgressDialog->Pulse(_T("Updating view..."));
if (dial->GetReturnCode() == wxID_OK)
{
#if defined(BUILD_BRUKER)
- if (nb->GetSelection()==0)//Selection: Bruker Image Reader
+ if (nb->GetSelection()==0)//Selection: Bruker Image Reader
{
std::string inputDir = crea::wx2std(gimmickTools->getInputDir());
std::string outputDir = crea::wx2std(gimmickTools->getOutputDir());
if (addToDB)
{
std::cout <<"after addToDB" << std::endl;
- mProgressDialog = new wxProgressDialog(_T("Adding directory"),_T(""),1000,this,wxPD_ELAPSED_TIME |wxPD_CAN_ABORT );
+ mProgressDialog = new wxProgressDialog(_T("Adding directory"),_T(""),1000,
+
+//EED this,
+ NULL,
+
+ wxPD_ELAPSED_TIME |wxPD_CAN_ABORT );
std::cout <<"after new wxProgressDialog" << std::endl;
mCurrentDirectory = gimmickTools->getOutputDir();
std::cout <<"after gimmickTools->getOutputDir[" <<mCurrentDirectory << std::endl;
new wxProgressDialog(_T("Adding drive"),
_T(""),
1000,
- this,
+
+//EED this,
+ NULL,
+
wxPD_ELAPSED_TIME |
// wxPD_ESTIMATED_TIME |
// wxPD_REMAINING_TIME |
new wxProgressDialog(_T("Adding file(s)"),
_T(""),
1000,
- this,
+
+//EED this,
+ NULL,
+
wxPD_ELAPSED_TIME |
// wxPD_ESTIMATED_TIME |
// wxPD_REMAINING_TIME |
// std::cout << "OnAddProgress "<<mess<<std::endl;
wxString s(wxString::From8BitData(mess));
// std::cout << "Pulse"<<std::endl;
+
if(mProgressDialog != 0)
{
if (!mProgressDialog->Pulse(s))