OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-10 07:26:03 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merged branch dev into pre-proto

Browse Source
This commit is contained in:
Magne Sjaastad 2017-02-17 11:38:32 +01:00
commit a10b96ba3e
7 changed files with 54 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
ApplicationCode/FileInterface/RifReaderEclipseSummary.cpp
View File

@ -30,7 +30,7 @@
///
//--------------------------------------------------------------------------------------------------
RifReaderEclipseSummary::RifReaderEclipseSummary()
: ecl_sum(NULL)
: m_ecl_sum(NULL)
{
}
@ -48,7 +48,7 @@ RifReaderEclipseSummary::~RifReaderEclipseSummary()
//--------------------------------------------------------------------------------------------------
bool RifReaderEclipseSummary::open(const std::string& headerFileName, const std::vector<std::string>& dataFileNames)
{
assert(ecl_sum == NULL);
assert(m_ecl_sum == NULL);
if (headerFileName.empty() || dataFileNames.size() == 0) return false;
@ -62,20 +62,17 @@ bool RifReaderEclipseSummary::open(const std::string& headerFileName, const std:
}
std::string itemSeparatorInVariableNames = ":";
ecl_sum = ecl_sum_fread_alloc(headerFileName.data(), dataFiles, itemSeparatorInVariableNames.data());
m_ecl_sum = ecl_sum_fread_alloc(headerFileName.data(), dataFiles, itemSeparatorInVariableNames.data());
stringlist_free(dataFiles);
if (ecl_sum)
if (m_ecl_sum)
{
eclSmSpec = ecl_sum_get_smspec(ecl_sum);
assert(eclSmSpec != NULL);
assert(ecl_sum != NULL);
m_ecl_SmSpec = ecl_sum_get_smspec(m_ecl_sum);
for ( int time_index = 0; time_index < timeStepCount(); time_index++ )
{
time_t sim_time = ecl_sum_iget_sim_time(ecl_sum, time_index);
time_t sim_time = ecl_sum_iget_sim_time(m_ecl_sum, time_index);
m_timeSteps.push_back(sim_time);
}
@ -90,10 +87,10 @@ bool RifReaderEclipseSummary::open(const std::string& headerFileName, const std:
//--------------------------------------------------------------------------------------------------
void RifReaderEclipseSummary::close()
{
if (ecl_sum)
if (m_ecl_sum)
{
ecl_sum_free(ecl_sum);
ecl_sum = NULL;
ecl_sum_free(m_ecl_sum);
m_ecl_sum = NULL;
}
}
@ -248,7 +245,7 @@ const std::vector<RifEclipseSummaryAddress>& RifReaderEclipseSummary::allResultA
//--------------------------------------------------------------------------------------------------
bool RifReaderEclipseSummary::values(const RifEclipseSummaryAddress& resultAddress, std::vector<double>* values)
{
assert(ecl_sum != NULL);
assert(m_ecl_sum != NULL);
int variableIndex = indexFromAddress(resultAddress);
@ -258,14 +255,16 @@ bool RifReaderEclipseSummary::values(const RifEclipseSummaryAddress& resultAddre
int tsCount = timeStepCount();
values->reserve(timeStepCount());
const smspec_node_type * ertSumVarNode = ecl_smspec_iget_node(eclSmSpec, variableIndex);
int paramsIndex = smspec_node_get_params_index(ertSumVarNode);
for(int time_index = 0; time_index < tsCount; time_index++)
if (m_ecl_SmSpec)
{
double value = ecl_sum_iget(ecl_sum, time_index, paramsIndex);
values->push_back(value);
const smspec_node_type* ertSumVarNode = ecl_smspec_iget_node(m_ecl_SmSpec, variableIndex);
int paramsIndex = smspec_node_get_params_index(ertSumVarNode);
for(int time_index = 0; time_index < tsCount; time_index++)
{
double value = ecl_sum_iget(m_ecl_sum, time_index, paramsIndex);
values->push_back(value);
}
}
return true;
@ -276,9 +275,11 @@ bool RifReaderEclipseSummary::values(const RifEclipseSummaryAddress& resultAddre
//--------------------------------------------------------------------------------------------------
int RifReaderEclipseSummary::timeStepCount() const
{
assert(ecl_sum != NULL);
assert(m_ecl_sum != nullptr);
return ecl_sum_get_data_length(ecl_sum);
if (m_ecl_SmSpec == nullptr) return 0;
return ecl_sum_get_data_length(m_ecl_sum);
}
//--------------------------------------------------------------------------------------------------
@ -286,7 +287,7 @@ int RifReaderEclipseSummary::timeStepCount() const
//--------------------------------------------------------------------------------------------------
const std::vector<time_t>& RifReaderEclipseSummary::timeSteps() const
{
assert(ecl_sum != NULL);
assert(m_ecl_sum != NULL);
return m_timeSteps;
}
@ -328,12 +329,12 @@ int RifReaderEclipseSummary::indexFromAddress(const RifEclipseSummaryAddress& re
//--------------------------------------------------------------------------------------------------
void RifReaderEclipseSummary::buildMetaData()
{
if(m_allResultAddresses.size() == 0)
if(m_allResultAddresses.size() == 0 && m_ecl_SmSpec)
{
int varCount = ecl_smspec_num_nodes(eclSmSpec);
int varCount = ecl_smspec_num_nodes(m_ecl_SmSpec);
for(int i = 0; i < varCount; i++)
{
const smspec_node_type * ertSumVarNode = ecl_smspec_iget_node(eclSmSpec, i);
const smspec_node_type * ertSumVarNode = ecl_smspec_iget_node(m_ecl_SmSpec, i);
RifEclipseSummaryAddress addr = addressFromErtSmSpecNode(ertSumVarNode);
m_allResultAddresses.push_back(addr);
m_resultAddressToErtNodeIdx[addr] = i;
@ -358,11 +359,13 @@ bool RifReaderEclipseSummary::hasAddress(const RifEclipseSummaryAddress& resultA
//--------------------------------------------------------------------------------------------------
std::string RifReaderEclipseSummary::unitName(const RifEclipseSummaryAddress& resultAddress)
{
if (!m_ecl_SmSpec) return "";
int variableIndex = indexFromAddress(resultAddress);
if(variableIndex < 0) return "";
const smspec_node_type * ertSumVarNode = ecl_smspec_iget_node(eclSmSpec, variableIndex);
const smspec_node_type * ertSumVarNode = ecl_smspec_iget_node(m_ecl_SmSpec, variableIndex);
return smspec_node_get_unit(ertSumVarNode);
}

4
ApplicationCode/FileInterface/RifReaderEclipseSummary.h
View File

@ -64,8 +64,8 @@ private:
typedef struct ecl_sum_struct ecl_sum_type;
typedef struct ecl_smspec_struct ecl_smspec_type;
ecl_sum_type* ecl_sum;
const ecl_smspec_type * eclSmSpec;
ecl_sum_type* m_ecl_sum;
const ecl_smspec_type * m_ecl_SmSpec;
std::vector<time_t> m_timeSteps;
std::vector<RifEclipseSummaryAddress> m_allResultAddresses;

13
ApplicationCode/ProjectDataModel/Flow/RimWellFlowRateCurve.cpp
View File

@ -119,7 +119,18 @@ void RimWellFlowRateCurve::updateCurveAppearance()
m_qwtPlotCurve->setStyle(QwtPlotCurve::Steps);
QColor curveQColor = QColor (m_curveColor.value().rByte(), m_curveColor.value().gByte(), m_curveColor.value().bByte());
m_qwtPlotCurve->setBrush(QBrush( curveQColor));
QLinearGradient gradient;
gradient.setCoordinateMode(QGradient::StretchToDeviceMode);
gradient.setColorAt(0,curveQColor.darker(110));
gradient.setColorAt(0.15,curveQColor);
gradient.setColorAt(0.25,curveQColor);
gradient.setColorAt(0.4,curveQColor.darker(110));
gradient.setColorAt(0.6,curveQColor);
gradient.setColorAt(0.8,curveQColor.darker(110));
gradient.setColorAt(1,curveQColor);
m_qwtPlotCurve->setBrush(gradient);
QPen curvePen = m_qwtPlotCurve->pen();
curvePen.setColor(curveQColor.darker());
m_qwtPlotCurve->setPen(curvePen);

1
ApplicationCode/UserInterface/RiuNightchartsWidget.cpp
View File

@ -92,6 +92,7 @@ void RiuNightchartsWidget::clear()
m_chart = Nightcharts();
m_chart.setType(Nightcharts::Pie);
m_chart.setLegendType(Nightcharts::Vertical);
m_chart.setShadows(false);
m_marginLeft = 10;
m_marginTop = 10;

9
Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmChildArrayField.inl
View File

@ -15,14 +15,7 @@ namespace caf
template<typename DataType>
PdmChildArrayField<DataType*>::~PdmChildArrayField()
{
#ifdef _DEBUG
for (size_t index = 0; index < m_pointers.size(); ++index)
{
assert(m_pointers.at(index).isNull());
}
#endif
this->removeThisAsParentField();
deleteAllChildObjects();
}
//--------------------------------------------------------------------------------------------------

6
Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmChildField.inl
View File

@ -52,11 +52,7 @@ caf::PdmChildField<DataType*>::PdmChildField(const DataTypePtr& fieldValue)
template<typename DataType >
caf::PdmChildField<DataType*>::~PdmChildField()
{
bool The_object_owned_by_the_child_field_is_deleted = m_fieldValue.isNull();
assert(The_object_owned_by_the_child_field_is_deleted); // Did you forget ?
if (!m_fieldValue.isNull()) m_fieldValue.rawPtr()->removeAsParentField(this);
m_fieldValue.setRawPtr(NULL);
delete m_fieldValue.rawPtr();
}

8
ThirdParty/nightcharts/nightcharts.cpp vendored
View File

@ -122,7 +122,8 @@ int Nightcharts::draw(QPainter *painter)
double pdegree = 0;
//Options
QLinearGradient gradient(cX+0.5*cW,cY,cX+0.5*cW,cY+cH*2.5);
//QLinearGradient gradient(cX + 0.5*cW, cY, cX + 0.5*cW, cY + cH*2.5);
QRadialGradient gradient(cX + 0.5*cW, cY+0.5*cH, 0.5*cW);
gradient.setColorAt(1,Qt::black);
@ -145,6 +146,11 @@ int Nightcharts::draw(QPainter *painter)
for (int i=0;i<pieces.size();i++)
{
gradient.setColorAt(0,pieces[i].rgbColor);
// Added for radial gradient
gradient.setColorAt(0.85,pieces[i].rgbColor);
gradient.setColorAt(0.95,pieces[i].rgbColor.darker(120));
gradient.setColorAt(1,pieces[i].rgbColor.darker(140));
// <--
painter->setBrush(gradient);
pen.setColor(pieces[i].rgbColor);
painter->setPen(pen);