*** empty log message ***

diff --git a/src2/creaImageIOWxGimmickTools.cpp b/src2/creaImageIOWxGimmickTools.cpp
index 44b6390c9e1241c812ae14afe5fb3b3b3aa47638..58728d67836b7fc4e308e393294609637aa088fa 100644 (file)
--- a/src2/creaImageIOWxGimmickTools.cpp
+++ b/src2/creaImageIOWxGimmickTools.cpp
@@ -6,7 +6,7 @@ namespace creaImageIO
        ** Begin of the threshold panel
        **/
        WxGimmickTools::WxGimmickTools(wxWindow* parent, wxString mCurrentDirectory)
-       : wxPanel(parent, -1, wxDefaultPosition, wxSize(300,200), wxBORDER_SUNKEN)
+       : wxPanel(parent, -1, wxDefaultPosition, wxSize(300,250), wxBORDER_SUNKEN)
        {
                _currentDir = mCurrentDirectory;
                _addFiles = true;
@@ -24,18 +24,25 @@ namespace creaImageIO
                Connect( outputDir->GetId(), wxEVT_COMMAND_BUTTON_CLICKED , (wxObjectEventFunction) &WxGimmickTools::onOutputDir );
                Connect( _addCheckBox->GetId(), wxEVT_COMMAND_CHECKBOX_CLICKED, (wxObjectEventFunction) &WxGimmickTools::onAddToDatabase );
 
-               wxFlexGridSizer * sizer         = new wxFlexGridSizer(2,5);
-               sizer -> Add( _inputPath, 1, wxGROW, 10 );
-               sizer -> Add( inputDir, 1, wxGROW, 10 );
-               sizer -> Add( new wxStaticText(this,-1,_T(" "))  , 1, wxGROW, 10 );
-               sizer -> Add( new wxStaticText(this,-1,_T(" "))  , 1, wxGROW, 10 );
-               sizer -> Add( _outputPath, 1, wxGROW, 10 );
-               sizer -> Add( outputDir, 1, wxGROW, 10 );
-               sizer -> Add( new wxStaticText(this,-1,_T(" "))  , 1, wxGROW, 10 );
-               sizer -> Add( new wxStaticText(this,-1,_T(" "))  , 1, wxGROW, 10 );
-               sizer -> Add( _addCheckBox, 1, wxGROW, 10 );
+               wxFlexGridSizer * textSizer     = new wxFlexGridSizer(1,2);
+               textSizer -> Add( new wxStaticText(this,-1,_T("Transform a Bruker image into Dicom format."))  , 1, wxGROW );
+               textSizer -> Add( new wxStaticText(this,-1,_T("If checkbox is selected images will be loaded into the DB."))  , 1, wxGROW );
 
-               this->SetSizer( sizer );
+               wxFlexGridSizer * sizer = new wxFlexGridSizer(2,5);
+               sizer -> Add( new wxStaticText(this,-1,_T(" "))  , 1, wxGROW );
+               sizer -> Add( new wxStaticText(this,-1,_T(" "))  , 1, wxGROW );
+               sizer -> Add( _inputPath, 1, wxGROW );
+               sizer -> Add( inputDir, 1, wxGROW );
+               sizer -> Add( _outputPath, 1, wxGROW );
+               sizer -> Add( outputDir, 1, wxGROW );
+               sizer -> Add( new wxStaticText(this,-1,_T(" "))  , 1, wxGROW );
+               sizer -> Add( new wxStaticText(this,-1,_T(" "))  , 1, wxGROW );
+               sizer -> Add( _addCheckBox, 1, wxGROW );
+
+               wxFlexGridSizer * topSizer      = new wxFlexGridSizer(1,2);
+               topSizer -> Add( textSizer, 1, wxGROW );
+               topSizer -> Add( sizer, 1, wxGROW );
+               this->SetSizer( topSizer );
                this->SetAutoLayout( true );
                this->Layout();
        }

diff --git a/src2/creaImageIOWxGimmickView.cpp b/src2/creaImageIOWxGimmickView.cpp
index b445d82955383e73fc4855fe525c3401579f507a..6c84edb0baacf5343a997b9426f08dd00d20d406 100644 (file)
--- a/src2/creaImageIOWxGimmickView.cpp
+++ b/src2/creaImageIOWxGimmickView.cpp
@@ -676,8 +676,7 @@ namespace creaImageIO
     wxDialog* dial= new wxDialog (this,-1,_T("System Settings"),wxDefaultPosition, wxSize(450,600));
     wxBoxSizer *siz = new wxBoxSizer(wxVERTICAL);
     // Notebook
-    wxNotebook* nb= new wxNotebook(dial,
-                                  -1,wxDefaultPosition, wxDefaultSize, 0);
+    wxNotebook* nb= new wxNotebook(dial, -1, wxDefaultPosition, wxDefaultSize, 0);
     
     siz->Add( nb,1,wxGROW  ,0);  
     CreateSettingsDialog(nb);
@@ -692,91 +691,62 @@ namespace creaImageIO
   {
                mViewer->StopPlayer();
                
-               wxDialog* dial= new wxDialog (this,-1,"Tools",wxDefaultPosition, wxSize(300,200));
+               wxDialog* dial = new wxDialog (this,-1,"Tools",wxDefaultPosition, wxSize(300,250));
 
+               wxSizer* buttonsSizer = dial->CreateSeparatedButtonSizer(wxOK|wxCANCEL);
+               wxNotebook* nb= new wxNotebook(dial, -1, wxDefaultPosition, wxDefaultSize, 0);
 
-               WxGimmickTools * gimmickTools = new WxGimmickTools(dial, mCurrentDirectory);
+               wxBoxSizer *dialSizer = new wxBoxSizer(wxVERTICAL);     
+               dialSizer->Add(nb,1,wxGROW,0);
+               dialSizer->Add(buttonsSizer,0,wxGROW);
 
-               wxBoxSizer *topsizer = new wxBoxSizer(wxVERTICAL);      
-               
-
-               wxSizer* bsizer = dial->CreateSeparatedButtonSizer(wxOK|wxCANCEL);
-               topsizer->Add(gimmickTools,1,wxGROW,0);
-               topsizer->Add(bsizer,0,wxGROW);
+               //First page: Bruker Image Reader
+               WxGimmickTools * gimmickTools = new WxGimmickTools(nb, mCurrentDirectory);
+               nb->AddPage( gimmickTools, crea::std2wx("Bruker Image Reader") );
 
-               dial->SetSizer(topsizer, true);
+               dial->SetSizer(dialSizer, 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();
 
-               /*
-                       
-               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);
-           
-               if (FD->ShowModal()==wxID_OK)
-               {
-
-               
-                       std::string dirname = wx2std (FD->GetPath());
-                       bool recurse =  isNeedRecursive(dirname);
-                       if (recurse)
+               if (dial->GetReturnCode() == wxID_OK)
                        {
-                               recurse = wxMessageBox(_T("Recurse into sub-directories ?"),  _T("Scan directory"),      wxYES_NO,this ) == wxYES ? true : false;
+                               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)
+                                       {
+                                               /*
+                                               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();
+                                               }       
+                                       }
+
+                                       else
+                                       {
+                                               wxMessageBox(_T("One or both of the directory fields are empty"),_T("Empty Fields"),wxOK,this);
+                                       }
+                               }
                        }
-                       
-                       wxBusyCursor busy;
-                       wxString title(_T("Adding directory"));
-                       if (recurse) 
-                       title = _T("Adding directory (recursive)");
-                       mProgressDialog = 
-                       new wxProgressDialog(_T("Adding directory"),
-                                               _T(""),
-                                               1000,
-                                               this,
-                                               wxPD_ELAPSED_TIME |
-                                               //                             wxPD_ESTIMATED_TIME | 
-                                               //                             wxPD_REMAINING_TIME |
-                                               wxPD_CAN_ABORT );
-                       
-                       mCurrentDirectory = FD->GetPath();  
-                       mGimmick->AddDir(crea::wx2std(mNotebook->GetPageText(mNotebook->GetSelection())),dirname,recurse);
-                       mProgressDialog->Pulse(_T("Updating view..."));
-                       
-                       UpdateTreeViewLevel(crea::wx2std(mNotebook->GetPageText(mNotebook->GetSelection())),1);
-                       delete mProgressDialog;
-                       DisplayAddSummary();
 
-               }
-               
-               */
+               mViewer->StartPlayer();
   }
   //=================================================
 
@@ -794,10 +764,8 @@ namespace creaImageIO
          //Fourth page: Selection of attributes to show (edit)
          wxPanel* attSelection=new wxPanel(nb);
          nb->AddPage( attSelection, crea::std2wx("Selection of Attributes") );
-
   }
 
-
   //=================================================
   /// AddProgress Gimmick callback
   void WxGimmickView::OnAddProgress( Gimmick::AddProgress& p)

diff --git a/src2/creaImageIOWxGimmickView.h b/src2/creaImageIOWxGimmickView.h
index e2b71ba378d2386dda86f2336b5fbdb9fa978b4e..937442e51623d466ddd57ff521275a329441c070 100644 (file)
--- a/src2/creaImageIOWxGimmickView.h
+++ b/src2/creaImageIOWxGimmickView.h
@@ -123,7 +123,6 @@ namespace creaImageIO
     void OnTools(wxCommandEvent& event);
        ///Creates the settings dialog (the pages inside and the information)
        void CreateSettingsDialog(wxNotebook* nb);
-    
     /// Display a message box with the last addition statistics
     void DisplayAddSummary();