mirror of
https://github.com/OPM/ResInsight.git
synced 2026-09-03 20:53:13 -05:00
Magne Sjaastad
@@ -225,14 +225,6 @@ void RimAnnotationInViewCollection::onGlobalCollectionChanged(const RimAnnotatio
|
||||
updateConnectedEditors();
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
size_t RimAnnotationInViewCollection::annotationsCount() const
|
||||
{
|
||||
return m_textAnnotations->m_annotations.size() + allGlobalPdmAnnotations().size();
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
|
||||
@@ -58,7 +58,6 @@ public:
|
||||
std::vector<RimPolylinesFromFileAnnotationInView*> globalPolylineFromFileAnnotations() const;
|
||||
|
||||
void onGlobalCollectionChanged(const RimAnnotationCollection* globalCollection);
|
||||
size_t annotationsCount() const;
|
||||
|
||||
bool hasTextAnnotationsWithCustomFontSize(RiaFontCache::FontSize defaultFontSize) const;
|
||||
bool applyFontSizeToAllTextAnnotations(RiaFontCache::FontSize oldFontSize, RiaFontCache::FontSize fontSize, bool forceSizeChange = false);
|
||||
|
||||
@@ -53,14 +53,6 @@ void RimAnnotationTextAppearance::setFontSize(FontSize size)
|
||||
m_fontSize = size;
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RimAnnotationTextAppearance::setFontColor(const cvf::Color3f& newColor)
|
||||
{
|
||||
m_fontColor = newColor;
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
@@ -69,14 +61,6 @@ void RimAnnotationTextAppearance::setBackgroundColor(const cvf::Color3f& newColo
|
||||
m_backgroundColor = newColor;
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RimAnnotationTextAppearance::setAnchorLineColor(const cvf::Color3f& newColor)
|
||||
{
|
||||
m_anchorLineColor = newColor;
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
|
||||
@@ -42,9 +42,7 @@ public:
|
||||
RimAnnotationTextAppearance();
|
||||
|
||||
void setFontSize(FontSize size);
|
||||
void setFontColor(const cvf::Color3f& newColor);
|
||||
void setBackgroundColor(const cvf::Color3f& newColor);
|
||||
void setAnchorLineColor(const cvf::Color3f& newColor);
|
||||
|
||||
FontSize fontSize() const;
|
||||
cvf::Color3f fontColor() const;
|
||||
|
||||
@@ -60,14 +60,6 @@ bool RimPolylinesAnnotationInView::isActive() const
|
||||
return m_isActive();
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RimPolylinesAnnotationInView::setSourceAnnotation(RimPolylinesAnnotation* annotation)
|
||||
{
|
||||
m_sourceAnnotation = annotation;
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
|
||||
@@ -56,7 +56,6 @@ public:
|
||||
~RimPolylinesAnnotationInView() override {}
|
||||
|
||||
bool isActive() const;
|
||||
void setSourceAnnotation(RimPolylinesAnnotation* annotation);
|
||||
RimPolylinesAnnotation* sourceAnnotation() const;
|
||||
|
||||
bool isVisible() const;
|
||||
|
||||
@@ -36,22 +36,6 @@
|
||||
#include "cafPdmUiPushButtonEditor.h"
|
||||
#include "cafPdmUiTreeOrdering.h"
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
/// Internal function
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
std::vector<cvf::Vec3d> xydToXyzVector(const std::vector<cvf::Vec3d>& xyds)
|
||||
{
|
||||
std::vector<cvf::Vec3d> xyzs;
|
||||
for (const auto& xyd : xyds)
|
||||
{
|
||||
auto xyz = xyd;
|
||||
xyz.z() = -xyd.z();
|
||||
xyzs.push_back(xyz);
|
||||
}
|
||||
return xyzs;
|
||||
}
|
||||
|
||||
|
||||
CAF_PDM_SOURCE_INIT(RimUserDefinedPolylinesAnnotation, "UserDefinedPolylinesAnnotation");
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
@@ -94,7 +78,6 @@ cvf::ref<RigPolyLinesData> RimUserDefinedPolylinesAnnotation::polyLinesData()
|
||||
{
|
||||
cvf::ref<RigPolyLinesData> pld = new RigPolyLinesData;
|
||||
std::vector<cvf::Vec3d> line;
|
||||
std::vector<std::vector<cvf::Vec3d> > lines;
|
||||
for (const RimPolylineTarget* target : m_targets)
|
||||
{
|
||||
line.push_back(target->targetPointXYZ());
|
||||
|
||||
@@ -99,14 +99,6 @@ void RimPerforationInterval::setCustomStartDate(const QDate& date)
|
||||
}
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RimPerforationInterval::enableCustomEndDate(bool enable)
|
||||
{
|
||||
m_useCustomEndDate = enable;
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
|
||||
@@ -52,7 +52,6 @@ public:
|
||||
void enableCustomStartDate(bool enable);
|
||||
void setCustomStartDate(const QDate& date);
|
||||
|
||||
void enableCustomEndDate(bool enable);
|
||||
void setCustomEndDate(const QDate& date);
|
||||
|
||||
void setDiameter(double diameter);
|
||||
|
||||
@@ -111,16 +111,6 @@ double RimSimWellFracture::wellAzimuthAtFracturePosition() const
|
||||
return simWellAzimuth;
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
double RimSimWellFracture::wellDipAtFracturePosition()
|
||||
{
|
||||
computeSimWellBranchesIfRequired();
|
||||
double simWellDip = m_branchCenterLines[m_branchIndex].simWellDipAngle(fracturePosition());
|
||||
return simWellDip;
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
|
||||
@@ -42,7 +42,6 @@ public:
|
||||
void updateAzimuthBasedOnWellAzimuthAngle() override;
|
||||
|
||||
double wellAzimuthAtFracturePosition() const override;
|
||||
double wellDipAtFracturePosition();
|
||||
double fractureMD() const override
|
||||
{
|
||||
return m_location;
|
||||
|
||||
@@ -394,19 +394,6 @@ QString RimGridCrossPlotDataSet::timeStepString() const
|
||||
return "";
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
std::vector<QString> RimGridCrossPlotDataSet::groupStrings() const
|
||||
{
|
||||
std::vector<QString> groupStrings;
|
||||
for (auto curve : m_crossPlotCurves())
|
||||
{
|
||||
groupStrings.push_back(legendConfig()->categoryNameFromCategoryValue(curve->groupIndex()));
|
||||
}
|
||||
return groupStrings;
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
|
||||
@@ -113,7 +113,6 @@ public:
|
||||
QString caseNameString() const;
|
||||
QString axisVariableString() const;
|
||||
QString timeStepString() const;
|
||||
std::vector<QString> groupStrings() const;
|
||||
|
||||
std::map<NameComponents, QString> nameComponents() const;
|
||||
|
||||
|
||||
@@ -63,7 +63,6 @@ void Rim2dIntersectionViewCollection::syncFromExistingIntersections( bool doUpda
|
||||
parentCase->descendantsIncludingThisOfType(allOrderedIntersectionsInCase);
|
||||
|
||||
std::set<RimIntersection*> currentIntersections(allOrderedIntersectionsInCase.begin(), allOrderedIntersectionsInCase.end());
|
||||
std::set<RimIntersection*> intersectionsNeedingViews = currentIntersections;
|
||||
|
||||
// Delete views without a valid intersection
|
||||
|
||||
|
||||
@@ -272,14 +272,6 @@ bool Rim3dOverlayInfoConfig::isActive() const
|
||||
return m_active;
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void Rim3dOverlayInfoConfig::setIsActive(bool active)
|
||||
{
|
||||
m_active = active;
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
|
||||
@@ -87,7 +87,6 @@ public:
|
||||
bool showCaseInfo() const;
|
||||
bool showResultInfo() const;
|
||||
bool isActive() const;
|
||||
void setIsActive(bool active);
|
||||
|
||||
bool showVersionInfo() const;
|
||||
|
||||
|
||||
@@ -1097,15 +1097,6 @@ void Rim3dView::disablePerspectiveProjectionField()
|
||||
RiaFieldhandleTools::disableWriteAndSetFieldHidden(&isPerspectiveView);
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void Rim3dView::enablePerspectiveProjectionField()
|
||||
{
|
||||
isPerspectiveView.uiCapability()->setUiHidden(false);
|
||||
isPerspectiveView.xmlCapability()->setIOWritable(true);
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
|
||||
@@ -166,7 +166,6 @@ protected:
|
||||
virtual void setDefaultView();
|
||||
void disableGridBoxField();
|
||||
void disablePerspectiveProjectionField();
|
||||
void enablePerspectiveProjectionField();
|
||||
cvf::Mat4d cameraPosition() const;
|
||||
cvf::Vec3d cameraPointOfInterest() const;
|
||||
RimViewNameConfig* nameConfig() const;
|
||||
|
||||
@@ -217,14 +217,6 @@ const std::vector<cvf::Vec4d>& RimContourMapProjection::trianglesWithVertexValue
|
||||
return m_trianglesWithVertexValues;
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
RimContourMapProjection::ResultAggregation RimContourMapProjection::resultAggregation() const
|
||||
{
|
||||
return m_resultAggregation();
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
@@ -249,14 +241,6 @@ bool RimContourMapProjection::showContourLines() const
|
||||
return m_showContourLines();
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
bool RimContourMapProjection::showContourLabels() const
|
||||
{
|
||||
return m_showContourLines() && m_showContourLabels();
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
@@ -348,15 +332,6 @@ double RimContourMapProjection::valueAtVertex(uint i, uint j) const
|
||||
return std::numeric_limits<double>::infinity();
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
bool RimContourMapProjection::hasResultAtVertex(uint i, uint j) const
|
||||
{
|
||||
size_t index = vertexIndexFromIJ(i, j);
|
||||
return m_aggregatedVertexResults[index] != std::numeric_limits<double>::infinity();
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
@@ -1411,14 +1386,6 @@ bool RimContourMapProjection::isMeanResult() const
|
||||
m_resultAggregation() == RESULTS_GEOM_VALUE;
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
bool RimContourMapProjection::isSummationResult() const
|
||||
{
|
||||
return isStraightSummationResult() || m_resultAggregation() == RESULTS_VOLUME_SUM;
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
|
||||
@@ -83,11 +83,9 @@ public:
|
||||
const std::vector<ContourPolygons>& contourPolygons() const;
|
||||
const std::vector<cvf::Vec4d>& trianglesWithVertexValues();
|
||||
|
||||
ResultAggregation resultAggregation() const;
|
||||
double sampleSpacing() const;
|
||||
double sampleSpacingFactor() const;
|
||||
bool showContourLines() const;
|
||||
bool showContourLabels() const;
|
||||
|
||||
QString resultAggregationText() const;
|
||||
|
||||
@@ -103,7 +101,6 @@ public:
|
||||
bool isColumnResult() const;
|
||||
|
||||
double valueAtVertex(uint i, uint j) const;
|
||||
bool hasResultAtVertex(uint i, uint j) const;
|
||||
|
||||
uint numberOfCells() const;
|
||||
uint numberOfValidCells() const;
|
||||
@@ -171,7 +168,6 @@ protected:
|
||||
const std::vector<double>& weightingResultValues) const;
|
||||
|
||||
bool isMeanResult() const;
|
||||
bool isSummationResult() const;
|
||||
bool isStraightSummationResult() const;
|
||||
static bool isStraightSummationResult(ResultAggregationEnum aggregationType);
|
||||
|
||||
|
||||
@@ -965,7 +965,6 @@ std::vector<QString> RimProject::simulationWellNames() const
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
RimWellPath* RimProject::wellPathFromSimWellName(const QString& simWellName, int branchIndex)
|
||||
{
|
||||
std::vector<RimWellPath*> paths;
|
||||
for (RimWellPath* const path : allWellPaths())
|
||||
{
|
||||
if (QString::compare(path->associatedSimulationWellName(), simWellName) == 0 &&
|
||||
|
||||
@@ -731,14 +731,6 @@ bool RimRegularLegendConfig::showLegend() const
|
||||
return m_showLegend;
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RimRegularLegendConfig::setShowLegend(bool show)
|
||||
{
|
||||
m_showLegend = show;
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
|
||||
@@ -123,7 +123,6 @@ public:
|
||||
|
||||
cvf::ScalarMapper* scalarMapper() { return m_currentScalarMapper.p(); }
|
||||
bool showLegend() const;
|
||||
void setShowLegend(bool show);
|
||||
|
||||
const caf::TitledOverlayFrame* titledOverlayFrame() const override;
|
||||
caf::TitledOverlayFrame* titledOverlayFrame() override;
|
||||
|
||||
@@ -441,17 +441,6 @@ RimLegendConfig::RangeModeType RimScaleLegendConfig::rangeMode() const
|
||||
return m_rangeMode();
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RimScaleLegendConfig::setCurrentScale(double scale)
|
||||
{
|
||||
m_currentScale = scale;
|
||||
|
||||
// Update legend
|
||||
updateLegend();
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
|
||||
@@ -109,8 +109,6 @@ public:
|
||||
|
||||
RangeModeType rangeMode() const;
|
||||
|
||||
void setCurrentScale(double scale);
|
||||
|
||||
private:
|
||||
void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) override;
|
||||
void initAfterRead() override;
|
||||
@@ -145,6 +143,4 @@ private:
|
||||
caf::PdmField<double> m_userDefinedMaxValue;
|
||||
caf::PdmField<double> m_userDefinedMinValue;
|
||||
caf::PdmField<caf::AppEnum<ColorRangesType> > m_colorRangeMode;
|
||||
|
||||
double m_currentScale; // [meters/pixel]
|
||||
};
|
||||
|
||||
@@ -287,7 +287,6 @@ void RimWellLogExtractionCurve::fieldChangedByUi(const caf::PdmFieldHandle* chan
|
||||
this->loadDataAndUpdate(true);
|
||||
}
|
||||
else if (changedField == &m_branchDetection ||
|
||||
changedField == &m_branchIndex ||
|
||||
changedField == &m_branchIndex)
|
||||
{
|
||||
clearGeneratedSimWellPaths();
|
||||
@@ -979,4 +978,4 @@ void RimWellLogExtractionCurve::setBranchDetection(bool branchDetection)
|
||||
void RimWellLogExtractionCurve::setBranchIndex(int index)
|
||||
{
|
||||
m_branchIndex = index;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -149,7 +149,6 @@ RimObservedData* RimObservedDataCollection::createAndAddCvsObservedDataFromFile(
|
||||
if (!fileExists(fileName, errorText)) return nullptr;
|
||||
|
||||
RimObservedData* observedData = nullptr;
|
||||
bool parseOk = false;
|
||||
|
||||
RimCsvUserData* userData = new RimCsvUserData();
|
||||
RicPasteAsciiDataToSummaryPlotFeatureUi* parseOptions = userData->parseOptions();
|
||||
@@ -186,7 +185,6 @@ RimObservedData* RimObservedDataCollection::createAndAddCvsObservedDataFromFile(
|
||||
{
|
||||
this->m_observedDataArray.push_back(userData);
|
||||
observedData = userData;
|
||||
parseOk = true;
|
||||
}
|
||||
else
|
||||
{
|
||||
|
||||
@@ -294,8 +294,8 @@ EnsembleParameter RimSummaryCaseCollection::ensembleParameter(const QString& par
|
||||
EnsembleParameter eParam;
|
||||
eParam.name = paramName;
|
||||
|
||||
bool numericValuesCount = 0;
|
||||
bool textValuesCount = 0;
|
||||
size_t numericValuesCount = 0;
|
||||
size_t textValuesCount = 0;
|
||||
|
||||
// Prepare case realization params, and check types
|
||||
for (const auto& rimCase : allSummaryCases())
|
||||
|
||||
Reference in New Issue
Block a user