diff --git a/ApplicationCode/Commands/CompletionCommands/RicExportFishbonesLateralsFeature.cpp b/ApplicationCode/Commands/CompletionCommands/RicExportFishbonesLateralsFeature.cpp index ef9b30de28..72ce6cd8f9 100644 --- a/ApplicationCode/Commands/CompletionCommands/RicExportFishbonesLateralsFeature.cpp +++ b/ApplicationCode/Commands/CompletionCommands/RicExportFishbonesLateralsFeature.cpp @@ -112,14 +112,6 @@ void RicExportFishbonesLateralsFeature::onActionTriggered(bool isChecked) RiaLogging::info("Completed export of Fishbones well path laterals to : " + fileName); } -//-------------------------------------------------------------------------------------------------- -/// -//-------------------------------------------------------------------------------------------------- -QString RicExportFishbonesLateralsFeature::formatNumber(double val, int numberOfDecimals) -{ - return QString("%1").arg(val, 0, 'f', numberOfDecimals); -} - //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationCode/Commands/CompletionCommands/RicExportFishbonesLateralsFeature.h b/ApplicationCode/Commands/CompletionCommands/RicExportFishbonesLateralsFeature.h index e4909882ed..e4fe9d4cae 100644 --- a/ApplicationCode/Commands/CompletionCommands/RicExportFishbonesLateralsFeature.h +++ b/ApplicationCode/Commands/CompletionCommands/RicExportFishbonesLateralsFeature.h @@ -50,6 +50,5 @@ protected: virtual bool isCommandEnabled() override; private: - static QString formatNumber(double val, int numberOfDecimals); static RimFishbonesCollection* selectedFishbonesCollection(); }; diff --git a/ApplicationCode/Commands/CompletionExportCommands/RicWellPathFractureTextReportFeatureImpl.cpp b/ApplicationCode/Commands/CompletionExportCommands/RicWellPathFractureTextReportFeatureImpl.cpp index d3d6dbc8ae..48b63ad71c 100644 --- a/ApplicationCode/Commands/CompletionExportCommands/RicWellPathFractureTextReportFeatureImpl.cpp +++ b/ApplicationCode/Commands/CompletionExportCommands/RicWellPathFractureTextReportFeatureImpl.cpp @@ -51,14 +51,6 @@ QString orientationText(RimFractureTemplate::FracOrientationEnum orientation) return caf::AppEnum::uiText(orientation); } -//-------------------------------------------------------------------------------------------------- -/// -//-------------------------------------------------------------------------------------------------- -RifEclipseOutputTableDoubleFormatting floatWithThreeDigits() -{ - return RifEclipseOutputTableDoubleFormatting(RIF_FLOAT, 3); -} - //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationCode/Commands/EclipseCommands/EclipseWell/RicEclipseWellFeatureImpl.cpp b/ApplicationCode/Commands/EclipseCommands/EclipseWell/RicEclipseWellFeatureImpl.cpp index 2b60dc5ab2..70232b680b 100644 --- a/ApplicationCode/Commands/EclipseCommands/EclipseWell/RicEclipseWellFeatureImpl.cpp +++ b/ApplicationCode/Commands/EclipseCommands/EclipseWell/RicEclipseWellFeatureImpl.cpp @@ -50,22 +50,3 @@ std::vector RicEclipseWellFeatureImpl::selectedWells() return selection; } -//-------------------------------------------------------------------------------------------------- -/// -//-------------------------------------------------------------------------------------------------- -RimSimWellInViewCollection* RicEclipseWellFeatureImpl::wellCollectionFromSelection() -{ - std::vector selection = selectedWells(); - if (selection.size() > 0) - { - RimSimWellInView* firstWell = selection[0]; - - RimSimWellInViewCollection* wellCollection = nullptr; - firstWell->firstAncestorOrThisOfType(wellCollection); - - return wellCollection; - } - - return nullptr; -} - diff --git a/ApplicationCode/Commands/EclipseCommands/EclipseWell/RicEclipseWellFeatureImpl.h b/ApplicationCode/Commands/EclipseCommands/EclipseWell/RicEclipseWellFeatureImpl.h index 3e4c8b1103..5d928a2e5c 100644 --- a/ApplicationCode/Commands/EclipseCommands/EclipseWell/RicEclipseWellFeatureImpl.h +++ b/ApplicationCode/Commands/EclipseCommands/EclipseWell/RicEclipseWellFeatureImpl.h @@ -31,5 +31,4 @@ class RicEclipseWellFeatureImpl public: static bool isAnyWellSelected(); static std::vector selectedWells(); - static RimSimWellInViewCollection* wellCollectionFromSelection(); }; diff --git a/ApplicationCode/Commands/SummaryPlotCommands/RicEditSummaryCrossPlotFeature.cpp b/ApplicationCode/Commands/SummaryPlotCommands/RicEditSummaryCrossPlotFeature.cpp index 38c67c532c..8927943274 100644 --- a/ApplicationCode/Commands/SummaryPlotCommands/RicEditSummaryCrossPlotFeature.cpp +++ b/ApplicationCode/Commands/SummaryPlotCommands/RicEditSummaryCrossPlotFeature.cpp @@ -81,9 +81,6 @@ bool RicEditSummaryCrossPlotFeature::isCommandEnabled() //-------------------------------------------------------------------------------------------------- void RicEditSummaryCrossPlotFeature::onActionTriggered(bool isChecked) { - RimProject* project = RiaApplication::instance()->project(); - CVF_ASSERT(project); - auto dialog = RicEditSummaryCrossPlotFeature::curveCreatorDialog(); if (!dialog->isVisible()) diff --git a/ApplicationCode/Commands/SummaryPlotCommands/RicEditSummaryPlotFeature.cpp b/ApplicationCode/Commands/SummaryPlotCommands/RicEditSummaryPlotFeature.cpp index 6b8c47a56b..84a3ebb320 100644 --- a/ApplicationCode/Commands/SummaryPlotCommands/RicEditSummaryPlotFeature.cpp +++ b/ApplicationCode/Commands/SummaryPlotCommands/RicEditSummaryPlotFeature.cpp @@ -83,9 +83,6 @@ bool RicEditSummaryPlotFeature::isCommandEnabled() //-------------------------------------------------------------------------------------------------- void RicEditSummaryPlotFeature::onActionTriggered(bool isChecked) { - RimProject* project = RiaApplication::instance()->project(); - CVF_ASSERT(project); - auto dialog = RicEditSummaryPlotFeature::curveCreatorDialog(); if (!dialog->isVisible()) diff --git a/ApplicationCode/FileInterface/RifEclipseSummaryTools.cpp b/ApplicationCode/FileInterface/RifEclipseSummaryTools.cpp index 3bbcb8458c..59e1b9a1cc 100644 --- a/ApplicationCode/FileInterface/RifEclipseSummaryTools.cpp +++ b/ApplicationCode/FileInterface/RifEclipseSummaryTools.cpp @@ -85,38 +85,6 @@ void RifEclipseSummaryTools::findSummaryFiles(const QString& inputFile, return; } - -//-------------------------------------------------------------------------------------------------- -/// -//-------------------------------------------------------------------------------------------------- -QStringList RifEclipseSummaryTools::findSummaryDataFiles(const QString& caseFile) -{ - QStringList fileNames; - - QString path; - QString base; - - findSummaryHeaderFileInfo(caseFile, nullptr, &path, &base, nullptr); - if (path.isEmpty() || base.isEmpty()) return fileNames; - - char* header_file = nullptr; - stringlist_type* summary_file_list = stringlist_alloc_new(); - - ecl_util_alloc_summary_files(RiaStringEncodingTools::toNativeEncoded(path).data(), RiaStringEncodingTools::toNativeEncoded(base).data(), nullptr, &header_file, summary_file_list); - if (stringlist_get_size( summary_file_list ) > 0) - { - for (int i = 0; i < stringlist_get_size(summary_file_list); i++) - { - fileNames.push_back(RiaStringEncodingTools::fromNativeEncoded(stringlist_iget(summary_file_list, i))); - } - } - - free(header_file); - stringlist_free(summary_file_list); - - return fileNames; -} - //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationCode/FileInterface/RifEclipseSummaryTools.h b/ApplicationCode/FileInterface/RifEclipseSummaryTools.h index b2e825f808..dc24df4c41 100644 --- a/ApplicationCode/FileInterface/RifEclipseSummaryTools.h +++ b/ApplicationCode/FileInterface/RifEclipseSummaryTools.h @@ -36,7 +36,6 @@ class RifEclipseSummaryTools { public: static void findSummaryHeaderFile(const QString& inputFile, QString* headerFile, bool* isFormatted); - static QStringList findSummaryDataFiles(const QString& caseFile); static QString findGridCaseFileFromSummaryHeaderFile(const QString& summaryHeaderFile); static void findSummaryFiles(const QString& inputFile, QString* headerFile, QStringList* dataFiles); diff --git a/ApplicationCode/FileInterface/RifEclipseUserDataParserTools.cpp b/ApplicationCode/FileInterface/RifEclipseUserDataParserTools.cpp index 49a7fc9473..6c61050100 100644 --- a/ApplicationCode/FileInterface/RifEclipseUserDataParserTools.cpp +++ b/ApplicationCode/FileInterface/RifEclipseUserDataParserTools.cpp @@ -116,58 +116,6 @@ std::vector RifEclipseUserDataParserTools::splitLineAndRemoveCommen return words; } -////-------------------------------------------------------------------------------------------------- -///// -////-------------------------------------------------------------------------------------------------- -//RifEclipseSummaryAddress::SummaryVarCategory RifEclipseUserDataParserTools::identifyCategory(const std::string& word) -//{ -// if (word.size() == 0) return RifEclipseSummaryAddress::SUMMARY_INVALID; -// -// if (!RiaStdStringTools::containsOnlyLettersAndDigits(word)) return RifEclipseSummaryAddress::SUMMARY_INVALID; -// -// if (word.size() > 2 && word[0] == 'R' && word[2] == 'F') -// { -// return RifEclipseSummaryAddress::SUMMARY_REGION_2_REGION; -// } -// -// char firstLetter = word.at(0); -// -// if (firstLetter == 'A') return RifEclipseSummaryAddress::SUMMARY_AQUIFER; -// if (firstLetter == 'B') return RifEclipseSummaryAddress::SUMMARY_BLOCK; -// if (firstLetter == 'C') return RifEclipseSummaryAddress::SUMMARY_WELL_COMPLETION; -// if (firstLetter == 'F') return RifEclipseSummaryAddress::SUMMARY_FIELD; -// if (firstLetter == 'G') return RifEclipseSummaryAddress::SUMMARY_WELL_GROUP; -// if (firstLetter == 'N') return RifEclipseSummaryAddress::SUMMARY_NETWORK; -// if (firstLetter == 'R') return RifEclipseSummaryAddress::SUMMARY_REGION; -// if (firstLetter == 'S') return RifEclipseSummaryAddress::SUMMARY_WELL_SEGMENT; -// if (firstLetter == 'W') return RifEclipseSummaryAddress::SUMMARY_WELL; -// -// if (word.size() < 2) return RifEclipseSummaryAddress::SUMMARY_INVALID; -// -// std::string firstTwoLetters = word.substr(0, 2); -// -// if (firstTwoLetters == "LB") return RifEclipseSummaryAddress::SUMMARY_BLOCK_LGR; -// if (firstTwoLetters == "LC") return RifEclipseSummaryAddress::SUMMARY_WELL_COMPLETION_LGR; -// if (firstTwoLetters == "LW") return RifEclipseSummaryAddress::SUMMARY_WELL_LGR; -// -// return RifEclipseSummaryAddress::SUMMARY_INVALID; -//} - -//-------------------------------------------------------------------------------------------------- -/// -//-------------------------------------------------------------------------------------------------- -size_t RifEclipseUserDataParserTools::findFirstNonEmptyEntryIndex(std::vector& list) -{ - for (size_t i = 0; i < list.size(); i++) - { - if (!list[i].empty()) - { - return i; - } - } - return list.size(); -} - //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationCode/FileInterface/RifEclipseUserDataParserTools.h b/ApplicationCode/FileInterface/RifEclipseUserDataParserTools.h index b8782e12e7..f73dadfe72 100644 --- a/ApplicationCode/FileInterface/RifEclipseUserDataParserTools.h +++ b/ApplicationCode/FileInterface/RifEclipseUserDataParserTools.h @@ -146,7 +146,6 @@ public: static bool isAComment(const std::string& word); static std::vector splitLineAndRemoveComments(const std::string& line); static std::vector splitLineToDoubles(const std::string& line); - static size_t findFirstNonEmptyEntryIndex(std::vector& list); static bool keywordParser(const std::string& line, std::string& origin, std::string& dateFormat, std::string& startDate); static bool isANumber(const std::string& line); static std::vector headerReader(std::stringstream& streamData, std::string& line); diff --git a/ApplicationCode/ProjectDataModel/Flow/RimWellFlowRateCurve.cpp b/ApplicationCode/ProjectDataModel/Flow/RimWellFlowRateCurve.cpp index 8213c217d0..c33bb803d7 100644 --- a/ApplicationCode/ProjectDataModel/Flow/RimWellFlowRateCurve.cpp +++ b/ApplicationCode/ProjectDataModel/Flow/RimWellFlowRateCurve.cpp @@ -113,14 +113,6 @@ void RimWellFlowRateCurve::setDoFillCurve(bool doFill) m_doFillCurve = doFill; } -//-------------------------------------------------------------------------------------------------- -/// -//-------------------------------------------------------------------------------------------------- -bool RimWellFlowRateCurve::doFillCurve() const -{ - return m_doFillCurve; -} - //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationCode/ProjectDataModel/Flow/RimWellFlowRateCurve.h b/ApplicationCode/ProjectDataModel/Flow/RimWellFlowRateCurve.h index ef8898f25a..c4b55e00a3 100644 --- a/ApplicationCode/ProjectDataModel/Flow/RimWellFlowRateCurve.h +++ b/ApplicationCode/ProjectDataModel/Flow/RimWellFlowRateCurve.h @@ -48,7 +48,6 @@ public: int groupId() const; void setDoFillCurve(bool doFill); - bool doFillCurve() const; protected: virtual QString createCurveAutoName() override; diff --git a/ApplicationCode/ProjectDataModel/RimWellLogCurve.cpp b/ApplicationCode/ProjectDataModel/RimWellLogCurve.cpp index 5c802c3663..21c952f68c 100644 --- a/ApplicationCode/ProjectDataModel/RimWellLogCurve.cpp +++ b/ApplicationCode/ProjectDataModel/RimWellLogCurve.cpp @@ -56,14 +56,6 @@ RimWellLogCurve::~RimWellLogCurve() { } -//-------------------------------------------------------------------------------------------------- -/// -//-------------------------------------------------------------------------------------------------- -bool RimWellLogCurve::depthRange(double* minimumDepth, double* maximumDepth) const -{ - return yValueRange(minimumDepth, maximumDepth); -} - //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationCode/ProjectDataModel/RimWellLogCurve.h b/ApplicationCode/ProjectDataModel/RimWellLogCurve.h index 6dfce98a2c..e9449c6831 100644 --- a/ApplicationCode/ProjectDataModel/RimWellLogCurve.h +++ b/ApplicationCode/ProjectDataModel/RimWellLogCurve.h @@ -38,7 +38,6 @@ public: RimWellLogCurve(); virtual ~RimWellLogCurve(); - bool depthRange(double* minimumDepth, double* maximumDepth) const; bool valueRange(double* minimumValue, double* maximumValue) const; const RigWellLogCurveData* curveData() const; diff --git a/ApplicationCode/ProjectDataModel/Summary/RimSummaryCaseCollection.cpp b/ApplicationCode/ProjectDataModel/Summary/RimSummaryCaseCollection.cpp index 7206c3af90..3bfaa4d9fc 100644 --- a/ApplicationCode/ProjectDataModel/Summary/RimSummaryCaseCollection.cpp +++ b/ApplicationCode/ProjectDataModel/Summary/RimSummaryCaseCollection.cpp @@ -82,14 +82,6 @@ void RimSummaryCaseCollection::removeCase(RimSummaryCase* summaryCase) } } -//-------------------------------------------------------------------------------------------------- -/// -//-------------------------------------------------------------------------------------------------- -void RimSummaryCaseCollection::deleteAllCases() -{ - m_cases.deleteAllChildObjects(); -} - //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationCode/ProjectDataModel/Summary/RimSummaryCaseCollection.h b/ApplicationCode/ProjectDataModel/Summary/RimSummaryCaseCollection.h index fb6939b538..b3fd062f64 100644 --- a/ApplicationCode/ProjectDataModel/Summary/RimSummaryCaseCollection.h +++ b/ApplicationCode/ProjectDataModel/Summary/RimSummaryCaseCollection.h @@ -65,7 +65,6 @@ public: virtual ~RimSummaryCaseCollection(); void removeCase(RimSummaryCase* summaryCase); - void deleteAllCases(); void addCase(RimSummaryCase* summaryCase, bool updateCurveSets = true); virtual std::vector allSummaryCases() const; void setName(const QString& name); diff --git a/ApplicationCode/ReservoirDataModel/RigWellLogFile.cpp b/ApplicationCode/ReservoirDataModel/RigWellLogFile.cpp index 9d9f9d843a..f943ac3a4c 100644 --- a/ApplicationCode/ReservoirDataModel/RigWellLogFile.cpp +++ b/ApplicationCode/ReservoirDataModel/RigWellLogFile.cpp @@ -35,23 +35,6 @@ #include // Needed for HUGE_VAL on Linux -//-------------------------------------------------------------------------------------------------- -/// Find the largest possible "ususal" value to use for absent data (-999.25, -9999.25, etc.) -//-------------------------------------------------------------------------------------------------- -static double sg_createAbsentValue(double lowestDataValue) -{ - double absentValue = -999.0; - - while (absentValue > lowestDataValue) - { - absentValue *= 10; - absentValue -= 9; - } - - return absentValue - 0.25; -} - - //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- @@ -265,95 +248,6 @@ QString RigWellLogFile::wellLogChannelUnitString(const QString& wellLogChannelNa return unit; } -//-------------------------------------------------------------------------------------------------- -/// -//-------------------------------------------------------------------------------------------------- -bool RigWellLogFile::exportToLasFile(const RimWellLogCurve* curve, const QString& fileName) -{ - CVF_ASSERT(curve); - - const RigWellLogCurveData* curveData = curve->curveData(); - if (!curveData) - { - return false; - } - - double minX, maxX; - curve->valueRange(&minX, &maxX); - double absentValue = sg_createAbsentValue(minX); - - std::vector wellLogValues = curveData->xValues(); - for (size_t vIdx = 0; vIdx < wellLogValues.size(); vIdx++) - { - double value = wellLogValues[vIdx]; - if (value == HUGE_VAL || value == -HUGE_VAL || value != value) - { - wellLogValues[vIdx] = absentValue; - } - } - - QString wellLogChannelName = curve->wellLogChannelName().trimmed(); - wellLogChannelName.replace(".", "_"); - - QString wellLogDate = curve->wellDate().trimmed(); - wellLogDate.replace(".", "_"); - wellLogDate.replace(" ", "_"); - - NRLib::LasWell lasFile; - lasFile.addWellInfo("WELL", curve->wellName().trimmed().toStdString()); - lasFile.addWellInfo("DATE", wellLogDate.toStdString()); - - if (curveData->depthUnit() == RiaDefines::UNIT_METER) - { - lasFile.AddLog("DEPTH", "M", "Depth in meters", curveData->measuredDepths()); - } - else if (curveData->depthUnit() == RiaDefines::UNIT_FEET) - { - lasFile.AddLog("DEPTH", "FT", "Depth in feet", curveData->measuredDepths()); - } - else if (curveData->depthUnit() == RiaDefines::UNIT_NONE) - { - CVF_ASSERT(false); - lasFile.AddLog("DEPTH", "", "Depth in connection number", curveData->measuredDepths()); - } - - if(curveData->tvDepths().size()) - { - lasFile.AddLog("TVDMSL", "M", "True vertical depth in meters", curveData->tvDepths()); - } - - lasFile.AddLog(wellLogChannelName.trimmed().toStdString(), "NO_UNIT", "", wellLogValues); - lasFile.SetMissing(absentValue); - - double minDepth = 0.0; - double maxDepth = 0.0; - curveData->calculateMDRange(&minDepth, &maxDepth); - - lasFile.setStartDepth(minDepth); - lasFile.setStopDepth(maxDepth); - - if (curveData->depthUnit() == RiaDefines::UNIT_METER) - { - lasFile.setDepthUnit("M"); - } - else if (curveData->depthUnit() == RiaDefines::UNIT_FEET) - { - lasFile.setDepthUnit("FT"); - } - else if ( curveData->depthUnit() == RiaDefines::UNIT_NONE ) - { - CVF_ASSERT(false); - lasFile.setDepthUnit(""); - } - - lasFile.setVersionInfo("2.0"); - - std::vector commentHeader; - lasFile.WriteToFile(fileName.toStdString(), commentHeader); - - return true; -} - //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationCode/ReservoirDataModel/RigWellLogFile.h b/ApplicationCode/ReservoirDataModel/RigWellLogFile.h index 411fa8e2d2..29667a06f1 100644 --- a/ApplicationCode/ReservoirDataModel/RigWellLogFile.h +++ b/ApplicationCode/ReservoirDataModel/RigWellLogFile.h @@ -56,8 +56,6 @@ public: QString wellLogChannelUnitString(const QString& wellLogChannelName, RiaDefines::DepthUnitType displayDepthUnit) const; RiaDefines::DepthUnitType depthUnit() const; - static bool exportToLasFile(const RimWellLogCurve* curve, const QString& fileName); - bool hasTvdChannel() const; private: diff --git a/ApplicationCode/UserInterface/RiuSummaryQwtPlot.cpp b/ApplicationCode/UserInterface/RiuSummaryQwtPlot.cpp index 94f6f85292..c1cda8c630 100644 --- a/ApplicationCode/UserInterface/RiuSummaryQwtPlot.cpp +++ b/ApplicationCode/UserInterface/RiuSummaryQwtPlot.cpp @@ -165,36 +165,6 @@ void RiuSummaryQwtPlot::currentVisibleWindow(QwtInterval* leftAxis, QwtInterval* *timeAxis = axisScaleDiv(xBottom).interval(); } -//-------------------------------------------------------------------------------------------------- -/// -//-------------------------------------------------------------------------------------------------- -void RiuSummaryQwtPlot::setZoomWindow(const QwtInterval& leftAxis, const QwtInterval& rightAxis, const QwtInterval& timeAxis) -{ - { - QRectF zoomWindow; - zoomWindow.setLeft(timeAxis.minValue()); - zoomWindow.setRight(timeAxis.maxValue()); - zoomWindow.setTop(leftAxis.maxValue()); - zoomWindow.setBottom(leftAxis.minValue()); - - m_zoomerLeft->blockSignals(true); - m_zoomerLeft->zoom(zoomWindow); - m_zoomerLeft->blockSignals(false); - } - - { - QRectF zoomWindow; - zoomWindow.setLeft(timeAxis.minValue()); - zoomWindow.setRight(timeAxis.maxValue()); - zoomWindow.setTop(rightAxis.maxValue()); - zoomWindow.setBottom(rightAxis.minValue()); - - // No need to block signal since there is no connected slot - m_zoomerRight->zoom(zoomWindow); - } - -} - //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationCode/UserInterface/RiuSummaryQwtPlot.h b/ApplicationCode/UserInterface/RiuSummaryQwtPlot.h index a166206284..f8a175af81 100644 --- a/ApplicationCode/UserInterface/RiuSummaryQwtPlot.h +++ b/ApplicationCode/UserInterface/RiuSummaryQwtPlot.h @@ -61,10 +61,6 @@ public: QwtInterval* rightAxis, QwtInterval* timeAxis) const; - void setZoomWindow(const QwtInterval& leftAxis, - const QwtInterval& rightAxis, - const QwtInterval& timeAxis); - void addOrUpdateEnsembleCurveSetLegend(RimEnsembleCurveSet * curveSetToShowLegendFor); void removeEnsembleCurveSetLegend(RimEnsembleCurveSet * curveSetToShowLegendFor); diff --git a/ApplicationCode/UserInterface/RiuSummaryVectorDescriptionMap.cpp b/ApplicationCode/UserInterface/RiuSummaryVectorDescriptionMap.cpp index 06de0c0c2f..edd2ed2f67 100644 --- a/ApplicationCode/UserInterface/RiuSummaryVectorDescriptionMap.cpp +++ b/ApplicationCode/UserInterface/RiuSummaryVectorDescriptionMap.cpp @@ -81,14 +81,6 @@ std::string RiuSummaryVectorDescriptionMap::vectorLongName(const std::string& ve ? info.longName : vectorName; } -//-------------------------------------------------------------------------------------------------- -/// -//-------------------------------------------------------------------------------------------------- -RifEclipseSummaryAddress::SummaryVarCategory RiuSummaryVectorDescriptionMap::vectorCategory(const std::string& vectorName) -{ - return vectorInfo(vectorName).category; -} - //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationCode/UserInterface/RiuSummaryVectorDescriptionMap.h b/ApplicationCode/UserInterface/RiuSummaryVectorDescriptionMap.h index 7f58173405..6ebc683129 100644 --- a/ApplicationCode/UserInterface/RiuSummaryVectorDescriptionMap.h +++ b/ApplicationCode/UserInterface/RiuSummaryVectorDescriptionMap.h @@ -46,7 +46,6 @@ public: RiuSummaryVectorInfo vectorInfo(const std::string& vectorName); std::string vectorLongName(const std::string& vectorName, bool returnVectorNameIfNotFound = false); - RifEclipseSummaryAddress::SummaryVarCategory vectorCategory(const std::string& vectorName); private: RiuSummaryVectorDescriptionMap(); diff --git a/doc/unused_functions_detection_and_actions.txt b/doc/unused_functions_detection_and_actions.txt index 8bedd8ef49..091dab0fa3 100644 --- a/doc/unused_functions_detection_and_actions.txt +++ b/doc/unused_functions_detection_and_actions.txt @@ -1,4 +1,7 @@ +2018-10-18 : Based on list of unused functions from cppcheck on build server + + Nothing to do ------------- unchanged ApplicationCode\UnitTests\ListKeywordsForObjectsAndFields-Test.cpp 16 style unusedFunction false The function 'writeTextToFile' is never used. @@ -43,7 +46,17 @@ unchanged ApplicationCode\GeoMech\GeoMechDataModel\RigFemPartGrid.cpp 371 style unchanged ApplicationCode\GeoMech\GeoMechDataModel\RigFemPartGrid.cpp 362 style unusedFunction false The function 'gridPointCountI' is never used. unchanged ApplicationCode\GeoMech\GeoMechDataModel\RigFemPartGrid.cpp 497 style unusedFunction false The function 'gridPointCoordinate' is never used. unchanged ApplicationCode\Commands\HoloLensCommands\VdeArrayDataPacket.cpp 221 style unusedFunction false The function 'fromRawPacketBuffer' is never used. - +unchanged ApplicationCode\UserInterface\RiuWellLogPlot.cpp 520 style unusedFunction false The function 'showEvent' is never used. +unchanged ApplicationCode\ProjectDataModel\Flow\RimWellPltPlot.cpp 1056 style unusedFunction false The function 'setupBeforeSave' is never used. +unchanged ApplicationCode\Commands\ApplicationCommands\RicCloseProjectFeature.cpp 52 style unusedFunction false The function 'setupActionLook' is never used. +unchanged ApplicationCode\ProjectDataModel\Completions\RimPerforationInterval.cpp 103 style unusedFunction false The function 'enableCustomEndDate' is never used. +unchanged ApplicationCode\GeoMech\OdbReader\RifOdbReader.cpp 551 style unusedFunction false The function 'elementSet' is never used. +unchanged ApplicationCode\FileInterface\RifJsonEncodeDecode.cpp 45 style unusedFunction false The function 'dumpToFile' is never used. +unchanged ApplicationCode\FileInterface\RifEclipseSummaryTools.cpp 168 style unusedFunction false The function 'dumpMetaData' is never used. +unchanged ApplicationCode\UserInterface\RiuDragDrop.cpp 254 style unusedFunction false The function 'dropMimeData' is never used. +unchanged ApplicationCode\ProjectDataModel\RimWellPathAttribute.cpp 60 style unusedFunction false The function 'diameterInInches' is never used. +unchanged ApplicationCode\ProjectDataModel\RimSummaryCalculationVariable.cpp 170 style unusedFunction false The function 'defineObjectEditorAttribute' is never used. +unchanged ApplicationCode\Commands\FractureCommands\RicCreateMultipleFracturesUi.cpp 201 style unusedFunction WIP --- @@ -132,30 +145,19 @@ unchanged ApplicationCode\ProjectDataModel\Summary\RimEnsembleCurveSet.cpp 748 s unchanged ApplicationCode\FileInterface\RifSummaryReaderInterface.cpp 48 style unusedFunction false The function 'fromTimeT' is never used. unchanged ApplicationCode\ProjectDataModel\RimWellLogTrack.cpp 1209 style unusedFunction false The function 'showWellPathAttributesBothSides' is never used. unchanged ApplicationCode\ProjectDataModel\RimWellLogTrack.cpp 1585 style unusedFunction false The function 'formationNameIndexToName' is never used. +unchanged ApplicationCode\Commands\CompletionCommands\RicExportFishbonesLateralsFeature.cpp 118 style unusedFunction false The function 'formatNumber' is never used. +unchanged ApplicationCode\Commands\CompletionExportCommands\RicWellPathFractureTextReportFeatureImpl.cpp 57 style unusedFunction false The function 'floatWithThreeDigits' is never used. +unchanged ApplicationCode\FileInterface\RifEclipseSummaryTools.cpp 105 style unusedFunction false The function 'findSummaryDataFiles' is never used. +unchanged ApplicationCode\FileInterface\RifEclipseUserDataParserTools.cpp 159 style unusedFunction false The function 'findFirstNonEmptyEntryIndex' is never used. +unchanged ApplicationCode\ReservoirDataModel\RigWellLogFile.cpp 271 style unusedFunction false The function 'exportToLasFile' is never used. +unchanged ApplicationCode\Application\Tools\RiaQDateTimeTools.cpp 242 style unusedFunction false The function 'equalTo' is never used. +unchanged ApplicationCode\UserInterface\RiuSummaryQwtPlot.cpp 171 style unusedFunction false The function 'setZoomWindow' is never used. +unchanged ApplicationCode\ProjectDataModel\Flow\RimWellFlowRateCurve.cpp 119 style unusedFunction false The function 'doFillCurve' is never used. +unchanged ApplicationCode\ProjectDataModel\RimWellLogCurve.cpp 62 style unusedFunction false The function 'depthRange' is never used. +unchanged ApplicationCode\ProjectDataModel\Summary\RimSummaryCaseCollection.cpp 88 style unusedFunction false The function 'deleteAllCases' is never used. +unchanged ApplicationCode\Commands\EclipseCommands\EclipseWell\RicEclipseWellFeatureImpl.cpp 56 style unusedFunction false The function 'wellCollectionFromSelection' is never used. +unchanged ApplicationCode\UserInterface\RiuSummaryVectorDescriptionMap.cpp 87 style unusedFunction false The function 'vectorCategory' is never used. Backlog ------- -unchanged ApplicationCode\Commands\CompletionCommands\RicExportFishbonesLateralsFeature.cpp 118 style unusedFunction false The function 'formatNumber' is never used. -unchanged ApplicationCode\Commands\CompletionExportCommands\RicWellPathFractureTextReportFeatureImpl.cpp 57 style unusedFunction false The function 'floatWithThreeDigits' is never used. -unchanged ApplicationCode\FileInterface\RifEclipseSummaryTools.cpp 105 style unusedFunction false The function 'findSummaryDataFiles' is never used. -unchanged ApplicationCode\UserInterface\RiuWellLogPlot.cpp 520 style unusedFunction false The function 'showEvent' is never used. -unchanged ApplicationCode\FileInterface\RifEclipseUserDataParserTools.cpp 159 style unusedFunction false The function 'findFirstNonEmptyEntryIndex' is never used. -unchanged ApplicationCode\ReservoirDataModel\RigWellLogFile.cpp 271 style unusedFunction false The function 'exportToLasFile' is never used. -unchanged ApplicationCode\ProjectDataModel\Flow\RimWellPltPlot.cpp 1056 style unusedFunction false The function 'setupBeforeSave' is never used. -unchanged ApplicationCode\Commands\ApplicationCommands\RicCloseProjectFeature.cpp 52 style unusedFunction false The function 'setupActionLook' is never used. -unchanged ApplicationCode\Application\Tools\RiaQDateTimeTools.cpp 242 style unusedFunction false The function 'equalTo' is never used. -unchanged ApplicationCode\UserInterface\RiuSummaryQwtPlot.cpp 171 style unusedFunction false The function 'setZoomWindow' is never used. -unchanged ApplicationCode\ProjectDataModel\Completions\RimPerforationInterval.cpp 103 style unusedFunction false The function 'enableCustomEndDate' is never used. -unchanged ApplicationCode\GeoMech\OdbReader\RifOdbReader.cpp 551 style unusedFunction false The function 'elementSet' is never used. -unchanged ApplicationCode\FileInterface\RifJsonEncodeDecode.cpp 45 style unusedFunction false The function 'dumpToFile' is never used. -unchanged ApplicationCode\FileInterface\RifEclipseSummaryTools.cpp 168 style unusedFunction false The function 'dumpMetaData' is never used. -unchanged ApplicationCode\UserInterface\RiuDragDrop.cpp 254 style unusedFunction false The function 'dropMimeData' is never used. -unchanged ApplicationCode\ProjectDataModel\Flow\RimWellFlowRateCurve.cpp 119 style unusedFunction false The function 'doFillCurve' is never used. -unchanged ApplicationCode\ProjectDataModel\RimWellPathAttribute.cpp 60 style unusedFunction false The function 'diameterInInches' is never used. -unchanged ApplicationCode\ProjectDataModel\RimWellLogCurve.cpp 62 style unusedFunction false The function 'depthRange' is never used. -unchanged ApplicationCode\ProjectDataModel\Summary\RimSummaryCaseCollection.cpp 88 style unusedFunction false The function 'deleteAllCases' is never used. -unchanged ApplicationCode\ProjectDataModel\RimSummaryCalculationVariable.cpp 170 style unusedFunction false The function 'defineObjectEditorAttribute' is never used. -unchanged ApplicationCode\Commands\EclipseCommands\EclipseWell\RicEclipseWellFeatureImpl.cpp 56 style unusedFunction false The function 'wellCollectionFromSelection' is never used. -unchanged ApplicationCode\UserInterface\RiuSummaryVectorDescriptionMap.cpp 87 style unusedFunction false The function 'vectorCategory' is never used. -unchanged ApplicationCode\Commands\FractureCommands\RicCreateMultipleFracturesUi.cpp 201 style unusedFunction \ No newline at end of file