Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
jalhyd
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor 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
jalhyd
Commits
f62a65f3
Commit
f62a65f3
authored
5 years ago
by
mathias.chouet
Browse files
Options
Downloads
Patches
Plain Diff
Fix bug in parameters visibility (PAB)
parent
dce40689
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/pab/cloisons.ts
+8
-1
8 additions, 1 deletion
src/pab/cloisons.ts
src/structure/parallel_structure.ts
+1
-12
1 addition, 12 deletions
src/structure/parallel_structure.ts
with
9 additions
and
13 deletions
src/pab/cloisons.ts
+
8
−
1
View file @
f62a65f3
...
...
@@ -83,7 +83,14 @@ export class Cloisons extends ParallelStructure {
}
public
adjustChildParameters
(
child
:
Nub
)
{
super
.
adjustChildParameters
(
child
);
const
prms
=
child
.
prms
as
StructureParams
;
if
(
!
this
.
isInPAB
&&
prms
.
ZDV
.
visible
)
{
// Dans le contexte hors PAB
// Pour les seuils (i.e. Structures avec cote de radier de seuil)
// on remplace ZDV par h1 la charge sur le seuil
prms
.
h1
.
visible
=
true
;
prms
.
ZDV
.
visible
=
false
;
}
if
(
child
.
prms
instanceof
StructureKiviParams
)
{
// hide ZRAM for KIVI, in Cloisons and PAB context only
child
.
prms
.
ZRAM
.
visible
=
false
;
...
...
This diff is collapsed.
Click to expand it.
src/structure/parallel_structure.ts
+
1
−
12
View file @
f62a65f3
...
...
@@ -6,7 +6,7 @@ import { ParamsEquation } from "../param/params-equation";
import
{
Session
}
from
"
../session
"
;
import
{
Result
}
from
"
../util/result
"
;
import
{
ParallelStructureParams
}
from
"
./parallel_structure_params
"
;
import
{
Structure
,
StructureParams
}
from
"
./structure
"
;
import
{
Structure
}
from
"
./structure
"
;
import
{
loiAdmissiblesOuvrages
,
LoiDebit
}
from
"
./structure_props
"
;
export
{
ParallelStructureParams
};
...
...
@@ -49,17 +49,6 @@ export class ParallelStructure extends Nub {
return
(
this
.
parent
!==
undefined
&&
this
.
parent
instanceof
Pab
);
}
public
adjustChildParameters
(
child
:
Nub
)
{
const
prms
=
child
.
prms
as
StructureParams
;
if
(
!
this
.
isInPAB
&&
prms
.
ZDV
.
visible
)
{
// Dans le contexte hors PAB
// Pour les seuils (i.e. Structures avec cote de radier de seuil)
// on remplace ZDV par h1 la charge sur le seuil
prms
.
h1
.
visible
=
true
;
prms
.
ZDV
.
visible
=
false
;
}
}
/** Returns admissible LoiDebit grouped by StructureType */
public
getLoisAdmissibles
():
{
[
key
:
string
]:
LoiDebit
[];
}
{
return
loiAdmissiblesOuvrages
;
...
...
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