From 03ad142261f9f829dbe0c92f7acba88ef074ce19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacob=20St=C3=B8ren?= Date: Wed, 12 Jun 2013 10:52:46 +0200 Subject: [PATCH] Removed debug output p4#: 21887 --- ApplicationCode/Application/RiaApplication.cpp | 4 ++-- ApplicationCode/ModelVisualization/RivWellPathPartMgr.cpp | 8 +++++--- ApplicationCode/ModelVisualization/RivWellPathPartMgr.h | 2 +- ApplicationCode/ProjectDataModel/RimProject.cpp | 4 ++-- ApplicationCode/ProjectDataModel/RimReservoirView.cpp | 8 ++++---- ApplicationCode/ProjectDataModel/RimWellPath.cpp | 4 ++-- .../ProjectDataModel/RimWellPathCollection.cpp | 2 +- 7 files changed, 17 insertions(+), 15 deletions(-) diff --git a/ApplicationCode/Application/RiaApplication.cpp b/ApplicationCode/Application/RiaApplication.cpp index 482bdf6ba5..a2415172e8 100644 --- a/ApplicationCode/Application/RiaApplication.cpp +++ b/ApplicationCode/Application/RiaApplication.cpp @@ -309,7 +309,7 @@ bool RiaApplication::loadProject(const QString& projectFileName) if (oilField == NULL) continue; if (oilField->wellPathCollection == NULL) { - printf("Create well path collection for oil field %i in loadProject.\n", oilFieldIdx); + //printf("Create well path collection for oil field %i in loadProject.\n", oilFieldIdx); oilField->wellPathCollection = new RimWellPathCollection(); oilField->wellPathCollection->setProject(m_project); } @@ -367,7 +367,7 @@ void RiaApplication::addWellPathsToModel(QList wellPathFilePaths) if (oilField->wellPathCollection == NULL) { - printf("Create well path collection.\n"); + //printf("Create well path collection.\n"); oilField->wellPathCollection = new RimWellPathCollection(); oilField->wellPathCollection->setProject(m_project); RiuMainWindow::instance()->uiPdmModel()->updateUiSubTree(m_project); diff --git a/ApplicationCode/ModelVisualization/RivWellPathPartMgr.cpp b/ApplicationCode/ModelVisualization/RivWellPathPartMgr.cpp index 1e8d04f678..d697cb1891 100644 --- a/ApplicationCode/ModelVisualization/RivWellPathPartMgr.cpp +++ b/ApplicationCode/ModelVisualization/RivWellPathPartMgr.cpp @@ -235,16 +235,18 @@ void RivWellPathPartMgr::appendStaticGeometryPartsToModel(cvf::ModelBasicList* m if (m_needsTransformUpdate) { - printf("G"); + //printf("G"); buildWellPathParts(displayModelOffset, characteristicCellSize, boundingBox); } else { - printf("s"); + //printf("s"); } if (m_wellBranches.size() < 1) - printf("RivWellPathPartMgr::appendStaticGeometryPartsToModel: There are no well branches in well \"%s\"!!!\n", (const char*) m_rimWellPath->name().toLocal8Bit()); + { + //printf("RivWellPathPartMgr::appendStaticGeometryPartsToModel: There are no well branches in well \"%s\"!!!\n", (const char*) m_rimWellPath->name().toLocal8Bit()); + } std::list::iterator it; for (it = m_wellBranches.begin(); it != m_wellBranches.end(); it++) diff --git a/ApplicationCode/ModelVisualization/RivWellPathPartMgr.h b/ApplicationCode/ModelVisualization/RivWellPathPartMgr.h index 407ab7828e..b1dc9ed3c8 100644 --- a/ApplicationCode/ModelVisualization/RivWellPathPartMgr.h +++ b/ApplicationCode/ModelVisualization/RivWellPathPartMgr.h @@ -43,7 +43,7 @@ public: void setScaleTransform(cvf::Transform * scaleTransform); - void scheduleGeometryRegen() { m_needsTransformUpdate = true; printf("R"); } + void scheduleGeometryRegen() { m_needsTransformUpdate = true; }//printf("R"); } void appendStaticGeometryPartsToModel(cvf::ModelBasicList* model, cvf::Vec3d displayModelOffset, double characteristicCellSize, cvf::BoundingBox boundingBox); diff --git a/ApplicationCode/ProjectDataModel/RimProject.cpp b/ApplicationCode/ProjectDataModel/RimProject.cpp index 9c415bd32c..2d1a26c047 100644 --- a/ApplicationCode/ProjectDataModel/RimProject.cpp +++ b/ApplicationCode/ProjectDataModel/RimProject.cpp @@ -223,7 +223,7 @@ void RimProject::initAfterRead() if (analysisModels) { analysisModels->caseGroups.push_back(sourceCaseGroup); - printf("Moved m_project->caseGroupsObsolete[%i] to first oil fields analysis models\n", cgIdx); + //printf("Moved m_project->caseGroupsObsolete[%i] to first oil fields analysis models\n", cgIdx); movedOneRimIdenticalGridCaseGroup = true; // moved at least one so assume the others will be moved too... } } @@ -240,7 +240,7 @@ void RimProject::initAfterRead() if (analysisModels) { analysisModels->cases.push_back(sourceCase); - printf("Moved m_project->casesObsolete[%i] to first oil fields analysis models\n", cIdx); + //printf("Moved m_project->casesObsolete[%i] to first oil fields analysis models\n", cIdx); movedOneRimCase = true; // moved at least one so assume the others will be moved too... } } diff --git a/ApplicationCode/ProjectDataModel/RimReservoirView.cpp b/ApplicationCode/ProjectDataModel/RimReservoirView.cpp index fcf6121334..6b2c3b7b75 100644 --- a/ApplicationCode/ProjectDataModel/RimReservoirView.cpp +++ b/ApplicationCode/ProjectDataModel/RimReservoirView.cpp @@ -652,7 +652,7 @@ void RimReservoirView::createDisplayModel() //-------------------------------------------------------------------------------------------------- void RimReservoirView::updateCurrentTimeStep() { - printf("########## updateCurrentTimeStep for frame %i ##########\n", m_currentTimeStep.v()); + //printf("########## updateCurrentTimeStep for frame %i ##########\n", m_currentTimeStep.v()); std::vector geometriesToRecolor; if (this->propertyFilterCollection()->hasActiveFilters()) @@ -765,7 +765,7 @@ void RimReservoirView::updateCurrentTimeStep() for (size_t i = 0; i < wellPathModels.size(); i++) { - printf("updateCurrentTimeStep: Remove WellPathModel %i from frameScene, for frame %i\n", i, m_currentTimeStep.v()); + //printf("updateCurrentTimeStep: Remove WellPathModel %i from frameScene, for frame %i\n", i, m_currentTimeStep.v()); frameScene->removeModel(wellPathModels[i]); } @@ -777,12 +777,12 @@ void RimReservoirView::updateCurrentTimeStep() RivWellPathCollectionPartMgr* wellPathCollectionPartMgr = (wellPathCollection) ? wellPathCollection->wellPathCollectionPartMgr() : NULL; if (wellPathCollectionPartMgr) { - printf("updateCurrentTimeStep: Append well paths for frame %i: ", m_currentTimeStep.v()); + //printf("updateCurrentTimeStep: Append well paths for frame %i: ", m_currentTimeStep.v()); cvf::Vec3d displayModelOffset = eclipseCase()->reservoirData()->mainGrid()->displayModelOffset(); double characteristicCellSize = eclipseCase()->reservoirData()->mainGrid()->characteristicIJCellSize(); cvf::BoundingBox boundingBox = currentActiveCellInfo()->geometryBoundingBox(); wellPathCollectionPartMgr->appendStaticGeometryPartsToModel(wellPathModelBasicList.p(), displayModelOffset, m_reservoirGridPartManager->scaleTransform(), characteristicCellSize, boundingBox); - printf("\n"); + //printf("\n"); } wellPathModelBasicList->updateBoundingBoxesRecursive(); frameScene->addModel(wellPathModelBasicList.p()); diff --git a/ApplicationCode/ProjectDataModel/RimWellPath.cpp b/ApplicationCode/ProjectDataModel/RimWellPath.cpp index 8b8897816b..68aab7c3cc 100644 --- a/ApplicationCode/ProjectDataModel/RimWellPath.cpp +++ b/ApplicationCode/ProjectDataModel/RimWellPath.cpp @@ -183,9 +183,9 @@ void RimWellPath::readWellPathFile() updateDate = updateDateTime.toString("d MMMM yyyy"); updateUser = jsonMap["updateUser"].toString(); - printf("Read JSON file: well path name = %s\n filePath = %s\n", + /*printf("Read JSON file: well path name = %s\n filePath = %s\n", name().toStdString().c_str(), - (const char*) filepath().toLocal8Bit()); + (const char*) filepath().toLocal8Bit());*/ double datumElevation = jsonMap["datumElevation"].toDouble(); diff --git a/ApplicationCode/ProjectDataModel/RimWellPathCollection.cpp b/ApplicationCode/ProjectDataModel/RimWellPathCollection.cpp index 0f6d01edb4..12af620f21 100644 --- a/ApplicationCode/ProjectDataModel/RimWellPathCollection.cpp +++ b/ApplicationCode/ProjectDataModel/RimWellPathCollection.cpp @@ -144,7 +144,7 @@ void RimWellPathCollection::addWellPaths( QStringList filePaths ) QString s2 = f2.fileName(); if (s1 == s2) { - printf("Attempting to open well path JSON file that is already open:\n %s\n", (const char*) filePath.toLocal8Bit()); + //printf("Attempting to open well path JSON file that is already open:\n %s\n", (const char*) filePath.toLocal8Bit()); alreadyOpen = true; break; }