X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=appli%2FBasicViewer%2Fmain.cxx;h=b71b6682625a0cbcc0834385353b06e0fd45fc81;hb=22f291ff6afce66933c2a8fe97097692680d186b;hp=48f9b3fc19728e3424fbce4a20aeb477a7ddd51d;hpb=06610dcdeeb287e2b964216abc09bceb070c7298;p=creaMaracasVisu.git

diff --git a/appli/BasicViewer/main.cxx b/appli/BasicViewer/main.cxx
index 48f9b3f..b71b668 100644
--- a/appli/BasicViewer/main.cxx
+++ b/appli/BasicViewer/main.cxx
@@ -1,8 +1,37 @@
+/*
+# ---------------------------------------------------------------------
+#
+# Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image
+#                        pour la Sant�)
+# Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton
+# Previous Authors : Laurent Guigues, Jean-Pierre Roux
+# CreaTools website : www.creatis.insa-lyon.fr/site/fr/creatools_accueil
+#
+#  This software is governed by the CeCILL-B license under French law and
+#  abiding by the rules of distribution of free software. You can  use,
+#  modify and/ or redistribute the software under the terms of the CeCILL-B
+#  license as circulated by CEA, CNRS and INRIA at the following URL
+#  http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html
+#  or in the file LICENSE.txt.
+#
+#  As a counterpart to the access to the source code and  rights to copy,
+#  modify and redistribute granted by the license, users are provided only
+#  with a limited warranty  and the software's author,  the holder of the
+#  economic rights,  and the successive licensors  have only  limited
+#  liability.
+#
+#  The fact that you are presently reading this means that you have had
+#  knowledge of the CeCILL-B license and that you accept its terms.
+# ------------------------------------------------------------------------ */
+
 #include "wx/wx.h"
 #include "wxMaracas_N_ViewersWidget.h"
 #include "OpenImageDialog.h"
 #include "vtkImageData.h"
 
+#include <structBCPSettings.h>
+#include <buttonContainerSettings.h>
+#include <creaPanelButtonContainer.h>
 
 class MyApp:public wxApp
 {
@@ -40,10 +69,11 @@ bool MyApp::OnInit()
 	MyFrame *frame = new MyFrame(wxT("CREATIS basic"));
 
 	const int width = 600;
+
 	const int height = 250;
 
 	frame->SetSize(width,height);
-	
+
 	frame->Show(true);
 
 	return true;
@@ -60,7 +90,6 @@ void MyFrame::OnOpen(wxCommandEvent& event)
 {
 	//wxMessageBox(wxT("You clicked the open option"));
 
-#ifdef WIN32
 			creaMaracasVisuKernel::OpenImageDialog *diag = new creaMaracasVisuKernel::OpenImageDialog(true);
 			 wxBoxSizer *sizer = new wxBoxSizer(wxVERTICAL);
 
@@ -73,14 +102,6 @@ void MyFrame::OnOpen(wxCommandEvent& event)
 			sizer->Add(viewer,1,wxGROW);
 			  SetSizer(sizer);
 			}
-
-#else 
-			creaMaracasVisuKernel::OpenImageDialog *diag = new creaMaracasVisuKernel::OpenImageDialog(false);
-			if(diag->getImageData() != NULL){
-				image = diag->getImageData();
-				strfilename = diag->getFilename();
-			}
-#endif
 }
 
 void MyFrame::OnAbout(wxCommandEvent& event)