Osdu: get well paths from ddms instead of Osdu Storage api.

This commit is contained in:
Kristian Bendiksen
2024-06-07 15:57:51 +02:00
parent dd6c41b84e
commit 8854abe482
11 changed files with 301 additions and 227 deletions

View File

@@ -17,6 +17,7 @@
/////////////////////////////////////////////////////////////////////////////////
#include "RiaApplication.h"
#include "OsduImportCommands/RiaOsduConnector.h"
#include "RiaArgumentParser.h"
#include "RiaBaseDefs.h"
#include "RiaFilePathTools.h"
@@ -97,6 +98,7 @@
#include "Riu3DMainWindowTools.h"
#include "RiuGuiTheme.h"
#include "RiuMainWindow.h"
#include "RiuViewer.h"
#include "RiuViewerCommands.h"
@@ -170,6 +172,7 @@ RiaApplication::RiaApplication()
setLastUsedDialogDirectory( "MULTICASEIMPORT", "/" );
m_commandRouter = std::make_unique<RimCommandRouter>();
m_osduConnector = nullptr;
}
//--------------------------------------------------------------------------------------------------
@@ -1690,3 +1693,20 @@ bool RiaApplication::generateCode( const QString& fileName, gsl::not_null<QStrin
return true;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RiaOsduConnector* RiaApplication::makeOsduConnector()
{
if ( m_osduConnector ) return m_osduConnector;
RiaPreferencesOsdu* osduPreferences = preferences()->osduPreferences();
const QString server = osduPreferences->server();
const QString dataPartitionId = osduPreferences->dataPartitionId();
const QString authority = osduPreferences->authority();
const QString scopes = osduPreferences->scopes();
const QString clientId = osduPreferences->clientId();
m_osduConnector = new RiaOsduConnector( RiuMainWindow::instance(), server, dataPartitionId, authority, scopes, clientId );
return m_osduConnector;
}

View File

@@ -68,6 +68,7 @@ class RiuMainWindowBase;
class RiuPlotMainWindow;
class RiuRecentFileActionProvider;
class RiaArgumentParser;
class RiaOsduConnector;
namespace caf
{
@@ -200,6 +201,8 @@ public:
virtual void addToRecentFiles( const QString& fileName ) {}
virtual void showFormattedTextInMessageBoxOrConsole( const QString& errMsg ) = 0;
RiaOsduConnector* makeOsduConnector();
protected:
// Protected implementation specific overrides
virtual void invokeProcessEvents( QEventLoop::ProcessEventsFlags flags = QEventLoop::AllEvents ) = 0;
@@ -255,4 +258,5 @@ protected:
private:
static RiaApplication* s_riaApplication;
RiaOsduConnector* m_osduConnector;
};