diff --git a/Fwk/VizFwk/LibGuiQt/cvfqtUtils.cpp b/Fwk/VizFwk/LibGuiQt/cvfqtUtils.cpp index 74c97e3f25..8c884a9f5f 100644 --- a/Fwk/VizFwk/LibGuiQt/cvfqtUtils.cpp +++ b/Fwk/VizFwk/LibGuiQt/cvfqtUtils.cpp @@ -39,6 +39,8 @@ #include "cvfVector2.h" #include "cvfqtUtils.h" +#include + namespace cvfqt { @@ -55,22 +57,22 @@ namespace cvfqt { //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -QString Utils::toQString(const cvf::String& ceeString) +QString Utils::toQString(const cvf::String& cvfString) { - if (ceeString.isEmpty()) + if (cvfString.isEmpty()) { return QString(); } if (sizeof(wchar_t) == 2) { - const unsigned short* strPtr = reinterpret_cast(ceeString.c_str()); + const unsigned short* strPtr = reinterpret_cast(cvfString.c_str()); return QString::fromUtf16(strPtr); } else if (sizeof(wchar_t) == 4) { - const unsigned int* strPtr = reinterpret_cast(ceeString.c_str()); + const unsigned int* strPtr = reinterpret_cast(cvfString.c_str()); return QString::fromUcs4(strPtr); } @@ -83,7 +85,7 @@ QString Utils::toQString(const cvf::String& ceeString) //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -cvf::String Utils::fromQString(const QString& qtString) +cvf::String Utils::toString(const QString& qtString) { if (qtString.length() == 0) { @@ -110,6 +112,39 @@ cvf::String Utils::fromQString(const QString& qtString) } +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +std::vector Utils::toStringVector(const QStringList& stringList) +{ + std::vector strVec; + + foreach (QString s, stringList) + { + strVec.push_back(toString(s)); + } + + return strVec; +} + + + +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +QStringList Utils::toQStringList(const std::vector& stringVector) +{ + QStringList strList; + + foreach (cvf::String s, stringVector) + { + strList.push_back(toQString(s)); + } + + return strList; +} + + //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- diff --git a/Fwk/VizFwk/LibGuiQt/cvfqtUtils.h b/Fwk/VizFwk/LibGuiQt/cvfqtUtils.h index 9609dd26c4..face8bf4e5 100644 --- a/Fwk/VizFwk/LibGuiQt/cvfqtUtils.h +++ b/Fwk/VizFwk/LibGuiQt/cvfqtUtils.h @@ -54,12 +54,18 @@ namespace cvfqt { class Utils { public: - static QString toQString(const cvf::String& ceeString); - static cvf::String fromQString(const QString& qtString); + static QString toQString(const cvf::String& cvfString); + static cvf::String toString(const QString& qtString); - static QImage toQImage(const cvf::TextureImage& textureImage); - static void fromQImage(const QImage& qImage, cvf::TextureImage* textureImage); - static void fromQImageRegion(const QImage& qImage, const cvf::Vec2ui& srcPos, const cvf::Vec2ui& size, cvf::TextureImage* textureImage); + static std::vector toStringVector(const QStringList& stringList); + static QStringList toQStringList(const std::vector& stringVector); + + static QImage toQImage(const cvf::TextureImage& textureImage); + static void fromQImage(const QImage& qImage, cvf::TextureImage* textureImage); + static void fromQImageRegion(const QImage& qImage, const cvf::Vec2ui& srcPos, const cvf::Vec2ui& size, cvf::TextureImage* textureImage); + + // Deprecated + static cvf::String fromQString(const QString& qtString) { return toString(qtString); } }; }