X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src2%2FcreaImageIOWxGimmickView.cpp;h=cec329ba94ba9d9bc30c8651f121d8255b627930;hb=2f0e50f69eb904d629cf8db62eb9a4094db93097;hp=900101ad1a4cdc848fa05489766bb0d3382689ea;hpb=f1caae70392f96f30dd90eb073be6be10fbf1caa;p=creaImageIO.git

diff --git a/src2/creaImageIOWxGimmickView.cpp b/src2/creaImageIOWxGimmickView.cpp
index 900101a..cec329b 100644
--- a/src2/creaImageIOWxGimmickView.cpp
+++ b/src2/creaImageIOWxGimmickView.cpp
@@ -61,7 +61,9 @@ namespace creaImageIO
 			       wxWindow *parent, 
 			       const wxWindowID id,
 			       const wxPoint& pos, const wxSize& size,
-			       int image_type,
+			       int min_dim,
+				   int max_dim,
+				   int out_dim,
 			       int number_of_threads)
     : wxPanel(parent,id,pos,size),
       GimmickView(gimmick),
@@ -98,6 +100,10 @@ namespace creaImageIO
 	//Gimmick
 	mGimmick=gimmick;
 
+	mSelectionMaxDimension=max_dim;
+	mSelectionMinDimension=min_dim;
+	mOutputDimension=out_dim;
+
     // Create the views
     CreateTreeViews();
 
@@ -180,6 +186,10 @@ namespace creaImageIO
 		   name<<"'"<<std::endl);
     // Create the WxTreeView
     WxTreeView* view = new WxTreeView(h,mNotebook,-1);
+	
+	view->SetMaxDimension(mSelectionMaxDimension);
+	view->SetMinDimension(mSelectionMinDimension);
+	view->SetOutputDimension(mOutputDimension);
 
     // TO DO : TEST THAT A VIEW WITH SAME NAME IS NOT
     // ALREADY IN THE MAP
@@ -190,8 +200,21 @@ namespace creaImageIO
 
   }
   //======================================================================
+  /// Returns the selected Images so that they comply with the given parameter(<4D)
+  vtkImageData* WxGimmickView::GetSelectedImage(int dim)
+  {
+	  return NULL;
+  }
 
-
+  //======================================================================
+  /// Returns the selected Images so that they comply with the given parameter(4D)
+  void WxGimmickView::GetSelectedImages(std::vector<vtkImageData*>& s, int dim)
+  {
+	
+		//GetTreeViewMap()["Local database"]->GetImageData()
+		//return NULL	;
+	
+  }
 
   //=================================================
   void WxGimmickView::CreateIconList()
@@ -263,8 +286,8 @@ namespace creaImageIO
 			       1000,
 			       this,
 			       wxPD_ELAPSED_TIME |
-			       wxPD_ESTIMATED_TIME | 
-			       wxPD_REMAINING_TIME |
+			       //			       wxPD_ESTIMATED_TIME | 
+			       //			       wxPD_REMAINING_TIME |
 			       wxPD_CAN_ABORT );
 
 	// TO DO : select the current tree handler
@@ -274,30 +297,7 @@ namespace creaImageIO
 
 	UpdateTreeViewLevel("Local database",1);
 	delete mProgressDialog;
-	
-    /*   
-	TreeItemData *data = 
-	  (TreeItemData *)
-	  mTreeListCtrl->GetItemData(mItemOfMenu);
-	DicomDatabase* db = data->GetDicomNode()->GetDicomDatabase();
-	DicomDatabase::UpdateSummary summary;
-	wxProgressDialog* progress = 
-	  new wxProgressDialog(_T("Adding file(s)"),
-			       _T(""),
-			       1000,
-			       this,
-			       wxPD_ELAPSED_TIME |
-			       wxPD_ESTIMATED_TIME | 
-			       wxPD_REMAINING_TIME |
-			       wxPD_CAN_ABORT );
-       
-	db->AddFiles(filenames,progress,summary);
-	
-	progress->Pulse(_T("Updating view..."));
-	UpdateDicomDatabaseView(db);
-	delete progress;
-	DisplayUpdateSummary(summary,this);
-	*/
+	DisplayAddSummary();	
       }
 	
   }
@@ -334,8 +334,8 @@ namespace creaImageIO
 			       1000,
 			       this,
 			       wxPD_ELAPSED_TIME |
-			       wxPD_ESTIMATED_TIME | 
-			       wxPD_REMAINING_TIME |
+			       //			       wxPD_ESTIMATED_TIME | 
+			       //			       wxPD_REMAINING_TIME |
 			       wxPD_CAN_ABORT );
 	std::string dirname = wx2std (FD->GetPath()) ;
 	mCurrentDirectory = FD->GetPath();  
@@ -347,9 +347,18 @@ namespace creaImageIO
 	
 	UpdateTreeViewLevel("Local database",1);
 	delete mProgressDialog;
-	
+	DisplayAddSummary();
       }
   }
+  //=================================================
+
+   //=================================================
+  void WxGimmickView::OnRemove(wxCommandEvent& event)
+  {
+	//TODO Select current tree handler       
+    wxBusyCursor busy;
+    GetTreeViewMap()["Local database"]->RemoveSelected(1);
+  }
   //=================================================
 
   //=================================================
@@ -363,7 +372,7 @@ namespace creaImageIO
 	   p.GetNumberScannedFiles(),
 	   p.GetNumberHandledFiles(),
 	   p.GetNumberAddedFiles());
-    std::cout << "OnAddProgress "<<mess<<std::endl;
+    //    std::cout << "OnAddProgress "<<mess<<std::endl;
     wxString s(wxString::From8BitData(mess));
     //  std::cout << "Pulse"<<std::endl;
     if (!mProgressDialog->Pulse(s)) 
@@ -374,10 +383,39 @@ namespace creaImageIO
   }
   //=================================================
 
- //=================================================
+  //=================================================
+  void WxGimmickView::DisplayAddSummary()
+  {
+    const Gimmick::AddProgress& p = mGimmick->GetAddProgress();
+    std::stringstream mess;
+    mess << "Dirs \tscanned\t: " << p.GetNumberScannedDirs()  << "\n";
+    mess << "Files\tscanned\t: " << p.GetNumberScannedFiles() << "\n";
+    mess << "Files\thandled\t: " << p.GetNumberHandledFiles() << "\n\n";
+    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",
+	    summary.parse_time,
+	    (int)( summary.parse_time*100./summary.total_time),
+	    summary.file_scan_time,
+	    (int)(summary.file_scan_time*100./summary.total_time),
+	    summary.update_structs_time,
+	    (int)(summary.update_structs_time*100./summary.total_time),
+	    summary.update_database_time,
+	    (int)(summary.update_database_time*100./summary.total_time),
+	    summary.total_time );
+    
+    mess << times;
+    */
+    wxMessageBox(std2wx(mess.str()),_T("Addition result"),wxOK,this);
+  }
+   //=================================================
+
+   //=================================================
   BEGIN_EVENT_TABLE(WxGimmickView, wxPanel)
     EVT_TOOL(TOOL_ADDFILES_ID, WxGimmickView::OnAddFiles)
     EVT_TOOL(TOOL_ADDDIR_ID, WxGimmickView::OnAddDir)
+	EVT_TOOL(TOOL_REMOVE_ID, WxGimmickView::OnRemove)
     END_EVENT_TABLE()
   //=================================================