Skip to content

Commit 85a701e

Browse files
reem-codesreem-codes
committed
title of profile loaded
1 parent c7ecc56 commit 85a701e

5 files changed

Lines changed: 24 additions & 14 deletions

File tree

‎data_structure/CMakeLists.txt‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ endforeach( OUTPUTCONFIG CMAKE_CONFIGURATION_TYPES )
2929
############## Removing some warnings on Visual Studio
3030

3131
if(MSVC)
32-
add_compile_definitions(NOMINMAX)
3332
add_definitions(/D_CRT_SECURE_NO_WARNINGS)
3433
add_definitions(/D_SCL_SECURE_NO_WARNINGS)
3534
# For generating folders in IDE by same directory structure
@@ -47,7 +46,6 @@ include_directories( "${PROJECT_SOURCE_DIR}/src" )
4746

4847
######## Files ############
4948
file(GLOB_RECURSE LACTEAXP_MERGE_SRC_FILES RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "src/lactea_xp_merged/*.cpp" "src/lactea_xp_merged/*.hpp" "src/lactea_xp_merged/*.c" "src/lactea_xp_merged/*.h")
50-
file(GLOB_RECURSE UTILS_SRC_FILES RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "src/utils/*.cpp" "src/utils/*.hpp" "src/utils/*.c" "src/utils/*.h" "src/utils/gl/*.cpp" "src/utils/gl/*.hpp" "src/utils/gl/*.c" "src/utils/gl/*.h" "src/utils/ImGuiFileDialog/ImGuiFileDialog.cpp")
5149
file(GLOB_RECURSE EXTERNAL_SORT_SRC_FILES RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "src/external_sort/*.cpp" "src/external_sort/*.hpp")
5250

5351
##############################################################################

‎web_visualizer/index.html‎

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -20,20 +20,23 @@
2020

2121
<body>
2222
<div id="container">
23-
<section id="lactea-container">
23+
<div id="lactea-container">
2424
<div>
2525
<canvas id="lactea-canvas" width="200" height="100"></canvas>
2626
</div>
27-
<section id="info-container">
28-
<div id="query"></div>
29-
<div id="info"></div>
30-
</section>
31-
<div id="figures">
32-
<div class="spectrum">
33-
<canvas id="spectrum" width="500" height="300"></canvas>
34-
</div>
27+
<div>
28+
<section id="info-container">
29+
<h1 id="profile-title"></h1>
30+
<div id="query"></div>
31+
<div id="info"></div>
32+
</section>
33+
<section id="figures">
34+
<div class="spectrum">
35+
<canvas id="spectrum" width="500" height="300"></canvas>
36+
</div>
37+
</section>
3538
</div>
36-
</section>
39+
</div>
3740

3841
<section id="help-container">
3942
<button id="help_button">Help</button>

‎web_visualizer/res/styles/style.css‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,10 @@ body {
4242
left: 1%;
4343
}
4444

45+
#profile-title {
46+
text-align: center;
47+
}
48+
4549
#figures {
4650
margin: 0 auto;
4751
top: 1%;

‎web_visualizer/res/styles/style.scss‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,12 +53,16 @@ body {
5353
// overflow-x: hidden;
5454
}
5555

56+
5657
#info-container {
5758
width: 100%;
5859
bottom: 1%;
5960
left: 1%;
6061
}
6162

63+
#profile-title {
64+
text-align: center;
65+
}
6266

6367
#figures {
6468
margin: 0 auto;

‎web_visualizer/src/visualizer/LacteaVisualizer.js‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,14 +70,14 @@ export class LacteaVisualizer {
7070
});
7171
}
7272

73-
loadSettings(settings) {
73+
loadSettings(settings, message) {
7474
this.settings.load(settings.general ?? {});
7575
this.cam.load(settings.camera ?? {});
7676
this.lacteaCache.load(settings.cache ?? {});
7777
this.renderPipeline.load(settings.renderPipeline ?? {});
7878
// this.signature.load(settings.signature ?? {});
7979
this.colormap.load(settings.colormap ?? {});
80-
this.settings.reloadEverything();
80+
this.settings.reloadEverything(message);
8181
}
8282

8383
async load() {
@@ -88,6 +88,7 @@ export class LacteaVisualizer {
8888

8989
async loadProfile(name) {
9090
console.log(`loading profile ${name}`);
91+
document.getElementById("profile-title").innerHTML = `Loading Settings for ${name}`;
9192
await fetch(`res/profile/${name}`)
9293
.then(file => file.text())
9394
.then(text => JSON.parse(text))

0 commit comments

Comments
 (0)