Commit 124d3118 authored by Alexandre Halbach's avatar Alexandre Halbach

Check geo

parent 986ece16
......@@ -28,7 +28,7 @@ rawarc::rawarc(int physreg, std::vector<std::shared_ptr<rawshape>> inputpoints,
std::shared_ptr<rawshape> rawarc::extrude(int physreg, double height, int numlayers)
{
return std::shared_ptr<rawextrusion>(new rawextrusion(physreg, sons, {shared_from_this()}, height, numlayers));
return std::shared_ptr<rawextrusion>(new rawextrusion(physreg, shared_from_this(), height, numlayers));
}
std::shared_ptr<rawshape> rawarc::duplicate(void)
......
......@@ -35,11 +35,6 @@ rawdisk::rawdisk(int physreg, std::shared_ptr<rawshape> centerpoint, double radi
}
std::shared_ptr<rawshape> rawdisk::extrude(int physreg, double height, int numlayers)
{
return std::shared_ptr<rawextrusion>(new rawextrusion(physreg, sons, {shared_from_this()}, height, numlayers));
}
std::shared_ptr<rawshape> rawdisk::duplicate(void)
{
std::shared_ptr<rawdisk> out(new rawdisk);
......
......@@ -50,8 +50,6 @@ class rawdisk: public rawshape
rawdisk(int physreg, std::shared_ptr<rawshape> centerpoint, double radius, int nummeshpts);
std::shared_ptr<rawshape> extrude(int physreg, double height, int numlayers);
std::shared_ptr<rawshape> duplicate(void);
void setphysicalregion(int physreg);
......
This diff is collapsed.
......@@ -15,6 +15,7 @@
#include "expression.h"
#include "rawshape.h"
#include "rawquadrangle.h"
#include "rawline.h"
#include "rawpoint.h"
#include "geotools.h"
......@@ -41,21 +42,14 @@ class rawextrusion: public rawshape
// Extrusion length:
double myheight;
// Dimension of the extruded shape:
int mydimension;
// Unextruded shapes:
std::vector<std::shared_ptr<rawshape>> myunextrudedregions = {};
// Lines that are the contour of the unextruded shape:
std::vector<std::shared_ptr<rawshape>> mycontourregions = {};
// Unextruded rawshape:
std::shared_ptr<rawshape> mybaseshape;
public:
rawextrusion(void) {};
rawextrusion(int physreg, std::vector<std::shared_ptr<rawshape>> contour, std::vector<std::shared_ptr<rawshape>> innerregions, double height, int numlayers);
rawextrusion(int physreg, std::shared_ptr<rawshape> innerrawshape, double height, int numlayers);
std::shared_ptr<rawshape> duplicate(void);
......
......@@ -57,7 +57,7 @@ rawline::rawline(int physreg, std::vector<std::shared_ptr<rawshape>> inputpoints
std::shared_ptr<rawshape> rawline::extrude(int physreg, double height, int numlayers)
{
return std::shared_ptr<rawextrusion>(new rawextrusion(physreg, sons, {shared_from_this()}, height, numlayers));
return std::shared_ptr<rawextrusion>(new rawextrusion(physreg, shared_from_this(), height, numlayers));
}
std::shared_ptr<rawshape> rawline::duplicate(void)
......
......@@ -19,7 +19,7 @@ rawpoint::rawpoint(int physreg, std::vector<double> coords)
std::shared_ptr<rawshape> rawpoint::extrude(int physreg, double height, int numlayers)
{
return std::shared_ptr<rawextrusion>(new rawextrusion(physreg, {}, {shared_from_this()}, height, numlayers));
return std::shared_ptr<rawextrusion>(new rawextrusion(physreg, shared_from_this(), height, numlayers));
}
std::shared_ptr<rawshape> rawpoint::duplicate(void)
......
......@@ -47,7 +47,7 @@ rawquadrangle::rawquadrangle(int physreg, std::vector<std::shared_ptr<rawshape>>
std::shared_ptr<rawshape> rawquadrangle::extrude(int physreg, double height, int numlayers)
{
return std::shared_ptr<rawextrusion>(new rawextrusion(physreg, sons, {shared_from_this()}, height, numlayers));
return std::shared_ptr<rawextrusion>(new rawextrusion(physreg, shared_from_this(), height, numlayers));
}
std::shared_ptr<rawshape> rawquadrangle::duplicate(void)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment