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

Linux compile fixes

Browse Source 
p4#: 21550
This commit is contained in:
Jacob Støren 2013-05-06 12:02:32 +02:00
parent cf664210bf
commit 5c0e55e7c1
6 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ApplicationCode/ModelVisualization/RivReservoirViewPartMgr.cpp
View File

@ -743,4 +743,4 @@ RivReservoirPartMgr * RivReservoirViewPartMgr::reservoirPartManager(ReservoirGeo
{
return &m_geometries[geometryType];
}
}
}

2
ApplicationCode/ProjectDataModel/Rim3dOverlayInfoConfig.h
View File

@ -23,6 +23,8 @@
#include "cafPdmField.h"
#include "cafAppEnum.h"
#include "cvfAssert.h"
#include "cvfVector2.h"
class RimReservoirView;

2
ApplicationCode/ProjectDataModel/RimCellRangeFilter.cpp
View File

@ -280,7 +280,7 @@ RigGridBase* RimCellRangeFilter::selectedGrid()
CVF_ASSERT(mainGrid);
RigGridBase* grid = NULL;
if (gridIndex() >= mainGrid->gridCount())
if (static_cast<size_t>(gridIndex()) >= mainGrid->gridCount())
{
gridIndex = 0;
}

2
ApplicationCode/ProjectDataModel/RimCellRangeFilterCollection.cpp
View File

@ -80,7 +80,7 @@ void RimCellRangeFilterCollection::compoundCellRangeFilter(cvf::CellRangeFilter*
{
RimCellRangeFilter* rangeFilter = *it;
if (rangeFilter && rangeFilter->active && rangeFilter->gridIndex() == grid->gridIndex())
if (rangeFilter && rangeFilter->active() && static_cast<size_t>(rangeFilter->gridIndex()) == grid->gridIndex())
{
if (rangeFilter->filterMode == RimCellFilter::INCLUDE)
{

6
ApplicationCode/ProjectDataModel/RimLegendConfig.cpp
View File

@ -16,18 +16,20 @@
//
/////////////////////////////////////////////////////////////////////////////////
//#include "RiaStdInclude.h"
#include "RimLegendConfig.h"
#include "RimReservoirView.h"
#include "cafFactory.h"
#include "cafPdmUiLineEditor.h"
#include "cafPdmUiComboBoxEditor.h"
#include "cvfScalarMapperDiscreteLog.h"
#include "cvfScalarMapperContinuousLog.h"
#include "cvfScalarMapperContinuousLinear.h"
#include "cvfOverlayScalarMapperLegend.h"
#include "cvfScalarMapperDiscreteLinear.h"
#include <cmath>
#include "RiaApplication.h"
#include "cafPdmFieldCvfMat4d.h"
#include "cafPdmFieldCvfColor.h"

2
ApplicationCode/UserInterface/RiuMainWindow.cpp
View File

@ -1510,7 +1510,7 @@ void RiuMainWindow::updateScaleValue()
{
m_scaleFactor->setEnabled(true);
int scaleValue = RiaApplication::instance()->activeReservoirView()->scaleZ();
int scaleValue = static_cast<int>(RiaApplication::instance()->activeReservoirView()->scaleZ()); // Round down is probably ok.
m_scaleFactor->blockSignals(true);
m_scaleFactor->setValue(scaleValue);
m_scaleFactor->blockSignals(false);