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

#5671 Move caf::PdmFieldScriptability<cvf::Color3f> into cafPdmCvf

Browse Source
This commit is contained in:
Gaute Lindkvist 2020-03-13 13:38:57 +01:00 committed by Magne Sjaastad
parent 2853308a4a
commit ba0ded23c3
6 changed files with 136 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ApplicationCode/ProjectDataModel/Rim3dView.cpp
View File

@ -52,6 +52,7 @@
#include "cafDisplayCoordTransform.h"
#include "cafFrameAnimationControl.h"
#include "cafPdmFieldIOScriptability.h"
#include "cafPdmFieldIOScriptabilityCvfColor3.h"
#include "cvfCamera.h"
#include "cvfModelBasicList.h"

3
Fwk/AppFwk/cafPdmCvf/CMakeLists.txt
View File

@ -28,6 +28,8 @@ add_library( ${PROJECT_NAME}
cafPdmXmlColor3f.cpp
cafPdmXmlColor3f.h
cafPdmFieldCvfColor.h
cafPdmFieldIOScriptabilityCvfColor3.h
cafPdmFieldIOScriptabilityCvfColor3.cpp
cafPdmCoreVec3d.h
cafPdmUiCoreVec3d.cpp
@ -62,6 +64,7 @@ target_include_directories(${PROJECT_NAME}
target_link_libraries ( ${PROJECT_NAME}
cafUserInterface
LibCore
cafPdmScripting
${QT_LIBRARIES}
)

77
Fwk/AppFwk/cafPdmCvf/cafPdmFieldIOScriptabilityCvfColor3.cpp Normal file
View File

@ -0,0 +1,77 @@
//##################################################################################################
//
// Custom Visualization Core library
// Copyright (C) Ceetron Solutions AS
//
// This library may be used under the terms of either the GNU General Public License or
// the GNU Lesser General Public License as follows:
//
// GNU General Public License Usage
// This library is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// This library is distributed in the hope that it will be useful, but WITHOUT ANY
// WARRANTY; without even the implied warranty of MERCHANTABILITY or
// FITNESS FOR A PARTICULAR PURPOSE.
//
// See the GNU General Public License at <<http://www.gnu.org/licenses/gpl.html>>
// for more details.
//
// GNU Lesser General Public License Usage
// This library is free software; you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation; either version 2.1 of the License, or
// (at your option) any later version.
//
// This library is distributed in the hope that it will be useful, but WITHOUT ANY
// WARRANTY; without even the implied warranty of MERCHANTABILITY or
// FITNESS FOR A PARTICULAR PURPOSE.
//
// See the GNU Lesser General Public License at <<http://www.gnu.org/licenses/lgpl-2.1.html>>
// for more details.
//
//##################################################################################################
#include "cafPdmFieldIOScriptabilityCvfColor3.h"
#include <QColor>
using namespace caf;
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void PdmFieldScriptabilityIOHandler<cvf::Color3f>::writeToField(cvf::Color3f& fieldValue,
QTextStream& inputStream,
caf::PdmScriptIOMessages* errorMessageContainer,
bool stringsAreQuoted)
{
QString fieldStringValue;
PdmFieldScriptabilityIOHandler<QString>::writeToField(fieldStringValue,
inputStream,
errorMessageContainer,
stringsAreQuoted);
QColor qColor(fieldStringValue);
if (qColor.isValid())
{
fieldValue = cvf::Color3f(qColor.redF(), qColor.greenF(), qColor.blueF());
}
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void PdmFieldScriptabilityIOHandler<cvf::Color3f>::readFromField(const cvf::Color3f& fieldValue,
QTextStream& outputStream,
bool quoteStrings,
bool quoteNonBuiltin)
{
QColor qColor(fieldValue.rByte(), fieldValue.gByte(), fieldValue.bByte());
QString fieldStringValue = qColor.name();
PdmFieldScriptabilityIOHandler<QString>::readFromField(fieldStringValue, outputStream, quoteStrings);
}

55
Fwk/AppFwk/cafPdmCvf/cafPdmFieldIOScriptabilityCvfColor3.h Normal file
View File

@ -0,0 +1,55 @@
//##################################################################################################
//
// Custom Visualization Core library
// Copyright (C) Ceetron Solutions AS
//
// This library may be used under the terms of either the GNU General Public License or
// the GNU Lesser General Public License as follows:
//
// GNU General Public License Usage
// This library is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// This library is distributed in the hope that it will be useful, but WITHOUT ANY
// WARRANTY; without even the implied warranty of MERCHANTABILITY or
// FITNESS FOR A PARTICULAR PURPOSE.
//
// See the GNU General Public License at <<http://www.gnu.org/licenses/gpl.html>>
// for more details.
//
// GNU Lesser General Public License Usage
// This library is free software; you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation; either version 2.1 of the License, or
// (at your option) any later version.
//
// This library is distributed in the hope that it will be useful, but WITHOUT ANY
// WARRANTY; without even the implied warranty of MERCHANTABILITY or
// FITNESS FOR A PARTICULAR PURPOSE.
//
// See the GNU Lesser General Public License at <<http://www.gnu.org/licenses/lgpl-2.1.html>>
// for more details.
//
//##################################################################################################
#include "cafPdmFieldIOScriptability.h"
#include "cvfColor3.h"
namespace caf
{
template <>
struct PdmFieldScriptabilityIOHandler<cvf::Color3f>
{
static void writeToField(cvf::Color3f& fieldValue,
QTextStream& inputStream,
PdmScriptIOMessages* errorMessageContainer,
bool stringsAreQuoted = true);
static void readFromField(const cvf::Color3f& fieldValue,
QTextStream& outputStream,
bool quoteStrings = true,
bool quoteNonBuiltins = false);
};
}

36
Fwk/AppFwk/cafPdmScripting/cafPdmFieldIOScriptability.cpp
View File

@ -35,8 +35,6 @@
//##################################################################################################
#include "cafPdmFieldIOScriptability.h"
#include <QColor>
using namespace caf;
//--------------------------------------------------------------------------------------------------
@ -185,37 +183,3 @@ void PdmFieldScriptabilityIOHandler<bool>::readFromField( const bool& fieldValu
// Lower-case true/false is used in the documentation.
outputStream << ( fieldValue ? "true" : "false" );
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void PdmFieldScriptabilityIOHandler<cvf::Color3f>::writeToField( cvf::Color3f& fieldValue,
QTextStream& inputStream,
caf::PdmScriptIOMessages* errorMessageContainer,
bool stringsAreQuoted )
{
QString fieldStringValue;
PdmFieldScriptabilityIOHandler<QString>::writeToField( fieldStringValue,
inputStream,
errorMessageContainer,
stringsAreQuoted );
QColor qColor( fieldStringValue );
if ( qColor.isValid() )
{
fieldValue = cvf::Color3f( qColor.redF(), qColor.greenF(), qColor.blueF() );
}
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void PdmFieldScriptabilityIOHandler<cvf::Color3f>::readFromField( const cvf::Color3f& fieldValue,
QTextStream& outputStream,
bool quoteStrings,
bool quoteNonBuiltin )
{
QColor qColor( fieldValue.rByte(), fieldValue.gByte(), fieldValue.bByte() );
QString fieldStringValue = qColor.name();
PdmFieldScriptabilityIOHandler<QString>::readFromField( fieldStringValue, outputStream, quoteStrings );
}

15
Fwk/AppFwk/cafPdmScripting/cafPdmFieldIOScriptability.h
View File

@ -41,8 +41,6 @@
#include "cafPdmPtrField.h"
#include "cafPdmScriptIOMessages.h"
#include "cvfColor3.h"
#include <QString>
#include <QStringList>
#include <QTextStream>
@ -154,19 +152,6 @@ struct PdmFieldScriptabilityIOHandler<bool>
bool quoteNonBuiltins = false );
};
template <>
struct PdmFieldScriptabilityIOHandler<cvf::Color3f>
{
static void writeToField( cvf::Color3f& fieldValue,
QTextStream& inputStream,
PdmScriptIOMessages* errorMessageContainer,
bool stringsAreQuoted = true );
static void readFromField( const cvf::Color3f& fieldValue,
QTextStream& outputStream,
bool quoteStrings = true,
bool quoteNonBuiltins = false );
};
template <typename T>
struct PdmFieldScriptabilityIOHandler<AppEnum<T>>
{