X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=inline;f=src2%2FcreaImageIOWxGimmickView.cpp;h=6c84edb0baacf5343a997b9426f08dd00d20d406;hb=b3ff178d3759a8dbe3d02bcc178d8e22996f98b5;hp=0664caf2269cd0c170f60800172d23c40ce66621;hpb=9b19229069b38b9b14563f427554fa7c8fd9ac6f;p=creaImageIO.git

diff --git a/src2/creaImageIOWxGimmickView.cpp b/src2/creaImageIOWxGimmickView.cpp
index 0664caf..6c84edb 100644
--- 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;
@@ -12,6 +12,8 @@ using namespace crea;
 #include "icons/create-database.xpm"
 #include "icons/help.xpm"
 #include "icons/synchronize.xpm"
+#include "icons/settings.xpm"
+#include "icons/tools.xpm"
 
 #include <wx/imaglist.h>
 #include <wx/popupwin.h>
@@ -30,13 +32,15 @@ namespace creaImageIO
 	  TOOL_ADDDATABASE_ID = 4,
       TOOL_REMOVE_ID = 5,
 	  TOOL_SYNCHRONIZE_ID = 6,
-      TOOL_HELP_ID = 7
+      TOOL_HELP_ID = 7,
+	  TOOL_SETTINGS_ID = 8,
+	  TOOL_TOOLS_ID = 9
     };
   //======================================================================
 
   //================================================================
   // 
-  const int icon_number = 9;
+  const int icon_number = 11;
   // Icon ids
   typedef enum
     {
@@ -48,7 +52,9 @@ namespace creaImageIO
 	  Icon_database_add,
       Icon_remove,
 	  Icon_synchronize,
-      Icon_help
+      Icon_help,
+	  Icon_settings,
+      Icon_tools
     }
     icon_id;
   //================================================================
@@ -214,6 +220,16 @@ namespace creaImageIO
 				      mIcon->GetBitmap(Icon_help),
 				      _T("Open help window")
 				      );
+	mToolSettings = mToolBar->AddTool( TOOL_SETTINGS_ID, 
+				      _T("System settings"),
+				      mIcon->GetBitmap(Icon_settings),
+				      _T("Allows the modification of various system settings")
+				      );
+	mToolTools = mToolBar->AddTool( TOOL_TOOLS_ID, 
+				      _T("Tools"),
+				      mIcon->GetBitmap(Icon_tools),
+				      _T("Applies tools to images")
+				      );
     //const wxBitmap& bitmap1, const wxString& shortHelpString = "", wxItemKind kind = wxITEM_NORMAL)
 
     mToolBar->Realize();
@@ -283,6 +299,8 @@ namespace creaImageIO
     icons[Icon_help] = wxIcon(help_xpm);
 	icons[Icon_synchronize] = wxIcon(synchronize_xpm);
 	icons[Icon_create_database] = wxIcon(create_database_xpm);
+	icons[Icon_settings] = wxIcon(settings_xpm);
+	icons[Icon_tools] = wxIcon(tools_xpm);
 
     //   unsigned int NbIcons = 8;
     // Make an image list containing small icons
@@ -652,6 +670,102 @@ namespace creaImageIO
   }
   //=================================================
 
+  //=================================================
+  void WxGimmickView::OnSettings(wxCommandEvent& event)
+  {
+    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);
+    
+    siz->Add( nb,1,wxGROW  ,0);  
+    CreateSettingsDialog(nb);
+    dial->SetSizer(siz);
+    dial->ShowModal();
+  }
+  //=================================================
+
+  //=================================================
+  //AndresDonadio
+  void WxGimmickView::OnTools(wxCommandEvent& event)
+  {
+		mViewer->StopPlayer();
+		
+		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);
+
+		wxBoxSizer *dialSizer = new wxBoxSizer(wxVERTICAL);	
+		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") );
+
+		dial->SetSizer(dialSizer, true);
+		dial->Layout();
+		dial->ShowModal();
+
+		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)
+					{
+						/*
+						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);
+					}
+				}
+			}
+
+		mViewer->StartPlayer();
+  }
+  //=================================================
+
+  void WxGimmickView::CreateSettingsDialog(wxNotebook* nb)
+  {
+	  //First page: Customization of configurations
+	  wxPanel* customConfig=new wxPanel(nb);
+	  nb->AddPage( customConfig, crea::std2wx("Customize Configuration") );
+	  //Second page: Creation of Databases
+	  wxPanel* databaseCreation=new wxPanel(nb);
+	  nb->AddPage( databaseCreation, crea::std2wx("Create Database") );
+	  //Third page: CD/DVD Watch
+	  wxPanel* cdWatch=new wxPanel(nb);
+	  nb->AddPage( cdWatch, crea::std2wx("CD/DVD") );
+	  //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)
@@ -793,6 +907,8 @@ namespace creaImageIO
 	EVT_TOOL(TOOL_ADDDATABASE_ID, WxGimmickView::OnAddDB)
 	EVT_TOOL(TOOL_REMOVE_ID, WxGimmickView::OnRemove)
 	EVT_TOOL(TOOL_SYNCHRONIZE_ID, WxGimmickView::OnSynchronize)
+	EVT_TOOL(TOOL_SETTINGS_ID, WxGimmickView::OnSettings)
+	EVT_TOOL(TOOL_TOOLS_ID, WxGimmickView::OnTools)
   END_EVENT_TABLE()
   //=================================================