comparison: src/gldraw.cpp
src/gldraw.cpp
- changeset 507
- fc76d38c3530
- parent 506
- 525f6c48db83
- child 510
- ee90c55dfeef
equal
deleted
inserted
replaced
| 506:525f6c48db83 | 507:fc76d38c3530 |
|---|---|
| 1432 transform = getCircleDrawMatrix ((dist0 != 0) ? dist0 : dist1); | 1432 transform = getCircleDrawMatrix ((dist0 != 0) ? dist0 : dist1); |
| 1433 circleOrDisc = true; | 1433 circleOrDisc = true; |
| 1434 } | 1434 } |
| 1435 elif (g_RingFinder (dist0, dist1)) | 1435 elif (g_RingFinder (dist0, dist1)) |
| 1436 { // The ring finder found a solution, use that. Add the component rings to the file. | 1436 { // The ring finder found a solution, use that. Add the component rings to the file. |
| 1437 for (const RingFinder::SolutionComponent& cmp : g_RingFinder.solution()) | 1437 for (const RingFinder::Component& cmp : g_RingFinder.bestSolution()->components()) |
| 1438 { if ((refFile = getFile (radialFileName (::Ring, lores, lores, cmp.num))) == null) | 1438 { if ((refFile = getFile (radialFileName (::Ring, lores, lores, cmp.num))) == null) |
| 1439 { refFile = generatePrimitive (::Ring, lores, lores, cmp.num); | 1439 { refFile = generatePrimitive (::Ring, lores, lores, cmp.num); |
| 1440 refFile->setImplicit (false); | 1440 refFile->setImplicit (false); |
| 1441 } | 1441 } |
| 1442 | 1442 |
