Skip to content

Commit 1dfa44f

Browse files
authored
refactor: Add HistogramND constructors taking Vector3 (#2307)
1 parent 60dba40 commit 1dfa44f

File tree

6 files changed

+19
-3
lines changed

6 files changed

+19
-3
lines changed

src/math/histogram1D.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ Histogram1D::Histogram1D()
1414
clear();
1515
}
1616

17+
Histogram1D::Histogram1D(const Vector3 &minMaxRange) { initialise(minMaxRange.x, minMaxRange.y, minMaxRange.z); }
18+
1719
Histogram1D::Histogram1D(const Histogram1D &source) { (*this) = source; }
1820

1921
// Clear Data

src/math/histogram1D.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,9 @@ class Histogram1D : public Serialisable<>
1111
{
1212
public:
1313
Histogram1D();
14-
~Histogram1D() = default;
14+
Histogram1D(const Vector3 &minMaxRange);
1515
Histogram1D(const Histogram1D &source);
16+
~Histogram1D() = default;
1617
// Clear data
1718
void clear();
1819

src/math/histogram2D.cpp

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,11 @@ Histogram2D::Histogram2D()
1313
clear();
1414
}
1515

16+
Histogram2D::Histogram2D(const Vector3 &xMinMaxRange, const Vector3 &yMinMaxRange)
17+
{
18+
initialise(xMinMaxRange.x, xMinMaxRange.y, xMinMaxRange.z, yMinMaxRange.x, yMinMaxRange.y, yMinMaxRange.z);
19+
}
20+
1621
Histogram2D::Histogram2D(const Histogram2D &source) { (*this) = source; }
1722

1823
// Clear Data

src/math/histogram2D.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,9 @@ class Histogram2D
1212
{
1313
public:
1414
Histogram2D();
15-
~Histogram2D() = default;
15+
Histogram2D(const Vector3 &xMinMaxRange, const Vector3 &yMinMaxRange);
1616
Histogram2D(const Histogram2D &source);
17+
~Histogram2D() = default;
1718
// Clear data
1819
void clear();
1920

src/math/histogram3D.cpp

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,12 @@ Histogram3D::Histogram3D()
1313
clear();
1414
}
1515

16+
Histogram3D::Histogram3D(const Vector3 &xMinMaxRange, const Vector3 &yMinMaxRange, const Vector3 &zMinMaxRange)
17+
{
18+
initialise(xMinMaxRange.x, xMinMaxRange.y, xMinMaxRange.z, yMinMaxRange.x, yMinMaxRange.y, yMinMaxRange.z, zMinMaxRange.x,
19+
zMinMaxRange.y, zMinMaxRange.z);
20+
}
21+
1622
Histogram3D::Histogram3D(const Histogram3D &source) { (*this) = source; }
1723

1824
// Clear Data

src/math/histogram3D.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,9 @@ class Histogram3D
1212
{
1313
public:
1414
Histogram3D();
15-
~Histogram3D() = default;
15+
Histogram3D(const Vector3 &xMinMaxRange, const Vector3 &yMinMaxRange, const Vector3 &zMinMaxRange);
1616
Histogram3D(const Histogram3D &source);
17+
~Histogram3D() = default;
1718
// Clear data
1819
void clear();
1920

0 commit comments

Comments
 (0)