From: Juan Prieto <Juan.Prieto@creatis.insa-lyon.fr>
Date: Wed, 2 Dec 2009 16:27:37 +0000 (+0000)
Subject: open dialog y ya funciona el NV
X-Git-Tag: CREATOOLS.2-0-3~91
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=0a950237cfc2a381c1aa4f55b3200df29d3e5c33;p=creaMaracasVisu.git

open dialog y ya funciona el NV
---

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/OpenLoadImageDialog.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/OpenLoadImageDialog.cxx
index 23d080f..f2a0930 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/OpenLoadImageDialog.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/OpenLoadImageDialog.cxx
@@ -20,6 +20,7 @@ OpenLoadImageDialog::OpenLoadImageDialog()
 
 		getImageDataDialog = (GETIMAGEDATADIALOG)GetProcAddress(gimmickhandle, "getImageDataDialog");
 
+		std::cout<<"imagehandle "<<gimmickhandle<<std::endl;
 		std::cout<<"imagedatadialog "<<getImageDataDialog<<std::endl;
 
 		if(getImageDataDialog!=NULL){
@@ -27,10 +28,8 @@ OpenLoadImageDialog::OpenLoadImageDialog()
 			gimmicknotfound = false;
 		}
 	}	
-#else
-	//GNU part
-#endif
 
+#endif
 
 	if(gimmicknotfound){
 
@@ -46,6 +45,9 @@ OpenLoadImageDialog::OpenLoadImageDialog()
 			img = reader->GetOutput();		
 		}		
 	}	
+
+
+	
 }
 
 //-------------------------------------------------------------------
diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/LogicalColorBar.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/LogicalColorBar.cxx
index d94b756..feaf8f7 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/LogicalColorBar.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/LogicalColorBar.cxx
@@ -112,39 +112,43 @@
 			{
 				logicColorPoints.push_back(newColorPoint);
 				addedPoint = true;
-			}
-			for ( iter = logicColorPoints.begin(); i<=maxIndex && !addedPoint; iter++ )
-			{
-				nextIter = iter;
-				int before = (*iter)->getRealX() ;
-				if(before>xRealValue && i==0)
-				{
-					//Is the first point
-					logicColorPoints.insert( iter, newColorPoint );
-					addedPoint =true;
-					lastAddedPoint = newColorPoint;
-				}
-				else if(before<xRealValue && i==maxIndex)
+			}else{				
+				iter = logicColorPoints.begin();
+				for (i=0; i<=maxIndex && !addedPoint; i++)
 				{
-					//Is the last point 
-					logicColorPoints.insert( iter+1, newColorPoint );	
-					addedPoint =true;
-					lastAddedPoint = newColorPoint;
-				}
-				else if(i<maxIndex)
-				{
-					//
-					nextIter++;			
-					int after = (*nextIter)->getRealX();				
-					if( before < xRealValue && after> xRealValue)
+					nextIter = iter;
+					int before = (*iter)->getRealX() ;
+					if(before>xRealValue && i==0)
+					{
+						//Is the first point
+						logicColorPoints.insert( iter, newColorPoint );
+						addedPoint =true;
+						lastAddedPoint = newColorPoint;
+					}
+					else if(before<xRealValue && i==maxIndex)
 					{
-						logicColorPoints.insert( nextIter, newColorPoint );	
+						//Is the last point 
+						logicColorPoints.push_back(newColorPoint );	
 						addedPoint =true;
 						lastAddedPoint = newColorPoint;
 					}
-				}				
-				i++;
-			}		
+					else if(i<maxIndex)
+					{
+						//
+						nextIter++;			
+						int after = (*nextIter)->getRealX();				
+						if( before < xRealValue && after> xRealValue)
+						{
+							logicColorPoints.insert( nextIter, newColorPoint );	
+							addedPoint =true;
+							lastAddedPoint = newColorPoint;
+						}
+					}		
+					//std::cout<<"JCPaddColorPoint iterator "<<*iter<<std::endl;
+					if(!addedPoint)
+						++iter;
+				}		
+			}			
 		}
 		return addedPoint;		
 	}
diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkMPR3DViewCntrlPanel.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkMPR3DViewCntrlPanel.cxx
index dd262f4..055a12f 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkMPR3DViewCntrlPanel.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkMPR3DViewCntrlPanel.cxx
@@ -246,7 +246,7 @@ void wxVtkMPR3DViewCntrlPanel::OnEditColorTable(wxCommandEvent& event)
 	HistogramDialog* hDlg=new HistogramDialog(NULL,_T("Color table"),imagedata,2);
 	
 		
-	hDlg->erasePointsTransferenceFunction();	
+	hDlg->erasePointsTransferenceFunction();		
 	int ctfSize=ctfunVectorRed->size();
 	if(ctfSize>0)
 	{
@@ -257,9 +257,10 @@ void wxVtkMPR3DViewCntrlPanel::OnEditColorTable(wxCommandEvent& event)
 				double gr	= (*ctfunVectorPoint)[i];
 				double r	= (*ctfunVectorRed)[i];
 				double g	= (*ctfunVectorGreen)[i];
-				double b	= (*ctfunVectorBlue)[i];
-			
+				double b	= (*ctfunVectorBlue)[i];			
+
 				hDlg->addColorPoint(gr,(int)(r*255),(int)(g*255),(int)(b*255));
+
 				i++;
 			}
 	}