From: espinosa <Monica.Espinosa@creatis.insa-lyon.fr>
Date: Fri, 27 Mar 2015 14:48:52 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.creatis.insa-lyon.fr/bbtk
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=b324b7e01f19042425f979066aeada6ec4529e98;p=bbtk.git

Merge branch 'master' of ssh://git.creatis.insa-lyon.fr/bbtk

Conflicts:
	packages/std/src/bbstdWriteColumnsString.cxx

Conflicts:
	packages/std/src/bbstdWriteColumnsString.cxx
---

b324b7e01f19042425f979066aeada6ec4529e98
diff --cc packages/std/src/bbstdWriteColumnsString.cxx
index bd0f0b0,420d94f..0000000
deleted file mode 100644,100644
--- a/packages/std/src/bbstdWriteColumnsString.cxx
+++ /dev/null
@@@ -1,93 -1,134 +1,0 @@@
--//===== 
--// Before editing this file, make sure it's a file of your own (i.e.: it wasn't generated from xml description; if so : your modifications will be lost)
--//===== 
--#include "bbstdWriteColumnsString.h"
--#include "bbstdPackage.h"
--namespace bbstd
--{
--
--BBTK_ADD_BLACK_BOX_TO_PACKAGE(std,WriteColumnsString)
--BBTK_BLACK_BOX_IMPLEMENTATION(WriteColumnsString,bbtk::AtomicBlackBox);
--//===== 
--// Before editing this file, make sure it's a file of your own (i.e.: it wasn't generated from xml description; if so : your modifications will be lost)
--//===== 
--void WriteColumnsString::Process()
--{
--
--	std::cout << "MLER WriteColumnsString::Process Start " << std::endl;
--	
 -
--	std::ofstream write_fi;
--	write_fi.open(bbGetInputFileName().c_str());
- 	//std::cout<<"write_fi "<<bbGetInputFileName().c_str()<<std::endl;
- 	std::vector<std::string> headers = bbGetInputHeaders();
 -	
 -	std::vector<std::string> headers = bbGetInputHeaders(); //Headers Input
--
- 	int i,j,k;
 -	std::vector<std::vector<std::string> > values;
--
- 	if(write_fi.is_open())
 -	values.push_back(bbGetInputlstData1());
 -	values.push_back(bbGetInputlstData2());
 -	values.push_back(bbGetInputlstData3());
 -	values.push_back(bbGetInputlstData4());
 -	values.push_back(bbGetInputlstData5());
 -	values.push_back(bbGetInputlstData6());
 -	values.push_back(bbGetInputlstData7());
 -	values.push_back(bbGetInputlstData8());
 -	values.push_back(bbGetInputlstData9());
 -
 -	std::vector<std::vector<std::string> >::iterator it;
 -
 -	for(it = values.begin() ; it != values.end() ; )
--	{
- 		for(i=0 ;i< headers.size(); i++ )
 -		if((*it).empty())
--		{
- 			write_fi << headers[i] << "\t";
 -			it = values.erase(it);
 -		}else
 -		{
 -			it++;
 -		}
 -	}
 -	
 -	if(write_fi.is_open())
 -	{	
 -		//Add each header input write to file
 -		for(unsigned int i=0 ;i< headers.size(); i++ )
 -		{
 -			if(i==(headers.size()-1))
 -			{
 -				write_fi << headers[i] << "\n";
 -			}else{
 -				write_fi << headers[i] << "\t";
 -			}
 -
--		}//for headersSize
--
- 		for(j=0; j< bbGetInputlstData1().size();j++)
 -		unsigned int colSize = values[0].size();
 -
 -		for(unsigned int j=0;j<colSize;j++)
--		{
- 			write_fi << bbGetInputlstData1()[j] << "\n";
- 		}
 -			for(unsigned int i=0;i<values.size();i++)
 -			{
 -				if(i==(values.size()-1))
 -				{
 -					write_fi << values[i][j] << "\n";
 -				}else{
 -					write_fi << values[i][j] << "\t";
 -				}
--
- 		std::cout<<"size Header"<<headers.size()<<std::endl;
 -			}
 -			
 -		}
--		
- 
 -	 	
--	}// if write_fi.is_open()
--	else
--	{
--		std::cout<<"No es posible abrir"<<std::endl;
--	}//else
--
--	write_fi.close();
--
- 	bbSetOutputOutFileName("Prueba.txt");
 -	bbSetOutputOutFileName(bbGetInputFileName().c_str());
--
--	std::cout << "MLER WriteColumnsString::End Process " << std::endl;
--  
--}
--//===== 
--// Before editing this file, make sure it's a file of your own (i.e.: it wasn't generated from xml description; if so : your modifications will be lost)
--//===== 
--void WriteColumnsString::bbUserSetDefaultValues()
--{
--
--//  SET HERE THE DEFAULT INPUT/OUTPUT VALUES OF YOUR BOX 
--//    Here we initialize the input 'In' to 0
--   bbSetInputFileName("");	
--  
--}
--//===== 
--// Before editing this file, make sure it's a file of your own (i.e.: it wasn't generated from xml description; if so : your modifications will be lost)
--//===== 
--void WriteColumnsString::bbUserInitializeProcessing()
--{
--
--//  THE INITIALIZATION METHOD BODY :
--//    Here does nothing 
--//    but this is where you should allocate the internal/output pointers 
--//    if any 
--
--  
--}
--//===== 
--// Before editing this file, make sure it's a file of your own (i.e.: it wasn't generated from xml description; if so : your modifications will be lost)
--//===== 
--void WriteColumnsString::bbUserFinalizeProcessing()
--{
--
--//  THE FINALIZATION METHOD BODY :
--//    Here does nothing 
--//    but this is where you should desallocate the internal/output pointers 
--//    if any
--  
--}
--}
--// EO namespace bbstd
--
--
diff --cc packages/std/src/bbstdWriteColumnsString.h
index c0bee71,c0bee71..0000000
deleted file mode 100644,100644
--- a/packages/std/src/bbstdWriteColumnsString.h
+++ /dev/null
@@@ -1,69 -1,69 +1,0 @@@
--//===== 
--// Before editing this file, make sure it's a file of your own (i.e.: it wasn't generated from xml description; if so : your modifications will be lost)
--//===== 
--#ifndef __bbstdWriteColumnsString_h_INCLUDED__
--#define __bbstdWriteColumnsString_h_INCLUDED__
--#include "bbstd_EXPORT.h"
--#include "bbtkAtomicBlackBox.h"
--#include "iostream"
--
--namespace bbstd
--{
--
--class bbstd_EXPORT WriteColumnsString :
--   public bbtk::AtomicBlackBox
--{
--  BBTK_BLACK_BOX_INTERFACE(WriteColumnsString,bbtk::AtomicBlackBox);
--//===== 
--// Before editing this file, make sure it's a file of your own (i.e.: it wasn't generated from xml description; if so : your modifications will be lost)
--//===== 
--  BBTK_DECLARE_INPUT(FileName,std::string);
--  BBTK_DECLARE_INPUT(Headers,std::vector<std::string>);
--
--  BBTK_DECLARE_INPUT(lstData1,std::vector<std::string> );
--  BBTK_DECLARE_INPUT(lstData2,std::vector<std::string> );
--  BBTK_DECLARE_INPUT(lstData3,std::vector<std::string> );
--  BBTK_DECLARE_INPUT(lstData4,std::vector<std::string> );
--  BBTK_DECLARE_INPUT(lstData5,std::vector<std::string> );
--  BBTK_DECLARE_INPUT(lstData6,std::vector<std::string> );
--  BBTK_DECLARE_INPUT(lstData7,std::vector<std::string> );
--  BBTK_DECLARE_INPUT(lstData8,std::vector<std::string> );
--  BBTK_DECLARE_INPUT(lstData9,std::vector<std::string> );
--
--  BBTK_DECLARE_OUTPUT(OutFileName,std::string);
--  BBTK_PROCESS(Process);
--  void Process();
--//===== 
--// Before editing this file, make sure it's a file of your own (i.e.: it wasn't generated from xml description; if so : your modifications will be lost)
--//===== 
--};
--
--BBTK_BEGIN_DESCRIBE_BLACK_BOX(WriteColumnsString,bbtk::AtomicBlackBox);
--BBTK_NAME("WriteColumnsString");
--BBTK_AUTHOR("Monica ESPINOSA");
--BBTK_DESCRIPTION("Write Columns to file");
--BBTK_CATEGORY("read/write");
--
--BBTK_INPUT(WriteColumnsString,FileName,"File name",std::string,"");
--BBTK_INPUT(WriteColumnsString,Headers,"Headers of Columns",std::vector<std::string>,"");
--
--BBTK_INPUT(WriteColumnsString,lstData1,"vector of data",std::vector<std::string>,"");
--BBTK_INPUT(WriteColumnsString,lstData2,"vector of data",std::vector<std::string>,"");
--BBTK_INPUT(WriteColumnsString,lstData3,"vector of data",std::vector<std::string>,"");
--BBTK_INPUT(WriteColumnsString,lstData4,"vector of data",std::vector<std::string>,"");
--BBTK_INPUT(WriteColumnsString,lstData5,"vector of data",std::vector<std::string>,"");
--BBTK_INPUT(WriteColumnsString,lstData6,"vector of data",std::vector<std::string>,"");
--BBTK_INPUT(WriteColumnsString,lstData7,"vector of data",std::vector<std::string>,"");
--BBTK_INPUT(WriteColumnsString,lstData8,"vector of data",std::vector<std::string>,"");
--BBTK_INPUT(WriteColumnsString,lstData9,"vector of data",std::vector<std::string>,"");
--
--BBTK_OUTPUT(WriteColumnsString,OutFileName,"File Name",std::string,"");
--BBTK_END_DESCRIBE_BLACK_BOX(WriteColumnsString);
--//===== 
--// Before editing this file, make sure it's a file of your own (i.e.: it wasn't generated from xml description; if so : your modifications will be lost)
--//===== 
--}
--// EO namespace bbstd
--
--#endif // __bbstdWriteColumnsString_h_INCLUDED__
--