[Echempp-devel] GUI/Windows/Qt/EChem++/Experiment caExcitationFunctionDialog.cpp, 1.19, 1.20 cvExcitationFunctionDialog.cpp, 1.25, 1.26 userDefinedEtExcitationFunctionDialog.cpp, 1.3, 1.4 userDefinedItExcitationFunctionDialog.cpp, 1.3, 1.4

[beeblbrox <bee...@us...>]

Update of /cvsroot/echempp/GUI/Windows/Qt/EChem++/Experiment
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv25283

Modified Files:
	caExcitationFunctionDialog.cpp cvExcitationFunctionDialog.cpp 
	userDefinedEtExcitationFunctionDialog.cpp 
	userDefinedItExcitationFunctionDialog.cpp 
Log Message:
Changes due to boost::serialization.


Index: cvExcitationFunctionDialog.cpp
===================================================================
RCS file: /cvsroot/echempp/GUI/Windows/Qt/EChem++/Experiment/cvExcitationFunctionDialog.cpp,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** cvExcitationFunctionDialog.cpp	26 Mar 2007 17:05:32 -0000	1.25
--- cvExcitationFunctionDialog.cpp	19 Dec 2007 13:11:34 -0000	1.26
***************
*** 262,269 ****
        
      }
!     catch( ExcitationFunctions::LoadError& error )
!     {
!       QMessageBox::warning( this, "Load button", error.message().c_str() );
!     }
      catch( const ExperimentError& error )
      {
--- 262,269 ----
        
      }
! //     catch( ExcitationFunctions::LoadError& error )
! //     {
! //       QMessageBox::warning( this, "Load button", error.message().c_str() );
! //     }
      catch( const ExperimentError& error )
      {
***************
*** 1038,1042 ****
  
      EtExcitationFunction temp;
!     BSUtilities::xmlr::xmlLoad (fileName.ascii(), temp);
    
      _EtFunction = temp;
--- 1038,1042 ----
  
      EtExcitationFunction temp;
! //     BSUtilities::xmlr::xmlLoad (fileName.ascii(), temp);
    
      _EtFunction = temp;
***************
*** 1058,1065 ****
  
    }
!   catch( ExcitationFunctions::LoadError& error )
!   {
!     QMessageBox::warning( this, "Load button", error.message().c_str() );
!   }
    catch( const ExperimentError& error )
    {
--- 1058,1065 ----
  
    }
! //   catch( ExcitationFunctions::LoadError& error )
! //   {
! //     QMessageBox::warning( this, "Load button", error.message().c_str() );
! //   }
    catch( const ExperimentError& error )
    {
***************
*** 1085,1089 ****
        fileName.append(".xml");
      }
!     BSUtilities::xmlw::save(fileName.ascii(), _EtFunction); 
  }
  
--- 1085,1089 ----
        fileName.append(".xml");
      }
! //     BSUtilities::xmlw::save(fileName.ascii(), _EtFunction); 
  }
  

Index: userDefinedItExcitationFunctionDialog.cpp
===================================================================
RCS file: /cvsroot/echempp/GUI/Windows/Qt/EChem++/Experiment/userDefinedItExcitationFunctionDialog.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** userDefinedItExcitationFunctionDialog.cpp	26 Mar 2007 17:05:32 -0000	1.3
--- userDefinedItExcitationFunctionDialog.cpp	19 Dec 2007 13:11:34 -0000	1.4
***************
*** 327,331 ****
        for(;i<_itFunction.size();++i)
        {
! 	id = _itFunction.segment(i)->id();
        
  	if( id == "Constant" )
--- 327,333 ----
        for(;i<_itFunction.size();++i)
        {
! 	//	id = _itFunction.segment(i)->id();
! 	// TODO FIXME
! 	id = "";
        
  	if( id == "Constant" )
***************
*** 374,381 ****
      
      }
!     catch( ExcitationFunctions::LoadError& error )
!     {
!       QMessageBox::warning( this, "Load button", error.message().c_str() );
!     }
      catch( const ExperimentError& error )
      {
--- 376,383 ----
      
      }
! //     catch( ExcitationFunctions::LoadError& error )
! //     {
! //       QMessageBox::warning( this, "Load button", error.message().c_str() );
! //     }
      catch( const ExperimentError& error )
      {
***************
*** 1430,1434 ****
    {
      itExcitationFunction temp;
!     BSUtilities::xmlr::xmlLoad(fileName.ascii(), temp);
  
      std::vector<int> efType;
--- 1432,1436 ----
    {
      itExcitationFunction temp;
! //     BSUtilities::xmlr::xmlLoad(fileName.ascii(), temp);
  
      std::vector<int> efType;
***************
*** 1438,1442 ****
      for(;i<temp.size();++i)
      {
!       id = temp.segment(i)->id();
  
        if( id == "Constant" )
--- 1440,1446 ----
      for(;i<temp.size();++i)
      {
!       //      id = temp.segment(i)->id();
!       // TODO FIXME
!       id = "";
  
        if( id == "Constant" )
***************
*** 1493,1500 ****
  
    }
!   catch( ExcitationFunctions::LoadError& error )
!   {
!     QMessageBox::warning( this, "Load button", error.message().c_str() );
!   }
    catch( const ExperimentError& error )
    {
--- 1497,1504 ----
  
    }
! //   catch( ExcitationFunctions::LoadError& error )
! //   {
! //     QMessageBox::warning( this, "Load button", error.message().c_str() );
! //   }
    catch( const ExperimentError& error )
    {
***************
*** 1521,1525 ****
      fileName.append(".xml");
    }
!   BSUtilities::xmlw::save(fileName.ascii(), _itFunction); 
  }
  
--- 1525,1529 ----
      fileName.append(".xml");
    }
! //   BSUtilities::xmlw::save(fileName.ascii(), _itFunction); 
  }
  

Index: caExcitationFunctionDialog.cpp
===================================================================
RCS file: /cvsroot/echempp/GUI/Windows/Qt/EChem++/Experiment/caExcitationFunctionDialog.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** caExcitationFunctionDialog.cpp	26 Mar 2007 17:05:32 -0000	1.19
--- caExcitationFunctionDialog.cpp	19 Dec 2007 13:11:34 -0000	1.20
***************
*** 233,240 ****
  
      }
!     catch( ExcitationFunctions::LoadError& error )
!     {
!       QMessageBox::warning( this, "Load button", error.message().c_str() );
!     }
      catch( const ExperimentError& error )
      {
--- 233,240 ----
  
      }
! //     catch( ExcitationFunctions::LoadError& error )
! //     {
! //       QMessageBox::warning( this, "Load button", error.message().c_str() );
! //     }
      catch( const ExperimentError& error )
      {
***************
*** 972,976 ****
  
      EtExcitationFunction temp;
!     BSUtilities::xmlr::xmlLoad (fileName.ascii(), temp);
      
      _EtFunction = temp;
--- 972,976 ----
  
      EtExcitationFunction temp;
! //     BSUtilities::xmlr::xmlLoad (fileName.ascii(), temp);
      
      _EtFunction = temp;
***************
*** 992,999 ****
  
    }
!   catch( ExcitationFunctions::LoadError& error )
!   {
!     QMessageBox::warning( this, "Load button", error.message().c_str() );
!   }
    catch( const ExperimentError& error )
    {
--- 992,999 ----
  
    }
! //   catch( ExcitationFunctions::LoadError& error )
! //   {
! //     QMessageBox::warning( this, "Load button", error.message().c_str() );
! //   }
    catch( const ExperimentError& error )
    {
***************
*** 1019,1023 ****
        fileName.append(".xml");
      }
!     BSUtilities::xmlw::save(fileName.ascii(), _EtFunction); 
  }
  	
--- 1019,1023 ----
        fileName.append(".xml");
      }
! //     BSUtilities::xmlw::save(fileName.ascii(), _EtFunction); 
  }
  	

Index: userDefinedEtExcitationFunctionDialog.cpp
===================================================================
RCS file: /cvsroot/echempp/GUI/Windows/Qt/EChem++/Experiment/userDefinedEtExcitationFunctionDialog.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** userDefinedEtExcitationFunctionDialog.cpp	26 Mar 2007 17:05:32 -0000	1.3
--- userDefinedEtExcitationFunctionDialog.cpp	19 Dec 2007 13:11:34 -0000	1.4
***************
*** 305,309 ****
        for(;i<_EtFunction.size();++i)
        {
! 	id = _EtFunction.segment(i)->id();
        
  	if( id == "Constant" )
--- 305,311 ----
        for(;i<_EtFunction.size();++i)
        {
! 	// 	id = _EtFunction.segment(i)->id();
! 	// TODO FIXME
! 	id = "";
        
  	if( id == "Constant" )
***************
*** 343,350 ****
      
      }
!     catch( ExcitationFunctions::LoadError& error )
!     {
!       QMessageBox::warning( this, "Load button", error.message().c_str() );
!     }
      catch( const ExperimentError& error )
      {
--- 345,352 ----
      
      }
! //     catch( ExcitationFunctions::LoadError& error )
! //     {
! //       QMessageBox::warning( this, "Load button", error.message().c_str() );
! //     }
      catch( const ExperimentError& error )
      {
***************
*** 1360,1364 ****
    {
        EtExcitationFunction temp;
!       BSUtilities::xmlr::xmlLoad (fileName.ascii(), temp);
  
        std::vector<int> efType;
--- 1362,1366 ----
    {
        EtExcitationFunction temp;
! //       BSUtilities::xmlr::xmlLoad (fileName.ascii(), temp);
  
        std::vector<int> efType;
***************
*** 1368,1372 ****
      for(;i<temp.size();++i)
      {
!       id = temp.segment(i)->id();
  
        if( id == "Constant" )
--- 1370,1376 ----
      for(;i<temp.size();++i)
      {
! //       id = temp.segment(i)->id();
!       // TODO FIXME
!       id = "";
  
        if( id == "Constant" )
***************
*** 1415,1422 ****
  
    }
!   catch( ExcitationFunctions::LoadError& error )
!   {
!     QMessageBox::warning( this, "Load button", error.message().c_str() );
!   }
    catch( const ExperimentError& error )
    {
--- 1419,1426 ----
  
    }
! //   catch( ExcitationFunctions::LoadError& error )
! //   {
! //     QMessageBox::warning( this, "Load button", error.message().c_str() );
! //   }
    catch( const ExperimentError& error )
    {
***************
*** 1443,1447 ****
        fileName.append(".xml");
      }
!     BSUtilities::xmlw::save(fileName.ascii(), _EtFunction); 
  }
  
--- 1447,1451 ----
        fileName.append(".xml");
      }
!     //    BSUtilities::xmlw::save(fileName.ascii(), _EtFunction); 
  }