IgorA100
eaaa9bfaab
Fix: Cursor type (skin.js)
2024-05-27 16:11:55 +03:00
IgorA100
166716e7c9
Moved PanZoom functions to skin.js (watch.js)
2024-05-27 15:41:21 +03:00
IgorA100
8bdb169fca
Removed function manageCursor (montage.js)
2024-05-27 15:36:49 +03:00
IgorA100
707ac6f9ec
Moved PanZoom functions to skin.js (event.js)
2024-05-27 15:34:44 +03:00
IgorA100
18d30fe0bb
Moved PanZoom functions to skin.js (montage.js)
2024-05-27 15:28:16 +03:00
IgorA100
53437b51ed
Moved PanZoom functions here (skin.js)
...
Moved from Montage, Watch & Event page
2024-05-27 15:11:34 +03:00
Isaac Connor
cb8633bd11
Merge pull request #4040 from IgorA100/patch-118
...
Optimizing code related to GridStack (montage.js)
2024-05-26 18:56:34 -04:00
IgorA100
1b84a83d41
Chore: eslint (montage.js)
2024-05-26 22:35:50 +03:00
IgorA100
c5cd1b23c9
Optimizing code related to GridStack (montage.js)
...
And fix monitor positioning when switching Ratio
2024-05-26 22:29:30 +03:00
Isaac Connor
e716dca381
For custom layouts use a scale that gets us a width of 480px which is 25% of 1920.
2024-05-25 09:40:58 -04:00
Isaac Connor
2aecef113e
Only apply scale guessing if the layout is one of the predefined and hence known good layouts.
2024-05-25 09:27:11 -04:00
Isaac Connor
d00cc6f534
Merge pull request #4039 from IgorA100/patch-117
...
Fix: changedMonitors.forEach (montage.js)
2024-05-24 19:07:30 -04:00
IgorA100
f1b13e8eed
Update montage.js
2024-05-25 01:09:46 +03:00
Isaac Connor
9b1f3fd3e1
Use better format specifiers
2024-05-24 16:06:21 -04:00
Isaac Connor
d1d7dd77cc
Use a while instead of a pointless for
2024-05-24 16:03:36 -04:00
Isaac Connor
d3f4b63274
Use better format specifiers
2024-05-24 16:03:03 -04:00
IgorA100
d1f3a3f21d
Fix: changedMonitors.forEach (montage.js)
...
Iterating through the array was incorrect
2024-05-24 19:51:51 +03:00
Isaac Connor
00db9788d8
Limit scale to 100
2024-05-23 16:18:28 -04:00
Isaac Connor
84d38592db
Code cleanup allowing const variable
2024-05-23 16:18:00 -04:00
Isaac Connor
61a35f09ce
TUrn off test suite, as centos-8 has a too old version of catch2
2024-05-23 14:43:04 -04:00
Isaac Connor
4fcc69e973
Remove Freeform references and rename default_layout_id to audoLayoutName
2024-05-23 14:07:25 -04:00
Isaac Connor
8a57f919cc
Merge pull request #4034 from IgorA100/patch-115
...
Changed the algorithm for calculating grid columns on Montage page
2024-05-23 14:03:21 -04:00
Isaac Connor
6243330e68
Merge branch 'master' into patch-115
2024-05-23 14:03:14 -04:00
Isaac Connor
51c3e796c8
Merge pull request #4032 from IgorA100/patch-114
...
Trying to completely get rid of jiggling montage layout (montage.js)
2024-05-23 13:49:01 -04:00
Isaac Connor
217acd2e5f
Merge branch 'master' into patch-114
2024-05-23 13:48:53 -04:00
Isaac Connor
d84d67ee0b
Merge branch 'IgorA100-patch-116'
2024-05-23 13:46:34 -04:00
Isaac Connor
7c75356c8d
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2024-05-23 13:46:28 -04:00
Isaac Connor
4e1396e539
Foot html footer back where it should be and move PRESET_LAYOUT_NAMES to montage.js.php
2024-05-23 13:46:19 -04:00
Isaac Connor
4fcc433880
Only change src if it exists. Fixes non-zms players
2024-05-23 13:45:49 -04:00
Isaac Connor
fdf4d83e02
Use else for micro-optimisation
2024-05-23 13:45:32 -04:00
Isaac Connor
e1a324a20c
Merge pull request #4035 from IgorA100/patch-116
...
Calculation of Scale before the start of monitors. Montage page
2024-05-23 13:45:08 -04:00
Isaac Connor
02ccb5f12b
Remove unused zms url parameters
2024-05-23 13:31:30 -04:00
Isaac Connor
b63412ad24
Rework the layout resorting code to make sense to Isaac. Apply a default scale value calculated based on 1920/columns to improve initial load.
2024-05-23 13:31:16 -04:00
IgorA100
743e31bbcf
Fix movableMonitorData montage.js
2024-05-23 19:46:28 +03:00
Isaac Connor
5b7a0745c9
Freefrom => Auto
2024-05-23 12:31:47 -04:00
Isaac Connor
d3e5a6be41
Put back fps reporting
2024-05-23 12:29:27 -04:00
Isaac Connor
f4e94404a1
add frames=1 to zms url so that it only spits out 1 jpeg. the canvas loading code can't handle mjpeg so we are just wasting bandwidth. Handle a null data in frames loading ajax.
2024-05-23 12:29:07 -04:00
IgorA100
10628346a8
Cancel changes (Monitor.php)
2024-05-23 19:19:50 +03:00
IgorA100
161928bf33
Calculation of Scale before the start of monitors (montage.js)
2024-05-23 19:17:49 +03:00
Isaac Connor
352aff02e4
Allow 0 for MaxImageBufferCount
2024-05-23 10:42:52 -04:00
IgorA100
10b39b965f
Start monitors always with Scale=25 (Monitor.php)
...
Dirty code (test only) fixes #4033
2024-05-23 01:30:29 +03:00
IgorA100
8ba0aa0be5
Changing the algorithm for counting the number of grid columns (montage.php)
...
if ($monitorCount <= 3) {
$default_layout = $monitorCount . ' Wide';
} else if ($monitorCount <= 4) {
$default_layout = '2 Wide';
} else if ($monitorCount <= 6) {
$default_layout = '3 Wide';
} else if ($monitorCount%4 == 0) {
$default_layout = '4 Wide';
} else if ($monitorCount%6 == 0) {
$default_layout = '6 Wide';
} else {
$default_layout = '4 Wide';
}
2024-05-23 00:37:41 +03:00
IgorA100
6286d51703
Changed the algorithm for calculating grid columns (montage.php)
...
More than 12 monitors - "6 Wide"
From 4 to 12 - "4 Wide"
Less than 4 - "2 Wide"
It will probably be better this way.
2024-05-23 00:10:32 +03:00
Isaac Connor
bf8306dbf7
Merge pull request #4030 from IgorA100/patch-112
...
Fix: placement of monitors when initializing Layout №2 (montage.js)
2024-05-22 17:00:55 -04:00
IgorA100
0a5cce4cab
Update montage.js
2024-05-22 23:04:40 +03:00
IgorA100
5fdac67540
Trying to completely get rid of jiggling montage layout (montage.js)
2024-05-22 23:03:26 +03:00
Isaac Connor
915b706c6f
Merge pull request #4031 from IgorA100/patch-113
...
Fix: Jiggling montage layout (montage.js)
2024-05-22 14:38:57 -04:00
Isaac Connor
222c1c66ed
Remove errant ?
2024-05-22 14:35:57 -04:00
IgorA100
44a87bb137
Update montage.js
2024-05-22 21:13:29 +03:00
IgorA100
f1ac3f9486
Fix: Jiggling montage layout (montage.js)
...
Attempt to fix #4028
It seems to work for me, but there may be “side effects”, because... The analysis of monitor size changes is interrupted.
Additional testing is required.
2024-05-22 20:52:13 +03:00
