[Echempp-devel] GUI/Windows/Qt/EChem++/Model modelMainWindow.cpp, 1.64, 1.65 solverDialog.cpp, 1.90, 1.91

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

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

Modified Files:
	modelMainWindow.cpp solverDialog.cpp 
Log Message:
Patch for segmentation fault, when single experiment simulations
are run twice. Due to delete instead of delete[] call.


Index: solverDialog.cpp
===================================================================
RCS file: /cvsroot/echempp/GUI/Windows/Qt/EChem++/Model/solverDialog.cpp,v
retrieving revision 1.90
retrieving revision 1.91
diff -C2 -d -r1.90 -r1.91
*** solverDialog.cpp	27 Mar 2008 13:11:55 -0000	1.90
--- solverDialog.cpp	16 Sep 2008 20:03:02 -0000	1.91
***************
*** 779,783 ****
      experiment::MeasurementDataCV* mdca = NULL;
      if(_meas_data != NULL)
!       delete _meas_data;
      if(_cond_data->ec.potentialControlled)
        {
--- 779,783 ----
      experiment::MeasurementDataCV* mdca = NULL;
      if(_meas_data != NULL)
!       delete[] _meas_data;
      if(_cond_data->ec.potentialControlled)
        {

Index: modelMainWindow.cpp
===================================================================
RCS file: /cvsroot/echempp/GUI/Windows/Qt/EChem++/Model/modelMainWindow.cpp,v
retrieving revision 1.64
retrieving revision 1.65
diff -C2 -d -r1.64 -r1.65
*** modelMainWindow.cpp	27 Mar 2008 13:11:54 -0000	1.64
--- modelMainWindow.cpp	16 Sep 2008 20:03:02 -0000	1.65
***************
*** 204,208 ****
  #endif
  
!   this->ep = new experiment::cv::SimInduced(new experiment::ConditionDataModSim(), new experiment::MeasurementDataCV());
    this->ep->set_title("New Experiment");
  
--- 204,208 ----
  #endif
  
!   this->ep = new experiment::cv::SimInduced(new experiment::ConditionDataModSim(), new experiment::MeasurementDataCV[1]);
    this->ep->set_title("New Experiment");
  
***************
*** 253,257 ****
      {
        ep = new experiment::cv::SimInduced(new experiment::ConditionDataModSim(), 
! 					  new experiment::MeasurementDataCV());
      }
    if(ep->is_compound())
--- 253,257 ----
      {
        ep = new experiment::cv::SimInduced(new experiment::ConditionDataModSim(), 
! 					  new experiment::MeasurementDataCV[1]);
      }
    if(ep->is_compound())
***************
*** 398,402 ****
        ia_xml >> BOOST_SERIALIZATION_NVP(ep);
        // needed since measurement data is not serialized anymore
!       ep->set_meas_data(new experiment::MeasurementDataCV());
      }
    catch(std::exception& e)
--- 398,402 ----
        ia_xml >> BOOST_SERIALIZATION_NVP(ep);
        // needed since measurement data is not serialized anymore
!       ep->set_meas_data(new experiment::MeasurementDataCV[1]);
      }
    catch(std::exception& e)
***************
*** 706,710 ****
    fd->setFilter( "EChem++ Project (*.xml)" );
    fd->setViewMode( QFileDialog::List );
!   fd->setDir( "~/echempp/examples" );
    
    QString fileName;
--- 706,710 ----
    fd->setFilter( "EChem++ Project (*.xml)" );
    fd->setViewMode( QFileDialog::List );
!   fd->setDir( "." );
    
    QString fileName;
***************
*** 743,747 ****
    fd->setFilter( "EChem++ Project (*.xml)" );
    fd->setViewMode( QFileDialog::List );
!   fd->setDir( "~/echempp/data" );
    
    QString fileName;
--- 743,747 ----
    fd->setFilter( "EChem++ Project (*.xml)" );
    fd->setViewMode( QFileDialog::List );
!   fd->setDir( "." );
    
    QString fileName;
***************
*** 1007,1011 ****
        ep = NULL;
      }
!   this->ep = new experiment::cv::SimInduced(new experiment::ConditionDataModSim(), new experiment::MeasurementDataCV());
    this->ep->set_title("New single Experiment");
  }
--- 1007,1011 ----
        ep = NULL;
      }
!   this->ep = new experiment::cv::SimInduced(new experiment::ConditionDataModSim(), new experiment::MeasurementDataCV[1]);
    this->ep->set_title("New single Experiment");
  }
***************
*** 1066,1070 ****
    fd->setFilter( "Text files (*.txt *.TXT)" );
    fd->setViewMode( QFileDialog::List );
!   fd->setDir( "~/echempp/data" );
    QString fileName;
    if ( fd->exec() == QDialog::Accepted )
--- 1066,1070 ----
    fd->setFilter( "Text files (*.txt *.TXT)" );
    fd->setViewMode( QFileDialog::List );
!   fd->setDir( "." );
    QString fileName;
    if ( fd->exec() == QDialog::Accepted )
***************
*** 1120,1124 ****
    fd->setFilter( "Text files (*.txt *.TXT)" );
    fd->setViewMode( QFileDialog::List );
!   fd->setDir( "~/echempp/data" );
    
    QString fileName;
--- 1120,1124 ----
    fd->setFilter( "Text files (*.txt *.TXT)" );
    fd->setViewMode( QFileDialog::List );
!   fd->setDir( "." );
    
    QString fileName;