Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ISSUE #4911 - Milestone 3: Step 3 - Planes height calibration #5069

Merged
merged 81 commits into from
Aug 27, 2024
Merged
Show file tree
Hide file tree
Changes from 66 commits
Commits
Show all changes
81 commits
Select commit Hold shift + click to select a range
0439acf
ISSUE #4911 - initial drawings vertical calibration unity integration
The-Daniel Jun 21, 2024
22b4eb4
ISSUE #4911 - add vertical calibration toolbar buttons
The-Daniel Jul 2, 2024
cebb3e4
ISSUE #4911 - add planes calibration handler
The-Daniel Jul 2, 2024
1fb7909
ISSUE #4911 - update calibration context to include planes calibration
The-Daniel Jul 2, 2024
3e12dbb
ISSUE #4911 - convert vertical calibration context methods to use red…
The-Daniel Jul 3, 2024
e16908a
ISSUE #4911 - align 2d and 3d calibrations and project image onto model
The-Daniel Jul 10, 2024
8affbdb
Merge branch 'ISSUE_4909' into ISSUE_4911
The-Daniel Jul 11, 2024
394d848
ISSUE #4911 - fix problems due to merge. Switch back to using context
The-Daniel Jul 11, 2024
3381f6f
ISSUE #4911 - Allow 2D to be closed without losing the drawingId sear…
The-Daniel Jul 11, 2024
76ded1e
ISSUE #4911 - move plane selection logic from context to handler
The-Daniel Jul 12, 2024
13f07e5
ISSUE #4911 - simplify useEffects
The-Daniel Jul 12, 2024
5289a04
ISSUE #4911 - remove isStepValid from calibration context
The-Daniel Jul 12, 2024
fe565b9
ISSUE #4911 - add types. create helpers to simplify parsing of 3D/2D …
The-Daniel Jul 12, 2024
6b59d0f
ISSUE #4911 - user can click on meshes to select vertical boundaries
The-Daniel Jul 15, 2024
ab5ab0b
ISSUE #4911 - fix unnecessary y-flipping
The-Daniel Jul 15, 2024
f20cfe8
ISSUE #4911 - add align plane to surface button
The-Daniel Jul 15, 2024
0f5b8dc
ISSUE #4911 - plane image updates when vertices are altered
The-Daniel Jul 15, 2024
40404aa
ISSUE #4911 Updated unity to head of 545
sebjf Jul 16, 2024
7b2b99d
Merge branch 'ISSUE_4911' of https://github.com/3drepo/3drepo.io into…
The-Daniel Jul 16, 2024
f99a9d9
ISSUE #4911 - tweak workflow for first selecting planes
The-Daniel Jul 16, 2024
642f3a9
ISSUE #4911 - move vertical calibration helpers to actual file
The-Daniel Jul 16, 2024
3bfde52
ISSUE #4911 - convert planes object to be an array
The-Daniel Jul 16, 2024
fad752c
ISSUE #4911 - load preexisting vertical range values
The-Daniel Jul 16, 2024
8a5788d
ISSUE #4911 - move hidden logic inside planes range display
The-Daniel Jul 16, 2024
f36cbaf
ISSUE #4911 - vertical range display now only shows ft or m
The-Daniel Jul 16, 2024
606ff7d
Merge branch 'ISSUE_4897' into ISSUE_4911
The-Daniel Jul 16, 2024
486bce1
ISSUE #4911 - simplify vector transformation function
The-Daniel Jul 16, 2024
ac91ac6
ISSUE #4911 - revert change to transformVector which broke everything
The-Daniel Jul 17, 2024
e2bfe66
Merge branch 'ISSUE_4897' into ISSUE_4911
The-Daniel Jul 17, 2024
451dde3
ISSUE #4911 - hardcode clinic blueprints for testing
The-Daniel Jul 17, 2024
af54b24
ISSUE #4911 updated colour options method
sebjf Jul 17, 2024
5dc92ab
ISSUE #4911 - add revit house blueprints
The-Daniel Jul 18, 2024
798f633
ISSUE #4911 - remove sectioning tool from vertical calibration
The-Daniel Jul 18, 2024
a68aae3
ISSUE #4911 - tidy up styles
The-Daniel Jul 18, 2024
cd2aec1
ISSUE #4911 - use three for vector calculations
The-Daniel Jul 25, 2024
ed08791
ISSUE #4911 - remove magic number
The-Daniel Jul 25, 2024
014d0ba
ISSUE #4911 - fix align floor to object
The-Daniel Jul 26, 2024
76bf533
ISSUE #4911 - all panel control is now in calibrationHandler
The-Daniel Jul 26, 2024
3f7c427
ISSUE #4911 - fix unnecessary useEffects being triggered
The-Daniel Jul 26, 2024
b1ec842
ISSUE #4911 - vertical planes opacity
The-Daniel Jul 26, 2024
a294ce6
ISSUE #4911 - going back and changing calibration refreshes the image…
The-Daniel Jul 30, 2024
f787363
ISSUE #4911 - small tidy up
The-Daniel Jul 30, 2024
a2b3d99
ISSUE #4911 - fix 2d viewer disappearing when nodule is clicked
The-Daniel Jul 30, 2024
964cd72
ISSUE #4911 - update yarn lock
The-Daniel Jul 31, 2024
df7737c
ISSUE #4911 - use empty coord instead of empty vector
The-Daniel Jul 31, 2024
8338092
ISSUE #4911 - move sectioning hiding logic to calibration toolbar
The-Daniel Aug 1, 2024
732e5db
ISSUE #4911 - move calibration section toolbar to its own component
The-Daniel Aug 1, 2024
41d9e32
ISSUE #4911 - move offset translation to transformation matrix
The-Daniel Aug 1, 2024
44b01df
ISSUE #4911 - change planes type to Vector1D
The-Daniel Aug 1, 2024
4209c1f
ISSUE #4911 - fix unset planes being set to 0
The-Daniel Aug 2, 2024
2c957ab
ISSUE #4911 updated unity to head of 454
sebjf Aug 2, 2024
97fb35a
Merge branch 'ISSUE_4911' of https://github.com/3drepo/3drepo.io into…
The-Daniel Aug 2, 2024
38df92b
ISSUE #4911 - move plane colour/opacity unity calles to unity-utils
The-Daniel Aug 2, 2024
52ca2b6
ISSUE #4911 - use CONTAINER_UNITS for unit label
The-Daniel Aug 2, 2024
4e79394
ISSUE #4911 formalised colours api
sebjf Aug 2, 2024
f8a6e68
ISSUE #4911 - simplify planes calibration section hiding
The-Daniel Aug 5, 2024
e976f58
ISSUE #4911 - update method for clicking to set planes
The-Daniel Aug 6, 2024
625f500
Merge branch 'ISSUE_4911' of https://github.com/3drepo/3drepo.io into…
The-Daniel Aug 6, 2024
53a5d07
ISSUE #4911 - remove duplicate unity functions
The-Daniel Aug 6, 2024
0051b7e
ISSUE #4911 updated unity to head of 545
sebjf Aug 7, 2024
0d55cb8
ISSUE #4911 - adapt setCalibrationToolDrawing usage based on unity im…
The-Daniel Aug 7, 2024
a622a9c
Merge branch 'ISSUE_4897' into ISSUE_4911
The-Daniel Aug 9, 2024
5e7f44d
ISSUE #4911 - add types for threejs
The-Daniel Aug 9, 2024
afeeaff
ISSUE #4911 - update lockfile
The-Daniel Aug 9, 2024
eec2ba0
Merge branch 'ISSUE_4897' into ISSUE_4911
The-Daniel Aug 9, 2024
b5c80d5
ISSUE #4911 updated unity to head of 545
sebjf Aug 9, 2024
dfb0dc5
Merge branch 'ISSUE_4897' into ISSUE_4911
The-Daniel Aug 9, 2024
0492fa3
ISSUE #4911 - revert tabulation format
The-Daniel Aug 12, 2024
4ec84c4
ISSUE #4911 - lock version of threejs
The-Daniel Aug 12, 2024
c4e73b2
Merge branch 'ISSUE_4897' into ISSUE_4911
The-Daniel Aug 12, 2024
77a18b7
ISSUE #4911 - fix unnecessary code to do with planes ref
The-Daniel Aug 12, 2024
26c9a5d
ISSUE #4911 - fix toolbar section not animating on close/open
The-Daniel Aug 12, 2024
6bff978
ISSUE #4911 - simplify empty vertical planes constant
The-Daniel Aug 13, 2024
16ffdb5
Merge branch 'ISSUE_4897' into ISSUE_4911
The-Daniel Aug 19, 2024
d850dac
ISSUE #4911 - fix 2d vector not being redrawn when recalibrating
The-Daniel Aug 20, 2024
08b338f
Merge branch 'ISSUE_4897' into ISSUE_4911
The-Daniel Aug 20, 2024
709ca2c
Merge branch 'ISSUE_4897' into ISSUE_4911
sanmont3drepo Aug 21, 2024
8622250
ISSUE #4911 - fix 2d arrow not always activating
The-Daniel Aug 21, 2024
36a1453
Merge branch 'ISSUE_4911' of https://github.com/3drepo/3drepo.io into…
The-Daniel Aug 21, 2024
2e265cc
ISSUE #4911 - clipping is allowed in plane calibration before value i…
The-Daniel Aug 23, 2024
c1e68a0
ISSUE #4911 - calibration is enabled by default during each step
The-Daniel Aug 23, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified frontend/assets/drawings/blueprint.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
43,505 changes: 38,608 additions & 4,897 deletions frontend/assets/drawings/blueprint.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added frontend/assets/drawings/rac_level_1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
131,338 changes: 131,338 additions & 0 deletions frontend/assets/drawings/rac_level_1.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added frontend/assets/drawings/rac_level_2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
72,952 changes: 72,952 additions & 0 deletions frontend/assets/drawings/rac_level_2.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added frontend/assets/drawings/rac_site.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
44,678 changes: 44,678 additions & 0 deletions frontend/assets/drawings/rac_site.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
29 changes: 29 additions & 0 deletions frontend/assets/icons/viewer/vertical_calibration.svg.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
/**
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure this is wrong, if so, please ignore this comment

When "vertical calibration" mode is on, if "align to surface" is disabled, it is possible to select objects (in 3d calibration, if the respective calibration mode is not active, objects cannot be selected)

image

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this is how it should be. Do you agree/disagree @sanmont3drepo?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reaching the vertical calibration step, the calibration button is already active
image

This is not the same in calibration 3d. Should they both be either active or disabled for consistency?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@sanmont3drepo what do you think? I feel like they should be initially enabled as that is the primary point of the step

* Copyright (C) 2024 3D Repo Ltd
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Completing the calibration process (up to bottom and top plane) and trying to re-calibrate the drawing crashes the app

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have been unable to reproduce

*
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

When I'm setting the top plane, the part of the model above that plane is hidden. If I'm moving the bottom plane, though, shouldn't the bottom part of the model to be hidden?

As in, in the following picture, I would expect to see the section of the model contained between the 2 planes

image

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this is how it should be as the user is like going to be using the cross section of walls whilst looking from above to calibrate it. It makes more sense now that I have added some transparency to the planes

* This program is free software: you can redistribute it and/or modify
The-Daniel marked this conversation as resolved.
Show resolved Hide resolved
The-Daniel marked this conversation as resolved.
Show resolved Hide resolved
* it under the terms of the GNU Affero General Public License as
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Cancelling a calibration with planes sectioning the model and then starting a new calibration picks up the previous clipping view

Registrazione.2024-07-17.105722.mp4

* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/

type IProps = {
className?: any;
};

export default ({ className }: IProps) => (
<svg width="21" height="22" viewBox="0 0 21 22" fill="none" xmlns="http://www.w3.org/2000/svg" className={className}>
<path d="M21 1.23828C21 1.64602 20.6695 1.97656 20.2617 1.97656L12.2739 1.97656C11.8662 1.97656 11.5356 1.64602 11.5356 1.23828C11.5356 0.83054 11.8662 0.5 12.2739 0.5L20.2617 0.5C20.6695 0.5 21 0.83054 21 1.23828Z" fill="currentColor"/>
<path fillRule="evenodd" clipRule="evenodd" d="M0.750587 0.5C0.336049 0.5 1.1266e-06 0.83605 1.08484e-06 1.25059L0 20.7494C-2.30677e-08 21.164 0.336128 21.5 0.750586 21.5H6.11953C6.53407 21.5 6.87012 21.1639 6.87012 20.7494L6.87012 1.25059C6.87012 0.836061 6.53408 0.500001 6.11953 0.500001L0.750587 0.5ZM1.47656 20.0234L1.47656 1.97656L5.39356 1.97656V5.38086H3.594C3.18625 5.38086 2.85571 5.7114 2.85571 6.11914C2.85571 6.52688 3.18625 6.85742 3.594 6.85742H5.39356V10.2617H3.59399C3.18625 10.2617 2.85571 10.5923 2.85571 11C2.85571 11.4077 3.18625 11.7383 3.59399 11.7383H5.39356V15.1426H3.59399C3.18625 15.1426 2.85571 15.4731 2.85571 15.8809C2.85571 16.2886 3.18625 16.6191 3.59399 16.6191H5.39356L5.39355 20.0234H1.47656Z" fill="currentColor"/>
<path d="M17.4305 5.13674C17.7189 5.42506 18.1863 5.42506 18.4746 5.13674C18.7629 4.84842 18.7629 4.38097 18.4746 4.09265L16.7859 2.40389C16.6474 2.26543 16.4596 2.18765 16.2638 2.18765C16.068 2.18765 15.8802 2.26543 15.7418 2.40389L14.0553 4.09038C13.767 4.37869 13.767 4.84615 14.0553 5.13446C14.3436 5.42278 14.8111 5.42278 15.0994 5.13446L15.5136 4.7202L15.5221 17.2906L15.0949 16.8633C14.8066 16.575 14.3391 16.575 14.0508 16.8633C13.7625 17.1517 13.7625 17.6191 14.0508 17.9074L15.7396 19.5962C15.878 19.7347 16.0658 19.8124 16.2616 19.8124C16.4574 19.8124 16.6452 19.7347 16.7836 19.5962L18.4701 17.9097C18.7584 17.6214 18.7584 17.1539 18.4701 16.8656C18.1818 16.5773 17.7144 16.5773 17.426 16.8656L16.9987 17.293L16.9902 4.69638L17.4305 5.13674Z" fill="currentColor"/>
<path d="M20.2617 21.5C20.6695 21.5 21 21.1695 21 20.7617C21 20.354 20.6695 20.0234 20.2617 20.0234H12.2739C11.8662 20.0234 11.5356 20.354 11.5356 20.7617C11.5356 21.1695 11.8662 21.5 12.2739 21.5H20.2617Z" fill="currentColor"/>
</svg>
);
Loading
Loading