From 889a570e33794a5d0c35505e8f7fa335d5cb5bb1 Mon Sep 17 00:00:00 2001 From: Andreas Fabri Date: Thu, 5 Apr 2007 10:04:07 +0000 Subject: [PATCH] Replaced gcvt --- .../demo/Stream_lines_2/streamlines.cpp | 43 ++++++++++--------- 1 file changed, 23 insertions(+), 20 deletions(-) diff --git a/Stream_lines_2/demo/Stream_lines_2/streamlines.cpp b/Stream_lines_2/demo/Stream_lines_2/streamlines.cpp index 7b7986f5cbc..bceb537bc82 100644 --- a/Stream_lines_2/demo/Stream_lines_2/streamlines.cpp +++ b/Stream_lines_2/demo/Stream_lines_2/streamlines.cpp @@ -27,8 +27,8 @@ int main(int, char*) #include #include -#include - +#include +#include #include #include #include @@ -456,17 +456,24 @@ class MyWidget : public QGLWidget drawing(); } + template + std::string five_letters(T i) + { + std::ostringstream ss ; + ss << i ; + std::string s = ss.str().substr(0,5); + + if(s.length()<5){ + s.insert((std::string::size_type)0, 5-s.length(), ' '); + } + return s; + } + void updatestatus() { - char str[20]; - gcvt(p.density_, 4, str); - densitylabel->setText(str); - gcvt(p.ratio_, 4, str); - ratiolabel->setText(str); - gcvt(p.sampling_, 4, str); - samplinglabel->setText(str); - gcvt(p.number_of_lines_, 4, str); - numberlabel->setText(str); + std::string s = five_letters( p.density_ ) + five_letters( p.ratio_ ) + five_letters( p.sampling_ ) + five_letters(p.number_of_lines_); + + numberlabel->setText(s.c_str()); } void setstatus() @@ -475,13 +482,12 @@ class MyWidget : public QGLWidget densitytextlabel = new QLabel(this); - char str[20]; + densitytextlabel->setText("Separating distance"); statusbar->addWidget(densitytextlabel); densitylabel = new QLabel(this); - gcvt(p.density_, 4, str); - densitylabel->setText(str); + densitylabel->setText(five_letters(p.density_).c_str()); statusbar->addWidget(densitylabel); densityspacelabel = new QLabel(this); densityspacelabel->setText(" "); @@ -491,8 +497,7 @@ class MyWidget : public QGLWidget ratiotextlabel->setText("Saturation ratio"); statusbar->addWidget(ratiotextlabel); ratiolabel = new QLabel(this); - gcvt(p.ratio_, 4, str); - ratiolabel->setText(str); + ratiolabel->setText(five_letters(p.ratio_).c_str()); statusbar->addWidget(ratiolabel); ratiospacelabel = new QLabel(this); ratiospacelabel->setText(" "); @@ -502,8 +507,7 @@ class MyWidget : public QGLWidget samplingtextlabel->setText("Sampling step"); statusbar->addWidget(samplingtextlabel); samplinglabel = new QLabel(this); - gcvt(p.sampling_, 4, str); - samplinglabel->setText(str); + samplinglabel->setText(five_letters(p.sampling_).c_str()); statusbar->addWidget(samplinglabel); samplingspacelabel = new QLabel(this); samplingspacelabel->setText(" "); @@ -513,8 +517,7 @@ class MyWidget : public QGLWidget numbertextlabel->setText("Number of lines"); statusbar->addWidget(numbertextlabel); numberlabel = new QLabel(this); - gcvt(p.number_of_lines_, 4, str); - numberlabel->setText(str); + numberlabel->setText(five_letters(p.number_of_lines_).c_str()); statusbar->addWidget(numberlabel); numberspacelabel = new QLabel(this); numberspacelabel->setText(" ");