From: Kevin M. Rosenberg Date: Mon, 8 Jan 2001 02:02:18 +0000 (+0000) Subject: r362: no message X-Git-Tag: debian-4.5.3-3~655 X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=commitdiff_plain;h=e69a48c43eb11e0a6ffcf7f5edf28a1f10672d12 r362: no message --- diff --git a/src/views.cpp b/src/views.cpp index 593dbf8..72ed48d 100644 --- a/src/views.cpp +++ b/src/views.cpp @@ -9,7 +9,7 @@ ** This is part of the CTSim program ** Copyright (C) 1983-2000 Kevin Rosenberg ** -** $Id: views.cpp,v 1.55 2001/01/08 02:00:45 kevin Exp $ +** $Id: views.cpp,v 1.56 2001/01/08 02:02:18 kevin Exp $ ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License (version 2) as @@ -1462,19 +1462,19 @@ ImageFileView::OnCompareCol (wxCommandEvent& event) unsigned int iL; for (iL = 0; iL < rIF.nLabels(); iL++) { - std::string s = GetDocument()->GetFirstView()->GetFrame()->GetTitle(); + std::string s = GetDocument()->GetFirstView()->GetFrame()->GetTitle().c_str(); s += ": "; s += rIF.labelGet(iL).getLabelString(); rPlotFile.addDescription (s.c_str()); } for (iL = 0; iL < rIF.nLabels(); iL++) { - std::string s = pCompareDoc->GetFirstView()->GetFrame()->GetTitle(); + std::string s = pCompareDoc->GetFirstView()->GetFrame()->GetTitle().c_str(); s += ": "; s += rCompareIF.labelGet(iL).getLabelString(); rPlotFile.addDescription (s.c_str()); } - os << " Between " << GetDocument()->GetFirstView()->GetFrame()->GetTitle() << " and " - << pCompareDoc->GetFirstView()->GetFrame()->GetTitle(); + os << " Between " << GetDocument()->GetFirstView()->GetFrame()->GetTitle().c_str() << " and " + << pCompareDoc->GetFirstView()->GetFrame()->GetTitle().c_str(); *theApp->getLog() << os.str().c_str() << "\n"; rPlotFile.addDescription (os.str().c_str()); } @@ -1552,19 +1552,19 @@ ImageFileView::OnCompareRow (wxCommandEvent& event) rPlotFile.addColumn (2, pY2); unsigned int iL; for (iL = 0; iL < rIF.nLabels(); iL++) { - std::string s = GetDocument()->GetFirstView()->GetFrame()->GetTitle(); + std::string s = GetDocument()->GetFirstView()->GetFrame()->GetTitle().c_str(); s += ": "; s += rIF.labelGet(iL).getLabelString(); rPlotFile.addDescription (s.c_str()); } for (iL = 0; iL < rIF.nLabels(); iL++) { - std::string s = pCompareDoc->GetFirstView()->GetFrame()->GetTitle(); + std::string s = pCompareDoc->GetFirstView()->GetFrame()->GetTitle().c_str(); s += ": "; s += rCompareIF.labelGet(iL).getLabelString(); rPlotFile.addDescription (s.c_str()); } - os << " Between " << GetDocument()->GetFirstView()->GetFrame()->GetTitle() << " and " - << pCompareDoc->GetFirstView()->GetFrame()->GetTitle(); + os << " Between " << GetDocument()->GetFirstView()->GetFrame()->GetTitle().c_str() << " and " + << pCompareDoc->GetFirstView()->GetFrame()->GetTitle().c_str(); *theApp->getLog() << os.str().c_str() << "\n"; rPlotFile.addDescription (os.str().c_str()); }