Renamed to WellPathImportSsihub, and updated folder names

p4#: 22329

ApplicationCode/CMakeLists.txt

@@ -83,7 +83,7 @@ list( APPEND CPP_SOURCES
     ${CODE_SOURCE_FILES}
 )
 
-add_subdirectory(ssihubInterface)
+add_subdirectory(WellPathImportSsihub)
 
 
 # Define files for MOC-ing
@@ -230,7 +230,7 @@ set( LINK_LIBRARIES
     LibGeometry
     LibCore
 
-    ssihubInterface
+    WellPathImportSsihub
 
     ecl
     ert_util

ApplicationCode/WellPathImportSsihub/CMakeLists.txt

@@ -1,20 +1,14 @@
 cmake_minimum_required (VERSION 2.8)
 
-project (ssihubInterface)
+project (WellPathImportSsihub)
 
 # These headers need to go through Qt's MOC compiler
 set( QOBJECT_HEADERS   
-    ssihubWebServiceInterface.h
-    ssihubDialog.h 
-    httpwindow.h
-
     RiuWellImportWizard.h
-
 )
 
 
 set( QT_UI_FILES   
-    authenticationdialog.ui 
 )
 
 if ( (${CMAKE_VERSION} VERSION_LESS 2.8.6) OR (NOT CMAKE_AUTOMOC) )
@@ -32,11 +26,6 @@ include_directories(
 
 
 add_library( ${PROJECT_NAME}
-    ssihubInterface.cpp
-    ssihubWebServiceInterface.cpp
-    ssihubDialog.cpp
-    httpwindow.cpp
-
     RimWellPathImport.h
     RimWellPathImport.cpp
     RimOilRegionEntry.h

ApplicationCode/WellPathImportSsihubTestApp/CMakeLists.txt

@@ -1,6 +1,6 @@
 cmake_minimum_required (VERSION 2.8)
 
-project ( ssihubTestApplication )
+project ( WellPathImportSsihubTestApp )
 
 
 set (QT_COMPONENTS_REQUIRED QtCore QtGui QtMain QtOpenGl QtNetwork QtScript QtScriptTools)
@@ -11,14 +11,15 @@ include (${QT_USE_FILE})
 find_package( OpenGL )
 
 
-add_subdirectory(../ssihubInterface "${CMAKE_CURRENT_BINARY_DIR}/ssihubInterface")
+
+add_subdirectory(../WellPathImportSsihub "${CMAKE_CURRENT_BINARY_DIR}/WellPathImportSsihub")
 add_subdirectory(../../cafProjectDataModel "${CMAKE_CURRENT_BINARY_DIR}/cafProjectDataModel")
 add_subdirectory(../../cafUserInterface "${CMAKE_CURRENT_BINARY_DIR}/cafUserInterface")
 
 add_subdirectory(../../cafTests/cafTestApplication "${CMAKE_CURRENT_BINARY_DIR}/cafTestApplication")
 
 include_directories(
-    ${ssihubInterface_SOURCE_DIR}
+    ${WellPathImportSsihub_SOURCE_DIR}
 	${CMAKE_CURRENT_SOURCE_DIR}/../../cafProjectDataModel 
 	${CMAKE_CURRENT_SOURCE_DIR}/../../cafUserInterface
 )
@@ -56,7 +57,7 @@ target_link_libraries ( ${PROJECT_NAME}
     cafProjectDataModel
     cafUserInterface
 
-    ssihubInterface
+    WellPathImportSsihub
     ${QT_LIBRARIES}
 )
 

ApplicationCode/WellPathImportSsihubTestApp/main.cpp

@@ -41,7 +41,6 @@
 #include <QApplication>
 #include <QDir>
 
-#include "ssihubInterface.h"
 #include "TestTools.h"
 #include "RiuWellImportWizard.h"
 #include "RimWellPathImport.h"
@@ -58,23 +57,11 @@ int main(int argc, char *argv[])
     QString destinationFolder("c:/tmp/resinsight_ws");
     QString wsAddress("http://127.0.0.1:5000");
     
-    ssihub::Interface wsInterface;
-    wsInterface.setWebServiceAddress(wsAddress);
-    wsInterface.setJsonDestinationFolder(destinationFolder);
 
     int north = 7500000;
     int south = 7000000;
     int east =   401000;
     int west =   400000;
-    wsInterface.setRegion(north, south, east, west);
-
-    //QStringList jsonWellPathFileNames = wsInterface.jsonWellPaths();
-
-//     void setWebServiceAddress(const QString wsAdress);
-//     void setJsonDestinationFolder(const QString folder);
-//     void setRegion(int east, int west, int north, int south);
-// 
-//     QStringList jsonWellPaths();
 
     RimWellPathImport* wellPathImportObject = TestTools::createMockObject();
     wellPathImportObject->north = north;