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

CppCheck : Fix various minor issues

Browse Source
This commit is contained in:
Magne Sjaastad 2018-12-21 12:32:57 +01:00
parent e514a77a80
commit a9c7773ef7
6 changed files with 28 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ApplicationCode/Commands/SummaryPlotCommands/RicPasteAsciiDataToSummaryPlotFeatureUi.h
View File

@ -38,7 +38,12 @@
class AsciiDataParseOptions
{
public:
AsciiDataParseOptions() : useCustomDateTimeFormat(false), assumeNumericDataColumns(false) { }
AsciiDataParseOptions()
: useCustomDateTimeFormat(false)
, assumeNumericDataColumns(false)
, curveSymbolSkipDistance(0.0f)
{
}
QString plotTitle;
QString curvePrefix;

20
ApplicationCode/ProjectDataModel/Flow/RimWellRftPlot.cpp
View File

@ -152,11 +152,11 @@ void RimWellRftPlot::applyCurveAppearance(RimWellLogCurve* newCurve)
static size_t defaultColorTableIndex = 0;
static size_t defaultSymbolTableIndex = 0;
cvf::Color3f currentColor;
RiuQwtSymbol::PointSymbolEnum currentSymbol = symbolTable.front();
RiuQwtPlotCurve::LineStyleEnum currentLineStyle = RiuQwtPlotCurve::STYLE_SOLID;
bool isCurrentColorSet = false;
bool isCurrentSymbolSet = false;
cvf::Color3f currentColor;
RiuQwtSymbol::PointSymbolEnum currentSymbol = symbolTable.front();
RiuQwtPlotCurve::LineStyleEnum currentLineStyle = RiuQwtPlotCurve::STYLE_SOLID;
bool isCurrentColorSet = false;
bool isCurrentSymbolSet = false;
std::set<cvf::Color3f> assignedColors;
std::set<RiuQwtSymbol::PointSymbolEnum> assignedSymbols;
@ -686,13 +686,13 @@ void RimWellRftPlot::fieldChangedByUi(const caf::PdmFieldHandle* changedField, c
if (changedField == &m_wellPathNameOrSimWellName)
{
if (changedField == &m_wellPathNameOrSimWellName)
{
m_branchIndex = 0;
}
m_branchIndex = 0;
RimWellLogTrack* const plotTrack = m_wellLogPlot->trackByIndex(0);
plotTrack->deleteAllCurves();
if (plotTrack)
{
plotTrack->deleteAllCurves();
}
updateEditorsFromCurves();
updateFormationsOnPlot();

6
ApplicationCode/UserInterface/RiuCalculationsContextMenuManager.h
View File

@ -41,7 +41,11 @@ class RiuCalculationsContextMenuManager : public QObject
static const std::map<QString, std::set<QString>> MENU_MAP;
public:
RiuCalculationsContextMenuManager() { }
RiuCalculationsContextMenuManager()
: m_curveCalc(nullptr)
, m_textPosition(0)
{
}
void attachWidget(QWidget* widget, RicSummaryCurveCalculator* curveCalc);

5
ApplicationCode/UserInterface/RiuExpressionContextMenuManager.h
View File

@ -39,7 +39,10 @@ class RiuExpressionContextMenuManager : public QObject
static const std::map<QString, std::set<QString>> MENU_MAP;
public:
RiuExpressionContextMenuManager() { }
RiuExpressionContextMenuManager()
: m_textPosition(0)
{
}
void attachTextEdit(QTextEdit* textEdit);

7
ApplicationCode/UserInterface/RiuViewerCommands.cpp
View File

@ -177,12 +177,7 @@ void RiuViewerCommands::displayContextMenu(QMouseEvent* event)
if (pickItemInfos.size())
{
cvf::Vec3d globalIntersectionPoint(cvf::Vec3d::ZERO);
if ( pickItemInfos.size() )
{
globalIntersectionPoint = pickItemInfos[0].globalPickedPoint();
}
cvf::Vec3d globalIntersectionPoint = pickItemInfos[0].globalPickedPoint();
for (const auto& pickItem : pickItemInfos)
{

2
ApplicationCode/UserInterface/RiuWellPathComponentPlotItem.cpp
View File

@ -50,6 +50,7 @@ RiuWellPathComponentPlotItem::RiuWellPathComponentPlotItem(const RimWellPath* we
, m_componentType(RiaDefines::WELL_PATH)
, m_columnOffset(0.0)
, m_depthType(RimWellLogPlot::MEASURED_DEPTH)
, m_maxColumnOffset(0.0)
, m_showLabel(false)
{
CVF_ASSERT(wellPath);
@ -68,6 +69,7 @@ RiuWellPathComponentPlotItem::RiuWellPathComponentPlotItem(const RimWellPath* we
: m_wellPath(wellPath)
, m_columnOffset(0.0)
, m_depthType(RimWellLogPlot::MEASURED_DEPTH)
, m_maxColumnOffset(0.0)
, m_showLabel(false)
{
CVF_ASSERT(wellPath && component);