refactor : fix some badsmells

Author: thomaslepoix

src/domain/board.cpp

@@ -571,24 +571,17 @@ void Board::detect_diagonal_zones(Plane plane) {
 		found += subranges.size();
 		bar.tick(found, k);
 		for(auto& subrange : subranges) {
-			auto angles = subrange
+			auto subrange_angles = subrange
 				| views::transform([](auto const& range) { return range.angles; })
 				| views::join
 				| ranges::to<vector<Angle*>>();
-			ranges::sort(angles);
-			ranges::unique(angles);
-
-			auto edges = subrange
-				| views::transform([](auto const& range) { return range.edges; })
-				| views::join
-				| ranges::to<vector<Edge*>>();
-			ranges::sort(edges);
-			ranges::unique(edges);
+			ranges::sort(subrange_angles);
+			auto [b, e] = ranges::unique(subrange_angles);
+			angles.erase(b, e);
 
 			conflict_manager->add_diagonal_or_circular_zone(
 				Axes[plane][view_axis],
-				angles,
-				edges,
+				subrange_angles,
 				global_params.get()
 			);
 		}

src/domain/conflict_manager.cpp

@@ -204,7 +204,7 @@ ConflictTooCloseMeshlinePolicies* ConflictManager::add_too_close_meshline_polici
 
 // TODO merge if two DOCZ in the same axis overlap, coming from two different planes
 //******************************************************************************
-void ConflictManager::add_diagonal_or_circular_zone(Axis axis, vector<Angle*> const& angles, vector<Edge*> const& edges, GlobalParams* global_params) {
+void ConflictManager::add_diagonal_or_circular_zone(Axis axis, vector<Angle*> const& angles, GlobalParams* global_params) {
 	auto [t, state] = make_next_state();
 
 	if(angles.empty())
@@ -256,7 +256,7 @@ void ConflictManager::auto_solve_all_diagonal_zones(Axis const axis) {
 		"["s + to_string(axis) + "] Solving INTERVAL part of DIAGONAL_ZONE conflicts ");
 
 	for(auto const& conflict : get_current_state().all_diagonal_or_circular_zone[axis]) {
-		conflict->solve_intervals(*line_policy_manager);
+		conflict->solve_intervals();
 		bar.tick(i++);
 	}
 

src/domain/conflict_manager.hpp

@@ -58,7 +58,7 @@ class ConflictManager
 	void add_edge_in_polygon(Edge* a, Polygon* polygon, Range const range, std::optional<Edge const*> b = std::nullopt);
 	ConflictTooCloseMeshlinePolicies* add_too_close_meshline_policies(MeshlinePolicy* a, MeshlinePolicy* b) noexcept;
 
-	void add_diagonal_or_circular_zone(Axis axis, std::vector<Angle*> const& angles, std::vector<Edge*> const& edges, GlobalParams* global_params);
+	void add_diagonal_or_circular_zone(Axis axis, std::vector<Angle*> const& angles, GlobalParams* global_params);
 
 //	void add_user_will(Edge* a); // TODO
 

src/domain/conflicts/conflict_diagonal_or_circular_zone.cpp

@@ -81,7 +81,7 @@ void ConflictDiagonalOrCircularZone::solve_angles() {
 }
 
 //******************************************************************************
-void ConflictDiagonalOrCircularZone::solve_intervals(MeshlinePolicyManager& line_policy_manager) {
+void ConflictDiagonalOrCircularZone::solve_intervals() {
 	auto [t, state] = make_next_state();
 
 	// TODO lmin for extremities

src/domain/conflicts/conflict_diagonal_or_circular_zone.hpp

@@ -48,7 +48,7 @@ class ConflictDiagonalOrCircularZone
 	// TODO Refactor to Avoid that
 	void auto_solve(MeshlinePolicyManager& line_policy_manager) override;
 	void solve_angles();
-	void solve_intervals(MeshlinePolicyManager& line_policy_manager);
+	void solve_intervals();
 };
 
 } // namespace domain

src/domain/meshline_policy_manager.cpp

@@ -172,7 +172,7 @@ void MeshlinePolicyManager::detect_intervals_per_diagonal_zones(Axis const axis)
 	for(auto& conflict : conflict_manager->get_diagonal_or_circular_zones(axis)) {
 		Bounding1D const bounding = conflict->bounding();
 		vector<Interval*> intervals;
-		for(auto& interval : state.intervals[axis]) {
+		for(auto const& interval : state.intervals[axis]) {
 			++i;
 			if(does_overlap(bounding, interval->m)) {
 				++found;

src/ui/qt/processing_view/processing_interval.cpp

@@ -57,7 +57,7 @@ ProcessingInterval::ProcessingInterval(domain::Interval const* interval, QGraphi
 		nodegraph::Port* docz_port = nullptr;
 		auto const& state = interval->get_current_state();
 		for(domain::Conflict* conflict : state.conflicts) {
-			if(auto* conflict_docz = dynamic_cast<domain::ConflictDiagonalOrCircularZone*>(conflict); conflict_docz) {
+			if(auto const* conflict_docz = dynamic_cast<domain::ConflictDiagonalOrCircularZone*>(conflict); conflict_docz) {
 				if(!docz_port) {
 					docz_port = add_input_port(" ");
 					docz_port->setFlag(QGraphicsItem::ItemIsSelectable);

src/ui/qt/structure_view/structure_angle.cpp

@@ -16,7 +16,7 @@
 
 namespace ui::qt {
 
-static qreal diameter = 5;
+static qreal constexpr diameter = 5;
 
 //******************************************************************************
 static QRectF convert(domain::Angle const* angle) {

src/ui/qt/structure_view/structure_angle.hpp

@@ -43,7 +43,7 @@ class StructureAngle : public QGraphicsEllipseItem {
 
 	std::function<Params const& ()> locate_structure_angle_params;
 
-	StructureAngle(domain::Angle const* angle, QGraphicsItem* parent = nullptr);
+	explicit StructureAngle(domain::Angle const* angle, QGraphicsItem* parent = nullptr);
 
 	int type() const override;
 	void paint(QPainter* painter, QStyleOptionGraphicsItem const* option, QWidget* widget = nullptr) override;