X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=bbtk%2Fsrc%2FbbmaracasvisuShowNPoints.cxx;h=b33daa47a187c337002ca084e8fcf6f5cf680a34;hb=64786ec38c5272e34bff52b0ade41b032d2387ea;hp=25debba998835ec2288161ba90eb76b10d9a49d3;hpb=06b4871abe344407fcce79f440ecef87a2afe8f0;p=creaMaracasVisu.git

diff --git a/bbtk/src/bbmaracasvisuShowNPoints.cxx b/bbtk/src/bbmaracasvisuShowNPoints.cxx
index 25debba..b33daa4 100644
--- a/bbtk/src/bbmaracasvisuShowNPoints.cxx
+++ b/bbtk/src/bbmaracasvisuShowNPoints.cxx
@@ -1,3 +1,28 @@
+/*# ---------------------------------------------------------------------
+#
+# 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 "bbmaracasvisuShowNPoints.h"
 #include "bbcreaMaracasVisuPackage.h"
 
@@ -139,6 +164,7 @@ WidgetShowNPoints::~WidgetShowNPoints()
 {
 }
 
+//------------------------------------------------------------------------
 void WidgetShowNPoints::SetRadio(double radio)
 {
 	this->mradio=radio;
@@ -187,7 +213,7 @@ void WidgetShowNPoints::SetOpacity(double opacity)
 {
 	this->mopacity=opacity;
 	//NTU: For Slider
-	sdrOpacity->SetValue(this->mopacity/100.0);
+	sdrOpacity->SetValue(this->mopacity*100.0);
 }
 
 //------------------------------------------------------------------------
@@ -292,7 +318,6 @@ void WidgetShowNPoints::AddPoint(int x, int y, int z, std::string label)
 	lstActorsText.push_back(textActor);
 
 	RefreshPoint(lstPointsX.size()-1);
-	SetOutputBox();
 }
 
 //------------------------------------------------------------------------
@@ -307,6 +332,7 @@ void WidgetShowNPoints::OnAddPoint (wxCommandEvent& event)
 	if (this->renderer!=NULL){
 		if (mpoint.size()==3){
 			AddPoint(mpoint[0],mpoint[1],mpoint[2], (const char*) ( textCtrl->GetValue().mb_str() ) );
+			SetOutputBox();
 		} else {//mpoint.size
 			printf("creaMaracasVisu::ShowNPoints (not match point) \n");
 		}
@@ -420,6 +446,7 @@ void WidgetShowNPoints::OnAddPoint (wxCommandEvent& event)
 					if (strcmp(chartmp,"<_VOID_>")==0) { strcpy(chartmp,""); }
 					AddPoint(x,y,z, chartmp );
 				}
+				SetOutputBox();
 				fclose(ff);
 			} else {   // else ff
 				printf("WidgetShowNPoints::OnLoadPoints  ...Error... reading file");
@@ -469,6 +496,7 @@ void WidgetShowNPoints::OnAddPoint (wxCommandEvent& event)
 		{
 			id=0;
 			AddPoint(0,0,0,"");
+			SetOutputBox();
 		}
 		
 		
@@ -605,12 +633,15 @@ void WidgetShowNPoints::UpdatePoints(wxCommandEvent &event)
 	}
 
 	//NTU: For updating
-	SetOutputBox();
+//EED	SetOutputBox();
+        renderer->GetRenderWindow()->Render();
+
 }
 
 BBTK_ADD_BLACK_BOX_TO_PACKAGE(creaMaracasVisu,ShowNPoints)
 BBTK_BLACK_BOX_IMPLEMENTATION(ShowNPoints,bbtk::WxBlackBox);
 
+//-----------------------------------------------------------------
 void ShowNPoints::Process()
 {
 	if (mwxwidget!=NULL)
@@ -626,20 +657,23 @@ void ShowNPoints::Process()
 		bbSetOutputlstPointsY( mwxwidget->GetLstPointsY() );
 		bbSetOutputlstPointsZ( mwxwidget->GetLstPointsZ() );
 		bbSetOutputlstLabels( mwxwidget->GetLstLabels() );
+
 	} // mwxwidget
 }
 
+//-----------------------------------------------------------------
 void ShowNPoints::CreateWidget(wxWindow* parent)
 {
 	mwxwidget = new WidgetShowNPoints( parent, this);
     bbSetOutputWidget( mwxwidget );
 }
 
+//-----------------------------------------------------------------
 void ShowNPoints::bbUserSetDefaultValues()
 {
 	mwxwidget = NULL;
 
-	bbSetInputRadio(1);
+	bbSetInputRadio(10);
 	bbSetInputOpacity(1);
 
 	std::vector<double> colour;