]> Creatis software - creaImageIO.git/blobdiff - src2/creaImageIOWxGimmickView.cpp
Allow reading image files without name extention
[creaImageIO.git] / src2 / creaImageIOWxGimmickView.cpp
index fb46be65b1bfefc812697d47c05401272635b375..c3e2b07c20807c32ca585a052bdc2bfeb4d5120c 100644 (file)
@@ -1,8 +1,11 @@
-#include <creaImageIOWxGimmickView.h>
+#include <creaImageIOWxGimmickView.h>
 #include <creaImageIOWxTreeView.h>
 #include <creaImageIOSystem.h>
 #include <creaImageIOWxCustomizeConfigPanel.h>
 #include <creaImageIOWxListenerPanel.h>
+#include <creaImageIOWxEditFieldsPanel.h>
+#include <creaImageIOWxAttributeSelectionPanel.h>
+#include <creaImageIOWxPACSConnectionPanel.h>
 
 using namespace crea;
 // Icons
@@ -17,10 +20,14 @@ using namespace crea;
 #include "icons/synchronize.xpm"
 #include "icons/settings.xpm"
 #include "icons/tools.xpm"
+//#include "icons/import.xpm"
 
 #include <wx/imaglist.h>
 #include <wx/popupwin.h>
 #include<boost/filesystem/operations.hpp>
+#if defined(BUILD_BRUKER)
+       #include "bruker2dicom.h"
+#endif
 
 namespace creaImageIO
 {
@@ -168,6 +175,7 @@ namespace creaImageIO
        mListener->ConnectObserver(boost::bind( &WxGimmickView::OnDriveMount , this, _1 ) );
        mListener->Create();
        mListener->Run();
+       mListener->Pause();
     
     mConstructed = true;
   }
@@ -339,7 +347,7 @@ namespace creaImageIO
   {
     mViewer->StopPlayer();
    long style = wxOPEN | wxFILE_MUST_EXIST | wxFD_MULTIPLE;
-    std::string wc("*.*");
+    std::string wc("*");
     wxFileDialog* FD = new wxFileDialog( 0, 
                                         _T("Select file"),
                                         _T(""),
@@ -416,9 +424,10 @@ namespace creaImageIO
                mProgressDialog = 
                new wxProgressDialog(_T("Adding directory"),
                                        _T(""),
-                                       1000,
+                                       NumberFilesToAdd(dirname,recurse),
                                        this,
-                                       wxPD_ELAPSED_TIME |
+                                       wxPD_ELAPSED_TIME | 
+                                       wxPD_SMOOTH |
                                        //                             wxPD_ESTIMATED_TIME | 
                                        //                             wxPD_REMAINING_TIME |
                                        wxPD_CAN_ABORT );
@@ -435,6 +444,33 @@ namespace creaImageIO
     mViewer->StartPlayer();
   }
 
+
+   //=================================================
+  // Determines number of files potentially to add to database
+   int WxGimmickView::NumberFilesToAdd(const std::string &dirpath, bool recursive)
+  {
+          int nb = 0;
+          if ( !boost::filesystem::exists( dirpath ) ) return nb;
+          boost::filesystem::directory_iterator end_itr; // default construction yields past-the-end
+          for ( boost::filesystem::directory_iterator itr( dirpath );  itr != end_itr;  ++itr )
+         {
+               // If is directory & recurse : do recurse
+               if ( boost::filesystem::is_directory(itr->status()) )
+               {
+                       if (recursive) 
+                       {
+                               nb += NumberFilesToAdd(itr->string(), recursive);
+                       }
+               }
+               else
+               {
+                       nb++;
+               }
+         }
+       return nb;
+
+  }
+
     //=================================================
    // Test a directory to know if contains sub-directory to analyze
   bool WxGimmickView::isNeedRecursive(std::string i_name)
@@ -647,6 +683,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)
   {       
@@ -695,6 +744,38 @@ namespace creaImageIO
     dial->ShowModal();
   }
   //=================================================
+  void WxGimmickView::OnImportExport(wxCommandEvent &Event)
+  {
+       wxBusyCursor busy;
+       // Test if one image is selected => export
+       // if not =>import
+    if (GetTreeViewMap()[crea::wx2std(mNotebook->GetPageText(mNotebook->GetSelection()))])
+       {
+               ExportImages();
+       }
+       else
+       {
+               ImportImages();
+       }
+  }
+
+  void WxGimmickView::ExportImages()
+  {
+               //Archive selection: name, emplacement
+               //same process than copy local but to a zip
+               // if settings are yes "always ask for descriptor addition", ask
+               // if settings are yes, adding descriptor
+  }
+
+  void WxGimmickView::ImportImages()
+  {
+               //Find the *.zip
+               //dezip
+               // Contain a descriptor.text
+               // create a new database, and add to database
+               // if not, add to current database
+               // 
+  }
 
   //=================================================
   //AndresDonadio
@@ -702,7 +783,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 +792,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 +804,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();
@@ -782,18 +870,40 @@ namespace creaImageIO
          nb->AddPage( customConfig, crea::std2wx("Customize Configuration") );
 
          //Second page: Creation of Databases
-         wxPanel* databaseCreation=new wxPanel(nb);
-         nb->AddPage( databaseCreation, crea::std2wx("Create Database") );
+         /*wxPanel* databaseCreation=new wxPanel(nb);
+         nb->AddPage( databaseCreation, crea::std2wx("Create Database") );*/
+
+         //Second page (temporary): Connection to PACS
+         WxPACSConnectionPanel* pacs=new WxPACSConnectionPanel(nb,dial, this);
+         nb->AddPage( pacs, crea::std2wx("Connect to PACS") );
 
          //Third page: CD/DVD Watch
          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<std::string> shown;
+      std::vector<std::string> 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<std::string>& shown, 
+         std::vector<std::string>& nShown, int level)
+  {
+         GetTreeViewMap()[crea::wx2std(mNotebook->GetPageText(mNotebook->GetSelection()))]->GetAttributes(shown,nShown,level);
+  }
+
+  //===================================================================
+  void WxGimmickView::OnAttributesChanged(const std::vector<std::string>& nShown, int level)
+  {
+         GetTreeViewMap()[crea::wx2std(mNotebook->GetPageText(mNotebook->GetSelection()))]->SetNonVisibleAttributes(nShown,level);
+         std::vector<std::string> 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 +978,30 @@ namespace creaImageIO
          mListener->Pause();
   }
 
+  //========================================================================
+  void WxGimmickView::CreateEditFieldsDialog(tree::Node* node, std::vector<std::string> names, std::vector<std::string> keys)
+  {
+         wxDialog* dial= new wxDialog (this,-1,crea::std2wx("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 +1029,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,