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

diff --git a/src/creaImageIOWxGimmick.cpp b/src/creaImageIOWxGimmick.cpp
index 6a203a3..c009da4 100644
--- a/src/creaImageIOWxGimmick.cpp
+++ b/src/creaImageIOWxGimmick.cpp
@@ -63,6 +63,8 @@ namespace creaImageIO
       PopUp_Settings = 501,
       PopUp_About    = 502,
       PopUp_User = WxGimmick::UserMenuFirstId,
+      PopUp_SaveAs = 701,
+      PopUp_AddToFavorites = 702
     };
   //================================================================
 
@@ -334,9 +336,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 +359,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 +412,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 +919,11 @@ namespace creaImageIO
 	  }
       }
 
+    if (GetDicomDatabaseList().size()==0) mFieldsView->UpdateFields(db);
     GetDicomDatabaseList().push_back(db);
     UpdateDicomDatabaseView(db);
 
+
   }
   //================================================================
 
@@ -910,10 +933,13 @@ namespace creaImageIO
   {
     wxBusyCursor busy;
     //    std::cout << "WxGimmick : Reading config"<<std::endl;
+    LoadOrCreateFavoritesDatabase();
 
-    //    std::cout << "==> Loading collections from '"<<mDatabaseListFile
+    //    std::cout <<     
+    creaMessage("Gimmick!",1,"Gimmick! : ==> Loading collections from '"<<mDatabaseListFile<<"'"<<std::endl);
     //	      <<"'"<<std::endl;
 
+
     std::ifstream s;
     s.open(mDatabaseListFile.c_str());
     if (s.good())
@@ -948,7 +974,7 @@ namespace creaImageIO
 	      }
 	    else 
 	      {
-		//	    std::cout << "    ... ERROR !"<<std::endl;
+		creaMessage("Gimmick!",1,"           ==> ERROR opening collection '"<<tokens[0]<<"'"<<std::endl);
 		delete db;
 	      }
 	  }
@@ -956,7 +982,7 @@ namespace creaImageIO
 	}
 	else 
 	{
-		std::cout << "ERROR opening "<<mDatabaseListFile<<std::endl;
+	  creaMessage("Gimmick!",1,"           ==> File does not exist. It will be created on exit (if you already ran Gimmick! and exited normally, this is not normal. Send a bug report).");
 	}
 
 	
@@ -1002,6 +1028,13 @@ namespace creaImageIO
   }
   //================================================================
 
+  //================================================================
+  void WxGimmick::LoadOrCreateFavoritesDatabase()
+  {
+    // TODO
+  }
+  //================================================================
+
   /*
   //================================================================
   void  WxGimmick::OnClose(wxCloseEvent& event)
@@ -1435,7 +1468,7 @@ namespace creaImageIO
   void  WxGimmick::OnPopUpSettings(wxCommandEvent& event)
   {
     WxGimmickSettingsDialog* s = 
-      new WxGimmickSettingsDialog(this);
+      new WxGimmickSettingsDialog(this,&mSettings);
     s->ShowModal();
     delete s;
   }
@@ -1970,7 +2003,7 @@ namespace creaImageIO
 	      }
 	    sib = GetTreeListCtrl()->GetNextSibling(sib);
 	  }
-	prio = maxprio + 1000;
+	prio = maxprio + 999;
 	sib = GetTreeListCtrl()->GetPrevSibling(item);
 	while (sib.IsOk())
 	  {
@@ -2013,13 +2046,17 @@ namespace creaImageIO
   void WxGimmick::ShowImage(vtkImageData* im)
   {
     //  wxBusyCursor busy;
+    mViewer->SetInput( im );
+    mViewer->SetSlice( 0 );
     
+
     int x1,x2,y1,y2,z1,z2;
     double spx,spy,spz;
+    im->Update();
     im->GetSpacing(spx,spy,spz);
     im->GetExtent (x1,x2,y1,y2,z1,z2);
-    
     /*
+    std::cout << "-----------------------------"<<std::endl;
       std::cout << x1 << "-"<<x2<<std::endl; 
       std::cout << y1 << "-"<<y2<<std::endl; 
       std::cout << z1 << "-"<<z2<<std::endl; 
@@ -2047,19 +2084,39 @@ namespace creaImageIO
 	mspy = spy;
 	mspz = spz;
 	
+	double *range = im->GetScalarRange();
+	 mViewer->SetColorWindow(range[1] - range[0]);
+	 mViewer->SetColorLevel(0.5 * (range[1] + range[0]));
+
+	 mViewer->GetRenderer()->ResetCamera();
+	double bounds[6];
+
+
+	 mViewer->GetRenderer()->ComputeVisiblePropBounds(bounds);
+
+	 /*
+	std::cout <<"bounds : "<<bounds[0]<<","
+<<bounds[1]<<","
+<<bounds[2]<<","
+<<bounds[3]<<","
+<<bounds[4]<<","
+		  <<bounds[5]<<std::endl;
+	 */
+	 mViewer->GetRenderer()->ResetCameraClippingRange(bounds);
+	/*
 	vtkCamera *camera = mViewer->GetRenderer()->GetActiveCamera();
 	
 	camera->SetViewUp ( spx*0, -spy*1, spz*0);
-	camera->SetPosition( spx*(x1+x2)/2, spy*(y1+y2)/2, -spz*10000000); 
+	camera->SetPosition( spx*(x1+x2)/2, spy*(y1+y2)/2, spz*10000000); 
 	camera->SetFocalPoint	( spx*(x1+x2)/2	, spy*(y1+y2)/2	, spz*0); 
 	
 	camera->ComputeViewPlaneNormal();
 	camera->SetParallelScale(  spx*(x2-x1)/2.0 );
 	
+	camera->Roll ( 180 );
+	*/
       }
     
-    mViewer->SetInput( im );
-    mViewer->SetSlice( 0 );
     mInteractor->Render();
   } 
   //================================================================
@@ -2140,15 +2197,13 @@ namespace creaImageIO
   void  WxGimmick::OnInternalIdle()
   {
     ProcessImageEvents();
+    /*
     if (mJustStarted)
       {
-	// Show tip if no collection
-	if (GetDicomDatabaseList().size()==0)
-	  {
-	    ShowHelp();
-	  }
+
 	mJustStarted = false;
-      }
+	}
+    */
     //
   }
   //================================================================
@@ -2758,12 +2813,14 @@ namespace creaImageIO
     //====================================================================
     void WxGimmick::ShowHelp()
     {
+      /*
       if (mHelpWindow==0)
 	{
 	  mHelpWindow = new WxGimmickHelpWindow(this);
 	}
       mHelpWindow->CenterOnParent();
       mHelpWindow->ShowModal();
+      */
     }
     //====================================================================