Adding a bezel to the wall in Web Interface#146
Merged
ppodhajski merged 3 commits intoBlueBrain:masterfrom May 5, 2017
Merged
Conversation
rdumusc
reviewed
May 5, 2017
| for (var j = 0; j < totalDisplaysPerScreen; j++) | ||
| div.append("<div class='bezel'></div>"); | ||
|
|
||
| $(".bezel").css("grid-column-gap", bezelWidth).css("grid-row-gap", bezelHeight).hide(); |
|
|
||
| var totalScreens = screenCountX * screenCountY; | ||
| var displayPerScreenVertical = bezelsVertical + 1; | ||
| var displayPerScreenHorizontal = bezelsHorizontal + 1; |
There was a problem hiding this comment.
maybe we could rename all "display" to "monitors" (plural) here to avoid any confusion with the X11 displays?
| xhr.send(null); | ||
| } | ||
|
|
||
| function showBezel() |
There was a problem hiding this comment.
showBezels (plural), applies to multiple places
| @@ -1,5 +1,5 @@ | |||
| <configuration> | |||
| <dimensions mullionHeight="12" fullscreen="1" numTilesWidth="2" screenHeight="1080" mullionWidth="14" screenWidth="3840" numTilesHeight="3"/> | |||
| <dimensions mullionHeight="12" fullscreen="1" numTilesWidth="2" screenHeight="1080" mullionWidth="14" screenWidth="3840" numTilesHeight="3" bezelsVertical="2" bezelsHorizontal="2"/> | |||
There was a problem hiding this comment.
I would really stick to bezelsPerScreenX / bezelsPerScreenY otherwise it looks like the total number of bezels.
Also, it would be better if the values in this configuration were meaningful, using bezelsPerScreenX=1, bezelsPerScreenY=0, and taking this opportunity to adjust screenWidth="3854" because if should normally include the mullionWidth to be correct
| const QString& getFilename() const; | ||
|
|
||
| /** Get the number of vertical bezels. */ | ||
| int getBezelsVertical() const; |
There was a problem hiding this comment.
The same remark applies here and everywhere in fact, I think it should be getBezelsPerScreenX as is it not a global count of bezels
| position: absolute; | ||
| width: 100%; | ||
| height: 100%; | ||
|
|
There was a problem hiding this comment.
you need a formatting tool also for css and javascript... ;-)
| CONFIG_EXPECTED_BEZELS_VERTICAL); | ||
|
|
||
| BOOST_CHECK_EQUAL(config.getBezelsHorizontal(), | ||
| CONFIG_EXPECTED_BEZELS_HORIZONAL); |
There was a problem hiding this comment.
Since the #define is used only here, and the other checks in this function do not use #defines, I would just use the values here for simplicty
ppodhajski
force-pushed
the
feature/bezels
branch
2 times, most recently
from
05f6deb to
4354f26
Compare
rdumusc
reviewed
May 5, 2017
| /** Get the filename passed to the constructor. */ | ||
| const QString& getFilename() const; | ||
|
|
||
| /** Get the number of horizonal bezels. */ |
| BOOST_CHECK_EQUAL(config.getFullscreen(), true); | ||
|
|
||
| BOOST_CHECK_EQUAL(config.getBezelsPerScreenY(), 1); | ||
| BOOST_CHECK_EQUAL(config.getBezelsPerScreenX(), 0); |
| getInt(query, _bezelsPerScreenY); | ||
|
|
||
| query.setQuery("string(/configuration/dimensions/@bezelsPerScreenX)"); | ||
| getInt(query, _bezelsPerScreenX); |
| return _bezelsPerScreenY; | ||
| } | ||
|
|
||
| int Configuration::getBezelsPerScreenX() const |
| bezelWidth=config["dimensions"]["bezelWidth"]; | ||
| bezelHeight=config["dimensions"]["bezelHeight"]; | ||
| bezelsPerScreenY=config["dimensions"]["bezelsPerScreenY"]; | ||
| bezelsPerScreenX=config["dimensions"]["bezelsPerScreenX"]; |
|
|
||
| var totalScreens = screenCountX * screenCountY; | ||
| var monitorsPerScreenY = bezelsPerScreenY + 1; | ||
| var monitorsPerScreenX = bezelsPerScreenX + 1; |
| {"bezelHeight", _config.getMullionHeight()}, | ||
| {"bezelWidth", _config.getMullionWidth()}, | ||
| {"bezelsPerScreenY", _config.getBezelsPerScreenY()}, | ||
| {"bezelsPerScreenX", _config.getBezelsPerScreenX()}}}, |
| div.append("<div class='bezel'></div>"); | ||
| } | ||
| $(".bezel").css("grid-column-gap", bezelWidth).css("grid-row-gap", bezelHeight).hide(); | ||
|
|
| var div = $("<div class=bezel > </div>"); | ||
| $("#wallOutline").append(div); | ||
| div.css("grid-template-columns", "repeat("+monitorsPerScreenY+", 1fr)"); | ||
| div.css("grid-template-rows", "repeat("+monitorsPerScreenX+ ", 1fr)"); |
rdumusc
approved these changes
May 5, 2017
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.