System : Replace tab with four spaces

This commit is contained in:
Magne Sjaastad 2018-03-12 11:12:39 +01:00
parent 8e8c168405
commit 716bb3184b
45 changed files with 368 additions and 368 deletions

View File

@ -100,7 +100,7 @@
#ifndef WIN32
#include <unistd.h> // for usleep
#include <unistd.h> // for usleep
#endif //WIN32
#ifdef USE_UNIT_TESTS
@ -1492,12 +1492,12 @@ std::vector<QString> RiaApplication::readFileListFromTextFile(QString listFileNa
//--------------------------------------------------------------------------------------------------
void RiaApplication::waitUntilCommandObjectsHasBeenProcessed()
{
// Wait until all command objects have completed
while (!m_commandQueueLock.tryLock())
{
processEvents();
}
m_commandQueueLock.unlock();
// Wait until all command objects have completed
while (!m_commandQueueLock.tryLock())
{
processEvents();
}
m_commandQueueLock.unlock();
}
//--------------------------------------------------------------------------------------------------

View File

@ -94,19 +94,19 @@ public:
RiaApplication(int& argc, char** argv);
~RiaApplication();
static RiaApplication* instance();
static RiaApplication* instance();
int parseArgumentsAndRunUnitTestsIfRequested();
bool parseArguments();
void setActiveReservoirView(Rim3dView*);
Rim3dView* activeReservoirView();
const Rim3dView* activeReservoirView() const;
RimGridView* activeGridView();
Rim3dView* activeReservoirView();
const Rim3dView* activeReservoirView() const;
RimGridView* activeGridView();
RimViewWindow* activePlotWindow() const;
RimProject* project();
RimProject* project();
void createMockModel();
void createResultsMockModel();
@ -199,7 +199,7 @@ public:
static std::vector<QString> readFileListFromTextFile(QString listFileName);
void waitUntilCommandObjectsHasBeenProcessed();
void waitUntilCommandObjectsHasBeenProcessed();
private:
@ -217,10 +217,10 @@ private:
void setHelpText(const QString& helpText);
private slots:
void slotWorkerProcessFinished(int exitCode, QProcess::ExitStatus exitStatus);
void slotWorkerProcessFinished(int exitCode, QProcess::ExitStatus exitStatus);
private:
caf::PdmPointer<Rim3dView> m_activeReservoirView;
caf::PdmPointer<Rim3dView> m_activeReservoirView;
caf::PdmPointer<RimProject> m_project;
RiaSocketServer* m_socketServer;

View File

@ -177,36 +177,36 @@ std::string RiaImageCompareReporter::cssString() const
html += "";
html += ".image-slider {";
html += "position:relative;";
html += "display: inline-block;";
html += "line-height: 0;";
html += "position:relative;";
html += "display: inline-block;";
html += "line-height: 0;";
html += "}";
html += ".image-slider > div {";
html += "position: absolute;";
html += "top: 0; bottom: 0; left: 0;";
html += "width: 25px;";
html += "max-width: 100%;";
html += "overflow: hidden;";
html += "resize: horizontal;";
html += "position: absolute;";
html += "top: 0; bottom: 0; left: 0;";
html += "width: 25px;";
html += "max-width: 100%;";
html += "overflow: hidden;";
html += "resize: horizontal;";
html += "}";
html += ".image-slider > div:before {";
html += "content: '';";
html += "position: absolute;";
html += "right: 0; bottom: 0;";
html += "width: 23px; height: 23px;";
html += "padding: 5px;";
html += "background: linear-gradient(-45deg, gray 50%, transparent 0);";
html += "background-clip: content-box;";
html += "cursor: ew-resize;";
html += "-webkit-filter: drop-shadow(0 0 6px black);";
html += "filter: drop-shadow(0 0 6px black);";
html += "content: '';";
html += "position: absolute;";
html += "right: 0; bottom: 0;";
html += "width: 23px; height: 23px;";
html += "padding: 5px;";
html += "background: linear-gradient(-45deg, gray 50%, transparent 0);";
html += "background-clip: content-box;";
html += "cursor: ew-resize;";
html += "-webkit-filter: drop-shadow(0 0 6px black);";
html += "filter: drop-shadow(0 0 6px black);";
html += "}";
html += ".image-slider img {";
html += "user-select: none;";
html += "max-width: 1000px;";
html += "user-select: none;";
html += "max-width: 1000px;";
html += "}";
html += "</style>";

View File

@ -256,38 +256,38 @@ void RiaRegressionTestRunner::runRegressionTest(const QString& testRootPath, con
if (fib.exists() && fig.exists())
{
{
QString headerText = testCaseFolder.dirName();
{
QString headerText = testCaseFolder.dirName();
html += "<table>\n";
html += " <tr>\n";
html += " <td colspan=\"3\" bgcolor=\"darkblue\" height=\"40\"> <b><font color=\"white\" size=\"3\"> " + headerText + " </font></b> </td>\n";
html += " </tr>\n";
html += "<table>\n";
html += " <tr>\n";
html += " <td colspan=\"3\" bgcolor=\"darkblue\" height=\"40\"> <b><font color=\"white\" size=\"3\"> " + headerText + " </font></b> </td>\n";
html += " </tr>\n";
textFileCompare.runComparison(baseFilesFolderName, generatedFilesFolderName);
QString diff = textFileCompare.diffOutput();
if (diff.isEmpty())
{
html += " <tr>\n";
html += " <td colspan=\"3\" bgcolor=\"lightgray\"> <font color=\"green\">No text diff detected</font> </td> \n";
html += " </tr>\n";
}
else
{
html += " <tr>\n";
html += " <td colspan=\"3\" bgcolor=\"lightgray\"> <font color=\"red\">Text diff detected - output from diff tool : </font> </td> \n";
html += " </tr>\n";
}
textFileCompare.runComparison(baseFilesFolderName, generatedFilesFolderName);
QString diff = textFileCompare.diffOutput();
if (diff.isEmpty())
{
html += " <tr>\n";
html += " <td colspan=\"3\" bgcolor=\"lightgray\"> <font color=\"green\">No text diff detected</font> </td> \n";
html += " </tr>\n";
}
else
{
html += " <tr>\n";
html += " <td colspan=\"3\" bgcolor=\"lightgray\"> <font color=\"red\">Text diff detected - output from diff tool : </font> </td> \n";
html += " </tr>\n";
}
// Table end
html += "</table>\n";
// Table end
html += "</table>\n";
if (!diff.isEmpty())
{
html += QString("<code> %1 </code>").arg(diff);
}
}
if (!diff.isEmpty())
{
html += QString("<code> %1 </code>").arg(diff);
}
}
QFile file(htmlReportFileName);
if (file.open(QIODevice::Append | QIODevice::Text))

View File

@ -61,7 +61,7 @@ bool RiaTextFileCompare::runComparison(const QString& baseFolder, const QString&
}
// Command line arguments used when invoking 'diff'
// See https://docs.freebsd.org/info/diff/diff.info.diff_Options.html
// See https://docs.freebsd.org/info/diff/diff.info.diff_Options.html
QString args = "-r -u --strip-trailing-cr";
QString completeCommand = QString("\"%1\" %2 %3 %4").arg(fullFilePath).arg(baseFolder).arg(generatedFolder).arg(args);

View File

@ -97,7 +97,7 @@ list( APPEND REFERENCED_CMAKE_FILES
ModelVisualization/WindowEdgeAxesOverlayItem/CMakeLists_files.cmake
UserInterface/CMakeLists_files.cmake
Commands/CMakeLists_files.cmake
Commands/ApplicationCommands/CMakeLists_files.cmake
Commands/CompletionCommands/CMakeLists_files.cmake
@ -124,14 +124,14 @@ list( APPEND REFERENCED_CMAKE_FILES
option (RESINSIGHT_INCLUDE_APPLICATION_UNIT_TESTS "Include ApplicationCode Unit Tests" OFF)
if (RESINSIGHT_INCLUDE_APPLICATION_UNIT_TESTS)
add_definitions(-DUSE_UNIT_TESTS)
add_definitions(-DUSE_UNIT_TESTS)
list( APPEND REFERENCED_CMAKE_FILES
UnitTests/CMakeLists_files.cmake
)
list( APPEND CPP_SOURCES
${ResInsight_SOURCE_DIR}/ThirdParty/gtest/gtest-all.cc
${ResInsight_SOURCE_DIR}/ThirdParty/gtest/gtest-all.cc
)
endif()
@ -155,7 +155,7 @@ add_subdirectory(ResultStatisticsCache)
set( RI_LIBRARIES
WellPathImportSsihub
ResultStatisticsCache
ResultStatisticsCache
)
#
@ -163,10 +163,10 @@ set( RI_LIBRARIES
#
set(RESINSIGHT_ODB_API_DIR "" CACHE PATH "Optional path to the ABAQUS ODB API from Simulia. Needed for support of geomechanical models")
if(NOT ${RESINSIGHT_ODB_API_DIR} EQUAL "")
add_definitions(-DUSE_ODB_API)
add_subdirectory(GeoMech/OdbReader)
SET(RESINSIGHT_USE_ODB_API 1)
MESSAGE( STATUS "Using ODB-Api from : ${RESINSIGHT_ODB_API_DIR}" )
add_definitions(-DUSE_ODB_API)
add_subdirectory(GeoMech/OdbReader)
SET(RESINSIGHT_USE_ODB_API 1)
MESSAGE( STATUS "Using ODB-Api from : ${RESINSIGHT_ODB_API_DIR}" )
endif()
add_subdirectory(GeoMech/GeoMechDataModel)
@ -192,7 +192,7 @@ if (RESINSIGHT_FOUND_HDF5)
source_group( "FileInterface" FILES FileInterface/RifHdf5Reader.h FileInterface/RifHdf5Reader.cpp )
add_definitions(-DUSE_HDF5)
add_definitions(-DUSE_HDF5)
endif()
if (RESINSIGHT_ENABLE_PROTOTYPE_FEATURE_SOURING)
@ -271,7 +271,7 @@ set( EXE_FILES
${QRC_FILES_CPP}
${WIN_RESOURCE}
${HEADER_FILES}
${REFERENCED_CMAKE_FILES}
${REFERENCED_CMAKE_FILES}
../ResInsightVersion.cmake
../.clang-format
)
@ -349,9 +349,9 @@ if(RESINSIGHT_ENABLE_COTIRE)
ReservoirDataModel/RigCellGeometryTools.cpp
)
foreach (fileToExclude ${COTIRE_EXCLUDE_FILES})
foreach (fileToExclude ${COTIRE_EXCLUDE_FILES})
set_source_files_properties (${fileToExclude} PROPERTIES COTIRE_EXCLUDED TRUE)
endforeach(fileToExclude)
endforeach(fileToExclude)
# disable precompiled headers
set_target_properties(ResInsight PROPERTIES COTIRE_ENABLE_PRECOMPILED_HEADER FALSE)
@ -382,16 +382,16 @@ if (MSVC)
# Odb Dlls
if (RESINSIGHT_USE_ODB_API)
# Find all the dlls
file (GLOB RI_ALL_ODB_DLLS ${RESINSIGHT_ODB_API_DIR}/lib/*.dll)
# Strip off the path
foreach (aDLL ${RI_ALL_ODB_DLLS})
get_filename_component(filenameWithExt ${aDLL} NAME)
list(APPEND RI_ODB_DLLS ${filenameWithExt} )
endforeach(aDLL)
# Find all the dlls
file (GLOB RI_ALL_ODB_DLLS ${RESINSIGHT_ODB_API_DIR}/lib/*.dll)
# Strip off the path
foreach (aDLL ${RI_ALL_ODB_DLLS})
get_filename_component(filenameWithExt ${aDLL} NAME)
list(APPEND RI_ODB_DLLS ${filenameWithExt} )
endforeach(aDLL)
foreach (aDLL ${RI_ODB_DLLS})
foreach (aDLL ${RI_ODB_DLLS})
list(APPEND RI_DLL_FILENAMES ${RESINSIGHT_ODB_API_DIR}/lib/${aDLL})
endforeach()
endif()
@ -410,13 +410,13 @@ endif(MSVC)
foreach (FILE_TO_COPY ${RI_DLL_FILENAMES})
add_custom_command(TARGET ResInsight POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy_if_different
"${FILE_TO_COPY}"
"${CMAKE_CURRENT_BINARY_DIR}/$<CONFIGURATION>")
"${FILE_TO_COPY}"
"${CMAKE_CURRENT_BINARY_DIR}/$<CONFIGURATION>")
if (_unityTargetName)
add_custom_command(TARGET ${_unityTargetName} POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy_if_different
"${FILE_TO_COPY}"
"${CMAKE_CURRENT_BINARY_DIR}/$<CONFIGURATION>")
"${FILE_TO_COPY}"
"${CMAKE_CURRENT_BINARY_DIR}/$<CONFIGURATION>")
endif()
endforeach()
@ -437,10 +437,10 @@ if (RESINSIGHT_PRIVATE_INSTALL)
# tell binary to first attempt to load libraries from its own directory
set(RESINSIGHT_INSTALL_RPATH "\$ORIGIN")
if (${RESINSIGHT_USE_ODB_API})
# This is a "hack" to make ResInsight runtime find the ODB so files used when compiling.
# statoil wanted it this way, but we should probbly make a different installoptions that does things this way,
# and really do copy them when doing PRIVATE_INSTALL
if (${RESINSIGHT_USE_ODB_API})
# This is a "hack" to make ResInsight runtime find the ODB so files used when compiling.
# statoil wanted it this way, but we should probbly make a different installoptions that does things this way,
# and really do copy them when doing PRIVATE_INSTALL
set(RESINSIGHT_INSTALL_RPATH ${RESINSIGHT_INSTALL_RPATH} ${RESINSIGHT_ODB_API_DIR}/lib)
endif()

View File

@ -146,8 +146,8 @@ public:
const std::vector<RimSimWellInView*>& simWells,
const RicExportCompletionDataSettingsUi& exportSettings);
static std::vector<RigCompletionData> computeCompletionsForWellPath(RimWellPath* wellPath,
const RicExportCompletionDataSettingsUi& exportSettings);
static std::vector<RigCompletionData> computeCompletionsForWellPath(RimWellPath* wellPath,
const RicExportCompletionDataSettingsUi& exportSettings);
private:
static double calculateTransmissibilityAsEclipseDoes(RimEclipseCase* eclipseCase,

View File

@ -71,7 +71,7 @@ void RicCreateDuplicateTemplateInOtherUnitSystemFeature::onActionTriggered(bool
fractureTemplateCollection->addFractureTemplate(copyOfTemplate);
auto currentUnit = copyOfTemplate->fractureTemplateUnit();
auto currentUnit = copyOfTemplate->fractureTemplateUnit();
if (currentUnit == RiaEclipseUnitTools::UNITS_METRIC)
{
copyOfTemplate->convertToUnitSystem(RiaEclipseUnitTools::UNITS_FIELD);
@ -88,7 +88,7 @@ void RicCreateDuplicateTemplateInOtherUnitSystemFeature::onActionTriggered(bool
copyOfTemplate->loadDataAndUpdate();
copyOfTemplate->updateConnectedEditors();
RicNewEllipseFractureTemplateFeature::selectFractureTemplateAndUpdate(fractureTemplateCollection, copyOfTemplate);
RicNewEllipseFractureTemplateFeature::selectFractureTemplateAndUpdate(fractureTemplateCollection, copyOfTemplate);
}
//--------------------------------------------------------------------------------------------------

View File

@ -40,8 +40,8 @@ CAF_CMD_SOURCE_INIT(RicCloseObservedDataFeature, "RicCloseObservedDataFeature");
//--------------------------------------------------------------------------------------------------
void RicCloseObservedDataFeature::setupActionLook(QAction* actionToSetup)
{
actionToSetup->setText("Close");
actionToSetup->setIcon(QIcon(":/Erase.png"));
actionToSetup->setText("Close");
actionToSetup->setIcon(QIcon(":/Erase.png"));
}
//--------------------------------------------------------------------------------------------------
@ -96,8 +96,8 @@ bool RicCloseObservedDataFeature::isCommandEnabled()
//--------------------------------------------------------------------------------------------------
void RicCloseObservedDataFeature::onActionTriggered(bool isChecked)
{
std::vector<RimObservedData*> selection;
caf::SelectionManager::instance()->objectsByType(&selection);
std::vector<RimObservedData*> selection;
caf::SelectionManager::instance()->objectsByType(&selection);
CVF_ASSERT(selection.size() > 0);
RicCloseObservedDataFeature::deleteObservedData(selection);

View File

@ -43,8 +43,8 @@ CAF_CMD_SOURCE_INIT(RicCloseSummaryCaseFeature, "RicCloseSummaryCaseFeature");
//--------------------------------------------------------------------------------------------------
void RicCloseSummaryCaseFeature::setupActionLook(QAction* actionToSetup)
{
actionToSetup->setText("Close Summary Case");
actionToSetup->setIcon(QIcon(":/Erase.png"));
actionToSetup->setText("Close Summary Case");
actionToSetup->setIcon(QIcon(":/Erase.png"));
}
//--------------------------------------------------------------------------------------------------
@ -103,8 +103,8 @@ bool RicCloseSummaryCaseFeature::isCommandEnabled()
//--------------------------------------------------------------------------------------------------
void RicCloseSummaryCaseFeature::onActionTriggered(bool isChecked)
{
std::vector<RimSummaryCase*> selection;
caf::SelectionManager::instance()->objectsByType(&selection);
std::vector<RimSummaryCase*> selection;
caf::SelectionManager::instance()->objectsByType(&selection);
CVF_ASSERT(selection.size() > 0);
RicCloseSummaryCaseFeature::deleteSummaryCases(selection);

View File

@ -40,23 +40,23 @@ public:
bool dynamicResult(const QString& result, size_t stepIndex, std::vector<double>* values) const override;
private:
std::vector<std::string> getSourSimTimeStepFileNames(const QString& fileName) const;
QDateTime sourSimDateTimeToQDateTime(std::string dateString) const;
std::vector<std::string> getSourSimTimeStepFileNames(const QString& fileName) const;
QDateTime sourSimDateTimeToQDateTime(std::string dateString) const;
std::string getTimeStepNumberAs5DigitString(std::string fileName) const;
std::string IntTo5DigitString(int i) const;
std::string getTimeStepNumberAs5DigitString(std::string fileName) const;
std::string IntTo5DigitString(int i) const;
int getIntAttribute(H5::H5File file, std::string groupName, std::string attributeName) const;
double getDoubleAttribute(H5::H5File file, std::string groupName, std::string attributeName) const;
std::string getStringAttribute(H5::H5File file, std::string groupName, std::string attributeName) const;
int getIntAttribute(H5::H5File file, std::string groupName, std::string attributeName) const;
double getDoubleAttribute(H5::H5File file, std::string groupName, std::string attributeName) const;
std::string getStringAttribute(H5::H5File file, std::string groupName, std::string attributeName) const;
std::vector<std::string> getSubGroupNames(H5::H5File file, std::string baseGroupName) const;
std::vector<double> getStepTimeValues(H5::H5File file, std::string baseGroupName) const;
std::vector<std::string> getResultNames(H5::H5File file, std::string baseGroupName) const;
void getElementResultValues(H5::H5File file, std::string groupName, std::vector<double>* resultValues) const;
std::vector<std::string> getSubGroupNames(H5::H5File file, std::string baseGroupName) const;
std::vector<double> getStepTimeValues(H5::H5File file, std::string baseGroupName) const;
std::vector<std::string> getResultNames(H5::H5File file, std::string baseGroupName) const;
void getElementResultValues(H5::H5File file, std::string groupName, std::vector<double>* resultValues) const;
private:
QString m_fileName; // name of SourSimRL main file given by user
int m_fileStrategy; // SourSimRL file strategy, fileStrategy == 1 means one time step per file
std::vector<std::string> m_timeStepFileNames; // files containing transient SourSimRL results, one time step per file
QString m_fileName; // name of SourSimRL main file given by user
int m_fileStrategy; // SourSimRL file strategy, fileStrategy == 1 means one time step per file
std::vector<std::string> m_timeStepFileNames; // files containing transient SourSimRL results, one time step per file
};

View File

@ -341,7 +341,7 @@ cvf::ref<cvf::Part> RivWellFracturePartMgr::createEllipseSurfacePart(const RimEc
std::vector<cvf::Vec3f> nodeCoords;
std::vector<cvf::uint> triangleIndices;
m_rimFracture->fractureTemplate()->fractureTriangleGeometry(&nodeCoords, &triangleIndices);
m_rimFracture->fractureTemplate()->fractureTriangleGeometry(&nodeCoords, &triangleIndices);
cvf::Mat4d fractureXf = m_rimFracture->transformMatrix();
std::vector<cvf::Vec3f> nodeDisplayCoords = transformToFractureDisplayCoords(nodeCoords, fractureXf, *displayCoordTransform);
@ -411,7 +411,7 @@ cvf::ref<cvf::Part> RivWellFracturePartMgr::createStimPlanColorInterpolatedSurfa
std::vector<cvf::Vec3f> nodeCoords;
std::vector<cvf::uint> triangleIndices;
stimPlanFracTemplate->fractureTriangleGeometry(&nodeCoords, &triangleIndices);
stimPlanFracTemplate->fractureTriangleGeometry(&nodeCoords, &triangleIndices);
if (triangleIndices.empty() || nodeCoords.empty())
{
@ -489,7 +489,7 @@ cvf::ref<cvf::Part> RivWellFracturePartMgr::createStimPlanColorInterpolatedSurfa
}
geo->setTextureCoordArray(textureCoords.p());
cvf::ref<cvf::Part> surfacePart = createScalarMapperPart(geo.p(), scalarMapper, m_rimFracture, activeView.isLightingDisabled());
cvf::ref<cvf::Part> surfacePart = createScalarMapperPart(geo.p(), scalarMapper, m_rimFracture, activeView.isLightingDisabled());
return surfacePart;
}
@ -625,9 +625,9 @@ cvf::ref<cvf::Part> RivWellFracturePartMgr::createStimPlanElementColorSurfacePar
cvf::ref<cvf::DrawableGeo> geo = buildDrawableGeoFromTriangles(triIndicesToInclude, nodeDisplayCoords);
geo->setTextureCoordArray(textureCoords.p());
cvf::ref<cvf::Part> surfacePart = createScalarMapperPart(geo.p(), scalarMapper, m_rimFracture, activeView.isLightingDisabled());
cvf::ref<cvf::Part> surfacePart = createScalarMapperPart(geo.p(), scalarMapper, m_rimFracture, activeView.isLightingDisabled());
return surfacePart;
return surfacePart;
}
else
{

View File

@ -34,7 +34,7 @@ namespace cvf
class DrawableGeo;
class Part;
class Color3f;
class ScalarMapper;
class ScalarMapper;
}
namespace caf
@ -80,9 +80,9 @@ private:
std::vector<cvf::Vec3d> fractureBorderPolygon();
static cvf::ref<cvf::Part> createScalarMapperPart(cvf::DrawableGeo* drawableGeo, const cvf::ScalarMapper* scalarMapper, RimFracture* fracture, bool disableLighting);
static std::vector<cvf::Vec3f> transformToFractureDisplayCoords(const std::vector<cvf::Vec3f>& polygon,
static cvf::ref<cvf::Part> createScalarMapperPart(cvf::DrawableGeo* drawableGeo, const cvf::ScalarMapper* scalarMapper, RimFracture* fracture, bool disableLighting);
static std::vector<cvf::Vec3f> transformToFractureDisplayCoords(const std::vector<cvf::Vec3f>& polygon,
cvf::Mat4d m,
const caf::DisplayCoordTransform& displayCoordTransform);

View File

@ -221,10 +221,10 @@ void RivWellPathPartMgr::appendVirtualTransmissibilitiesToModel(cvf::ModelBasicL
RigEclipseCaseData* eclipseCaseData = eclipseCase->eclipseCaseData();
const RigVirtualPerforationTransmissibilities* trans = eclipseCaseData->virtualPerforationTransmissibilities();
if (trans)
{
if (trans)
{
}
}
}
//--------------------------------------------------------------------------------------------------

View File

@ -216,11 +216,11 @@ void RimEllipseFractureTemplate::assignConductivityToCellsInsideEllipse()
m_fractureGrid->setFractureCells(fractureCells);
// Set well intersection to center of ellipse
// Set well intersection to center of ellipse
std::pair<size_t, size_t> wellCenterFractureCellIJ = std::make_pair(numberOfCellsI / 2, numberOfCellsJ / 2);
m_fractureGrid->setWellCenterFractureCellIJ(wellCenterFractureCellIJ);
m_fractureGrid->setICellCount(numberOfCellsI);
m_fractureGrid->setICellCount(numberOfCellsI);
m_fractureGrid->setJCellCount(numberOfCellsJ);
}

View File

@ -732,7 +732,7 @@ void RimStimPlanFractureTemplate::fractureTriangleGeometry(std::vector<cvf::Vec3
{
loadDataAndUpdate();
}
else
else
{
m_stimPlanFractureDefinitionData->createFractureTriangleGeometry(m_wellPathDepthAtFracture,
name(),

View File

@ -616,7 +616,7 @@ caf::CmdFeatureMenuBuilder RimContextCommandBuilder::commandsFromSelection()
menuBuilder << "Separator";
menuBuilder << "RicCutReferencesToClipboardFeature";
menuBuilder << "Separator";
menuBuilder << "RicCloseSummaryCaseFeature";
menuBuilder << "RicCloseSummaryCaseFeature";
menuBuilder << "RicCloseSummaryCaseInCollectionFeature";
menuBuilder << "RicDeleteSummaryCaseCollectionFeature";
menuBuilder << "RicCloseObservedDataFeature";

View File

@ -156,8 +156,8 @@ RimEclipseView::RimEclipseView()
m_reservoirGridPartManager = new RivReservoirViewPartMgr(this);
m_simWellsPartManager = new RivReservoirSimWellsPartMgr(this);
m_eclipseCase = nullptr;
m_eclipseCase = nullptr;
}
//--------------------------------------------------------------------------------------------------

View File

@ -177,7 +177,7 @@ private:
caf::PdmChildField<RimCellEdgeColors*> m_cellEdgeResult;
caf::PdmChildField<RimEclipseFaultColors*> m_faultResultSettings;
caf::PdmChildField<RimStimPlanColors*> m_fractureColors;
caf::PdmChildField<RimVirtualPerforationResults*> m_virtualPerforationResult;
caf::PdmChildField<RimVirtualPerforationResults*> m_virtualPerforationResult;
caf::PdmChildField<RimSimWellInViewCollection*> m_wellCollection;
caf::PdmChildField<RimFaultInViewCollection*> m_faultCollection;
@ -189,6 +189,6 @@ private:
cvf::ref<RivReservoirViewPartMgr> m_reservoirGridPartManager;
cvf::ref<RivReservoirSimWellsPartMgr> m_simWellsPartManager;
std::vector<RivCellSetEnum> m_visibleGridParts;
};

View File

@ -115,17 +115,17 @@ RimPlotCurve::RimPlotCurve()
//--------------------------------------------------------------------------------------------------
RimPlotCurve::~RimPlotCurve()
{
if (m_qwtPlotCurve)
{
m_qwtPlotCurve->detach();
delete m_qwtPlotCurve;
m_qwtPlotCurve = nullptr;
}
if (m_qwtPlotCurve)
{
m_qwtPlotCurve->detach();
delete m_qwtPlotCurve;
m_qwtPlotCurve = nullptr;
}
if (m_parentQwtPlot)
{
m_parentQwtPlot->replot();
}
if (m_parentQwtPlot)
{
m_parentQwtPlot->replot();
}
}
//--------------------------------------------------------------------------------------------------

View File

@ -109,8 +109,8 @@ public:
caf::PdmField<WellHeadPositionEnum> wellHeadPosition;
caf::PdmField<bool> isAutoDetectingBranches;
caf::PdmChildArrayField<RimSimWellInView*> wells;
caf::PdmChildArrayField<RimSimWellInView*> wells;
RimSimWellInView* findWell(QString name);
bool hasVisibleWellCells();

View File

@ -31,7 +31,7 @@ class RimSummaryCaseCollection : public caf::PdmObject
public:
RimSummaryCaseCollection();
virtual ~RimSummaryCaseCollection();
void removeCase(RimSummaryCase* summaryCase);
void addCase(RimSummaryCase* summaryCase);

View File

@ -171,7 +171,7 @@ RimSummaryCurve::~RimSummaryCurve()
//--------------------------------------------------------------------------------------------------
void RimSummaryCurve::setSummaryCaseY(RimSummaryCase* sumCase)
{
m_yValuesSummaryCase = sumCase;
m_yValuesSummaryCase = sumCase;
}
//--------------------------------------------------------------------------------------------------

View File

@ -37,11 +37,11 @@
#include <cmath>
//--------------------------------------------------------------------------------------------------
// e format as [-]9.9e[+|-]999
// E format as[-]9.9E[+| -]999
// f format as[-]9.9
// g use e or f format, whichever is the most concise
// G use E or f format, whichever is the most concise
// e format as [-]9.9e[+|-]999
// E format as[-]9.9E[+| -]999
// f format as[-]9.9
// g use e or f format, whichever is the most concise
// G use E or f format, whichever is the most concise
//--------------------------------------------------------------------------------------------------
class DecimalScaleDraw : public QwtScaleDraw

View File

@ -79,11 +79,11 @@ RimSummaryPlot::RimSummaryPlot()
CAF_PDM_InitFieldNoDefault(&m_curveFilters_OBSOLETE, "SummaryCurveFilters", "", "", "", "");
m_curveFilters_OBSOLETE.uiCapability()->setUiTreeHidden(true);
CAF_PDM_InitFieldNoDefault(&m_summaryCurveCollection, "SummaryCurveCollection", "", "", "", "");
CAF_PDM_InitFieldNoDefault(&m_summaryCurveCollection, "SummaryCurveCollection", "", "", "", "");
m_summaryCurveCollection.uiCapability()->setUiTreeHidden(true);
m_summaryCurveCollection = new RimSummaryCurveCollection;
CAF_PDM_InitFieldNoDefault(&m_summaryCurves_OBSOLETE, "SummaryCurves", "", "", "", "");
CAF_PDM_InitFieldNoDefault(&m_summaryCurves_OBSOLETE, "SummaryCurves", "", "", "", "");
m_summaryCurves_OBSOLETE.uiCapability()->setUiTreeHidden(true);
CAF_PDM_InitFieldNoDefault(&m_gridTimeHistoryCurves, "GridTimeHistoryCurves", "", "", "", "");
@ -1302,7 +1302,7 @@ QWidget* RimSummaryPlot::createViewWidget(QWidget* mainWindowParent)
if ( m_summaryCurveCollection )
{
m_summaryCurveCollection->setParentQwtPlotAndReplot(m_qwtPlot);
m_summaryCurveCollection->setParentQwtPlotAndReplot(m_qwtPlot);
}
}

View File

@ -164,7 +164,7 @@ private:
caf::PdmField<QString> m_userDefinedPlotTitle;
caf::PdmChildArrayField<RimGridTimeHistoryCurve*> m_gridTimeHistoryCurves;
caf::PdmChildField<RimSummaryCurveCollection*> m_summaryCurveCollection;
caf::PdmChildField<RimSummaryCurveCollection*> m_summaryCurveCollection;
caf::PdmChildArrayField<RimAsciiDataCurve*> m_asciiDataCurves;
caf::PdmField<bool> m_isAutoZoom;

View File

@ -48,7 +48,7 @@ void CompletionDataFrame::setCompletionData(const std::vector<RigCompletionData>
//--------------------------------------------------------------------------------------------------
const std::map<RigCompletionDataGridCell, std::vector<RigCompletionData>>& CompletionDataFrame::multipleCompletionsPerEclipseCell() const
{
return m_multipleCompletionsPerEclipseCell;
return m_multipleCompletionsPerEclipseCell;
}
//--------------------------------------------------------------------------------------------------
@ -69,22 +69,22 @@ void RigVirtualPerforationTransmissibilities::appendCompletionDataForWellPath(
const std::vector<RigCompletionData>& completions)
{
/*
auto item = m_mapFromWellToCompletionData.find(wellPath);
if (item != m_mapFromWellToCompletionData.end())
{
item->second.setCompletionData
}
auto item = m_mapFromWellToCompletionData.find(wellPath);
if (item != m_mapFromWellToCompletionData.end())
{
item->second.setCompletionData
}
auto it = m_multipleCompletionsPerEclipseCell.find(completion.completionDataGridCell());
if (it != m_multipleCompletionsPerEclipseCell.end())
{
it->second.push_back(completion);
}
else
{
m_multipleCompletionsPerEclipseCell.insert(std::pair<RigCompletionDataGridCell, std::vector<RigCompletionData>>(
completion.completionDataGridCell(), std::vector<RigCompletionData>{completion}));
}
auto it = m_multipleCompletionsPerEclipseCell.find(completion.completionDataGridCell());
if (it != m_multipleCompletionsPerEclipseCell.end())
{
it->second.push_back(completion);
}
else
{
m_multipleCompletionsPerEclipseCell.insert(std::pair<RigCompletionDataGridCell, std::vector<RigCompletionData>>(
completion.completionDataGridCell(), std::vector<RigCompletionData>{completion}));
}
*/
}
@ -97,11 +97,11 @@ const std::map<RigCompletionDataGridCell, std::vector<RigCompletionData>>&
{
static std::map<RigCompletionDataGridCell, std::vector<RigCompletionData>> dummy;
auto item = m_mapFromWellToCompletionData.find(wellPath);
if (item != m_mapFromWellToCompletionData.end())
{
return item->second[timeStepIndex].multipleCompletionsPerEclipseCell();
}
auto item = m_mapFromWellToCompletionData.find(wellPath);
if (item != m_mapFromWellToCompletionData.end())
{
return item->second[timeStepIndex].multipleCompletionsPerEclipseCell();
}
return dummy;
}

View File

@ -40,8 +40,8 @@ public:
void setCompletionData(const std::vector<RigCompletionData>& completions);
const std::map<RigCompletionDataGridCell, std::vector<RigCompletionData>>&
multipleCompletionsPerEclipseCell() const;
const std::map<RigCompletionDataGridCell, std::vector<RigCompletionData>>&
multipleCompletionsPerEclipseCell() const;
private:
std::map<RigCompletionDataGridCell, std::vector<RigCompletionData>> m_multipleCompletionsPerEclipseCell;

View File

@ -525,7 +525,7 @@ std::vector<const RigWellPath*> RigEclipseCaseData::simulationWellBranches(const
//--------------------------------------------------------------------------------------------------
void RigEclipseCaseData::setVirtualPerforationTransmissibilities(RigVirtualPerforationTransmissibilities* virtualPerforationTransmissibilities)
{
m_virtualPerforationTransmissibilities = virtualPerforationTransmissibilities;
m_virtualPerforationTransmissibilities = virtualPerforationTransmissibilities;
}
//--------------------------------------------------------------------------------------------------
@ -533,7 +533,7 @@ void RigEclipseCaseData::setVirtualPerforationTransmissibilities(RigVirtualPerfo
//--------------------------------------------------------------------------------------------------
const RigVirtualPerforationTransmissibilities* RigEclipseCaseData::virtualPerforationTransmissibilities() const
{
return m_virtualPerforationTransmissibilities;
return m_virtualPerforationTransmissibilities;
}
//--------------------------------------------------------------------------------------------------

View File

@ -111,8 +111,8 @@ public:
bool includeAllCellCenters,
bool useAutoDetectionOfBranches) const;
void setVirtualPerforationTransmissibilities(RigVirtualPerforationTransmissibilities* virtualPerforationTransmissibilities);
const RigVirtualPerforationTransmissibilities* virtualPerforationTransmissibilities() const;
void setVirtualPerforationTransmissibilities(RigVirtualPerforationTransmissibilities* virtualPerforationTransmissibilities);
const RigVirtualPerforationTransmissibilities* virtualPerforationTransmissibilities() const;
private:
void computeActiveCellIJKBBox();
@ -131,7 +131,7 @@ private:
cvf::ref<RigFormationNames> m_activeFormationNamesData;
RigVirtualPerforationTransmissibilities* m_virtualPerforationTransmissibilities;
RigVirtualPerforationTransmissibilities* m_virtualPerforationTransmissibilities;
cvf::Collection<RigSimWellData> m_simWellData; //< A WellResults object for each well in the reservoir
cvf::Collection<cvf::UByteArray> m_wellCellsInGrid; //< A bool array pr grid with one bool pr cell telling whether the cell is a well cell or not

View File

@ -71,11 +71,11 @@ private:
// Filter out inactive cells
if (!actCellInfo->isActive(cIdx)) continue;
size_t cellResultIndex = cIdx;
if (m_resultsData->isUsingGlobalActiveIndex(m_scalarResultIndex))
{
cellResultIndex = actCellInfo->cellResultIndex(cIdx);
}
size_t cellResultIndex = cIdx;
if (m_resultsData->isUsingGlobalActiveIndex(m_scalarResultIndex))
{
cellResultIndex = actCellInfo->cellResultIndex(cIdx);
}
if (cellResultIndex != cvf::UNDEFINED_SIZE_T && cellResultIndex < values.size())
{

View File

@ -73,11 +73,11 @@ private:
{
if (!(*m_cellVisibilities)[cIdx]) continue;
size_t cellResultIndex = cIdx;
if (m_caseData->isUsingGlobalActiveIndex(m_scalarResultIndex))
{
cellResultIndex = actCellInfo->cellResultIndex(cIdx);
}
size_t cellResultIndex = cIdx;
if (m_caseData->isUsingGlobalActiveIndex(m_scalarResultIndex))
{
cellResultIndex = actCellInfo->cellResultIndex(cIdx);
}
if (cellResultIndex != cvf::UNDEFINED_SIZE_T && cellResultIndex < values.size())
{

View File

@ -1,58 +1,58 @@
<RCC>
<qresource prefix="/">
<file>AppLogo48x48.png</file>
<file>Default.png</file>
<file>NorthViewArrow.png</file>
<file>SouthViewArrow.png</file>
<file>EastViewArrow.png</file>
<file>WestViewArrow.png</file>
<file>UpViewArrow.png</file>
<file>DownViewArrow.png</file>
<file>CellFilter_Values.png</file>
<file>CellFilter_Range.png</file>
<file>CellResult.png</file>
<file>EdgeResult_1.png</file>
<file>EdgeResult_2.png</file>
<file>Legend.png</file>
<file>Plus.png</file>
<file>Minus.png</file>
<file>Save.png</file>
<file>Well.png</file>
<file>WellCollection.png</file>
<file>AppLogo48x48.png</file>
<file>Default.png</file>
<file>NorthViewArrow.png</file>
<file>SouthViewArrow.png</file>
<file>EastViewArrow.png</file>
<file>WestViewArrow.png</file>
<file>UpViewArrow.png</file>
<file>DownViewArrow.png</file>
<file>CellFilter_Values.png</file>
<file>CellFilter_Range.png</file>
<file>CellResult.png</file>
<file>EdgeResult_1.png</file>
<file>EdgeResult_2.png</file>
<file>Legend.png</file>
<file>Plus.png</file>
<file>Minus.png</file>
<file>Save.png</file>
<file>Well.png</file>
<file>WellCollection.png</file>
<file>octave.png</file>
<file>Folder.png</file>
<file>EclipseInput48x48.png</file>
<file>Cases16x16.png</file>
<file>CreateGridCaseGroup16x16.png</file>
<file>GridCaseGroup16x16.png</file>
<file>Histogram16x16.png</file>
<file>Histograms16x16.png</file>
<file>ZoomAll16x16.png</file>
<file>draw_style_lines_24x24.png</file>
<file>draw_style_meshlines_24x24.png</file>
<file>draw_style_meshoutlines_24x24.png</file>
<file>draw_style_outlines_24x24.png</file>
<file>draw_style_surface_24x24.png</file>
<file>disable_lighting_24x24.png</file>
<file>SnapShot.png</file>
<file>SnapShotSave.png</file>
<file>SnapShotSaveViews.png</file>
<file>draw_style_faults_24x24.png</file>
<file>Cases16x16.png</file>
<file>CreateGridCaseGroup16x16.png</file>
<file>GridCaseGroup16x16.png</file>
<file>Histogram16x16.png</file>
<file>Histograms16x16.png</file>
<file>ZoomAll16x16.png</file>
<file>draw_style_lines_24x24.png</file>
<file>draw_style_meshlines_24x24.png</file>
<file>draw_style_meshoutlines_24x24.png</file>
<file>draw_style_outlines_24x24.png</file>
<file>draw_style_surface_24x24.png</file>
<file>disable_lighting_24x24.png</file>
<file>SnapShot.png</file>
<file>SnapShotSave.png</file>
<file>SnapShotSaveViews.png</file>
<file>draw_style_faults_24x24.png</file>
<file>draw_style_faults_label_24x24.png</file>
<file>Case48x48.png</file>
<file>GridModels.png</file>
<file>draw_style_WellCellsToRangeFilter_24x24.png</file>
<file>draw_style_surface_w_fault_mesh_24x24.png</file>
<file>InfoBox16x16.png</file>
<file>GeoMechCase48x48.png</file>
<file>GridModels.png</file>
<file>draw_style_WellCellsToRangeFilter_24x24.png</file>
<file>draw_style_surface_w_fault_mesh_24x24.png</file>
<file>InfoBox16x16.png</file>
<file>GeoMechCase48x48.png</file>
<file>GeoMechCases48x48.png</file>
<file>chain.png</file>
<file>TileWindows24x24.png</file>
<file>LasFile16x16.png</file>
<file>WellLogTrack16x16.png</file>
<file>WellLogPlot16x16.png</file>
<file>WellLogPlots16x16.png</file>
<file>WellLogCurve16x16.png</file>
<file>LasFile16x16.png</file>
<file>WellLogTrack16x16.png</file>
<file>WellLogPlot16x16.png</file>
<file>WellLogPlots16x16.png</file>
<file>WellLogCurve16x16.png</file>
<file>CrossSection16x16.png</file>
<file>CrossSections16x16.png</file>
<file>Refresh-32.png</file>

View File

@ -145,18 +145,18 @@ RimEclipseCase* RiaSocketServer::findReservoir(int caseId)
// If the active mdi window is different from an Eclipse view, search through available mdi windows to find the last activated
// Eclipse view. The sub windows are returned with the most recent activated window at the back.
QList<QMdiSubWindow*> subWindows = RiuMainWindow::instance()->subWindowList(QMdiArea::ActivationHistoryOrder);
for (int i = subWindows.size() - 1; i > -1; i--)
{
RiuViewer* viewer = subWindows[i]->widget()->findChild<RiuViewer*>();
if (viewer)
{
for (int i = subWindows.size() - 1; i > -1; i--)
{
RiuViewer* viewer = subWindows[i]->widget()->findChild<RiuViewer*>();
if (viewer)
{
RimEclipseView* riv = dynamic_cast<RimEclipseView*>(viewer->ownerReservoirView());
if (riv)
{
return riv->eclipseCase();
}
}
}
}
}
}
else
{

View File

@ -1,6 +1,6 @@
CONFIGURE_FILE( ${CMAKE_CURRENT_LIST_DIR}/RiaTestDataDirectory.h.cmake
${CMAKE_BINARY_DIR}/Generated/RiaTestDataDirectory.h
${CMAKE_BINARY_DIR}/Generated/RiaTestDataDirectory.h
)
set (SOURCE_GROUP_HEADER_FILES

View File

@ -12,122 +12,122 @@
//--------------------------------------------------------------------------------------------------
TEST(DISABLED_HDFTests, BasicFileRead)
{
std::string file_path = "D:/ResInsight/SourSim/PKMUNK_NOV_TEST_SS.sourpre.00001";
std::string file_path = "D:/ResInsight/SourSim/PKMUNK_NOV_TEST_SS.sourpre.00001";
try
{
H5::Exception::dontPrint(); // Turn off auto-printing of failures to handle the errors appropriately
try
{
H5::Exception::dontPrint(); // Turn off auto-printing of failures to handle the errors appropriately
H5::H5File file(file_path.c_str(), H5F_ACC_RDONLY);
H5::H5File file(file_path.c_str(), H5F_ACC_RDONLY);
{
H5::Group timestep = file.openGroup("Timestep_00001");
H5::Attribute attr = timestep.openAttribute("timestep");
{
H5::Group timestep = file.openGroup("Timestep_00001");
H5::Attribute attr = timestep.openAttribute("timestep");
double timestep_value = 0.0;
double timestep_value = 0.0;
H5::DataType type = attr.getDataType();
attr.read(type, &timestep_value);
H5::DataType type = attr.getDataType();
attr.read(type, &timestep_value);
//std::cout << "Timestep value " << timestep_value << std::endl;
EXPECT_NEAR(timestep_value, 1.0, 1e-1);
}
//std::cout << "Timestep value " << timestep_value << std::endl;
EXPECT_NEAR(timestep_value, 1.0, 1e-1);
}
{
// Group size is not an attribute!
{
// Group size is not an attribute!
H5::Group GridFunctions = file.openGroup("Timestep_00001/GridParts/GridPart_00000/GridFunctions");
H5::Group GridFunctions = file.openGroup("Timestep_00001/GridParts/GridPart_00000/GridFunctions");
hsize_t group_size = GridFunctions.getNumObjs();
hsize_t group_size = GridFunctions.getNumObjs();
//std::cout << "GridFunctions group_size " << group_size << std::endl;
EXPECT_EQ(size_t(20), group_size);
//std::cout << "GridFunctions group_size " << group_size << std::endl;
EXPECT_EQ(size_t(20), group_size);
/* for (hsize_t i = 0; i < group_size; i++)
{
// H5std_string node_name = GridFunctions.getObjnameByIdx(i); // crashes on VS2017 due to lib/heap/runtime differences to HDF5 VS2015 lib
/* for (hsize_t i = 0; i < group_size; i++)
{
// H5std_string node_name = GridFunctions.getObjnameByIdx(i); // crashes on VS2017 due to lib/heap/runtime differences to HDF5 VS2015 lib
std::string node_name;
node_name.resize(1024);
std::string node_name;
node_name.resize(1024);
ssize_t slen = GridFunctions.getObjnameByIdx(i, &node_name[0], 1023);
ssize_t slen = GridFunctions.getObjnameByIdx(i, &node_name[0], 1023);
node_name.resize(slen + 1);
node_name.resize(slen + 1);
std::cout << "GridFunctions sub-node name " << node_name << std::endl;
}
std::cout << "GridFunctions sub-node name " << node_name << std::endl;
}
*/
std::string first_subnode(1024, '\0');
std::string first_subnode(1024, '\0');
ssize_t slen = GridFunctions.getObjnameByIdx(0, &first_subnode[0], 1023);
first_subnode.resize(slen + 1);
ssize_t slen = GridFunctions.getObjnameByIdx(0, &first_subnode[0], 1023);
first_subnode.resize(slen + 1);
EXPECT_TRUE(first_subnode.compare(0, slen, "GridFunction_00002") == 0);
}
EXPECT_TRUE(first_subnode.compare(0, slen, "GridFunction_00002") == 0);
}
{
H5::Group GridFunction_00002 = file.openGroup("Timestep_00001/GridParts/GridPart_00000/GridFunctions/GridFunction_00002");
H5::Attribute attr = GridFunction_00002.openAttribute("limits_max");
{
H5::Group GridFunction_00002 = file.openGroup("Timestep_00001/GridParts/GridPart_00000/GridFunctions/GridFunction_00002");
H5::Attribute attr = GridFunction_00002.openAttribute("limits_max");
double limits_max = 0.0;
H5::DataType type = attr.getDataType();
attr.read(type, &limits_max);
double limits_max = 0.0;
H5::DataType type = attr.getDataType();
attr.read(type, &limits_max);
// std::cout << "limits_max " << limits_max << std::endl;
EXPECT_NEAR(limits_max, 0.3970204292629652, 1e-10);
}
// std::cout << "limits_max " << limits_max << std::endl;
EXPECT_NEAR(limits_max, 0.3970204292629652, 1e-10);
}
{
H5::Group GridFunction_00002 = file.openGroup("Timestep_00001/GridParts/GridPart_00000/GridFunctions/GridFunction_00002");
H5::DataSet dataset = H5::DataSet(GridFunction_00002.openDataSet("values"));
{
H5::Group GridFunction_00002 = file.openGroup("Timestep_00001/GridParts/GridPart_00000/GridFunctions/GridFunction_00002");
H5::DataSet dataset = H5::DataSet(GridFunction_00002.openDataSet("values"));
hsize_t dims[2];
H5::DataSpace dataspace = dataset.getSpace();
dataspace.getSimpleExtentDims(dims, nullptr);
hsize_t dims[2];
H5::DataSpace dataspace = dataset.getSpace();
dataspace.getSimpleExtentDims(dims, nullptr);
std::vector<double> values;
values.resize(dims[0]);
dataset.read(values.data(), H5::PredType::NATIVE_DOUBLE);
std::vector<double> values;
values.resize(dims[0]);
dataset.read(values.data(), H5::PredType::NATIVE_DOUBLE);
/* for (hsize_t i = 0; i < dims[0]; i++)
{
std::cout << "value " << i << " " << values[i] << std::endl;
/* for (hsize_t i = 0; i < dims[0]; i++)
{
std::cout << "value " << i << " " << values[i] << std::endl;
}
}
*/
EXPECT_NEAR(values[0], 0.32356910366452146, 1e-10);
EXPECT_NEAR(values[dims[0] - 1], 0.12200070891582514, 1e-10);
}
EXPECT_NEAR(values[0], 0.32356910366452146, 1e-10);
EXPECT_NEAR(values[dims[0] - 1], 0.12200070891582514, 1e-10);
}
} // end of try block
catch (H5::FileIException error) // catch failure caused by the H5File operations
{
std::cout << error.getCDetailMsg();
}
catch (H5::DataSetIException error) // catch failure caused by the DataSet operations
{
std::cout << error.getCDetailMsg();
}
catch (H5::DataSpaceIException error) // catch failure caused by the DataSpace operations
{
std::cout << error.getCDetailMsg();
}
catch (H5::DataTypeIException error) // catch failure caused by the DataSpace operations
{
std::cout << error.getCDetailMsg();
}
} // end of try block
catch (H5::FileIException error) // catch failure caused by the H5File operations
{
std::cout << error.getCDetailMsg();
}
catch (H5::DataSetIException error) // catch failure caused by the DataSet operations
{
std::cout << error.getCDetailMsg();
}
catch (H5::DataSpaceIException error) // catch failure caused by the DataSpace operations
{
std::cout << error.getCDetailMsg();
}
catch (H5::DataTypeIException error) // catch failure caused by the DataSpace operations
{
std::cout << error.getCDetailMsg();
}
}

View File

@ -299,7 +299,7 @@ TEST(RifColumnBasedRsmspecParserTest, TestTwoPages)
out << " OP-1 OP-1 OP-1 OP-1 OP-1 OP-1 \n";
out << "\n";
out << "\n";
out << "1386 2003.170 1.0E-12 1.0E-12 1.0E-12 1.0E-12 1.0E-12 1.0E-12 --comment \n";
out << "1386 2003.170 1.0E-12 1.0E-12 1.0E-12 1.0E-12 1.0E-12 1.0E-12 --comment \n";
out << "1436 2003.307 1.0E-12 1.0E-12 1.0E-12 1.0E-12 1.0E-12 1.0E-12 --comment\n";
out << "1574 2003.685 1.0E-12 1.0E-12 1.0E-12 1.0E-12 1.0E-12 1.0E-12\n";
out << "1636 2003.855 1.0E-12 1.0E-12 1.0E-12 1.0E-12 1.0E-12 1.0E-12\n";

View File

@ -98,7 +98,7 @@ bool RiuCadNavigation::handleInputEvent(QInputEvent* inputEvent)
m_trackball->endNavigation();
m_isNavigating = false;
if (m_hasMovedMouseDuringNavigation) isEventHandled = true;
if (m_hasMovedMouseDuringNavigation) isEventHandled = true;
m_hasMovedMouseDuringNavigation = false;
}

View File

@ -43,17 +43,17 @@ class RiuCalculationsContextMenuManager : public QObject
public:
RiuCalculationsContextMenuManager() { }
void attachWidget(QWidget* widget, RicSummaryCurveCalculator* curveCalc);
void attachWidget(QWidget* widget, RicSummaryCurveCalculator* curveCalc);
public slots:
void slotMenuItems(QPoint point);
void slotMenuItems(QPoint point);
private slots:
void slotCreateCalculationCopy();
void slotCreateCalculationCopy();
private:
QPointer<QWidget> m_widget;
QPointer<QWidget> m_widget;
RicSummaryCurveCalculator* m_curveCalc;
int m_textPosition;
int m_textPosition;
std::map<QString, std::unique_ptr<QAction>> m_actionCache;
};

View File

@ -39,18 +39,18 @@ class RiuExpressionContextMenuManager : public QObject
static const std::map<QString, std::set<QString>> MENU_MAP;
public:
RiuExpressionContextMenuManager() { }
RiuExpressionContextMenuManager() { }
void attachTextEdit(QTextEdit* textEdit);
void attachTextEdit(QTextEdit* textEdit);
public slots:
void slotMenuItems(QPoint point);
void slotMenuItems(QPoint point);
private slots:
void slotShowText();
void slotShowText();
private:
QPointer<QTextEdit> m_textEdit;
int m_textPosition;
QPointer<QTextEdit> m_textEdit;
int m_textPosition;
std::map<QString, std::unique_ptr<QAction>> m_actionCache;
};

View File

@ -75,7 +75,7 @@ public:
void tileWindows();
bool isAnyMdiSubWindowVisible();
QMdiSubWindow* findMdiSubWindow(QWidget* viewer);
QList<QMdiSubWindow*> subWindowList(QMdiArea::WindowOrder order);
QList<QMdiSubWindow*> subWindowList(QMdiArea::WindowOrder order);
void addToTemporaryWidgets(QWidget* widget);

View File

@ -907,7 +907,7 @@ QMdiSubWindow* RiuMainWindow::findMdiSubWindow(QWidget* viewer)
//--------------------------------------------------------------------------------------------------
QList<QMdiSubWindow*> RiuMainWindow::subWindowList(QMdiArea::WindowOrder order)
{
return m_mdiArea->subWindowList(order);
return m_mdiArea->subWindowList(order);
}
//--------------------------------------------------------------------------------------------------
@ -1727,7 +1727,7 @@ void RiuMainWindow::slotShowRegressionTestDialog()
// Write preferences using QSettings and apply them to the application
regTestConfig.writeSettingsToApplicationStore();
RiaRegressionTestRunner::instance()->executeRegressionTests();
RiaRegressionTestRunner::instance()->executeRegressionTests();
}
}

View File

@ -111,7 +111,7 @@ public:
void tileWindows();
bool isAnyMdiSubWindowVisible();
QMdiSubWindow* findMdiSubWindow(QWidget* viewer);
QList<QMdiSubWindow*> subWindowList(QMdiArea::WindowOrder order);
QList<QMdiSubWindow*> subWindowList(QMdiArea::WindowOrder order);
RiuResultQwtPlot* resultPlot();
RiuRelativePermeabilityPlotPanel* relativePermeabilityPlotPanel();

View File

@ -40,7 +40,7 @@ public:
explicit RiuMessagePanel(QDockWidget* parent);
void addMessage(RILogLevel messageLevel, const QString& msg);
virtual QSize sizeHint () const;
virtual QSize sizeHint () const;
private slots:
void slotShowContextMenu(const QPoint& pos);

View File

@ -1,16 +1,16 @@
<RCC>
<qresource prefix="cafAnimControl">
<file>Play.png</file>
<file>Stop.png</file>
<file>Pause.png</file>
<file>StepFwd.png</file>
<file>StepBwd.png</file>
<file>SkipToEnd.png</file>
<file>SkipToStart.png</file>
<file>RepeatFromStart.png</file>
<file>RepeatFwdBwd.png</file>
<file>PlayBwd.png</file>
<file>Slow.png</file>
<file>Fast.png</file>
</qresource>
<file>Play.png</file>
<file>Stop.png</file>
<file>Pause.png</file>
<file>StepFwd.png</file>
<file>StepBwd.png</file>
<file>SkipToEnd.png</file>
<file>SkipToStart.png</file>
<file>RepeatFromStart.png</file>
<file>RepeatFwdBwd.png</file>
<file>PlayBwd.png</file>
<file>Slow.png</file>
<file>Fast.png</file>
</qresource>
</RCC>