Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
nghyd
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Cassiopée
nghyd
Commits
cac551a6
Commit
cac551a6
authored
1 year ago
by
François Grand
Committed by
AUBRY JEAN-PASCAL
1 year ago
Browse files
Options
Downloads
Patches
Plain Diff
fix: MacroRugoRemous form: restore section generation select, fix NaNs
refs
#609
parent
83f986f5
No related branches found
Branches containing commit
No related tags found
Tags containing commit
2 merge requests
!252
release: version 4.18.0
,
!213
Resolve "Ajout du module courbe de remous d'une passe à macro-rugosité"
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/app/components/generic-calculator/calculator.component.ts
+2
-3
2 additions, 3 deletions
...app/components/generic-calculator/calculator.component.ts
src/app/formulaire/definition/form-macrorugo-remous.ts
+4
-0
4 additions, 0 deletions
src/app/formulaire/definition/form-macrorugo-remous.ts
with
6 additions
and
3 deletions
src/app/components/generic-calculator/calculator.component.ts
+
2
−
3
View file @
cac551a6
...
...
@@ -742,7 +742,7 @@ export class GenericCalculatorComponent implements OnInit, DoCheck, AfterViewChe
// true if CourbeRemous results are present
public
get
hasCourbeRemousResults
()
{
return
this
.
is
(
CalculatorType
.
CourbeRemous
)
&&
this
.
hasResults
;
return
(
this
.
is
(
CalculatorType
.
CourbeRemous
)
||
this
.
is
(
CalculatorType
.
MacroRugoRemous
))
&&
this
.
hasResults
;
}
// true if current Nub is PAR
...
...
@@ -1012,8 +1012,7 @@ export class GenericCalculatorComponent implements OnInit, DoCheck, AfterViewChe
*/
public
get
courbeRemousPoints
():
any
[]
{
if
(
this
.
hasCourbeRemousResults
)
{
const
crForm
=
this
.
_formulaire
as
FormulaireCourbeRemous
;
for
(
const
r
of
crForm
.
results
)
{
for
(
const
r
of
this
.
_formulaire
.
results
)
{
if
(
r
instanceof
RemousResults
)
{
return
r
.
points
;
}
...
...
This diff is collapsed.
Click to expand it.
src/app/formulaire/definition/form-macrorugo-remous.ts
+
4
−
0
View file @
cac551a6
...
...
@@ -40,6 +40,7 @@ export class FormulaireMacroRugoRemous extends FormulaireFixedVar {
protected
reaffectResultComponents
()
{
const
mrr
=
this
.
currentNub
as
MacroRugoRemous
;
mrr
.
syncSectionMacroRugo
();
// variable supplémentaire à calculer
this
.
_remousResults
.
extraParamSymbol
=
mrr
.
getPropValue
(
"
varCalc
"
);
...
...
@@ -50,6 +51,9 @@ export class FormulaireMacroRugoRemous extends FormulaireFixedVar {
const
prmMRR
=
mrr
.
prms
as
MacroRugoRemousParams
;
this
.
_remousResults
.
parameters
=
prmMRR
;
// calcul
this
.
_remousResults
.
result
=
mrr
.
CalcSerie
();
const
sect
:
acSection
=
mrr
.
Sn
;
this
.
resultYn
=
sect
.
CalcSection
(
"
Yn
"
);
// hauteur normale
this
.
resultYc
=
sect
.
CalcSection
(
"
Yc
"
);
// hauteur critique
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment