new wxProgressDialog(_T("Adding file(s)"),
_T(""),
1000,
- this,
+// this,
+ NULL,
wxPD_ELAPSED_TIME |
// wxPD_ESTIMATED_TIME |
// wxPD_REMAINING_TIME |
mProgressDialog->Pulse(_T("Updating view..."));
UpdateTreeViewLevel(crea::wx2std(mNotebook->GetPageText(mNotebook->GetSelection())),1);
- delete mProgressDialog;
+ killProgress();
DisplayAddSummary();
}
new wxProgressDialog(_T("Adding directory"),
_T(""),
NumberFilesToAdd(dirname,recurse),
- this,
+
+//EED this,
+ NULL,
+
wxPD_ELAPSED_TIME |
wxPD_SMOOTH |
// wxPD_ESTIMATED_TIME |
mProgressDialog->Pulse(_T("Updating view..."));
UpdateTreeViewLevel(crea::wx2std(mNotebook->GetPageText(mNotebook->GetSelection())),1);
- delete mProgressDialog;
+ killProgress();
DisplayAddSummary();
}
mViewer->StartPlayer();
#else
void WxGimmickView::UpdateWindowUI(long flags)
{
- //if(mViewer)
- // {
- // mViewer->RefreshIfNecessary();
- // }
+ if(mViewer)
+ {
+ mViewer->RefreshIfNecessary();
+ }
}
#endif
//==================================================
//=================================================
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..."));
UpdateTreeViewLevel(crea::wx2std(mNotebook->GetPageText(mNotebook->GetSelection())),1);
- delete mProgressDialog;
+ killProgress();
DisplayAddSummary();
}
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;
std::cout <<"after mProgressDialog->Pulse" << std::endl;
UpdateTreeViewLevel(crea::wx2std(mNotebook->GetPageText(mNotebook->GetSelection())),1);
std::cout <<"after UpdateTreeViewLevel" << std::endl;
- delete mProgressDialog;
+ killProgress();
std::cout <<"after delete mProgressDialog" << std::endl;
DisplayAddSummary();
std::cout <<"after dDisplayAddSummary" << std::endl;
new wxProgressDialog(_T("Adding drive"),
_T(""),
1000,
- this,
+
+//EED this,
+ NULL,
+
wxPD_ELAPSED_TIME |
// wxPD_ESTIMATED_TIME |
// wxPD_REMAINING_TIME |
mProgressDialog->Pulse(_T("Updating view..."));
UpdateTreeViewLevel(crea::wx2std(mNotebook->GetPageText(mNotebook->GetSelection())),1);
- delete mProgressDialog;
+ killProgress();
DisplayAddSummary();
mViewer->StartPlayer();
}
new wxProgressDialog(_T("Adding file(s)"),
_T(""),
1000,
- this,
+
+//EED this,
+ NULL,
+
wxPD_ELAPSED_TIME |
// wxPD_ESTIMATED_TIME |
// wxPD_REMAINING_TIME |
mGimmick->AddFiles(storage,i_filenames);
mProgressDialog->Pulse(_T("Updating view..."));
UpdateTreeViewLevel(storage,1);
- delete mProgressDialog;
+ killProgress();
DisplayAddSummary();
}
}
// std::cout << "OnAddProgress "<<mess<<std::endl;
wxString s(wxString::From8BitData(mess));
// std::cout << "Pulse"<<std::endl;
- if (!mProgressDialog->Pulse(s))
- {
- p.SetStop();
- }
+
+ if(mProgressDialog != 0)
+ {
+ if (!mProgressDialog->Pulse(s))
+ {
+ p.SetStop();
+ }
+ }
// std::cout << "OnAddProgress ok"<<std::endl;
}
//=================================================
}
}
+ void WxGimmickView::killProgress()
+ {
+ mProgressDialog->Resume();
+ mProgressDialog->Destroy();
+ mProgressDialog = 0;
+ }
+
//=================================================
//=================================================