*** empty log message ***

[creaImageIO.git] / src2 / creaImageIOWxGimmickView.cpp

diff --git a/src2/creaImageIOWxGimmickView.cpp b/src2/creaImageIOWxGimmickView.cpp
index 1a423ebc3c52be0efee184b18ed5d7f6a709bfd1..b445d82955383e73fc4855fe525c3401579f507a 100644 (file)
--- a/src2/creaImageIOWxGimmickView.cpp
+++ b/src2/creaImageIOWxGimmickView.cpp
@@ -1,4 +1,4 @@
-#include <creaImageIOWxGimmickView.h>
+#include <creaImageIOWxGimmickView.h>
 #include <creaImageIOWxTreeView.h>
 #include <creaImageIOSystem.h>
 using namespace crea;
@@ -690,24 +690,56 @@ namespace creaImageIO
   //AndresDonadio
   void WxGimmickView::OnTools(wxCommandEvent& event)
   {
-    wxDialog* dial= new wxDialog (this,-1,_T("Tools"),wxDefaultPosition, wxDefaultSize);
-               wxBoxSizer      *siz = new wxBoxSizer(wxVERTICAL);
+               mViewer->StopPlayer();
                
-               wxButton *inBtn = new wxButton(dial,-1,_T("Input Directory"), wxDefaultPosition, wxSize(200,30) );
-               wxButton *outBtn = new wxButton(dial,-1,_T("Output Directory"), wxDefaultPosition, wxSize(200,30) );
+               wxDialog* dial= new wxDialog (this,-1,"Tools",wxDefaultPosition, wxSize(300,200));
 
-               dial->SetSizer(siz);
+
+               WxGimmickTools * gimmickTools = new WxGimmickTools(dial, mCurrentDirectory);
+
+               wxBoxSizer *topsizer = new wxBoxSizer(wxVERTICAL);      
+               
+
+               wxSizer* bsizer = dial->CreateSeparatedButtonSizer(wxOK|wxCANCEL);
+               topsizer->Add(gimmickTools,1,wxGROW,0);
+               topsizer->Add(bsizer,0,wxGROW);
+
+               dial->SetSizer(topsizer, true);
+               dial->Layout();
                dial->ShowModal();
+               
+               if (dial->GetReturnCode() == wxID_OK)
+               {
+                       wxString inputDir = gimmickTools->getInputDir();
+                       wxString outputDir = gimmickTools->getOutputDir();
+                       bool addToDB = gimmickTools->getCheckBoxValue();        
+/*
+                       Bruker2Dicom b2d;    
+                       b2d.SetInputDirectory(crea::wx2std(inputDir));
+                       b2d.SetOutputDirectory(crea::wx2std(outputDir));
+                       b2d.SetConvertModeToDicom();
+                       b2d.Execute();
+*/                     
+                       if (addToDB)
+                       {
+                               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();
+                       }       
+               }
+               
+               mViewer->StartPlayer();
 
                /*
-                       mViewer->StopPlayer();
+                       
                std::string name = crea::wx2std(mNotebook->GetCurrentPage()->GetName());
                long style = wxDD_DEFAULT_STYLE | wxDD_DIR_MUST_EXIST;
-               wxDirDialog* FD = 
-               new wxDirDialog( 0, 
-                               _T("Select directory"),
-                               mCurrentDirectory,
-                               style);
+               wxDirDialog* FD = new wxDirDialog( 0, _T("Select directory"), mCurrentDirectory, style);
            
                if (FD->ShowModal()==wxID_OK)
                {
@@ -743,7 +775,7 @@ namespace creaImageIO
                        DisplayAddSummary();
 
                }
-               mViewer->StartPlayer();
+               
                */
   }
   //=================================================