#3724, #3723 Several polyline annotation updates

Renamed from polyline to polylines.
Split into PolylinesFromFile and UserDefinedPolylines
Add import of polylines from file

ApplicationCode/Commands/AnnotationCommands/CMakeLists_files.cmake

@@ -0,0 +1,25 @@
+
+set (SOURCE_GROUP_HEADER_FILES
+${CMAKE_CURRENT_LIST_DIR}/RicImportPolylinesAnnotationFeature.h
+
+)
+
+set (SOURCE_GROUP_SOURCE_FILES
+${CMAKE_CURRENT_LIST_DIR}/RicImportPolylinesAnnotationFeature.cpp
+
+)
+
+list(APPEND CODE_HEADER_FILES
+${SOURCE_GROUP_HEADER_FILES}
+)
+
+list(APPEND CODE_SOURCE_FILES
+${SOURCE_GROUP_SOURCE_FILES}
+)
+
+set (QT_MOC_HEADERS
+${QT_MOC_HEADERS}
+)
+
+
+source_group( "CommandFeature\\AnnotationCommands" FILES ${SOURCE_GROUP_HEADER_FILES} ${SOURCE_GROUP_SOURCE_FILES} ${CMAKE_CURRENT_LIST_DIR}/CMakeLists_files.cmake )

ApplicationCode/Commands/AnnotationCommands/RicImportPolylinesAnnotationFeature.cpp

@@ -0,0 +1,93 @@
+/////////////////////////////////////////////////////////////////////////////////
+//
+//  Copyright (C) 2018-     equinor ASA
+// 
+//  ResInsight is free software: you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation, either version 3 of the License, or
+//  (at your option) any later version.
+// 
+//  ResInsight is distributed in the hope that it will be useful, but WITHOUT ANY
+//  WARRANTY; without even the implied warranty of MERCHANTABILITY or
+//  FITNESS FOR A PARTICULAR PURPOSE.
+// 
+//  See the GNU General Public License at <http://www.gnu.org/licenses/gpl.html> 
+//  for more details.
+//
+/////////////////////////////////////////////////////////////////////////////////
+
+#include "RicImportPolylinesAnnotationFeature.h"
+
+#include "RiaApplication.h"
+
+#include "RimOilField.h"
+#include "RimProject.h"
+#include "RimAnnotationCollection.h"
+#include "RimPolylinesAnnotation.h"
+
+#include "Riu3DMainWindowTools.h"
+
+#include <QAction>
+#include <QFileDialog>
+
+
+CAF_CMD_SOURCE_INIT(RicImportPolylinesAnnotationFeature, "RicImportPolylinesAnnotationFeature");
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+bool RicImportPolylinesAnnotationFeature::isCommandEnabled()
+{
+    return true;
+}
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+void RicImportPolylinesAnnotationFeature::onActionTriggered(bool isChecked)
+{
+    RiaApplication* app = RiaApplication::instance();
+    QString defaultDir = app->lastUsedDialogDirectory("BINARY_GRID");
+    QStringList fileNames = QFileDialog::getOpenFileNames(Riu3DMainWindowTools::mainWindowWidget(), 
+                                                          "Import Poly Lines Annotation", 
+                                                          defaultDir, 
+                                                          "Text File (*.txt);Polylines (*.dat);All Files (*.*)");
+
+    if (fileNames.isEmpty()) return;
+
+    // Remember the path to next time
+    app->setLastUsedDialogDirectory("BINARY_GRID", QFileInfo(fileNames.last()).absolutePath());
+
+    // Find or create the AnnotationsCollection
+
+    RimProject* proj = RiaApplication::instance()->project();
+    RimAnnotationCollection*  annotColl = proj->activeOilField()->annotationCollection();
+
+    if (!annotColl)
+    {
+        annotColl = new RimAnnotationCollection;
+        proj->activeOilField()->annotationCollection = annotColl;
+    }
+
+    // For each file, 
+    
+    RimPolyLinesFromFileAnnotation* lastCreatedOrUpdated = annotColl->importOrUpdatePolylinesFromFile(fileNames);
+   
+    proj->updateConnectedEditors();
+
+    if (lastCreatedOrUpdated)
+    {
+        Riu3DMainWindowTools::selectAsCurrentItem(lastCreatedOrUpdated);
+    }
+
+    annotColl->scheduleRedrawOfRelevantViews();
+}
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+void RicImportPolylinesAnnotationFeature::setupActionLook(QAction* actionToSetup)
+{
+    actionToSetup->setIcon(QIcon(":/FormationCollection16x16.png"));
+    actionToSetup->setText("Import Poly Lines Annotation");
+}

ApplicationCode/Commands/AnnotationCommands/RicImportPolylinesAnnotationFeature.h

@@ -0,0 +1,37 @@
+/////////////////////////////////////////////////////////////////////////////////
+//
+//  Copyright (C) 2018-     equinor ASA
+// 
+//  ResInsight is free software: you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation, either version 3 of the License, or
+//  (at your option) any later version.
+// 
+//  ResInsight is distributed in the hope that it will be useful, but WITHOUT ANY
+//  WARRANTY; without even the implied warranty of MERCHANTABILITY or
+//  FITNESS FOR A PARTICULAR PURPOSE.
+// 
+//  See the GNU General Public License at <http://www.gnu.org/licenses/gpl.html> 
+//  for more details.
+//
+/////////////////////////////////////////////////////////////////////////////////
+
+#pragma once
+
+#include "cafCmdFeature.h"
+
+//==================================================================================================
+/// 
+//==================================================================================================
+class RicImportPolylinesAnnotationFeature : public caf::CmdFeature
+{
+    CAF_CMD_HEADER_INIT;
+
+protected:
+    // Overrides
+    bool isCommandEnabled() override;
+    void onActionTriggered( bool isChecked ) override;
+    void setupActionLook( QAction* actionToSetup ) override;
+};
+
+

ApplicationCode/Commands/RicNewAnnotationFeature.cpp

@@ -22,7 +22,7 @@
 
 #include "RimTextAnnotation.h"
 #include "RimReachCircleAnnotation.h"
-#include "RimPolylineAnnotation.h"
+#include "RimPolylinesAnnotation.h"
 #include "RimAnnotationCollection.h"
 #include "RimProject.h"
 #include "RimOilField.h"
@@ -132,7 +132,7 @@ void RicNewPolylineAnnotationFeature::onActionTriggered(bool isChecked)
     auto coll = annotationCollection();
     if (coll)
     {
-        auto newAnnotation = new RimPolylineAnnotation();
+        auto newAnnotation = new RimUserDefinedPolyLinesAnnotation();
         coll->addAnnotation(newAnnotation);
         coll->updateConnectedEditors();
         RiuMainWindow::instance()->selectAsCurrentItem(newAnnotation);