Skip to content

Commit

Permalink
Rename
Browse files Browse the repository at this point in the history
  • Loading branch information
magnesj committed Feb 12, 2024
1 parent e82dba0 commit 8d62a70
Show file tree
Hide file tree
Showing 11 changed files with 25 additions and 26 deletions.
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
set(SOURCE_GROUP_HEADER_FILES
${CMAKE_CURRENT_LIST_DIR}/RicAppendPolygonFeature.h
${CMAKE_CURRENT_LIST_DIR}/RicAppendPolygonFileFeature.h
${CMAKE_CURRENT_LIST_DIR}/RicNewPolygonFeature.h
${CMAKE_CURRENT_LIST_DIR}/RicNewPolygonFileFeature.h
)

set(SOURCE_GROUP_SOURCE_FILES
${CMAKE_CURRENT_LIST_DIR}/RicAppendPolygonFeature.cpp
${CMAKE_CURRENT_LIST_DIR}/RicAppendPolygonFileFeature.cpp
${CMAKE_CURRENT_LIST_DIR}/RicNewPolygonFeature.cpp
${CMAKE_CURRENT_LIST_DIR}/RicNewPolygonFileFeature.cpp
)

list(APPEND COMMAND_CODE_HEADER_FILES ${SOURCE_GROUP_HEADER_FILES})
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
////////////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2022 Equinor ASA
// Copyright (C) 2024 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
Expand All @@ -16,7 +16,7 @@
//
/////////////////////////////////////////////////////////////////////////////////

#include "RicAppendPolygonFeature.h"
#include "RicNewPolygonFeature.h"

#include "Polygons/RimPolygon.h"
#include "Polygons/RimPolygonCollection.h"
Expand All @@ -27,12 +27,12 @@

#include <QAction>

CAF_CMD_SOURCE_INIT( RicAppendPolygonFeature, "RicAppendPolygonFeature" );
CAF_CMD_SOURCE_INIT( RicNewPolygonFeature, "RicNewPolygonFeature" );

//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RicAppendPolygonFeature::onActionTriggered( bool isChecked )
void RicNewPolygonFeature::onActionTriggered( bool isChecked )
{
auto proj = RimProject::current();
auto polygonCollection = proj->activeOilField()->polygonCollection();
Expand All @@ -47,8 +47,8 @@ void RicAppendPolygonFeature::onActionTriggered( bool isChecked )
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RicAppendPolygonFeature::setupActionLook( QAction* actionToSetup )
void RicNewPolygonFeature::setupActionLook( QAction* actionToSetup )
{
actionToSetup->setText( "Append Polygon" );
actionToSetup->setText( "New Polygon" );
actionToSetup->setIcon( QIcon( ":/PolylinesFromFile16x16.png" ) );
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
////////////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2022 Equinor ASA
// Copyright (C) 2024 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
Expand All @@ -23,7 +23,7 @@
//==================================================================================================
///
//==================================================================================================
class RicAppendPolygonFeature : public caf::CmdFeature
class RicNewPolygonFeature : public caf::CmdFeature
{
CAF_CMD_HEADER_INIT;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
//
/////////////////////////////////////////////////////////////////////////////////

#include "RicAppendPolygonFileFeature.h"
#include "RicNewPolygonFileFeature.h"

#include "Polygons/RimPolygon.h"
#include "Polygons/RimPolygonCollection.h"
Expand All @@ -28,12 +28,12 @@

#include <QAction>

CAF_CMD_SOURCE_INIT( RicAppendPolygonFileFeature, "RicAppendPolygonFileFeature" );
CAF_CMD_SOURCE_INIT( RicNewPolygonFileFeature, "RicNewPolygonFileFeature" );

//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RicAppendPolygonFileFeature::onActionTriggered( bool isChecked )
void RicNewPolygonFileFeature::onActionTriggered( bool isChecked )
{
auto proj = RimProject::current();
auto polygonCollection = proj->activeOilField()->polygonCollection();
Expand All @@ -50,8 +50,8 @@ void RicAppendPolygonFileFeature::onActionTriggered( bool isChecked )
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RicAppendPolygonFileFeature::setupActionLook( QAction* actionToSetup )
void RicNewPolygonFileFeature::setupActionLook( QAction* actionToSetup )
{
actionToSetup->setText( "Append File Polygon" );
actionToSetup->setText( "New File Polygon" );
actionToSetup->setIcon( QIcon( ":/PolylinesFromFile16x16.png" ) );
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
////////////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2022 Equinor ASA
// Copyright (C) 2024 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
Expand All @@ -23,7 +23,7 @@
//==================================================================================================
///
//==================================================================================================
class RicAppendPolygonFileFeature : public caf::CmdFeature
class RicNewPolygonFileFeature : public caf::CmdFeature
{
CAF_CMD_HEADER_INIT;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,6 @@

#include "cvfBoundingBox.h"

#include <xutility>

CAF_PDM_SOURCE_INIT( RimPolygonAppearance, "RimPolygonAppearance" );

//--------------------------------------------------------------------------------------------------
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ CAF_PDM_SOURCE_INIT( RimPolygonCollection, "RimPolygonCollection" );
//--------------------------------------------------------------------------------------------------
RimPolygonCollection::RimPolygonCollection()
{
CAF_PDM_InitObject( "Polygons", ":/PolylinesFromFile16x16.png" );
CAF_PDM_InitObject( "Polygons (Under construction)", ":/PolylinesFromFile16x16.png" );

CAF_PDM_InitFieldNoDefault( &m_polygons, "Polygons", "Polygons" );
CAF_PDM_InitFieldNoDefault( &m_polygonFiles, "PolygonFiles", "Polygon Files" );
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,6 @@ RimPolygonInView::RimPolygonInView()

CAF_PDM_InitFieldNoDefault( &m_targets, "Targets", "Targets" );
m_targets.uiCapability()->setUiEditorTypeName( caf::PdmUiTableViewEditor::uiEditorTypeName() );
// m_targets.uiCapability()->setUiTreeHidden(true);
m_targets.uiCapability()->setUiTreeChildrenHidden( true );
m_targets.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::TOP );
m_targets.uiCapability()->setCustomContextMenuEnabled( true );
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@
#include "RimPolylinePickerInterface.h"
#include "RimPolylinesDataInterface.h"

#include "RivPolylinePartMgr.h"

#include "cafPdmChildArrayField.h"
#include "cafPdmPtrField.h"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ CAF_PDM_SOURCE_INIT( RimPolygonInViewCollection, "RimPolygonInViewCollection" );
//--------------------------------------------------------------------------------------------------
RimPolygonInViewCollection::RimPolygonInViewCollection()
{
CAF_PDM_InitObject( "Polygons", ":/PolylinesFromFile16x16.png" );
CAF_PDM_InitObject( "Polygons (Under construction)", ":/PolylinesFromFile16x16.png" );

CAF_PDM_InitFieldNoDefault( &m_polygons, "Polygons", "Polygons" );
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1141,8 +1141,8 @@ caf::CmdFeatureMenuBuilder RimContextCommandBuilder::commandsFromSelection()
}
else if ( dynamic_cast<RimPolygonCollection*>( firstUiItem ) )
{
menuBuilder << "RicAppendPolygonFeature";
menuBuilder << "RicAppendPolygonFileFeature";
menuBuilder << "RicNewPolygonFeature";
menuBuilder << "RicNewPolygonFileFeature";
}

if ( dynamic_cast<Rim3dView*>( firstUiItem ) )
Expand Down

0 comments on commit 8d62a70

Please sign in to comment.