v1.0.0-rc.110 (#16)
All checks were successful
Build Packages / build:rpm (rocky8_nocuda) (push) Successful in 7m46s
Build Packages / build:rpm (rocky9_nocuda) (push) Successful in 8m45s
Build Packages / build:rpm (ubuntu2204_nocuda) (push) Successful in 6m56s
Build Packages / build:rpm (ubuntu2404_nocuda) (push) Successful in 5m58s
Build Packages / build:rpm (rocky8_sls9) (push) Successful in 6m59s
Build Packages / build:rpm (rocky8) (push) Successful in 7m33s
Build Packages / Generate python client (push) Successful in 19s
Build Packages / Build documentation (push) Successful in 41s
Build Packages / Create release (push) Has been skipped
Build Packages / build:rpm (rocky9) (push) Successful in 8m45s
Build Packages / build:rpm (ubuntu2204) (push) Successful in 7m51s
Build Packages / build:rpm (ubuntu2404) (push) Successful in 7m12s
Build Packages / Unit tests (push) Successful in 1h8m51s
All checks were successful
Build Packages / build:rpm (rocky8_nocuda) (push) Successful in 7m46s
Build Packages / build:rpm (rocky9_nocuda) (push) Successful in 8m45s
Build Packages / build:rpm (ubuntu2204_nocuda) (push) Successful in 6m56s
Build Packages / build:rpm (ubuntu2404_nocuda) (push) Successful in 5m58s
Build Packages / build:rpm (rocky8_sls9) (push) Successful in 6m59s
Build Packages / build:rpm (rocky8) (push) Successful in 7m33s
Build Packages / Generate python client (push) Successful in 19s
Build Packages / Build documentation (push) Successful in 41s
Build Packages / Create release (push) Has been skipped
Build Packages / build:rpm (rocky9) (push) Successful in 8m45s
Build Packages / build:rpm (ubuntu2204) (push) Successful in 7m51s
Build Packages / build:rpm (ubuntu2404) (push) Successful in 7m12s
Build Packages / Unit tests (push) Successful in 1h8m51s
This is an UNSTABLE release. * jfjoch_broker: Add auto-contrast option for preview images * Frontend: Add logo image * jfjoch_viewer: Add logo image * jfjoch_viewer: For image chart allow to set min value to zero * jfjoch_viewer: For resolution estimation plots, visualization uses 1/d^2 as measure * jfjoch_viewer: Add 3D unit cell visualization (experimental/WIP/not really there) * Documentation: Add logo image Reviewed-on: #16 Co-authored-by: Filip Leonarski <filip.leonarski@psi.ch> Co-committed-by: Filip Leonarski <filip.leonarski@psi.ch>
This commit was merged in pull request #16.
This commit is contained in:
@@ -162,8 +162,11 @@ void JFJochDiffractionImage::DrawResolutionRings() {
|
||||
auto geom = image->Dataset().experiment.GetDiffractionGeometry();
|
||||
geom.PoniRot3_rad(0.0);
|
||||
|
||||
|
||||
if (ring_mode == RingMode::Auto) {
|
||||
QColor ring_color = feature_color;
|
||||
if (ring_mode == RingMode::IceRings) {
|
||||
ring_color = ice_ring_color;
|
||||
res_ring = QVector<float>{ICE_RING_RES_A.begin(), ICE_RING_RES_A.end()};
|
||||
} else if (ring_mode == RingMode::Auto) {
|
||||
float radius_x_0 = geom.GetBeamX_pxl() - startX;
|
||||
float radius_x_1 = endX - geom.GetBeamX_pxl();
|
||||
|
||||
@@ -200,7 +203,7 @@ void JFJochDiffractionImage::DrawResolutionRings() {
|
||||
if (res_ring.empty())
|
||||
return;
|
||||
|
||||
QPen pen(feature_color, 5);
|
||||
QPen pen(ring_color, 5);
|
||||
pen.setCosmetic(true);
|
||||
|
||||
QVector<qreal> dashPattern = {10, 15};
|
||||
@@ -260,7 +263,7 @@ void JFJochDiffractionImage::DrawResolutionRings() {
|
||||
|
||||
QGraphicsTextItem *textItem = scene()->addText(
|
||||
QString("%1 Å").arg(QString::number(d, 'f', 2)), font);
|
||||
textItem->setDefaultTextColor(feature_color);
|
||||
textItem->setDefaultTextColor(ring_color);
|
||||
textItem->setPos(point.value());
|
||||
}
|
||||
phi_offset += 4.0 / 180.0 * M_PI;
|
||||
|
||||
Reference in New Issue
Block a user