#756 WIP: Curve Filter beeing created

This commit is contained in:
Jacob Støren 2016-06-15 15:18:45 +02:00
parent a37449d99d
commit 8d15fa1b84
2 changed files with 31 additions and 7 deletions

View File

@ -37,6 +37,18 @@
#include "RimSummaryCurve.h"
QTextStream& operator << (QTextStream& str, const std::vector<RifEclipseSummaryAddress>& sobj)
{
CVF_ASSERT(false);
return str;
}
QTextStream& operator >> (QTextStream& str, std::vector<RifEclipseSummaryAddress>& sobj)
{
CVF_ASSERT(false);
return str;
}
CAF_PDM_SOURCE_INIT(RimSummaryCurveFilter, "SummaryCurveFilter");
@ -148,22 +160,22 @@ QList<caf::PdmOptionItemInfo> RimSummaryCurveFilter::calculateValueOptions(const
{
const std::vector<RifEclipseSummaryAddress> allAddresses = reader->allResultAddresses();
addressCount = static_cast<int>(allAddresses.size());
std::map<RifEclipseSummaryAddress, int> addrToIdxMap;
std::set<RifEclipseSummaryAddress> addrUnion;
for(int i = 0; i <addressCount; i++)
{
if (false) continue;
addrToIdxMap[allAddresses[i]] = i;
addrUnion.insert(allAddresses[i]);
}
for (const auto& addrIntPair: addrToIdxMap)
for (const auto& address: addrUnion)
{
std::string name = addrIntPair.first.uiText();
std::string name = address.uiText();
QString s = QString::fromStdString(name);
optionList.push_back(caf::PdmOptionItemInfo(s, addrIntPair.second));
optionList.push_back(caf::PdmOptionItemInfo(s, QVariant::fromValue(address)));
}
}
optionList.push_front(caf::PdmOptionItemInfo(RimDefines::undefinedResultName(), addressCount));
optionList.push_front(caf::PdmOptionItemInfo(RimDefines::undefinedResultName(), QVariant::fromValue(RifEclipseSummaryAddress())));
if(useOptionsOnly) *useOptionsOnly = true;
}
@ -329,3 +341,11 @@ void RimSummaryCurveFilter::detachQwtCurve()
}
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimSummaryCurveFilter::syncronizeCurves()
{
}

View File

@ -36,6 +36,8 @@ class RimSummaryCase;
class RifReaderEclipseSummary;
class RiuLineSegmentQwtPlotCurve;
Q_DECLARE_METATYPE(RifEclipseSummaryAddress);
//==================================================================================================
///
///
@ -53,6 +55,7 @@ public:
private:
RifReaderEclipseSummary* summaryReader();
void syncronizeCurves();
// Overridden PDM methods
virtual void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue);
@ -80,6 +83,7 @@ private:
caf::PdmField<QString> m_lgrNameFilter;
caf::PdmField<QString> m_cellIJKFilter;
caf::PdmField<std::vector<int> > m_uiFilterResultMultiSelection;
caf::PdmField<std::vector<RifEclipseSummaryAddress> > m_uiFilterResultMultiSelection;
};