X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src2%2FcreaImageIOWxGimmickView.cpp;h=a77f9a7fe9de9bdc1726f0db2b1d01a3b22868ee;hb=46fb4b43011a4043c7b5ef2e7bd57e1695cd6b7f;hp=9d916f431f89233ed088fc201392ade3a1f2b419;hpb=381f766db11094bd9b96f9e948527cbec24f680a;p=creaImageIO.git

diff --git a/src2/creaImageIOWxGimmickView.cpp b/src2/creaImageIOWxGimmickView.cpp
index 9d916f4..a77f9a7 100644
--- a/src2/creaImageIOWxGimmickView.cpp
+++ b/src2/creaImageIOWxGimmickView.cpp
@@ -5,6 +5,7 @@
 #include <creaImageIOWxListenerPanel.h>
 #include <creaImageIOWxEditFieldsPanel.h>
 #include <creaImageIOWxAttributeSelectionPanel.h>
+#include <creaImageIOWxPACSConnectionPanel.h>
 
 using namespace crea;
 // Icons
@@ -653,6 +654,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)
   {       
@@ -750,7 +764,7 @@ namespace creaImageIO
 								if (addToDB)
 								{
 									mProgressDialog = new wxProgressDialog(_T("Adding directory"),_T(""),1000,this,wxPD_ELAPSED_TIME |wxPD_CAN_ABORT );
-									mCurrentDirectory = gimmickTools->getOutputDir();  // Try // JPRx
+									mCurrentDirectory = gimmickTools->getOutputDir();
 									mGimmick->AddDir(crea::wx2std(mNotebook->GetPageText(mNotebook->GetSelection())),outputDir,true);
 									mProgressDialog->Pulse(_T("Updating view..."));
 									
@@ -766,6 +780,7 @@ namespace creaImageIO
 							wxMessageBox(_T("One or both of the directory fields are empty"),_T("Empty Fields"),wxOK,this);
 						}
 				}
+					delete gimmickTools;
 #endif
 			}
 
@@ -794,8 +809,12 @@ 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());
@@ -901,7 +920,7 @@ namespace creaImageIO
   //========================================================================
   void WxGimmickView::CreateEditFieldsDialog(tree::Node* node, std::vector<std::string> names, std::vector<std::string> keys)
   {
-	  wxDialog* dial= new wxDialog (this,-1,_T("Edit Fields for node "+node->GetLabel()),wxDefaultPosition, wxSize(350,155));
+	  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);