OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

Refactored naming of cvfqt:Utils member functions

Browse Source
This commit is contained in:
sigurdp
2013-12-04 17:04:05 +01:00
parent cc72c7b2f6
commit 477792e89d
10 changed files with 35 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Fwk/VizFwk/LibGuiQt/cvfqtUtils.cpp
View File

@@ -176,7 +176,7 @@ QImage Utils::toQImage(const cvf::TextureImage& textureImage)
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void Utils::fromQImage(const QImage& qImage, cvf::TextureImage* textureImage)
void Utils::toTextureImage(const QImage& qImage, cvf::TextureImage* textureImage)
{
CVF_ASSERT(textureImage);
@@ -188,7 +188,7 @@ void Utils::fromQImage(const QImage& qImage, cvf::TextureImage* textureImage)
return;
}
return fromQImageRegion(qImage, cvf::Vec2ui(0, 0), cvf::Vec2ui(static_cast<cvf::uint>(width), static_cast<cvf::uint>(height)), textureImage);
return toTextureImageRegion(qImage, cvf::Vec2ui(0, 0), cvf::Vec2ui(static_cast<cvf::uint>(width), static_cast<cvf::uint>(height)), textureImage);
}
@@ -198,7 +198,7 @@ void Utils::fromQImage(const QImage& qImage, cvf::TextureImage* textureImage)
/// \attention The source position \a srcPos is specified in QImage's coordinate system, where
/// the pixel position (0,0) if the upper left corner.
//--------------------------------------------------------------------------------------------------
void Utils::fromQImageRegion(const QImage& qImage, const cvf::Vec2ui& srcPos, const cvf::Vec2ui& size, cvf::TextureImage* textureImage)
void Utils::toTextureImageRegion(const QImage& qImage, const cvf::Vec2ui& srcPos, const cvf::Vec2ui& size, cvf::TextureImage* textureImage)
{
CVF_ASSERT(qImage.width() >= 0);
CVF_ASSERT(qImage.height() >= 0);

7
Fwk/VizFwk/LibGuiQt/cvfqtUtils.h
View File

@@ -61,11 +61,8 @@ public:
static QStringList toQStringList(const std::vector<cvf::String>& 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); }
static void toTextureImage(const QImage& qImage, cvf::TextureImage* textureImage);
static void toTextureImageRegion(const QImage& qImage, const cvf::Vec2ui& srcPos, const cvf::Vec2ui& size, cvf::TextureImage* textureImage);
};
}

4
Fwk/VizFwk/TestApps/Qt/QtSnippetRunner/QSRMain.cpp
View File

@@ -69,8 +69,8 @@ int main(int argc, char *argv[])
return EXIT_SUCCESS;
}
if (!cmdLineArgs.m_testDataDir.isEmpty()) testDataDir = cvfqt::Utils::fromQString(cmdLineArgs.m_testDataDir);
if (!cmdLineArgs.m_shaderDir.isEmpty()) shaderDir = cvfqt::Utils::fromQString(cmdLineArgs.m_shaderDir);
if (!cmdLineArgs.m_testDataDir.isEmpty()) testDataDir = cvfqt::Utils::toString(cmdLineArgs.m_testDataDir);
if (!cmdLineArgs.m_shaderDir.isEmpty()) shaderDir = cvfqt::Utils::toString(cmdLineArgs.m_shaderDir);
if (cmdLineArgs.m_echoArguments)
{

2
Fwk/VizFwk/TestApps/Qt/QtSnippetRunner/QSRMainWindow.cpp
View File

@@ -436,7 +436,7 @@ void QSRMainWindow::slotRunLastUsedSnippet()
{
QSettings settings("Ceetron", "SnippetRunner");
cvf::String lastUsedSnippetId = cvfqt::Utils::fromQString(settings.value("LastUsedSnippetID").toString());
cvf::String lastUsedSnippetId = cvfqt::Utils::toString(settings.value("LastUsedSnippetID").toString());
// If no last used ID is found, use first snippet in list
if (lastUsedSnippetId.isEmpty() && m_availableSnippets.size() > 0)

34
Fwk/VizFwk/Tests/LibGuiQt_UnitTests/cvfqtUtils-Test.cpp
View File

@@ -105,12 +105,12 @@ TEST(UtilsTest, toQImage)
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
TEST(UtilsTest, fromQImage_withEmptyImage)
TEST(UtilsTest, toTextureImage_withEmptyImage)
{
QImage qi;
cvf::TextureImage i;
cvfqt::Utils::fromQImage(qi, &i);
cvfqt::Utils::toTextureImage(qi, &i);
EXPECT_EQ(0, i.width());
EXPECT_EQ(0, i.height());
}
@@ -119,13 +119,13 @@ TEST(UtilsTest, fromQImage_withEmptyImage)
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
TEST(UtilsTest, fromQImage_withSinglePixelImage)
TEST(UtilsTest, toTextureImage_withSinglePixelImage)
{
QImage qi(1, 1, QImage::Format_ARGB32);
qi.setPixel(0,0, qRgba(1, 2, 3, 4));
cvf::TextureImage i;
cvfqt::Utils::fromQImage(qi, &i);
cvfqt::Utils::toTextureImage(qi, &i);
ASSERT_EQ(1, i.width());
ASSERT_EQ(1, i.height());
EXPECT_EQ(cvf::Color4ub(1, 2, 3, 4), i.pixel(0,0));
@@ -135,7 +135,7 @@ TEST(UtilsTest, fromQImage_withSinglePixelImage)
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
TEST(UtilsTest, fromQImage)
TEST(UtilsTest, toTextureImage)
{
QImage qi(4, 3, QImage::Format_ARGB32);
qi.setPixel(0,0, qRgba( 0,10,50,100)); qi.setPixel(1,0, qRgba( 1,11,51,101)); qi.setPixel(2,0, qRgba( 2,12,52,102)); qi.setPixel(3,0, qRgba( 3,13,53,103));
@@ -143,7 +143,7 @@ TEST(UtilsTest, fromQImage)
qi.setPixel(0,2, qRgba( 8,18,58,108)); qi.setPixel(1,2, qRgba( 9,19,59,109)); qi.setPixel(2,2, qRgba(10,20,60,110)); qi.setPixel(3,2, qRgba(11,21,61,111));
cvf::TextureImage i;
cvfqt::Utils::fromQImage(qi, &i);
cvfqt::Utils::toTextureImage(qi, &i);
ASSERT_EQ(4, i.width());
ASSERT_EQ(3, i.height());
@@ -156,7 +156,7 @@ TEST(UtilsTest, fromQImage)
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
TEST(UtilsTest, fromQImage_premultipliedImageFormat)
TEST(UtilsTest, toTextureImage_premultipliedImageFormat)
{
QImage qi(4, 3, QImage::Format_ARGB32_Premultiplied);
qi.setPixel(0,0, qRgba( 0,10,50,100)); qi.setPixel(1,0, qRgba( 1,11,51,101)); qi.setPixel(2,0, qRgba( 2,12,52,102)); qi.setPixel(3,0, qRgba( 3,13,53,103));
@@ -164,7 +164,7 @@ TEST(UtilsTest, fromQImage_premultipliedImageFormat)
qi.setPixel(0,2, qRgba( 8,18,58,108)); qi.setPixel(1,2, qRgba( 9,19,59,109)); qi.setPixel(2,2, qRgba(10,20,60,110)); qi.setPixel(3,2, qRgba(11,21,61,111));
cvf::TextureImage i;
cvfqt::Utils::fromQImage(qi, &i);
cvfqt::Utils::toTextureImage(qi, &i);
ASSERT_EQ(4, i.width());
ASSERT_EQ(3, i.height());
@@ -177,25 +177,25 @@ TEST(UtilsTest, fromQImage_premultipliedImageFormat)
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
TEST(UtilsTest, fromQImageRegion_emptyRegion)
TEST(UtilsTest, toTextureImageRegion_emptyRegion)
{
QImage qi(3, 4, QImage::Format_ARGB32);
{
cvf::TextureImage i;
cvfqt::Utils::fromQImageRegion(qi, cvf::Vec2ui(1, 1), cvf::Vec2ui(0, 0), &i);
cvfqt::Utils::toTextureImageRegion(qi, cvf::Vec2ui(1, 1), cvf::Vec2ui(0, 0), &i);
EXPECT_EQ(0, i.width());
EXPECT_EQ(0, i.height());
}
{
cvf::TextureImage i;
cvfqt::Utils::fromQImageRegion(qi, cvf::Vec2ui(1, 1), cvf::Vec2ui(1, 0), &i);
cvfqt::Utils::toTextureImageRegion(qi, cvf::Vec2ui(1, 1), cvf::Vec2ui(1, 0), &i);
EXPECT_EQ(0, i.width());
EXPECT_EQ(0, i.height());
}
{
cvf::TextureImage i;
cvfqt::Utils::fromQImageRegion(qi, cvf::Vec2ui(1, 1), cvf::Vec2ui(0, 1), &i);
cvfqt::Utils::toTextureImageRegion(qi, cvf::Vec2ui(1, 1), cvf::Vec2ui(0, 1), &i);
EXPECT_EQ(0, i.width());
EXPECT_EQ(0, i.height());
}
@@ -205,7 +205,7 @@ TEST(UtilsTest, fromQImageRegion_emptyRegion)
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
TEST(UtilsTest, fromQImageRegion)
TEST(UtilsTest, toTextureImageRegion)
{
QImage qi(4, 3, QImage::Format_ARGB32);
qi.setPixel(0,0, qRgba( 0,10,50,100)); qi.setPixel(1,0, qRgba( 1,11,51,101)); qi.setPixel(2,0, qRgba( 2,12,52,102)); qi.setPixel(3,0, qRgba( 3,13,53,103));
@@ -214,14 +214,14 @@ TEST(UtilsTest, fromQImageRegion)
{
cvf::TextureImage i;
cvfqt::Utils::fromQImageRegion(qi, cvf::Vec2ui(0, 0), cvf::Vec2ui(2, 1), &i);
cvfqt::Utils::toTextureImageRegion(qi, cvf::Vec2ui(0, 0), cvf::Vec2ui(2, 1), &i);
ASSERT_EQ(2, i.width());
ASSERT_EQ(1, i.height());
EXPECT_EQ(cvf::Color4ub( 0,10,50,100), i.pixel(0,0)); EXPECT_EQ(cvf::Color4ub( 1,11,51,101), i.pixel(1,0));
}
{
cvf::TextureImage i;
cvfqt::Utils::fromQImageRegion(qi, cvf::Vec2ui(2, 1), cvf::Vec2ui(2, 2), &i);
cvfqt::Utils::toTextureImageRegion(qi, cvf::Vec2ui(2, 1), cvf::Vec2ui(2, 2), &i);
ASSERT_EQ(2, i.width());
ASSERT_EQ(2, i.height());
EXPECT_EQ(cvf::Color4ub( 6,16,56,106), i.pixel(0,1)); EXPECT_EQ(cvf::Color4ub( 7,17,57,107), i.pixel(1,1));
@@ -229,14 +229,14 @@ TEST(UtilsTest, fromQImageRegion)
}
{
cvf::TextureImage i;
cvfqt::Utils::fromQImageRegion(qi, cvf::Vec2ui(0, 2), cvf::Vec2ui(4, 1), &i);
cvfqt::Utils::toTextureImageRegion(qi, cvf::Vec2ui(0, 2), cvf::Vec2ui(4, 1), &i);
ASSERT_EQ(4, i.width());
ASSERT_EQ(1, i.height());
EXPECT_EQ(cvf::Color4ub( 8,18,58,108), i.pixel(0,0)); EXPECT_EQ(cvf::Color4ub( 9,19,59,109), i.pixel(1,0)); EXPECT_EQ(cvf::Color4ub(10,20,60,110), i.pixel(2,0)); EXPECT_EQ(cvf::Color4ub(11,21,61,111), i.pixel(3,0));
}
{
cvf::TextureImage i;
cvfqt::Utils::fromQImageRegion(qi, cvf::Vec2ui(3, 0), cvf::Vec2ui(1, 3), &i);
cvfqt::Utils::toTextureImageRegion(qi, cvf::Vec2ui(3, 0), cvf::Vec2ui(1, 3), &i);
ASSERT_EQ(1, i.width());
ASSERT_EQ(3, i.height());
EXPECT_EQ(cvf::Color4ub( 3,13,53,103), i.pixel(0,2));