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

pre-proto - Renaming function

Browse Source
This commit is contained in:
astridkbjorke 2017-01-04 11:39:49 +01:00
parent 61531de79a
commit 8c5ee201c0
5 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ApplicationCode/Commands/RicNewSimWellFractureAtPosFeature.cpp
View File

@ -71,7 +71,7 @@ void RicNewSimWellFractureAtPosFeature::onActionTriggered(bool isChecked)
fractureCollection->simwellFractures.push_back(fracture); fractureCollection->simwellFractures.push_back(fracture);
fracture->name = "Simulation Well Fracture"; fracture->name = "Simulation Well Fracture";
fracture->setijk(simWellItem->i, simWellItem->j, simWellItem->k); fracture->setIJK(simWellItem->i, simWellItem->j, simWellItem->k);
fractureCollection->updateConnectedEditors(); fractureCollection->updateConnectedEditors();
RiuMainWindow::instance()->selectAsCurrentItem(fracture); RiuMainWindow::instance()->selectAsCurrentItem(fracture);

2
ApplicationCode/ProjectDataModel/RimSimWellFracture.cpp
View File

@ -122,7 +122,7 @@ caf::PdmFieldHandle* RimSimWellFracture::userDescriptionField()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RimSimWellFracture::setijk(size_t i, size_t j, size_t k) void RimSimWellFracture::setIJK(size_t i, size_t j, size_t k)
{ {
m_i = static_cast<int>(i + 1); m_i = static_cast<int>(i + 1);
m_j = static_cast<int>(j + 1); m_j = static_cast<int>(j + 1);

9
ApplicationCode/ProjectDataModel/RimSimWellFracture.h
View File

@ -18,14 +18,17 @@
#pragma once #pragma once
#include "RimFracture.h"
#include "RimView.h"
#include "cafAppEnum.h" #include "cafAppEnum.h"
#include "cafPdmField.h" #include "cafPdmField.h"
#include "cafPdmObject.h" #include "cafPdmObject.h"
#include "cafPdmPtrField.h" #include "cafPdmPtrField.h"
#include "RimView.h"
#include "cvfBase.h"
#include "cvfVector3.h" #include "cvfVector3.h"
#include "RimFracture.h"
class RimFractureDefinition; class RimFractureDefinition;
@ -47,7 +50,7 @@ public:
virtual QList<caf::PdmOptionItemInfo> calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool * useOptionsOnly) override; virtual QList<caf::PdmOptionItemInfo> calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool * useOptionsOnly) override;
virtual caf::PdmFieldHandle* userDescriptionField() override; virtual caf::PdmFieldHandle* userDescriptionField() override;
void setijk(size_t i, size_t j, size_t k); void setIJK(size_t i, size_t j, size_t k);
// Overrides from RimFracture // Overrides from RimFracture
virtual cvf::Vec3d centerPointForFracture() override; virtual cvf::Vec3d centerPointForFracture() override;

2
ApplicationCode/ProjectDataModel/RimWellPathFracture.cpp
View File

@ -61,7 +61,7 @@ RimWellPathFracture::RimWellPathFracture(void)
CAF_PDM_InitField(&j, "J", 1, "Fracture location cell J", "", "", ""); CAF_PDM_InitField(&j, "J", 1, "Fracture location cell J", "", "", "");
CAF_PDM_InitField(&k, "K", 1, "Fracture location cell K", "", "", ""); CAF_PDM_InitField(&k, "K", 1, "Fracture location cell K", "", "", "");
CAF_PDM_InitFieldNoDefault(&fractureDefinition, "FractureDef", "FractureDef", "", "", ""); CAF_PDM_InitFieldNoDefault(&fractureDefinition, "FractureDef", "Fracture Template", "", "", "");
} }

5
ApplicationCode/ProjectDataModel/RimWellPathFractureCollection.h
View File

@ -37,8 +37,7 @@ public:
virtual ~RimWellPathFractureCollection(void); virtual ~RimWellPathFractureCollection(void);
caf::PdmChildArrayField<RimWellPathFracture*> fractures; caf::PdmChildArrayField<RimWellPathFracture*> fractures;
caf::PdmField<bool> isActive; caf::PdmField<bool> isActive;
void deleteFractures();
void deleteFractures();
}; };