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

Renamed PlotCurve -> Curve

Browse Source
This commit is contained in:
Jacob Støren
2015-11-04 16:19:38 +01:00
parent 10582750ab
commit 7b7ecf2f26
22 changed files with 83 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
ApplicationCode/UserInterface/RiuDragDrop.cpp
View File

@@ -148,7 +148,7 @@ Qt::ItemFlags RiuDragDrop::flags(const QModelIndex &index) const
caf::PdmUiItem* uiItem = uiTreeView->uiItemFromModelIndex(index);
if (dynamic_cast<RimEclipseCase*>(uiItem) ||
dynamic_cast<RimWellLogPlotCurve*>(uiItem) ||
dynamic_cast<RimWellLogCurve*>(uiItem) ||
dynamic_cast<RimWellLogFileChannel*>(uiItem) ||
dynamic_cast<RimWellLogTrack*>(uiItem))
{
@@ -174,7 +174,7 @@ Qt::ItemFlags RiuDragDrop::flags(const QModelIndex &index) const
}
else if (dynamic_cast<RimWellLogTrack*>(uiItem))
{
if (RiuTypedPdmObjects<RimWellLogPlotCurve>::containsTypedObjects(m_dragItems))
if (RiuTypedPdmObjects<RimWellLogCurve>::containsTypedObjects(m_dragItems))
{
itemflags |= Qt::ItemIsDropEnabled;
}
@@ -183,9 +183,9 @@ Qt::ItemFlags RiuDragDrop::flags(const QModelIndex &index) const
itemflags |= Qt::ItemIsDropEnabled;
}
}
else if (dynamic_cast<RimWellLogPlotCurve*>(uiItem))
else if (dynamic_cast<RimWellLogCurve*>(uiItem))
{
if (RiuTypedPdmObjects<RimWellLogPlotCurve>::containsTypedObjects(m_dragItems))
if (RiuTypedPdmObjects<RimWellLogCurve>::containsTypedObjects(m_dragItems))
{
itemflags |= Qt::ItemIsDropEnabled;
}
@@ -200,7 +200,7 @@ Qt::ItemFlags RiuDragDrop::flags(const QModelIndex &index) const
itemflags |= Qt::ItemIsDropEnabled;
}
}
else if (dynamic_cast<RimWellLogPlotCurve*>(uiItem))
else if (dynamic_cast<RimWellLogCurve*>(uiItem))
{
if (RiuTypedPdmObjects<RimWellLogFileChannel>::containsTypedObjects(m_dragItems))
{
@@ -241,7 +241,7 @@ bool RiuDragDrop::dropMimeData(const QMimeData *data, Qt::DropAction action, int
return handleGridCaseGroupDrop(action, draggedObjects, gridCaseGroup);
}
RimWellLogPlotCurve* wellLogPlotCurve;
RimWellLogCurve* wellLogPlotCurve;
dropTarget->firstAnchestorOrThisOfType(wellLogPlotCurve);
if (wellLogPlotCurve)
{
@@ -345,7 +345,7 @@ bool RiuDragDrop::handleWellLogPlotTrackDrop(Qt::DropAction action, caf::PdmObje
}
}
std::vector<RimWellLogPlotCurve*> wellLogPlotCurves = RiuTypedPdmObjects<RimWellLogPlotCurve>::typedObjectsFromGroup(draggedObjects);
std::vector<RimWellLogCurve*> wellLogPlotCurves = RiuTypedPdmObjects<RimWellLogCurve>::typedObjectsFromGroup(draggedObjects);
if (wellLogPlotCurves.size() > 0)
{
if (action == Qt::MoveAction)
@@ -373,9 +373,9 @@ bool RiuDragDrop::handleWellLogPlotTrackDrop(Qt::DropAction action, caf::PdmObje
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RiuDragDrop::handleWellLogPlotCurveDrop(Qt::DropAction action, caf::PdmObjectGroup& draggedObjects, RimWellLogPlotCurve* curveDropTarget)
bool RiuDragDrop::handleWellLogPlotCurveDrop(Qt::DropAction action, caf::PdmObjectGroup& draggedObjects, RimWellLogCurve* curveDropTarget)
{
std::vector<RimWellLogPlotCurve*> wellLogPlotCurves = RiuTypedPdmObjects<RimWellLogPlotCurve>::typedObjectsFromGroup(draggedObjects);
std::vector<RimWellLogCurve*> wellLogPlotCurves = RiuTypedPdmObjects<RimWellLogCurve>::typedObjectsFromGroup(draggedObjects);
if (wellLogPlotCurves.size() > 0)
{
if (action == Qt::MoveAction)

4
ApplicationCode/UserInterface/RiuDragDrop.h
View File

@@ -33,7 +33,7 @@ namespace caf
class RimIdenticalGridCaseGroup;
class RimWellLogPlot;
class RimWellLogTrack;
class RimWellLogPlotCurve;
class RimWellLogCurve;
//--------------------------------------------------------------------------------------------------
///
@@ -59,7 +59,7 @@ private:
bool handleGridCaseGroupDrop(Qt::DropAction action, caf::PdmObjectGroup& objectGroup, RimIdenticalGridCaseGroup* gridCaseGroup);
bool handleWellLogPlotTrackDrop(Qt::DropAction action, caf::PdmObjectGroup& objectGroup, RimWellLogTrack* wellLogPlotTrack);
bool handleWellLogPlotDrop(Qt::DropAction action, caf::PdmObjectGroup& objectGroup, RimWellLogPlot* wellLogPlot);
bool handleWellLogPlotCurveDrop(Qt::DropAction action, caf::PdmObjectGroup& objectGroup, RimWellLogPlotCurve* wellLogPlotCurve);
bool handleWellLogPlotCurveDrop(Qt::DropAction action, caf::PdmObjectGroup& objectGroup, RimWellLogCurve* wellLogPlotCurve);
static void objectGroupFromModelIndexes(caf::PdmObjectGroup* objectGroup, const QModelIndexList &indexes);
static std::vector<caf::PdmPointer<caf::PdmObjectHandle> > objectHandlesFromSelection();

8
ApplicationCode/UserInterface/RiuWellLogPlotCurve.cpp
View File

@@ -25,21 +25,21 @@
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RiuWellLogPlotCurve::RiuWellLogPlotCurve()
RiuWellLogCurve::RiuWellLogCurve()
{
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RiuWellLogPlotCurve::~RiuWellLogPlotCurve()
RiuWellLogCurve::~RiuWellLogCurve()
{
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RiuWellLogPlotCurve::drawCurve(QPainter* p, int style,
void RiuWellLogCurve::drawCurve(QPainter* p, int style,
const QwtScaleMap& xMap, const QwtScaleMap& yMap,
const QRectF& canvasRect, int from, int to) const
{
@@ -57,7 +57,7 @@ void RiuWellLogPlotCurve::drawCurve(QPainter* p, int style,
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RiuWellLogPlotCurve::setCurveData(const RigWellLogCurveData* curveData)
void RiuWellLogCurve::setCurveData(const RigWellLogCurveData* curveData)
{
CVF_ASSERT(curveData);

6
ApplicationCode/UserInterface/RiuWellLogPlotCurve.h
View File

@@ -29,12 +29,12 @@ class RigWellLogCurveData;
///
///
//==================================================================================================
class RiuWellLogPlotCurve : public QwtPlotCurve
class RiuWellLogCurve : public QwtPlotCurve
{
public:
RiuWellLogPlotCurve();
virtual ~RiuWellLogPlotCurve();
RiuWellLogCurve();
virtual ~RiuWellLogCurve();
void setCurveData(const RigWellLogCurveData* curveData);

2
ApplicationCode/UserInterface/RiuWellLogTrack.cpp
View File

@@ -253,7 +253,7 @@ void RiuWellLogTrack::selectClosestCurve(const QPoint& pos)
if (closestCurve && distMin < 20)
{
RimWellLogPlotCurve* selectedCurve = m_plotTrackDefinition->curveDefinitionFromCurve(closestCurve);
RimWellLogCurve* selectedCurve = m_plotTrackDefinition->curveDefinitionFromCurve(closestCurve);
if (selectedCurve)
{
RiuMainWindow::instance()->projectTreeView()->selectAsCurrentItem(selectedCurve);