Review fixes.

This commit is contained in:
Kristian Bendiksen committed 2024-06-14 17:31:22 +02:00
1 parent 44ca21636a
commit 7125670d8c
5 files changed
+5 -18

No files matched your search

@@ -257,6 +257,6 @@ protected:
bool m_runningWorkerProcess; bool m_runningWorkerProcess;
private: private:
static RiaApplication* s_riaApplication; static RiaApplication* s_riaApplication;
RiaOsduConnector* m_osduConnector; QPointer<RiaOsduConnector> m_osduConnector;
}; };
@@ -265,12 +265,6 @@ FieldSelectionPage::FieldSelectionPage( RimWellPathImport* wellPathImport, RiaOs
layout->addWidget( m_tableView ); layout->addWidget( m_tableView );
layout->setStretchFactor( m_tableView, 10 ); layout->setStretchFactor( m_tableView, 10 );
// Tree view
// caf::PdmUiTreeView* treeView = new caf::PdmUiTreeView( this );
// treeView->setPdmItem( wellPathImport );
// layout->addWidget( treeView );
// layout->setStretchFactor( treeView, 10 );
setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding ) ); setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding ) );
m_osduConnector = osduConnector; m_osduConnector = osduConnector;
@@ -242,7 +242,6 @@ public:
FieldSelectionPage( RimWellPathImport* wellPathImport, RiaOsduConnector* m_osduConnector, QWidget* parent = nullptr ); FieldSelectionPage( RimWellPathImport* wellPathImport, RiaOsduConnector* m_osduConnector, QWidget* parent = nullptr );
~FieldSelectionPage() override; ~FieldSelectionPage() override;
void initializePage() override;
bool isComplete() const override; bool isComplete() const override;
private slots: private slots:
void fieldsFinished(); void fieldsFinished();
@@ -18,11 +18,10 @@
#include "RimOsduWellLog.h" #include "RimOsduWellLog.h"
#include "RiaGuiApplication.h"
#include "RiaLogging.h"
#include "RiaDateStringParser.h" #include "RiaDateStringParser.h"
#include "RiaFieldHandleTools.h" #include "RiaFieldHandleTools.h"
#include "RiaGuiApplication.h"
#include "RiaLogging.h"
#include "RiaQDateTimeTools.h" #include "RiaQDateTimeTools.h"
#include "RimFileWellPath.h" #include "RimFileWellPath.h"
@@ -33,9 +32,7 @@
#include "Riu3DMainWindowTools.h" #include "Riu3DMainWindowTools.h"
#include <QFileInfo>
#include <QString> #include <QString>
#include <QStringList>
CAF_PDM_SOURCE_INIT( RimOsduWellLog, "OsduWellLog" ); CAF_PDM_SOURCE_INIT( RimOsduWellLog, "OsduWellLog" );
@@ -163,10 +163,7 @@ RimWellPath::RimWellPath()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RimWellPath::~RimWellPath() RimWellPath::~RimWellPath()
{ {
for ( const auto& wellLog : m_wellLogs() ) m_wellLogs.deleteChildren();
{
delete wellLog;
}
RimWellLogPlotCollection* plotCollection = RimMainPlotCollection::current()->wellLogPlotCollection(); RimWellLogPlotCollection* plotCollection = RimMainPlotCollection::current()->wellLogPlotCollection();
if ( plotCollection ) if ( plotCollection )