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

ResInsight: Linux compile fixes

Browse Source 
p4#: 18783
This commit is contained in:
Jacob Støren 2012-09-18 15:34:50 +02:00
parent e679ba07a5
commit 7c63cccc8d
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ApplicationCode/UserInterface/RiuSimpleHistogramWidget.h
View File

@ -21,7 +21,7 @@ private:
int xPosFromColIdx(size_t colIdx) { return (int)(m_x + 1 + (m_width - 2 ) * colIdx/m_histogramData.size());} int xPosFromColIdx(size_t colIdx) { return (int)(m_x + 1 + (m_width - 2 ) * colIdx/m_histogramData.size());}
int yPosFromCount(size_t colHeight) { return (int)(m_y + m_height - 1 - (m_height - 3 ) * colHeight/m_maxHistogramCount);} int yPosFromCount(size_t colHeight) { return (int)(m_y + m_height - 1 - (m_height - 3 ) * colHeight/m_maxHistogramCount);}
int xPosFromDomainValue(double value) { double range = m_max - m_min; return (range == 0.0) ? (m_x + 1) : (int)(m_x + 1 + (m_width - 2 ) * (value - m_min)/(m_max - m_min));} int xPosFromDomainValue(double value) { double range = m_max - m_min; return (range == 0.0) ? (int)(m_x + 1) : (int)(m_x + 1 + (m_width - 2 ) * (value - m_min)/(m_max - m_min));}
std::vector<size_t> m_histogramData; std::vector<size_t> m_histogramData;
double m_max; double m_max;

2
cafProjectDataModel/cafPdmField.inl
View File

@ -187,7 +187,7 @@ QVariant caf::PdmField<DataType>::uiValue() const
PdmOptionItemInfo::findValues(m_optionEntryCache, convertedFieldValue, indexes); PdmOptionItemInfo::findValues(m_optionEntryCache, convertedFieldValue, indexes);
if (convertedFieldValue.type() == QVariant::List) if (convertedFieldValue.type() == QVariant::List)
{ {
if (indexes.size() == convertedFieldValue.toList().size()) if (indexes.size() == static_cast<size_t>(convertedFieldValue.toList().size()))
{ {
QList<QVariant> returnList; QList<QVariant> returnList;
for(size_t i = 0; i < indexes.size(); ++i) for(size_t i = 0; i < indexes.size(); ++i)

4
cafUserInterface/cafPdmUiListEditor.cpp
View File

@ -36,8 +36,8 @@
#include <assert.h> #include <assert.h>
#include "..\src\corelib\kernel\qcoreevent.h" #include <QEvent>
#include "..\src\gui\kernel\qevent.h" #include <QKeyEvent>
//================================================================================================== //==================================================================================================
/// Helper class used to override flags to disable editable items /// Helper class used to override flags to disable editable items