Skip to content

Commit 3bf1326

Browse files
authored
Merge pull request acts-project#104 from asalzburger/chore-remove-sheets
feat!: removing sheets
2 parents efd9d4d + 91220a2 commit 3bf1326

12 files changed

Lines changed: 4 additions & 29649 deletions

File tree

README.md

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ This module has the core definition and plotting functionality for primitives.
1313

1414
This module acts as a translation layer between the caller libraries (etc. `ACTS`, `detray`) and core library.
1515
It allows to create `proto` objects for detectors that can then be used for plotting using the `core` module.
16-
This module does also contain a dedicated `display` area that prepares some standard sheets, a view examples can be placed below.
16+
This module does also contain a dedicated `display` area that assists in displaying the objects.
1717

1818
# Python bindings
1919

@@ -36,14 +36,6 @@ A view stand-alone files that are produced by the `googletest` based unit testin
3636
</tr>
3737
</table>
3838

39-
An example for an endcap sheet:
40-
41-
<img src="https://github.com/acts-project/actsvg/blob/main/docs/svg/odd_endcap_sheet_module_info.svg" width=600/>
42-
43-
An example for a barrel sheet (module info display):
44-
45-
<img src="https://github.com/acts-project/actsvg/blob/main/docs/svg/odd_barrel_sheet_module_info.svg" width=600/>
46-
4739
## Getting started
4840

4941
To build `actsvg` using CMake execute the following

core/include/actsvg/core/connectors.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ enum type { e_highlight, e_associate_id, e_associate_info };
2929
* @param sources_ are the source objects
3030
* @param targests_ are the target objects
3131
* @param s_t_connections_ are the connections from source to target
32-
* @param ls_ label the source or not (in case of multiple connection sheets)
32+
* @param ls_ label the source or not (in case of multiple connections)
3333
* @param on_off_ are the connection effects
3434
*
3535
* In case of e.g. a grid surface connection:

docs/svg/odd_barrel_sheet_module_info.svg

Lines changed: 0 additions & 23764 deletions
This file was deleted.

docs/svg/odd_endcap_sheet_module_info.svg

Lines changed: 0 additions & 3980 deletions
This file was deleted.

meta/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ actsvg_add_library( actsvg_meta meta
77
"include/actsvg/display/grids.hpp"
88
"include/actsvg/display/helpers.hpp"
99
"include/actsvg/display/materials.hpp"
10-
"include/actsvg/display/sheets.hpp"
1110
"include/actsvg/proto/cluster.hpp"
1211
"include/actsvg/proto/detector.hpp"
1312
"include/actsvg/proto/grid.hpp"

meta/include/actsvg/display/helpers.hpp

Lines changed: 2 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ views::contour range_contour(const surface_type& s_,
133133
contour = view.path(vertices_disc);
134134
} else {
135135
throw std::invalid_argument(
136-
"surface_sheet_xy(...) - could not estimate range.");
136+
"range_contour(...) - could not estimate range.");
137137
}
138138
return contour;
139139
}
@@ -166,7 +166,7 @@ static std::array<std::array<scalar, 2>, 2> view_range(
166166
*
167167
* @param v_ volume of the detector
168168
* @param view_ the view used for this
169-
* @param sh_ the sheet size
169+
* @param sh_ the canvas size
170170
* @param es_ is the equal scale
171171
* @param hl_ switch highlighting on/off
172172
* @param dt_ draw template is available
@@ -249,55 +249,6 @@ process_modules(const volume_type& v_, const view_type& view_,
249249
return {all_modules, scale_transform, axes};
250250
}
251251

252-
/** Helper method to connect the surface sheets to the
253-
* surfaces of the layer_sheets
254-
*
255-
* @tparam volume_type the type of volume (templated on point3_container)
256-
*
257-
* @param v_ the input volume
258-
* @param templates_ the given module templtes
259-
* @param o_ the object to which they are attached
260-
*
261-
**/
262-
template <typename volume_type>
263-
void connect_surface_sheets(const volume_type& v_,
264-
std::vector<std::vector<svg::object>>& templates_,
265-
svg::object& o_) {
266-
// Now create an item per surface
267-
for (auto [ib, surface_batch] : utils::enumerate(v_._surfaces)) {
268-
for (auto [is, s] : utils::enumerate(surface_batch)) {
269-
std::string sid = s._name;
270-
271-
svg::object& s_sheet_s = templates_[ib][is];
272-
s_sheet_s._attribute_map["display"] = "none";
273-
274-
// Object information to appear
275-
svg::object on;
276-
on._tag = "animate";
277-
on._attribute_map["fill"] = "freeze";
278-
on._attribute_map["attributeName"] = "display";
279-
on._attribute_map["from"] = "none";
280-
on._attribute_map["to"] = "block";
281-
on._attribute_map["begin"] = sid + __d + "mouseout";
282-
283-
svg::object off;
284-
285-
off._tag = "animate";
286-
off._attribute_map["fill"] = "freeze";
287-
off._attribute_map["attributeName"] = "display";
288-
off._attribute_map["to"] = "none";
289-
off._attribute_map["from"] = "block";
290-
off._attribute_map["begin"] = sid + __d + "mouseover";
291-
292-
// Store the animation
293-
s_sheet_s._sub_objects.push_back(off);
294-
s_sheet_s._sub_objects.push_back(on);
295-
296-
o_.add_object(s_sheet_s);
297-
}
298-
}
299-
}
300-
301252
} // namespace display
302253

303254
} // namespace actsvg

0 commit comments

Comments
 (0)