Skip to content

[BHP1-1247] Safe Separation Distance Calculator #120

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rjsheperd merged 7 commits into from
Aug 27, 2025
Merged

[BHP1-1247] Safe Separation Distance Calculator #120

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
0b1aac9
[BHP1-1247] Add Safe Separation Distance Calculator
rjsheperd Aug 26, 2025
e55aab1
Update discrete tool output to display background color
rjsheperd Aug 26, 2025
ed332d6
Update behave-mirror branch
rjsheperd Aug 27, 2025
2b0eb47
Ensure default units are added to new variables
rjsheperd Aug 27, 2025
9d2a927
Re-include RH in Wrapper CPP
rjsheperd Aug 27, 2025
95e2cfb
Re-include RH in behave.idl
rjsheperd Aug 27, 2025
185daf8
Merge branch 'main' into rj-BHP1-1247-safe-separation-distance-calcul…
rjsheperd Aug 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion bases/behave_components/src/cljs/behave/components/inputs.cljs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@

(defn text-input
[{:keys [disabled? error? error-msg focused? id label name on-blur on-change on-focus
placeholder value value-atom default-value on-key-press]}]
placeholder value value-atom default-value on-key-press background font-color]}]
[:div {:class ["input-text"
(when error? "input-text--error")
(when disabled? "input-text--disabled")
Expand All @@ -188,6 +188,8 @@
:on-focus on-focus
:placeholder placeholder
:type "text"}
background (assoc :style {:background background})
font-color (assoc-in [:style :color] font-color)
on-change (assoc :on-change on-change)
default-value (assoc :default-value default-value)
value (assoc :value value)
Expand Down
2 changes: 2 additions & 0 deletions behave-lib/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,7 @@ SET(SOURCE
behave-mirror/src/behave/randthread.cpp
behave-mirror/src/behave/relativeHumidity.cpp
behave-mirror/src/behave/safety.cpp
behave-mirror/src/behave/safeSeparationDistanceCalculator.cpp
behave-mirror/src/behave/slopeTool.cpp
behave-mirror/src/behave/species_master_table.cpp
behave-mirror/src/behave/spot.cpp
Expand Down Expand Up @@ -154,6 +155,7 @@ SET(HEADERS
behave-mirror/src/behave/randthread.h
behave-mirror/src/behave/relativeHumidity.h
behave-mirror/src/behave/safety.h
behave-mirror/src/behave/safeSeparationDistanceCalculator.h
behave-mirror/src/behave/slopeTool.h
behave-mirror/src/behave/species_master_table.h
behave-mirror/src/behave/spot.h
Expand Down
2 changes: 1 addition & 1 deletion behave-lib/behave-mirror
Open in desktop
Submodule behave-mirror updated 32 files
+2 −0 CMakeLists.txt
+99 −92 docs/annotated.html
+105 −0 docs/classRelativeHumidityTool-members.html
+157 −0 docs/classRelativeHumidityTool.html
+109 −0 docs/classSafeSeparationDistanceCalculator-members.html
+177 −0 docs/classSafeSeparationDistanceCalculator.html
+4 −4 docs/classes.html
+4 −0 docs/dir_f4e4da3920ec0a9cab000518c13815eb.html
+18 −16 docs/files.html
+140 −0 docs/relativeHumidity_8h_source.html
+201 −0 docs/safeSeparationDistanceCalculator_8h_source.html
+2 −1 docs/search/all_1.js
+3 −2 docs/search/all_10.js
+1 −1 docs/search/all_4.js
+15 −14 docs/search/all_e.js
+46 −42 docs/search/all_f.js
+2 −1 docs/search/classes_1.js
+2 −1 docs/search/classes_b.js
+24 −20 docs/search/classes_c.js
+3 −2 docs/search/classes_d.js
+88 −0 docs/structBurningCondition-members.html
+96 −0 docs/structBurningCondition.html
+88 −0 docs/structSafetyCondition-members.html
+96 −0 docs/structSafetyCondition.html
+88 −0 docs/structSlopeClass-members.html
+96 −0 docs/structSlopeClass.html
+88 −0 docs/structSpeedClass-members.html
+96 −0 docs/structSpeedClass.html
+85 −0 docs/structTupleHash-members.html
+95 −0 docs/structTupleHash.html
+172 −0 src/behave/safeSeparationDistanceCalculator.cpp
+93 −0 src/behave/safeSeparationDistanceCalculator.h
6 changes: 6 additions & 0 deletions behave-lib/include/cpp/emscripten/enums.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,3 +83,9 @@ typedef FDFMToolTimeOfDayIndex::TimeOfDayIndexEnum FDFMToolTimeOfDayIndex_TimeOf
// slopeTool.h
typedef RepresentativeFraction::RepresentativeFractionEnum RepresentativeFraction_RepresentativeFractionEnum;
typedef HorizontalDistanceIndex::HorizontalDistanceIndexEnum HorizontalDistanceIndex_HorizontalDistanceIndexEnum;

// SafeSeparationDistanceCalculator.h
typedef BurningCondition::BurningConditionEnum BurningCondition_BurningConditionEnum;
typedef SlopeClass::SlopeClassEnum SlopeClass_SlopeClassEnum;
typedef SpeedClass::SpeedClassEnum SpeedClass_SpeedClassEnum;
typedef SafetyCondition::SafetyConditionEnum SafetyCondition_SafetyConditionEnum;
Loading