X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src2%2FcreaImageIOWxGimmickView.cpp;h=9ada3c16b67eaf2f7738c1a6b0b10fff7739c66d;hb=36cf4b6daf031e4d5e757b4f732b9bf39d69200c;hp=fb46be65b1bfefc812697d47c05401272635b375;hpb=595926ac27740a8822b6de9579e2e148c59f469c;p=creaImageIO.git diff --git a/src2/creaImageIOWxGimmickView.cpp b/src2/creaImageIOWxGimmickView.cpp index fb46be6..9ada3c1 100644 --- a/src2/creaImageIOWxGimmickView.cpp +++ b/src2/creaImageIOWxGimmickView.cpp @@ -1,8 +1,10 @@ -#include +#include #include #include #include #include +#include +#include using namespace crea; // Icons @@ -21,6 +23,9 @@ using namespace crea; #include #include #include +#if defined(BUILD_BRUKER) + #include "bruker2dicom.h" +#endif namespace creaImageIO { @@ -168,6 +173,7 @@ namespace creaImageIO mListener->ConnectObserver(boost::bind( &WxGimmickView::OnDriveMount , this, _1 ) ); mListener->Create(); mListener->Run(); + mListener->Pause(); mConstructed = true; } @@ -647,6 +653,19 @@ namespace creaImageIO wxMessageBox(std2wx("The selected files have been copied"),_T("Copy files"),wxOK,this); } + //================================================= + void WxGimmickView::AddDir(std::string dirName) + { + mProgressDialog = new wxProgressDialog(_T("Adding directory"),_T(""),1000,this,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; + DisplayAddSummary(); + } + //================================================= void WxGimmickView::OnSynchronize(wxCommandEvent& event) { @@ -702,7 +721,7 @@ namespace creaImageIO { mViewer->StopPlayer(); - wxDialog* dial = new wxDialog (this,-1,"Tools",wxDefaultPosition, wxSize(300,250)); + wxDialog* dial = new wxDialog (this,-1,_T("Tools"),wxDefaultPosition, wxSize(300,250)); wxSizer* buttonsSizer = dial->CreateSeparatedButtonSizer(wxOK|wxCANCEL); wxNotebook* nb= new wxNotebook(dial, -1, wxDefaultPosition, wxDefaultSize, 0); @@ -711,9 +730,11 @@ namespace creaImageIO dialSizer->Add(nb,1,wxGROW,0); dialSizer->Add(buttonsSizer,0,wxGROW); - //First page: Bruker Image Reader - WxGimmickTools * gimmickTools = new WxGimmickTools(nb, mCurrentDirectory); - nb->AddPage( gimmickTools, crea::std2wx("Bruker Image Reader") ); +#if defined(BUILD_BRUKER) + //First page: Bruker Image Reader + WxGimmickTools * gimmickTools = new WxGimmickTools(nb, mCurrentDirectory); + nb->AddPage( gimmickTools, _T("Bruker Image Reader") ); +#endif dial->SetSizer(dialSizer, true); dial->Layout(); @@ -721,40 +742,45 @@ namespace creaImageIO if (dial->GetReturnCode() == wxID_OK) { - if (nb->GetSelection()==0)//Selection: Bruker Image Reader - { - std::string inputDir = crea::wx2std(gimmickTools->getInputDir()); - std::string outputDir = crea::wx2std(gimmickTools->getOutputDir()); - bool addToDB = gimmickTools->getCheckBoxValue(); - - if (inputDir.compare("")!=0 && outputDir.compare("")!=0) +#if defined(BUILD_BRUKER) + if (nb->GetSelection()==0)//Selection: Bruker Image Reader { - /* - Bruker2Dicom b2d; - b2d.SetInputDirectory(crea::wx2std(inputDir)); - b2d.SetOutputDirectory(crea::wx2std(outputDir)); - b2d.SetConvertModeToDicom(); - b2d.Execute(); - */ - - if (addToDB) + std::string inputDir = crea::wx2std(gimmickTools->getInputDir()); + std::string outputDir = crea::wx2std(gimmickTools->getOutputDir()); + bool addToDB = gimmickTools->getCheckBoxValue(); + + if (inputDir.compare("")!=0 && outputDir.compare("")!=0) { - mProgressDialog = new wxProgressDialog(_T("Adding directory"),_T(""),1000,this,wxPD_ELAPSED_TIME |wxPD_CAN_ABORT ); - mCurrentDirectory = outputDir; - mGimmick->AddDir(crea::wx2std(mNotebook->GetPageText(mNotebook->GetSelection())),crea::wx2std(outputDir),true); - mProgressDialog->Pulse(_T("Updating view...")); - - UpdateTreeViewLevel(crea::wx2std(mNotebook->GetPageText(mNotebook->GetSelection())),1); - delete mProgressDialog; - DisplayAddSummary(); - } - } - - else - { - wxMessageBox(_T("One or both of the directory fields are empty"),_T("Empty Fields"),wxOK,this); - } + if ( wxMessageBox(_T("Depending on the amount of Data the process can take between 1 and 5 minutes. Do you want to continue?"), + _T("Please confirm"), wxICON_QUESTION | wxYES_NO) == wxYES ) + { + Bruker2Dicom b2d; + b2d.SetInputDirectory(inputDir); + b2d.SetOutputDirectory(outputDir); + b2d.SetConvertModeToDicom(); + b2d.Execute(); + + if (addToDB) + { + mProgressDialog = new wxProgressDialog(_T("Adding directory"),_T(""),1000,this,wxPD_ELAPSED_TIME |wxPD_CAN_ABORT ); + mCurrentDirectory = gimmickTools->getOutputDir(); + mGimmick->AddDir(crea::wx2std(mNotebook->GetPageText(mNotebook->GetSelection())),outputDir,true); + mProgressDialog->Pulse(_T("Updating view...")); + + UpdateTreeViewLevel(crea::wx2std(mNotebook->GetPageText(mNotebook->GetSelection())),1); + delete mProgressDialog; + DisplayAddSummary(); + } + } + } + + else + { + wxMessageBox(_T("One or both of the directory fields are empty"),_T("Empty Fields"),wxOK,this); + } } + delete gimmickTools; +#endif } mViewer->StartPlayer(); @@ -789,11 +815,29 @@ namespace creaImageIO WxListenerPanel* cdWatch=new WxListenerPanel(nb,dial, this, mListener->IsPaused()); nb->AddPage( cdWatch, crea::std2wx("CD/DVD") ); - //Fourth page: Selection of attributes to show (edit) - wxPanel* attSelection=new wxPanel(nb); + //Fourth page: Selection of attributes to show + std::vector shown; + std::vector nShown; + GetTreeViewMap()[crea::wx2std(mNotebook->GetPageText(mNotebook->GetSelection()))]->GetAttributes(shown,nShown,1); + int nLev=GetTreeViewMap()[crea::wx2std(mNotebook->GetPageText(mNotebook->GetSelection()))]->GetNumberOfLevels(); + WxAttributeSelectionPanel* attSelection=new WxAttributeSelectionPanel(nb,dial,this,shown,nShown,nLev); nb->AddPage( attSelection, crea::std2wx("Selection of Attributes") ); } + //=================================================================== + void WxGimmickView::GetVisibleAttributes(std::vector& shown, + std::vector& nShown, int level) + { + GetTreeViewMap()[crea::wx2std(mNotebook->GetPageText(mNotebook->GetSelection()))]->GetAttributes(shown,nShown,level); + } + + //=================================================================== + void WxGimmickView::OnAttributesChanged(const std::vector& nShown, int level) + { + GetTreeViewMap()[crea::wx2std(mNotebook->GetPageText(mNotebook->GetSelection()))]->SetNonVisibleAttributes(nShown,level); + std::vector n=nShown; + GetTreeViewMap()[crea::wx2std(mNotebook->GetPageText(mNotebook->GetSelection()))]->CreateCtrl(n,level); + } //=================================================================== void WxGimmickView::OnSaveSettingsCallback(const std::string& copyPath, const std::string& dbPath, @@ -868,14 +912,30 @@ namespace creaImageIO mListener->Pause(); } + //======================================================================== + void WxGimmickView::CreateEditFieldsDialog(tree::Node* node, std::vector names, std::vector keys) + { + wxDialog* dial= new wxDialog (this,-1,_T("Edit Fields for node "+node->GetLabel()),wxDefaultPosition, wxSize(350,155)); + wxBoxSizer *siz = new wxBoxSizer(wxVERTICAL); + WxEditFieldsPanel* ef = new WxEditFieldsPanel(dial, dial, this, node, names, keys); + + siz->Add( ef,1,wxGROW ,0); + dial->SetSizer(siz); + dial->ShowModal(); + } + + //======================================================================== + void WxGimmickView::OnFieldsEdited(tree::Node* node, const std::string& name, const std::string& key, const std::string& val) + { + mGimmick->EditField(node, crea::wx2std(mNotebook->GetPageText(mNotebook->GetSelection())), name, key, val); + UpdateTreeViewLevel(crea::wx2std(mNotebook->GetPageText(mNotebook->GetSelection())),1); + } //================================================= /// AddProgress Gimmick callback void WxGimmickView::OnAddProgress( Gimmick::AddProgress& p) { - char mess[200]; - sprintf(mess,"%i dirs : %i files :\n %i handled - %i added", p.GetNumberScannedDirs(), p.GetNumberScannedFiles(), @@ -903,7 +963,7 @@ namespace creaImageIO mess << "Files\tadded \t: " << p.GetNumberAddedFiles() << "\n\n"; /* char times[500]; - sprintf(times,"Time to parse dir \t\t: %ld ms \t%d°/o\nTime to read files info \t: %ld ms \t%d°/o\nTime to update structs \t: %ld ms \t%d°/o\nTime to update database \t: %ld ms \t%d°/o\nTotal time \t\t\t: %ld ms", + sprintf(times,"Time to parse dir \t\t: %ld ms \t%d°/o\nTime to read files info \t: %ld ms \t%d°/o\nTime to update structs \t: %ld ms \t%d°/o\nTime to update database \t: %ld ms \t%d°/o\nTotal time \t\t\t: %ld ms", summary.parse_time, (int)( summary.parse_time*100./summary.total_time), summary.file_scan_time,