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

Merge remote-tracking branch 'origin/dev' into pre-proto

Browse Source
This commit is contained in:
Magne Sjaastad
2017-03-15 10:10:43 +01:00
parent 81c243297a 647b4348eb
commit 3d67946976
342 changed files with 4314 additions and 2890 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ApplicationCode/UserInterface/RiuSelectionManager.h
View File

@@ -55,9 +55,6 @@ public:
};
public:
RiuSelectionManager();
~RiuSelectionManager();
static RiuSelectionManager* instance();
// Returns selected items
@@ -84,6 +81,10 @@ public:
bool isEmpty(int role = RUI_APPLICATION_GLOBAL) const;
private:
RiuSelectionManager();
~RiuSelectionManager();
RiuSelectionManager(const RiuSelectionManager&) = delete;
void deleteAllItemsFromSelection(int role);
private:
@@ -167,7 +168,7 @@ public:
cvf::Color3f color,
int elementFace,
const cvf::Vec3d& localIntersectionPoint,
const std::array<cvf::Vec3f, 3>& m_intersectionTriangle );
const std::array<cvf::Vec3f, 3>& intersectionTriangle );
virtual ~RiuGeoMechSelectionItem() {};
virtual RiuSelectionType type() const