projects
/
ctsim.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
f13a8c0
)
Fix few more c-string to unicode strings
author
Kevin Rosenberg
<kevin@rosenberg.net>
Wed, 5 Aug 2009 23:38:06 +0000
(17:38 -0600)
committer
Kevin Rosenberg
<kevin@rosenberg.net>
Wed, 5 Aug 2009 23:38:06 +0000
(17:38 -0600)
src/views.cpp
patch
|
blob
|
history
diff --git
a/src/views.cpp
b/src/views.cpp
index b9c52b1bcdd115be480ca45d1ccd446b774c037f..f7898314fca127d73cc121433749e1c2a8867a87 100644
(file)
--- a/
src/views.cpp
+++ b/
src/views.cpp
@@
-1599,7
+1599,7
@@
ImageFileView::OnPlotFFTRow (wxCommandEvent& event)
} else {
PlotFile& rPlotFile = pPlotDoc->getPlotFile();
std::ostringstream os;
} else {
PlotFile& rPlotFile = pPlotDoc->getPlotFile();
std::ostringstream os;
- os << "Row " << yCursor;
+ os << "Row " << yCursor
<< ": "
;
std::string title("title ");
title += os.str();
rPlotFile.addEzsetCommand (title.c_str());
std::string title("title ");
title += os.str();
rPlotFile.addEzsetCommand (title.c_str());
@@
-1624,7
+1624,7
@@
ImageFileView::OnPlotFFTRow (wxCommandEvent& event)
rPlotFile.addColumn (3, pYMag);
for (unsigned int iL = 0; iL < rIF.nLabels(); iL++)
rPlotFile.addDescription (rIF.labelGet(iL).getLabelString().c_str());
rPlotFile.addColumn (3, pYMag);
for (unsigned int iL = 0; iL < rIF.nLabels(); iL++)
rPlotFile.addDescription (rIF.labelGet(iL).getLabelString().c_str());
- os << " FFT Plot of " <<
dynamic_cast<wxFrame*>(GetDocument()->GetFirstView()->GetFrame())->GetTitle().c_str(
);
+ os << " FFT Plot of " <<
wxConvUTF8.cWX2MB(dynamic_cast<wxFrame*>(GetDocument()->GetFirstView()->GetFrame())->GetTitle().c_str()
);
*theApp->getLog() << wxConvUTF8.cMB2WX(os.str().c_str()) << _T("\n");
rPlotFile.addDescription (os.str().c_str());
}
*theApp->getLog() << wxConvUTF8.cMB2WX(os.str().c_str()) << _T("\n");
rPlotFile.addDescription (os.str().c_str());
}
@@
-1699,7
+1699,7
@@
ImageFileView::OnPlotFFTCol (wxCommandEvent& event)
} else {
PlotFile& rPlotFile = pPlotDoc->getPlotFile();
std::ostringstream os;
} else {
PlotFile& rPlotFile = pPlotDoc->getPlotFile();
std::ostringstream os;
- os << "Column " << xCursor;
+ os << "Column " << xCursor
<< ": "
;
std::string title("title ");
title += os.str();
rPlotFile.addEzsetCommand (title.c_str());
std::string title("title ");
title += os.str();
rPlotFile.addEzsetCommand (title.c_str());
@@
-1724,7
+1724,7
@@
ImageFileView::OnPlotFFTCol (wxCommandEvent& event)
rPlotFile.addColumn (3, pYMag);
for (unsigned int iL = 0; iL < rIF.nLabels(); iL++)
rPlotFile.addDescription (rIF.labelGet(iL).getLabelString().c_str());
rPlotFile.addColumn (3, pYMag);
for (unsigned int iL = 0; iL < rIF.nLabels(); iL++)
rPlotFile.addDescription (rIF.labelGet(iL).getLabelString().c_str());
- os << " FFT Plot of " <<
dynamic_cast<wxFrame*>(GetDocument()->GetFirstView()->GetFrame())->GetTitle().c_str(
);
+ os << " FFT Plot of " <<
wxConvUTF8.cWX2MB(dynamic_cast<wxFrame*>(GetDocument()->GetFirstView()->GetFrame())->GetTitle().c_str()
);
*theApp->getLog() << wxConvUTF8.cMB2WX(os.str().c_str()) << _T("\n");
rPlotFile.addDescription (os.str().c_str());
}
*theApp->getLog() << wxConvUTF8.cMB2WX(os.str().c_str()) << _T("\n");
rPlotFile.addDescription (os.str().c_str());
}
@@
-1786,7
+1786,7
@@
ImageFileView::OnCompareCol (wxCommandEvent& event)
} else {
PlotFile& rPlotFile = pPlotDoc->getPlotFile();
std::ostringstream os;
} else {
PlotFile& rPlotFile = pPlotDoc->getPlotFile();
std::ostringstream os;
- os << "Column " << xCursor << " Comparison";
+ os << "Column " << xCursor << "
:
Comparison";
std::string title("title ");
title += os.str();
rPlotFile.addEzsetCommand (title.c_str());
std::string title("title ");
title += os.str();
rPlotFile.addEzsetCommand (title.c_str());
@@
-1808,7
+1808,7
@@
ImageFileView::OnCompareCol (wxCommandEvent& event)
unsigned int iL;
for (iL = 0; iL < rIF.nLabels(); iL++) {
std::ostringstream os;
unsigned int iL;
for (iL = 0; iL < rIF.nLabels(); iL++) {
std::ostringstream os;
- os << dynamic_cast<wxFrame*>(GetDocument()->GetFirstView()->GetFrame())->GetTitle().
mb_str(wxConvUTF8
);
+ os << dynamic_cast<wxFrame*>(GetDocument()->GetFirstView()->GetFrame())->GetTitle().
c_str(
);
os << ": " << rIF.labelGet(iL).getLabelString();
rPlotFile.addDescription (os.str().c_str());
}
os << ": " << rIF.labelGet(iL).getLabelString();
rPlotFile.addDescription (os.str().c_str());
}
@@
-1819,8
+1819,8
@@
ImageFileView::OnCompareCol (wxCommandEvent& event)
os << rCompareIF.labelGet(iL).getLabelString();
rPlotFile.addDescription (os.str().c_str());
}
os << rCompareIF.labelGet(iL).getLabelString();
rPlotFile.addDescription (os.str().c_str());
}
- os << "
Between " << dynamic_cast<wxFrame*>(GetDocument()->GetFirstView()->GetFrame())->GetTitle().c_str(
) << " and "
- << dynamic_cast<wxFrame*>(pCompareDoc->GetFirstView()->GetFrame())->GetTitle().
c_str(
);
+ os << "
between " << dynamic_cast<wxFrame*>(GetDocument()->GetFirstView()->GetFrame())->GetTitle().mb_str(wxConvUTF8
) << " and "
+ << dynamic_cast<wxFrame*>(pCompareDoc->GetFirstView()->GetFrame())->GetTitle().
mb_str(wxConvUTF8
);
*theApp->getLog() << wxConvUTF8.cMB2WX(os.str().c_str()) << _T("\n");
rPlotFile.addDescription (os.str().c_str());
}
*theApp->getLog() << wxConvUTF8.cMB2WX(os.str().c_str()) << _T("\n");
rPlotFile.addDescription (os.str().c_str());
}
@@
-1880,7
+1880,7
@@
ImageFileView::OnCompareRow (wxCommandEvent& event)
} else {
PlotFile& rPlotFile = pPlotDoc->getPlotFile();
std::ostringstream os;
} else {
PlotFile& rPlotFile = pPlotDoc->getPlotFile();
std::ostringstream os;
- os << "Row " << yCursor << " Comparison";
+ os << "Row " << yCursor << "
:
Comparison";
std::string title("title ");
title += os.str();
rPlotFile.addEzsetCommand (title.c_str());
std::string title("title ");
title += os.str();
rPlotFile.addEzsetCommand (title.c_str());
@@
-1912,8
+1912,8
@@
ImageFileView::OnCompareRow (wxCommandEvent& event)
<< rCompareIF.labelGet(iL).getLabelString();
rPlotFile.addDescription (os.str().c_str());
}
<< rCompareIF.labelGet(iL).getLabelString();
rPlotFile.addDescription (os.str().c_str());
}
- os << "
B
etween " << dynamic_cast<wxFrame*>(GetDocument()->GetFirstView()->GetFrame())->GetTitle().mb_str(wxConvUTF8) << " and "
- << dynamic_cast<wxFrame*>(pCompareDoc->GetFirstView()->GetFrame())->GetTitle().
c_str(
);
+ os << "
b
etween " << dynamic_cast<wxFrame*>(GetDocument()->GetFirstView()->GetFrame())->GetTitle().mb_str(wxConvUTF8) << " and "
+ << dynamic_cast<wxFrame*>(pCompareDoc->GetFirstView()->GetFrame())->GetTitle().
mb_str(wxConvUTF8
);
*theApp->getLog() << wxConvUTF8.cMB2WX(os.str().c_str()) << _T("\n");
rPlotFile.addDescription (os.str().c_str());
}
*theApp->getLog() << wxConvUTF8.cMB2WX(os.str().c_str()) << _T("\n");
rPlotFile.addDescription (os.str().c_str());
}