X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=src%2FcreaImageIOWxGimmick.cpp;h=3e744982e179fec219f04c1b232bd2090b9310f1;hb=46d6077cd663d529fb3f083001e9fee330da7fb8;hp=6a203a37d3d5bd05f5c92f5333d1829f38052259;hpb=d1b114808351682efa318e81fc64d2a27055b424;p=creaImageIO.git

diff --git a/src/creaImageIOWxGimmick.cpp b/src/creaImageIOWxGimmick.cpp
index 6a203a3..3e74498 100644
--- a/src/creaImageIOWxGimmick.cpp
+++ b/src/creaImageIOWxGimmick.cpp
@@ -334,9 +334,15 @@ namespace creaImageIO
     // Image sizer
     wxBoxSizer *isizer = new wxBoxSizer(wxHORIZONTAL  );
     mPanelImage->SetSizer( isizer ); 
-  
+ 
+    // Notebook
+    mwxNotebook = new wxNotebook(mSplitter2,
+				 -1,wxDefaultPosition, wxDefaultSize, 0);
+
+
+    
     // Fields view (bottom)
-    mFieldsView = new WxGimmickFieldsView(mSplitter2,-1,
+    mFieldsView = new WxGimmickFieldsView(mwxNotebook,-1,
 					    wxDefaultPosition,
 					    wxDefaultSize,0);
 
@@ -351,16 +357,20 @@ namespace creaImageIO
 	GetSettings().BgColour(DicomNode::Series),
 	GetSettings().Colour(DicomNode::Image),
 	GetSettings().BgColour(DicomNode::Image));
+    mwxNotebook->AddPage( mFieldsView, _T("Dicom fields"));
     
-    
-
+    // Help 
+    mHelp = new WxGimmickHelp(mwxNotebook);
+    mwxNotebook->AddPage( mHelp, _T("Help"));    
+ 
+    // Splitting
     int wsize = size.GetWidth();
     int hsize = size.GetHeight();
     int previewhsize = 150;
     int previewwsize = 400;
 
     mSplitter2->SetMinimumPaneSize( previewhsize );
-    mSplitter2->SplitHorizontally( mPanelImage, mFieldsView, 
+    mSplitter2->SplitHorizontally( mPanelImage, mwxNotebook, //mFieldsView, 
 				   hsize - previewhsize);
   
     rsizer->Add( mSplitter2,1,wxGROW  ,0);
@@ -400,7 +410,16 @@ namespace creaImageIO
 
     ShowImage(mReader.GetImage(""));
 
-    mJustStarted = true;
+    // Show help if no collection
+    if (GetDicomDatabaseList().size()==0)
+      {
+	mwxNotebook->SetSelection(1);
+      } 
+    else
+      {
+	mwxNotebook->SetSelection(0);
+      }
+    //    mJustStarted = true;
   }
   //================================================================
     
@@ -898,9 +917,11 @@ namespace creaImageIO
 	  }
       }
 
+    if (GetDicomDatabaseList().size()==0) mFieldsView->UpdateFields(db);
     GetDicomDatabaseList().push_back(db);
     UpdateDicomDatabaseView(db);
 
+
   }
   //================================================================
 
@@ -1435,7 +1456,7 @@ namespace creaImageIO
   void  WxGimmick::OnPopUpSettings(wxCommandEvent& event)
   {
     WxGimmickSettingsDialog* s = 
-      new WxGimmickSettingsDialog(this);
+      new WxGimmickSettingsDialog(this,&mSettings);
     s->ShowModal();
     delete s;
   }
@@ -2140,15 +2161,13 @@ namespace creaImageIO
   void  WxGimmick::OnInternalIdle()
   {
     ProcessImageEvents();
+    /*
     if (mJustStarted)
       {
-	// Show tip if no collection
-	if (GetDicomDatabaseList().size()==0)
-	  {
-	    ShowHelp();
-	  }
+
 	mJustStarted = false;
-      }
+	}
+    */
     //
   }
   //================================================================
@@ -2758,12 +2777,14 @@ namespace creaImageIO
     //====================================================================
     void WxGimmick::ShowHelp()
     {
+      /*
       if (mHelpWindow==0)
 	{
 	  mHelpWindow = new WxGimmickHelpWindow(this);
 	}
       mHelpWindow->CenterOnParent();
       mHelpWindow->ShowModal();
+      */
     }
     //====================================================================