#3756 Annotations. Moved files to subdirs

ApplicationCode/Commands/AnnotationCommands/CMakeLists_files.cmake

@@ -1,12 +1,16 @@
 
 set (SOURCE_GROUP_HEADER_FILES
 ${CMAKE_CURRENT_LIST_DIR}/RicImportPolylinesAnnotationFeature.h
-
+${CMAKE_CURRENT_LIST_DIR}/RicCreateTextAnnotationFeature.h
+${CMAKE_CURRENT_LIST_DIR}/RicCreateReachCircleAnnotationFeature.h
+${CMAKE_CURRENT_LIST_DIR}/RicCreateUserDefinedPolylinesAnnotationFeature.h
 )
 
 set (SOURCE_GROUP_SOURCE_FILES
 ${CMAKE_CURRENT_LIST_DIR}/RicImportPolylinesAnnotationFeature.cpp
-
+${CMAKE_CURRENT_LIST_DIR}/RicCreateTextAnnotationFeature.cpp
+${CMAKE_CURRENT_LIST_DIR}/RicCreateReachCircleAnnotationFeature.cpp
+${CMAKE_CURRENT_LIST_DIR}/RicCreateUserDefinedPolylinesAnnotationFeature.cpp
 )
 
 list(APPEND CODE_HEADER_FILES

ApplicationCode/Commands/AnnotationCommands/RicCreateUserDefinedPolylinesAnnotationFeature.cpp

@@ -0,0 +1,82 @@
+/////////////////////////////////////////////////////////////////////////////////
+//
+//  Copyright (C) 2016-     Statoil 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 "RicCreateUserDefinedPolylinesAnnotationFeature.h"
+
+#include "RiaApplication.h"
+
+#include "RimTextAnnotation.h"
+#include "RimReachCircleAnnotation.h"
+#include "RimPolylinesAnnotation.h"
+#include "RimAnnotationCollection.h"
+#include "RimAnnotationInViewCollection.h"
+#include "RimProject.h"
+#include "RimOilField.h"
+
+#include "RiuMainWindow.h"
+
+#include <cafSelectionManagerTools.h>
+
+#include <QAction>
+
+
+CAF_CMD_SOURCE_INIT(RicCreateUserDefinedPolylinesAnnotationFeature, "RicCreateUserDefinedPolylinesAnnotationFeature");
+
+
+//--------------------------------------------------------------------------------------------------
+///
+//--------------------------------------------------------------------------------------------------
+bool RicCreateUserDefinedPolylinesAnnotationFeature::isCommandEnabled()
+{
+    auto selObjs = caf::selectedObjectsByTypeStrict<RimAnnotationCollection*>();
+    return selObjs.size() == 1;
+}
+
+//--------------------------------------------------------------------------------------------------
+///
+//--------------------------------------------------------------------------------------------------
+void RicCreateUserDefinedPolylinesAnnotationFeature::onActionTriggered(bool isChecked)
+{
+    auto coll = annotationCollection();
+    if (coll)
+    {
+        auto newAnnotation = new RimUserDefinedPolylinesAnnotation();
+        coll->addAnnotation(newAnnotation);
+        coll->updateConnectedEditors();
+        RiuMainWindow::instance()->selectAsCurrentItem(newAnnotation);
+    }
+}
+
+//--------------------------------------------------------------------------------------------------
+///
+//--------------------------------------------------------------------------------------------------
+void RicCreateUserDefinedPolylinesAnnotationFeature::setupActionLook(QAction* actionToSetup)
+{
+    actionToSetup->setIcon(QIcon(":/Plus.png"));
+    actionToSetup->setText("Create User Defined Polyline Annotation");
+}
+
+//--------------------------------------------------------------------------------------------------
+///
+//--------------------------------------------------------------------------------------------------
+ RimAnnotationCollection* RicCreateUserDefinedPolylinesAnnotationFeature::annotationCollection() const
+{
+    auto project = RiaApplication::instance()->project();
+    auto oilField = project->activeOilField();
+    return oilField ? oilField->annotationCollection() : nullptr;
+}

ApplicationCode/Commands/AnnotationCommands/RicImportPolylinesAnnotationFeature.cpp

@@ -71,7 +71,7 @@ void RicImportPolylinesAnnotationFeature::onActionTriggered(bool isChecked)
 
     // For each file, 
     
-    RimPolyLinesFromFileAnnotation* lastCreatedOrUpdated = annotColl->importOrUpdatePolylinesFromFile(fileNames);
+    RimPolylinesFromFileAnnotation* lastCreatedOrUpdated = annotColl->importOrUpdatePolylinesFromFile(fileNames);
    
     proj->updateConnectedEditors();
 

ApplicationCode/Commands/CMakeLists_files.cmake

@@ -76,9 +76,6 @@ ${CMAKE_CURRENT_LIST_DIR}/RicConvertGroupToEnsembleFeature.h
 ${CMAKE_CURRENT_LIST_DIR}/RicResampleDialog.h
 ${CMAKE_CURRENT_LIST_DIR}/RicCreateTemporaryLgrFeature.h
 ${CMAKE_CURRENT_LIST_DIR}/RicDeleteTemporaryLgrsFeature.h
-${CMAKE_CURRENT_LIST_DIR}/RicCreateTextAnnotationFeature.h
-${CMAKE_CURRENT_LIST_DIR}/RicCreateReachCircleAnnotationFeature.h
-${CMAKE_CURRENT_LIST_DIR}/RicCreateUserDefinedPolylinesAnnotationFeature.h
 )
 
 
@@ -153,9 +150,6 @@ ${CMAKE_CURRENT_LIST_DIR}/RicConvertGroupToEnsembleFeature.cpp
 ${CMAKE_CURRENT_LIST_DIR}/RicResampleDialog.cpp
 ${CMAKE_CURRENT_LIST_DIR}/RicCreateTemporaryLgrFeature.cpp
 ${CMAKE_CURRENT_LIST_DIR}/RicDeleteTemporaryLgrsFeature.cpp
-${CMAKE_CURRENT_LIST_DIR}/RicCreateTextAnnotationFeature.cpp
-${CMAKE_CURRENT_LIST_DIR}/RicCreateReachCircleAnnotationFeature.cpp
-${CMAKE_CURRENT_LIST_DIR}/RicCreateUserDefinedPolylinesAnnotationFeature.cpp
 )
 
 

ApplicationCode/Commands/RicCreateUserDefinedPolylinesAnnotationFeature.cpp

@@ -55,7 +55,7 @@ void RicCreateUserDefinedPolylinesAnnotationFeature::onActionTriggered(bool isCh
     auto coll = annotationCollection();
     if (coll)
     {
-        auto newAnnotation = new RimUserDefinedPolyLinesAnnotation();
+        auto newAnnotation = new RimUserDefinedPolylinesAnnotation();
         coll->addAnnotation(newAnnotation);
         coll->updateConnectedEditors();
         RiuMainWindow::instance()->selectAsCurrentItem(newAnnotation);