Skip to content

Commit

Permalink
v0.1.22
Browse files Browse the repository at this point in the history
  • Loading branch information
tetov committed Feb 28, 2020
1 parent b79d52e commit 2abb711
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 10 deletions.
21 changes: 13 additions & 8 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,22 +4,27 @@ All notable changes to this project will be documented in this file.

The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## Unreleased
## \[0.1.22\] \[2020-02-28\]

### Added

### Changed
- Configuration option for timeout and wait times for docker commands in `compas_rcf.fabrication.runner`.

### Removed
### Changed

- Skip and/or place logic reworked in `compas_rcf.fabrication.abb_runner`.
- `abb_runner` is now verbose by default, `--verbose` is removed in favour of `--quiet`.
- Removed print statements from `abb_runner` and replaced them with `logging.info` calls.
- Fixed `id` attribute logic and renamed it to `bullet_id`. classmethod `compas_rcf.fabrication.clay_objs.ClayBullet.from_data` is backwards compatible.

## [0.1.21] [2020-02-26]
## \[0.1.21\] \[2020-02-26\]

### Changed
- `compas_rcf.fabrication.abb_runner` now prints progress updates to Flex pendant.
- `abb_runner` now dumps list of `ClayBullets` for every bullet into file with same filename as input JSON but with IN_PROGRESS added to start.
- `abb_runner` now checks if attribute `placed` is set on `ClayBullet` and if so asks user if it should be skipped or placed (with the option to set skip and place for all future bullets with `placed` attribute). This file is deleted when script exits cleanly.
- `compas_rcf.utils.csv_` renamed to `csv_reports`. Instead of a conversion tool it now creates an opinionated report from JSON file. It can also handle directories and multiple files as inputs.

- `compas_rcf.fabrication.abb_runner` now prints progress updates to Flex pendant.
- `abb_runner` now dumps list of `ClayBullets` for every bullet into file with same filename as input JSON but with IN\_PROGRESS added to start.
- `abb_runner` now checks if attribute `placed` is set on `ClayBullet` and if so asks user if it should be skipped or placed (with the option to set skip and place for all future bullets with `placed` attribute). This file is deleted when script exits cleanly.
- `compas_rcf.utils.csv_` renamed to `csv_reports`. Instead of a conversion tool it now creates an opinionated report from JSON file. It can also handle directories and multiple files as inputs.

## \[0.1.20\] \[2020-02-25\]

Expand Down
3 changes: 1 addition & 2 deletions src/compas_rcf/fabrication/abb_runner.py
Original file line number Diff line number Diff line change
Expand Up @@ -486,15 +486,14 @@ def abb_run(cmd_line_args):
["Place last N bullets again.", "Pick bullets to place again."],
).ask()
if skip_method == "Place last N bullets again.":
# TODO: Test
n_place_again = questionary.text(
"Number of bullets to place again counted from last bullet",
"1",
lambda val: val.isdigit(),
).ask()
last_placed = max(maybe_placed, key=attrgetter("bullet_id"))
last_placed_index = clay_bullets.index(last_placed)
to_place = clay_bullets[last_placed_index - int(n_place_again) - 1 :]
to_place = clay_bullets[last_placed_index - int(n_place_again) + 1 :]
else:
to_place_selection = questionary.checkbox(
"Select bullets:",
Expand Down

0 comments on commit 2abb711

Please sign in to comment.