From b6f7dff49c6010b0773da614aa8aa5ce5e633e29 Mon Sep 17 00:00:00 2001
From: Thomas Fischer <thomas.fischer@ufz.de>
Date: Wed, 23 Jan 2013 10:27:27 +0100
Subject: [PATCH] Fixed include dependencies.
---
FemLib/FEMCondition.cpp | 19 ++++++++++---------
FemLib/FEMCondition.h | 26 +++++++++++---------------
Gui/VtkVis/VtkConditionSource.cpp | 17 +++++++++++------
3 files changed, 32 insertions(+), 30 deletions(-)
diff --git a/FemLib/FEMCondition.cpp b/FemLib/FEMCondition.cpp
index 8d2f8002560..450a094d528 100644
--- a/FemLib/FEMCondition.cpp
+++ b/FemLib/FEMCondition.cpp
@@ -13,9 +13,6 @@
*/
#include "FEMCondition.h"
-#include "ProcessInfo.h"
-
-#include "GEOObjects.h" //for SourceTerm
FEMCondition::FEMCondition(const std::string &geometry_name, CondType t)
: _type(t), _geoName("[unspecified]"), _associated_geometry(geometry_name)
@@ -26,16 +23,20 @@ FEMCondition::FEMCondition(const std::string &geometry_name, CondType t)
this->setProcessDistributionType(FiniteElement::INVALID_DIS_TYPE);
}
-FEMCondition::FEMCondition(const std::string &geometry_name, FiniteElement::ProcessType pt,
- FiniteElement::PrimaryVariable pv, GeoLib::GEOTYPE gt, const std::string &gn,
- FiniteElement::DistributionType dt, CondType ct)
+FEMCondition::FEMCondition(const std::string &geometry_name,
+ FiniteElement::ProcessType pt,
+ FiniteElement::PrimaryVariable pv,
+ GeoLib::GEOTYPE gt,
+ const std::string &gn,
+ FiniteElement::DistributionType dt,
+ CondType ct)
: ProcessInfo(pt, pv/*, NULL*/), GeoInfo(gt, NULL), DistributionInfo(dt), _type(ct),
_geoName(gn), _associated_geometry(geometry_name)
{
}
FEMCondition::FEMCondition(const FEMCondition &cond, CondType t)
- : ProcessInfo(cond.getProcessType(), cond.getProcessPrimaryVariable()/*, NULL*/),
+ : ProcessInfo(cond.getProcessType(), cond.getProcessPrimaryVariable() /*, NULL*/),
GeoInfo(cond.getGeomType(), cond.getGeoObj()),
DistributionInfo(cond.getProcessDistributionType()),
_type(t),
@@ -67,6 +68,6 @@ void FEMCondition::setDisValues(const std::vector< std::pair<size_t, double> > &
nodes.push_back(dis_values[i].first);
values.push_back(dis_values[i].second);
}
- this->_disNodes=nodes;
- this->_disValues=values;
+ this->_disNodes = nodes;
+ this->_disValues = values;
}
diff --git a/FemLib/FEMCondition.h b/FemLib/FEMCondition.h
index d6c874cebc5..5b74ae47f94 100644
--- a/FemLib/FEMCondition.h
+++ b/FemLib/FEMCondition.h
@@ -15,22 +15,16 @@
#ifndef FEMCONDITION_H
#define FEMCONDITION_H
+#include <vector>
+
#include "DistributionInfo.h"
#include "GeoInfo.h"
-#include "GeoObject.h"
-#include "Point.h"
#include "ProcessInfo.h"
-#include <vector>
-
class CBoundaryCondition;
class CInitialCondition;
class CSourceTerm;
-//class GEOObjects;
-class GridAdapter;
-#include "GEOObjects.h"
-
/**
* \brief Adapter class for handling FEM Conditions in the user Interface
*/
@@ -47,11 +41,12 @@ public:
FEMCondition(const std::string &geometry_name, CondType t = UNSPECIFIED);
FEMCondition(const std::string &geometry_name,
- FiniteElement::ProcessType pt = FiniteElement::INVALID_PROCESS,
- FiniteElement::PrimaryVariable pv = FiniteElement::INVALID_PV,
- GeoLib::GEOTYPE gt = GeoLib::INVALID,
- const std::string &gn = "[unspecified]",
- FiniteElement::DistributionType dt = FiniteElement::INVALID_DIS_TYPE, CondType ct = UNSPECIFIED);
+ FiniteElement::ProcessType pt = FiniteElement::INVALID_PROCESS,
+ FiniteElement::PrimaryVariable pv = FiniteElement::INVALID_PV,
+ GeoLib::GEOTYPE gt = GeoLib::INVALID,
+ const std::string &gn = "[unspecified]",
+ FiniteElement::DistributionType dt = FiniteElement::INVALID_DIS_TYPE,
+ CondType ct = UNSPECIFIED);
FEMCondition(const FEMCondition &cond, CondType t);
~FEMCondition() {}
@@ -75,7 +70,8 @@ public:
void setConstantDisValue(double disValue) {_disValues.clear(); _disValues.push_back(disValue); }
/// Sets a vector of values specifying the distribution.
- void setDisValues(const std::vector<std::size_t> &disNodes, const std::vector<double> &disValues)
+ void setDisValues(const std::vector<std::size_t> &disNodes,
+ const std::vector<double> &disValues)
{
_disNodes = disNodes;
_disValues = disValues;
@@ -86,7 +82,7 @@ public:
void setDisValues(const std::vector< std::pair<std::size_t, double> > &dis_values);
/// Removes all distribution values
- void clearDisValues() { _disValues.resize(0); };
+ void clearDisValues() { _disValues.resize(0); }
/// Sets the name of the geo-object the condition is assigned to.
void setGeoName(std::string geoName) { _geoName = geoName; }
diff --git a/Gui/VtkVis/VtkConditionSource.cpp b/Gui/VtkVis/VtkConditionSource.cpp
index 416ea5a8622..70c8923200d 100644
--- a/Gui/VtkVis/VtkConditionSource.cpp
+++ b/Gui/VtkVis/VtkConditionSource.cpp
@@ -16,6 +16,8 @@
// GeoLib
#include "AABB.h"
#include "Color.h"
+#include "Polyline.h"
+#include "Surface.h"
#include "FEMCondition.h"
#include "VtkConditionSource.h"
@@ -29,9 +31,9 @@
#include <vtkPoints.h>
#include <vtkPolyData.h>
#include <vtkPolygon.h>
+#include <vtkProperty.h>
#include <vtkSmartPointer.h>
#include <vtkStreamingDemandDrivenPipeline.h>
-#include <vtkProperty.h>
#include <vtkLookupTable.h>
@@ -131,7 +133,8 @@ int VtkConditionSource::RequestData( vtkInformation* request,
dis_type_value = static_cast<vtkIdType>(_dis_type_map.size());
_dis_type_map.insert(std::pair<FiniteElement::DistributionType, size_t>(type, dis_type_value));
}
- else dis_type_value = it->second;
+ else
+ dis_type_value = it->second;
if ((*_cond_vec)[n]->getGeomType() == GeoLib::POINT)
{
@@ -166,7 +169,8 @@ int VtkConditionSource::RequestData( vtkInformation* request,
}
else if ((*_cond_vec)[n]->getGeomType() == GeoLib::POLYLINE)
{
- const GeoLib::Polyline* ply = static_cast<const GeoLib::Polyline*>((*_cond_vec)[n]->getGeoObj());
+ const GeoLib::Polyline* ply =
+ static_cast<const GeoLib::Polyline*>((*_cond_vec)[n]->getGeoObj());
const int nPoints = ply->getNumberOfPoints();
newLines->InsertNextCell(nPoints);
double value (0);
@@ -182,7 +186,7 @@ int VtkConditionSource::RequestData( vtkInformation* request,
scalars->InsertNextValue(dis_values[0]);
else if (type == FiniteElement::LINEAR || type == FiniteElement::LINEAR_NEUMANN)
{
- for (size_t j = 0; j < dis_values.size(); j ++)
+ for (size_t j = 0; j < dis_values.size(); j++)
{
if (static_cast<int>(dis_nodes[j]) == i)
value = dis_values[j];
@@ -216,7 +220,8 @@ int VtkConditionSource::RequestData( vtkInformation* request,
if (point_idx_map[point_index] == -1)
{
point_idx_map[point_index] = pnt_id;
- newPoints->InsertNextPoint((*_points)[point_index]->getCoords());
+ newPoints->InsertNextPoint(
+ (*_points)[point_index]->getCoords());
aPolygon->GetPointIds()->SetId(j, pnt_id);
distypes->InsertNextValue(dis_type_value);
@@ -246,7 +251,7 @@ int VtkConditionSource::RequestData( vtkInformation* request,
else if ((*_cond_vec)[n]->getGeomType() == GeoLib::INVALID)
{
size_t nValues = dis_values.size();
- for (size_t i=0; i<nValues; i++)
+ for (size_t i = 0; i < nValues; i++)
{
//vtkIdType pid = newPoints->InsertNextPoint((*_points)[dis_nodes[i]]->getData());
vtkIdType pid = newPoints->InsertNextPoint((*_points)[i]->getCoords());
--
GitLab