Skip to content

Commit 40d9e01

Browse files
Merge pull request #832 from KratosMultiphysics/information-panel
Information panel. Apps and examples
2 parents d9a277e + 46fe0ad commit 40d9e01

26 files changed

Lines changed: 315 additions & 118 deletions

File tree

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Group id="Thermic" name="Thermic examples">
3-
<Example id="BuoyancyHeatedSquare2D" app="Buoyancy" logo="HeatedSquare2D.png" name="Buoyancy heated\nsquare 2D" dim="2D" cmd="::Buoyancy::examples::HeatedSquare::Init"/>
3+
<Example id="BuoyancyHeatedSquare2D" app="Buoyancy" logo="HeatedSquare2D.png" name="Buoyancy heated\nsquare 2D" dim="2D" cmd="::Buoyancy::examples::HeatedSquare::Init">
4+
<Description></Description>
5+
</Example>
46
</Group>
Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Group id="DEM" name="DEM examples">
3-
<Example id="CDEMContinuumDrop2D" app="CDEM" logo="CirclesDrop2D.png" name="CirclesDrop 2D" dim="2D" cmd="::CDEM::examples::ContinuumDrop2D::Init"/>
4-
<Example id="CDEMContSpheresDrop3D2D" app="CDEM" logo="SpheresDrop3D.png" name="Spheres Drop 3D" dim="3D" cmd="::CDEM::examples::ContSpheresDrop3D::Init"/>
3+
<Example id="CDEMContinuumDrop2D" app="CDEM" logo="CirclesDrop2D.png" name="CirclesDrop 2D" dim="2D" cmd="::CDEM::examples::ContinuumDrop2D::Init">
4+
<Description></Description>
5+
</Example>
6+
<Example id="CDEMContSpheresDrop3D2D" app="CDEM" logo="SpheresDrop3D.png" name="Spheres Drop 3D" dim="3D" cmd="::CDEM::examples::ContSpheresDrop3D::Init">
7+
<Description></Description>
8+
</Example>
59
</Group>
Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Group id="Thermic" name="Thermic examples">
3-
<Example id="ConjugateHeatTransferHeatedSquare2D" app="ConjugateHeatTransfer" logo="HeatedSquare2D.png" name="Heated square 2D" dim="2D" cmd="::ConjugateHeatTransfer::examples::HeatedSquare::Init"/>
4-
<Example id="ConjugateHeatTransferCylinderCooling2D" app="ConjugateHeatTransfer" logo="CylinderCooling2D.png" name="Cylinder cooling 2D" dim="2D" cmd="::ConjugateHeatTransfer::examples::CylinderCooling::Init"/>
5-
<Example id="ConjugateHeatTransferBFS2D" app="ConjugateHeatTransfer" logo="BFS2D.png" name="BFS 2D" dim="2D" cmd="::ConjugateHeatTransfer::examples::BFS::Init"/>
3+
<Example id="ConjugateHeatTransferHeatedSquare2D" app="ConjugateHeatTransfer" logo="HeatedSquare2D.png" name="Heated square 2D" dim="2D" cmd="::ConjugateHeatTransfer::examples::HeatedSquare::Init">
4+
<Description></Description>
5+
</Example>
6+
<Example id="ConjugateHeatTransferCylinderCooling2D" app="ConjugateHeatTransfer" logo="CylinderCooling2D.png" name="Cylinder cooling 2D" dim="2D" cmd="::ConjugateHeatTransfer::examples::CylinderCooling::Init">
7+
<Description></Description>
8+
</Example>
9+
<Example id="ConjugateHeatTransferBFS2D" app="ConjugateHeatTransfer" logo="BFS2D.png" name="BFS 2D" dim="2D" cmd="::ConjugateHeatTransfer::examples::BFS::Init">
10+
<Description></Description>
11+
</Example>
612
</Group>
Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Group id="Thermic" name="Thermic examples">
3-
<Example id="ConvectionDiffusionHeatedSquare2D" app="ConvectionDiffusion" logo="HeatedSquare2D.png" name="Heated square 2D" dim="2D" cmd="::ConvectionDiffusion::examples::HeatedSquare::Init"/>
3+
<Example id="ConvectionDiffusionHeatedSquare2D" app="ConvectionDiffusion" logo="HeatedSquare2D.png" name="Heated square 2D" dim="2D" cmd="::ConvectionDiffusion::examples::HeatedSquare::Init">
4+
<Description></Description>
5+
</Example>
46
</Group>
Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Group id="DEM" name="DEM examples">
3-
<Example id="DEMDrop2D" app="DEM" logo="CirclesDrop.png" name="DEM circles drop 2D" dim="2D" cmd="::DEM::examples::CirclesDrop::Init"/>
4-
<Example id="DEMDrop3D" app="DEM" logo="SpheresDrop.png" name="DEM spheres drop 3D" dim="3D" cmd="::DEM::examples::SpheresDrop::Init"/>
3+
<Example id="DEMDrop2D" app="DEM" logo="CirclesDrop.png" name="DEM circles drop 2D" dim="2D" cmd="::DEM::examples::CirclesDrop::Init">
4+
<Description></Description>
5+
</Example>
6+
<Example id="DEMDrop3D" app="DEM" logo="SpheresDrop.png" name="DEM spheres drop 3D" dim="3D" cmd="::DEM::examples::SpheresDrop::Init">
7+
<Description></Description>
8+
</Example>
59
</Group>

kratos.gid/apps/DEMLauncher/start.tcl

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ proc ::DemLauncher::AppSelectorWindow { } {
2828
} {
2929
[$root selectNodes "value\[@n='nDim'\]"] setAttribute v wait
3030

31-
set initwind .gid.win_dem_launcher
31+
set initwind $::spdAux::application_window_id
3232
spdAux::DestroyWindows
3333
spdAux::RegisterWindow $initwind
3434
toplevel $initwind
@@ -47,21 +47,29 @@ proc ::DemLauncher::AppSelectorWindow { } {
4747
ttk::frame $w.top
4848
ttk::label $w.top.title_text -text [_ "Select a DEM application"]
4949

50-
ttk::frame $w.information -relief ridge
50+
ttk::frame $w.applications -relief ridge
5151
set i 0
5252
foreach app $available_apps {
5353
set img [::apps::getImgFrom $app]
5454
set app_publicname [[::apps::getAppById $app] getPublicName]
55-
set but [ttk::button $w.information.img$app -image $img -command [list ::DemLauncher::ChangeAppTo $app] ]
56-
ttk::label $w.information.text$app -text $app_publicname
57-
grid $w.information.img$app -column $i -row 0
58-
grid $w.information.text$app -column $i -row 1
55+
set but [ttk::button $w.applications.img$app -image $img -command [list ::DemLauncher::ChangeAppTo $app] ]
56+
bind $w.applications.img$app <Enter> {::spdAux::PlaceInformationWindowByPath %W applications}
57+
ttk::label $w.applications.text$app -text $app_publicname
58+
grid $w.applications.img$app -column $i -row 0
59+
grid $w.applications.text$app -column $i -row 1
5960
incr i
6061
}
6162
grid $w.top
6263
grid $w.top.title_text
6364

64-
grid $w.information
65+
grid $w.applications
66+
67+
# Information panel
68+
set spdAux::info_main_window_text ""
69+
ttk::labelframe $w.info -text " Information " -relief ridge
70+
ttk::label $w.info.text -textvariable spdAux::info_main_window_text
71+
grid $w.info.text
72+
grid $w.info -sticky we
6573
}
6674
}
6775

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,13 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Groups>
33
<Group id="DEM">
4-
<Example id="DEMPFEMInnerSphere3D" app="DEMPFEM" logo="InnerSphere.png" name="Inner Spheres" dim="3D" cmd="::DEMPFEM::examples::InnerSphere::Init"/>
4+
<Example id="DEMPFEMInnerSphere3D" app="DEMPFEM" logo="InnerSphere.png" name="Inner Spheres" dim="3D" cmd="::DEMPFEM::examples::InnerSphere::Init">
5+
<Description></Description>
6+
</Example>
57
</Group>
68
<Group id="PFEM" name="PFEM examples">
7-
<Example id="DEMPFEMInnerSphere3D" app="DEMPFEM" logo="InnerSphere.png" name="Inner Spheres" dim="3D" cmd="::DEMPFEM::examples::InnerSphere::Init"/>
9+
<Example id="DEMPFEMInnerSphere3D" app="DEMPFEM" logo="InnerSphere.png" name="Inner Spheres" dim="3D" cmd="::DEMPFEM::examples::InnerSphere::Init">
10+
<Description></Description>
11+
</Example>
812
</Group>
913
</Groups>
Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Group id="Dam" name="Dam examples">
3-
<Example id="DAMThermoMechaDam2D" app="Dam" logo="ThermoMechaDam2D.png" name="Thermomechanics 2D" dim="2D" cmd="::Dam::examples::ThermoMechaDam2D::Init"/>
4-
<Example id="DAMThermoMechaDam3D" app="Dam" logo="ThermoMechaDam3D.png" name="Thermomechanics 3D" dim="3D" cmd="::Dam::examples::ThermoMechaDam3D::Init"/>
3+
<Example id="DAMThermoMechaDam2D" app="Dam" logo="ThermoMechaDam2D.png" name="Thermomechanics 2D" dim="2D" cmd="::Dam::examples::ThermoMechaDam2D::Init">
4+
<Description></Description>
5+
</Example>
6+
<Example id="DAMThermoMechaDam3D" app="Dam" logo="ThermoMechaDam3D.png" name="Thermomechanics 3D" dim="3D" cmd="::Dam::examples::ThermoMechaDam3D::Init">
7+
<Description></Description>
8+
</Example>
59
</Group>
Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Group id="Fluid">
3-
<Example id="EmbeddedFluidCylinderInFlow3D" app="EmbeddedFluid" logo="EmbeddedCylinderInFlow3D.png" name="Cylinder in flow 3D" dim="3D" cmd="::EmbeddedFluid::examples::CylinderInFlow::Init"/>
3+
<Example id="EmbeddedFluidCylinderInFlow3D" app="EmbeddedFluid" logo="EmbeddedCylinderInFlow3D.png" name="Cylinder in flow 3D" dim="3D" cmd="::EmbeddedFluid::examples::CylinderInFlow::Init">
4+
<Description></Description>
5+
</Example>
46
</Group>
Lines changed: 36 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,45 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Groups>
33
<Group id="FSI" name="Fluid structure interaction examples">
4-
<Example id="FSIMokChannelWithFlexibleWall2D" app="FSI" logo="MokChannelWithFlexibleWall2D.png" name="Mok channel with\nflexible wall 2D" dim="2D" cmd="::FSI::examples::MokChannelFlexibleWall::Init"/>
5-
<Example id="FSIMokChannelWithFlexibleWall3D" app="FSI" logo="MokChannelWithFlexibleWall3D.png" name="Mok channel with\nflexible wall 3D" dim="3D" cmd="::FSI::examples::MokChannelFlexibleWall::Init"/>
6-
<Example id="FSITurekBenchmark2D" app="FSI" logo="TurekBenchmark2D.png" name="Turek benchmark 2D" dim="2D" cmd="::FSI::examples::TurekBenchmark::Init"/>
7-
<Example id="FSIHighRiseBuilding2D" app="FSI" logo="HighRiseBuilding.png" name="High rise building 2D" dim="2D" cmd="::FSI::examples::HighRiseBuilding::Init"/>
4+
<Example id="FSIMokChannelWithFlexibleWall2D" app="FSI" logo="MokChannelWithFlexibleWall2D.png" name="Mok channel with\nflexible wall 2D" dim="2D" cmd="::FSI::examples::MokChannelFlexibleWall::Init">
5+
<Description></Description>
6+
</Example>
7+
<Example id="FSIMokChannelWithFlexibleWall3D" app="FSI" logo="MokChannelWithFlexibleWall3D.png" name="Mok channel with\nflexible wall 3D" dim="3D" cmd="::FSI::examples::MokChannelFlexibleWall::Init">
8+
<Description></Description>
9+
</Example>
10+
<Example id="FSITurekBenchmark2D" app="FSI" logo="TurekBenchmark2D.png" name="Turek benchmark 2D" dim="2D" cmd="::FSI::examples::TurekBenchmark::Init">
11+
<Description></Description>
12+
</Example>
13+
<Example id="FSIHighRiseBuilding2D" app="FSI" logo="HighRiseBuilding.png" name="High rise building 2D" dim="2D" cmd="::FSI::examples::HighRiseBuilding::Init">
14+
<Description></Description>
15+
</Example>
816
</Group>
917
<Group id="Fluid">
10-
<Example id="FluidMokChannelWithFlexibleWall2D" app="FSI" logo="MokChannelWithFlexibleWall2D.png" name="Mok channel with\nflexible wall 2D" dim="2D" cmd="::FSI::examples::MokChannelFlexibleWall::Init"/>
11-
<Example id="FluidMokChannelWithFlexibleWall3D" app="FSI" logo="MokChannelWithFlexibleWall3D.png" name="Mok channel with\nflexible wall 3D" dim="3D" cmd="::FSI::examples::MokChannelFlexibleWall::Init"/>
12-
<Example id="FluidTurekBenchmark2D" app="FSI" logo="TurekBenchmark2D.png" name="Turek benchmark 2D" dim="2D" cmd="::FSI::examples::TurekBenchmark::Init"/>
13-
<Example id="FSIHighRiseBuilding2D" app="FSI" logo="HighRiseBuilding.png" name="High rise building 2D" dim="2D" cmd="::FSI::examples::HighRiseBuilding::Init"/>
18+
<Example id="FluidMokChannelWithFlexibleWall2D" app="FSI" logo="MokChannelWithFlexibleWall2D.png" name="Mok channel with\nflexible wall 2D" dim="2D" cmd="::FSI::examples::MokChannelFlexibleWall::Init">
19+
<Description></Description>
20+
</Example>
21+
<Example id="FluidMokChannelWithFlexibleWall3D" app="FSI" logo="MokChannelWithFlexibleWall3D.png" name="Mok channel with\nflexible wall 3D" dim="3D" cmd="::FSI::examples::MokChannelFlexibleWall::Init">
22+
<Description></Description>
23+
</Example>
24+
<Example id="FluidTurekBenchmark2D" app="FSI" logo="TurekBenchmark2D.png" name="Turek benchmark 2D" dim="2D" cmd="::FSI::examples::TurekBenchmark::Init">
25+
<Description></Description>
26+
</Example>
27+
<Example id="FSIHighRiseBuilding2D" app="FSI" logo="HighRiseBuilding.png" name="High rise building 2D" dim="2D" cmd="::FSI::examples::HighRiseBuilding::Init">
28+
<Description></Description>
29+
</Example>
1430
</Group>
1531
<Group id="Structural">
16-
<Example id="StructuralMokChannelWithFlexibleWall2D" app="FSI" logo="MokChannelWithFlexibleWall2D.png" name="Mok channel with\nflexible wall 2D" dim="2D" cmd="::FSI::examples::MokChannelFlexibleWall::Init"/>
17-
<Example id="StructuralMokChannelWithFlexibleWall3D" app="FSI" logo="MokChannelWithFlexibleWall3D.png" name="Mok channel with\nflexible wall 3D" dim="3D" cmd="::FSI::examples::MokChannelFlexibleWall::Init"/>
18-
<Example id="StructuralTurekBenchmark2D" app="FSI" logo="TurekBenchmark2D.png" name="Turek benchmark 2D" dim="2D" cmd="::FSI::examples::TurekBenchmark::Init"/>
19-
<Example id="FSIHighRiseBuilding2D" app="FSI" logo="HighRiseBuilding.png" name="High rise building 2D" dim="2D" cmd="::FSI::examples::HighRiseBuilding::Init"/>
32+
<Example id="StructuralMokChannelWithFlexibleWall2D" app="FSI" logo="MokChannelWithFlexibleWall2D.png" name="Mok channel with\nflexible wall 2D" dim="2D" cmd="::FSI::examples::MokChannelFlexibleWall::Init">
33+
<Description></Description>
34+
</Example>
35+
<Example id="StructuralMokChannelWithFlexibleWall3D" app="FSI" logo="MokChannelWithFlexibleWall3D.png" name="Mok channel with\nflexible wall 3D" dim="3D" cmd="::FSI::examples::MokChannelFlexibleWall::Init">
36+
<Description></Description>
37+
</Example>
38+
<Example id="StructuralTurekBenchmark2D" app="FSI" logo="TurekBenchmark2D.png" name="Turek benchmark 2D" dim="2D" cmd="::FSI::examples::TurekBenchmark::Init">
39+
<Description></Description>
40+
</Example>
41+
<Example id="FSIHighRiseBuilding2D" app="FSI" logo="HighRiseBuilding.png" name="High rise building 2D" dim="2D" cmd="::FSI::examples::HighRiseBuilding::Init">
42+
<Description></Description>
43+
</Example>
2044
</Group>
2145
</Groups>

0 commit comments

Comments
 (0)