mirror of
https://github.com/OPM/ResInsight.git
synced 2025-02-25 18:55:39 -06:00
WIP resolved conflicts
This commit is contained in:
@@ -93,7 +93,6 @@ void RicAddWellLogToPlotFeature::onActionTriggered(bool isChecked)
|
||||
|
||||
cvf::Color3f curveColor = RicWellLogPlotCurveFeatureImpl::curveColorFromIndex(curveIdx);
|
||||
curve->setColor(curveColor);
|
||||
curve->setDescription(wellLog->name());
|
||||
curve->setWellPath(wellPath);
|
||||
curve->setWellLogChannelName(wellLog->name());
|
||||
|
||||
|
||||
@@ -88,8 +88,7 @@ void RicNewWellLogCurveExtractionFeature::addCurve(RimWellLogPlotTrack* plotTrac
|
||||
cvf::Color3f curveColor = RicWellLogPlotCurveFeatureImpl::curveColorFromIndex(curveIndex);
|
||||
curve->setColor(curveColor);
|
||||
|
||||
curve->setDescription(QString("Curve %1").arg(plotTrack->curveCount()));
|
||||
|
||||
plotTrack->updateConnectedEditors();
|
||||
|
||||
RiuMainWindow::instance()->setCurrentObjectInTreeView(curve);
|
||||
}
|
||||
|
||||
@@ -88,8 +88,7 @@ void RicNewWellLogCurveLasFeature::addCurve(RimWellLogPlotTrack* plotTrack)
|
||||
cvf::Color3f curveColor = RicWellLogPlotCurveFeatureImpl::curveColorFromIndex(curveIndex);
|
||||
curve->setColor(curveColor);
|
||||
|
||||
curve->setDescription(QString("Curve %1").arg(plotTrack->curveCount()));
|
||||
|
||||
plotTrack->updateConnectedEditors();
|
||||
|
||||
RiuMainWindow::instance()->setCurrentObjectInTreeView(curve);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user