zec
/
halo2
mirror of https://github.com/zcash/halo2.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

dev: Render Selectors in a darker shade of blue 

The regions are now rendered uniformly the same colour, by removing the
background bleed-through (which was more complex now that the fixed
columns are rendered in two colours).
This commit is contained in:
Jack Grigg 2021-06-10 00:06:20 +01:00
parent 49e18b2647
commit faac7b798b
1 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/dev/graph/layout.rs
View File

@ -93,7 +93,7 @@ impl CircuitLayout {
let view_bottom = view_height.end;
// Prepare the grid layout. We render a red background for advice columns, white for
// instance columns, and blue for fixed columns.
// instance columns, and blue for fixed columns (with a darker blue for selectors).
let root =
drawing_area.apply_coord_spec(Cartesian2d::<RangedCoordusize, RangedCoordusize>::new(
view_width,
@ -115,12 +115,33 @@ impl CircuitLayout {
],
ShapeStyle::from(&BLUE.mix(0.2)).filled(),
))?;
for selector in layout.selectors {
let index = selector.index();
root.draw(&Rectangle::new(
[
(cs.num_advice_columns + cs.num_instance_columns + index, 0),
(
cs.num_advice_columns + cs.num_instance_columns + index + 1,
view_bottom,
),
],
ShapeStyle::from(&BLUE.mix(0.1)).filled(),
))?;
}
root.draw(&Rectangle::new(
[(0, 0), (total_columns, view_bottom)],
&BLACK,
))?;
let draw_region = |root: &DrawingArea<_, _>, top_left, bottom_right| {
root.draw(&Rectangle::new(
[top_left, bottom_right],
ShapeStyle::from(&WHITE).filled(),
))?;
root.draw(&Rectangle::new(
[top_left, bottom_right],
ShapeStyle::from(&RED.mix(0.2)).filled(),
))?;
root.draw(&Rectangle::new(
[top_left, bottom_right],
ShapeStyle::from(&GREEN.mix(0.2)).filled(),
@ -217,6 +238,8 @@ struct Layout {
/// Any cells assigned outside of a region. We store this as a `Vec` so that if any
/// cells are double-assigned, they will be visibly darker.
loose_cells: Vec<(Column<Any>, usize)>,
/// Columns we have observed are actually Selectors.
selectors: HashSet<Column<Any>>,
}
impl Layout {
@ -278,6 +301,8 @@ impl<F: Field> Assignment<F> for Layout {
A: FnOnce() -> AR,
AR: Into<String>,
{
// Remember that this column is a selector.
self.selectors.insert(selector.0.into());
// Selectors are just fixed columns.
self.assign_fixed(annotation, selector.0, row, || Ok(F::one()))
}