// Sets the current directory to the home dir
mCurrentDirectory = std2wx(gimmick->GetHomeDirectory());
+
// Connect the AddProgress callback
gimmick->ConnectAddProgressObserver
( boost::bind( &WxGimmickView::OnAddProgress , this, _1 ) );
/// By default if out_infos is empty, we dont' provide informations, we return only vtkImageData
/// if out_infos has only one entry "all" we provide all database informations
void WxGimmickView::getSelectedFiles(std::vector<OutStrGimmick> &outG, std::vector< std::string> i_attr,
- bool mult, const std::string out_model)
+ bool mult, const std::string out_model)
{
// First we select the files
- std::vector<std::string> files;
+ std::vector<std::string> files;
std::string db_name = crea::wx2std(mNotebook->GetPageText(mNotebook->GetSelection()));
GetTreeViewMap()[crea::wx2std(mNotebook->GetPageText(mNotebook->GetSelection()))]->GetSelectedAsString(files);
if (FD->ShowModal()==wxID_OK)
{
+ time(&mstart);
std::string dirname = wx2std (FD->GetPath());
bool recurse = isNeedRecursive(dirname);
if (recurse)
void WxGimmickView::OnTools(wxCommandEvent& event)
{
mViewer->StopPlayer();
-
+
wxDialog* dial = new wxDialog (this,-1,_T("Tools"),wxDefaultPosition, wxSize(550,350));
wxSizer* buttonsSizer = dial->CreateSeparatedButtonSizer(wxOK|wxCANCEL);
{
std::string inputDir = crea::wx2std(gimmickTools->getInputDir());
std::string outputDir = crea::wx2std(gimmickTools->getOutputDir());
-
+
bool addToDB = gimmickTools->getAddToDBCheckBoxValue();
if (inputDir.compare("")!=0 && outputDir.compare("")!=0)
{
- if ( wxMessageBox(_T("Depending on the amount of Data the process can take between 1 and 5 minutes. Do you want to continue?"),
+ if ( wxMessageBox(_T("Depending on the amount of Data the process can take several minutes. Do you want to continue?"),
_T("Please confirm"), wxICON_QUESTION | wxYES_NO) == wxYES )
{
Bruker2Dicom b2d;
b2d.SetConvertModeToDicom();
b2d.verbose=false;
b2d.Execute();
-
if (addToDB)
{
+ std::cout <<"after addToDB" << std::endl;
mProgressDialog = new wxProgressDialog(_T("Adding directory"),_T(""),1000,this,wxPD_ELAPSED_TIME |wxPD_CAN_ABORT );
+ std::cout <<"after new wxProgressDialog" << std::endl;
mCurrentDirectory = gimmickTools->getOutputDir();
+ std::cout <<"after gimmickTools->getOutputDir[" <<mCurrentDirectory << std::endl;
mGimmick->AddDir(crea::wx2std(mNotebook->GetPageText(mNotebook->GetSelection())),outputDir,true);
+ std::cout <<"after mGimmick->AddDir" << std::endl;
mProgressDialog->Pulse(_T("Updating view..."));
-
+ std::cout <<"after mProgressDialog->Pulse" << std::endl;
UpdateTreeViewLevel(crea::wx2std(mNotebook->GetPageText(mNotebook->GetSelection())),1);
+ std::cout <<"after UpdateTreeViewLevel" << std::endl;
delete mProgressDialog;
+ std::cout <<"after delete mProgressDialog" << std::endl;
DisplayAddSummary();
+ std::cout <<"after dDisplayAddSummary" << std::endl;
}
}
}
mess << "Files\tscanned\t: " << p.GetNumberScannedFiles() << "\n";
mess << "Files\thandled\t: " << p.GetNumberHandledFiles() << "\n\n";
mess << "Files\tadded \t: " << p.GetNumberAddedFiles() << "\n\n";
+ time_t end;
+ time(&end);
+ mess << "time to scan :" << difftime(end,mstart) << "sec";
wxMessageBox(std2wx(mess.str()),_T("Addition result"),wxOK,this);
}