Various linux fixes and missing includes

p4#: 20976
This commit is contained in:
Magne Sjaastad
2013-03-20 06:11:45 +01:00
parent 27dee4d4e2
commit 50206b9dc4
8 changed files with 17 additions and 10 deletions

View File

@@ -102,12 +102,12 @@ void RifEclipseOutputFileTools::timeSteps(ecl_file_type* ecl_file, std::vector<Q
double floorDayValue = cvf::Math::floor(dayValue); double floorDayValue = cvf::Math::floor(dayValue);
double dayFraction = dayValue - floorDayValue; double dayFraction = dayValue - floorDayValue;
int seconds = (dayFraction * 24.0 * 60.0 * 60.0); int seconds = static_cast<int>(dayFraction * 24.0 * 60.0 * 60.0);
QTime time(0, 0); QTime time(0, 0);
time = time.addSecs(seconds); time = time.addSecs(seconds);
QDate reportDate = simulationStart; QDate reportDate = simulationStart;
reportDate = reportDate.addDays(floorDayValue); reportDate = reportDate.addDays(static_cast<int>(floorDayValue));
QDateTime reportDateTime(reportDate, time); QDateTime reportDateTime(reportDate, time);
if (std::find(timeStepsFound.begin(), timeStepsFound.end(), reportDateTime) == timeStepsFound.end()) if (std::find(timeStepsFound.begin(), timeStepsFound.end(), reportDateTime) == timeStepsFound.end())

View File

@@ -46,7 +46,7 @@ void RigStatistics::addNamedResult(RigReservoirCellResults* destinationCellResul
// Initializes the size of the destination dataset to active union cell count // Initializes the size of the destination dataset to active union cell count
for (int i = 0; i < sourceTimeStepDates.size(); i++) for (size_t i = 0; i < sourceTimeStepDates.size(); i++)
{ {
dataValues[i].resize(activeUnionCellCount, HUGE_VAL); dataValues[i].resize(activeUnionCellCount, HUGE_VAL);
} }

View File

@@ -20,6 +20,7 @@
#include "cafPdmObject.h" #include "cafPdmObject.h"
#include "cafPdmPointer.h" #include "cafPdmPointer.h"
#include "cafPdmDocument.h"
#include "cafUiTreeModelPdm.h" #include "cafUiTreeModelPdm.h"
#include <QMimeData> #include <QMimeData>
@@ -45,7 +46,8 @@ public:
{ {
} }
MimeDataWithIndexes(const MimeDataWithIndexes & other)
MimeDataWithIndexes(const MimeDataWithIndexes & other) : QMimeData()
{ {
setIndexes(other.indexes()); setIndexes(other.indexes());
} }

View File

@@ -18,6 +18,8 @@
#include "RIStdInclude.h" #include "RIStdInclude.h"
#include "cafPdmDocument.h"
#include "RimUiTreeView.h" #include "RimUiTreeView.h"
#include "RimUiTreeModelPdm.h" #include "RimUiTreeModelPdm.h"
#include "RimReservoirView.h" #include "RimReservoirView.h"

View File

@@ -23,7 +23,10 @@
#include <QTreeView> #include <QTreeView>
class QItemSelection; class QItemSelection;
class PdmObjectGroup;
namespace caf {
class PdmObjectGroup;
}
//================================================================================================== //==================================================================================================
/// ///

View File

@@ -441,4 +441,4 @@ void RigEclipseCase::closeReaderInterface()
readerInterface->close(); readerInterface->close();
} }
} }
*/ */

View File

@@ -54,7 +54,7 @@ void RigWellResults::computeMappingFromResultTimeIndicesToWellTimeIndices(const
} }
qDebug() << "Result TimeStamps"; qDebug() << "Result TimeStamps";
for (int i = 0; i < resultTimes.size(); i++) for (size_t i = 0; i < resultTimes.size(); i++)
{ {
qDebug() << resultTimes[i].toString(); qDebug() << resultTimes[i].toString();
} }
@@ -65,7 +65,7 @@ void RigWellResults::computeMappingFromResultTimeIndicesToWellTimeIndices(const
size_t wellIdx = 0; size_t wellIdx = 0;
size_t activeWellIdx = cvf::UNDEFINED_SIZE_T; size_t activeWellIdx = cvf::UNDEFINED_SIZE_T;
while (wellIdx <= m_wellCellsTimeSteps.size() && resultIdx < resultTimes.size()) while (wellIdx <= m_wellCellsTimeSteps.size() && resultIdx < static_cast<int>(resultTimes.size()))
{ {
if (wellIdx < m_wellCellsTimeSteps.size() && m_wellCellsTimeSteps[wellIdx].m_timestamp <= resultTimes[resultIdx]) if (wellIdx < m_wellCellsTimeSteps.size() && m_wellCellsTimeSteps[wellIdx].m_timestamp <= resultTimes[resultIdx])
{ {

View File

@@ -548,7 +548,7 @@ void RIMainWindow::refreshAnimationActions()
{ {
std::vector<QDateTime> timeStepDates = app->activeReservoirView()->currentGridCellResults()->cellResults()->timeStepDates(0); std::vector<QDateTime> timeStepDates = app->activeReservoirView()->currentGridCellResults()->cellResults()->timeStepDates(0);
bool showHoursAndMinutes = false; bool showHoursAndMinutes = false;
for (int i = 0; i < timeStepDates.size(); i++) for (size_t i = 0; i < timeStepDates.size(); i++)
{ {
if (timeStepDates[i].time().hour() != 0.0 || timeStepDates[i].time().minute() != 0.0) if (timeStepDates[i].time().hour() != 0.0 || timeStepDates[i].time().minute() != 0.0)
{ {
@@ -562,7 +562,7 @@ void RIMainWindow::refreshAnimationActions()
formatString += " - hh:mm"; formatString += " - hh:mm";
} }
for (int i = 0; i < timeStepDates.size(); i++) for (size_t i = 0; i < timeStepDates.size(); i++)
{ {
timeStepStrings += timeStepDates[i].toString(formatString); timeStepStrings += timeStepDates[i].toString(formatString);
} }