OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

Additional deprecated renaming

Browse Source
This commit is contained in:
Sigurd Pettersen 2024-01-11 13:20:26 +01:00
parent aa33001b64
commit dbaeb770cf
3 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Fwk/VizFwk/TestApps/Qt/QtMultiView_deprecated/QMVFactory_deprecated.cpp
View File

@ -266,7 +266,7 @@ ref<cvf::ShaderProgram> QMVModelFactory_deprecated::createProgramUnlit()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
QMVSceneFactory::QMVSceneFactory(QMVModelFactory_deprecated* modelFactory)
QMVSceneFactory_deprecated::QMVSceneFactory_deprecated(QMVModelFactory_deprecated* modelFactory)
: m_modelFactory(modelFactory)
{
}
@ -275,7 +275,7 @@ QMVSceneFactory::QMVSceneFactory(QMVModelFactory_deprecated* modelFactory)
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
ref<cvf::Scene> QMVSceneFactory::createNumberedScene(int sceneNumber)
ref<cvf::Scene> QMVSceneFactory_deprecated::createNumberedScene(int sceneNumber)
{
ref<cvf::Model> model;
switch (sceneNumber)
@ -293,7 +293,7 @@ ref<cvf::Scene> QMVSceneFactory::createNumberedScene(int sceneNumber)
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
ref<cvf::Scene> QMVSceneFactory::createFromModel(cvf::Model* model)
ref<cvf::Scene> QMVSceneFactory_deprecated::createFromModel(cvf::Model* model)
{
ref<cvf::Scene> scene = new cvf::Scene;
@ -316,7 +316,7 @@ ref<cvf::Scene> QMVSceneFactory::createFromModel(cvf::Model* model)
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
ref<cvf::RenderSequence> QMVRenderSequenceFactory::createFromScene(cvf::Scene* scene)
ref<cvf::RenderSequence> QMVRenderSequenceFactory_deprecated::createFromScene(cvf::Scene* scene)
{
ref<cvf::Rendering> rendering = new cvf::Rendering;
rendering->renderEngine()->enableItemCountUpdate(true);

6
Fwk/VizFwk/TestApps/Qt/QtMultiView_deprecated/QMVFactory_deprecated.h
View File

@ -70,10 +70,10 @@ private:
//
//
//==================================================================================================
class QMVSceneFactory
class QMVSceneFactory_deprecated
{
public:
QMVSceneFactory(QMVModelFactory_deprecated* modelFactory);
QMVSceneFactory_deprecated(QMVModelFactory_deprecated* modelFactory);
ref<cvf::Scene> createNumberedScene(int sceneNumber);
ref<cvf::Scene> createFromModel(cvf::Model* model);
@ -89,7 +89,7 @@ private:
//
//
//==================================================================================================
class QMVRenderSequenceFactory
class QMVRenderSequenceFactory_deprecated
{
public:
ref<cvf::RenderSequence> createFromScene(cvf::Scene* model);

16
Fwk/VizFwk/TestApps/Qt/QtMultiView_deprecated/QMVMainWindow_deprecated.cpp
View File

@ -316,7 +316,7 @@ void QMVMainWindow_deprecated::deleteAllVizWidgets()
//--------------------------------------------------------------------------------------------------
void QMVMainWindow_deprecated::setSceneInAllVizWidgets(cvf::Scene* scene)
{
QMVRenderSequenceFactory factory;
QMVRenderSequenceFactory_deprecated factory;
int i;
for (i = 0; i < MAX_NUM_WIDGETS; i++)
@ -337,7 +337,7 @@ void QMVMainWindow_deprecated::setSceneInAllVizWidgets(cvf::Scene* scene)
//--------------------------------------------------------------------------------------------------
void QMVMainWindow_deprecated::spreadScenesAcrossVizWidgets(cvf::Collection<cvf::Scene>* sceneCollection)
{
QMVRenderSequenceFactory factory;
QMVRenderSequenceFactory_deprecated factory;
cvf::uint i;
for (i = 0; i < static_cast<cvf::uint>(MAX_NUM_WIDGETS); i++)
@ -478,7 +478,7 @@ void QMVMainWindow_deprecated::slotConfigNumWidgets()
void QMVMainWindow_deprecated::slotCreateSphereAndBoxScene()
{
QMVModelFactory_deprecated modelFactory(!m_softwareRenderingWidgetsAction->isChecked());
QMVSceneFactory sceneFactory(&modelFactory);
QMVSceneFactory_deprecated sceneFactory(&modelFactory);
ref<cvf::Model> model = modelFactory.createSphereAndBox();
ref<cvf::Scene> scene = sceneFactory.createFromModel(model.p());
@ -493,7 +493,7 @@ void QMVMainWindow_deprecated::slotCreateSphereAndBoxScene()
void QMVMainWindow_deprecated::slotCreateSpheresScene()
{
QMVModelFactory_deprecated modelFactory(!m_softwareRenderingWidgetsAction->isChecked());
QMVSceneFactory sceneFactory(&modelFactory);
QMVSceneFactory_deprecated sceneFactory(&modelFactory);
ref<cvf::Model> model = modelFactory.createSpheres();
ref<cvf::Scene> scene = sceneFactory.createFromModel(model.p());
@ -508,7 +508,7 @@ void QMVMainWindow_deprecated::slotCreateSpheresScene()
void QMVMainWindow_deprecated::slotCreateBoxesScene()
{
QMVModelFactory_deprecated modelFactory(!m_softwareRenderingWidgetsAction->isChecked());
QMVSceneFactory sceneFactory(&modelFactory);
QMVSceneFactory_deprecated sceneFactory(&modelFactory);
ref<cvf::Model> model = modelFactory.createBoxes();
ref<cvf::Scene> scene = sceneFactory.createFromModel(model.p());
@ -523,7 +523,7 @@ void QMVMainWindow_deprecated::slotCreateBoxesScene()
void QMVMainWindow_deprecated::slotCreateTrianglesScene()
{
QMVModelFactory_deprecated modelFactory(!m_softwareRenderingWidgetsAction->isChecked());
QMVSceneFactory sceneFactory(&modelFactory);
QMVSceneFactory_deprecated sceneFactory(&modelFactory);
ref<cvf::Model> model = modelFactory.createTriangles();
ref<cvf::Scene> scene = sceneFactory.createFromModel(model.p());
@ -538,8 +538,8 @@ void QMVMainWindow_deprecated::slotCreateTrianglesScene()
void QMVMainWindow_deprecated::slotAllWidgetsDifferentScene()
{
QMVModelFactory_deprecated modelFactory(!m_softwareRenderingWidgetsAction->isChecked());
QMVSceneFactory sceneFactory(&modelFactory);
QMVRenderSequenceFactory renderSeqFactory;
QMVSceneFactory_deprecated sceneFactory(&modelFactory);
QMVRenderSequenceFactory_deprecated renderSeqFactory;
int i;
for (i = 0; i < MAX_NUM_WIDGETS; i++)