Skip to content

Commit

Permalink
revert cadview back to before the lint fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
OlegMoshkovich committed Aug 8, 2022
1 parent ba0e410 commit 00416e5
Showing 1 changed file with 21 additions and 26 deletions.
47 changes: 21 additions & 26 deletions src/Containers/CadView.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ export default function CadView({

/** When viewer is ready, load IFC model. */
async function onViewer() {
if (viewer === null) {
if (viewer == null) {
debug().warn('CadView#onViewer, viewer is null')
return
}
Expand All @@ -150,37 +150,36 @@ export default function CadView({
filepath = filepath.split('.ifc')[0]
const parts = filepath.split('/')
filepath = parts[parts.length - 1]
debug().log('CadView#loadIfc: parsed blob: ', filepath)
filepath = `blob:${l.protocol}//${l.hostname + (l.port ? `:${ l.port}` : '')}/${filepath}`
debug(3).log('CadView#loadIfc: parsed blob: ', filepath)
filepath = `blob:${l.protocol}//${l.hostname + (l.port ? ':' + l.port : '')}/${filepath}`
}
const loadingMessageBase = `Loading ${filepath}`
setLoadingMessage(loadingMessageBase)
setIsLoading(true)
const loadedModel = await viewer.IFC.loadIfcUrl(
const model = await viewer.IFC.loadIfcUrl(
filepath,
!urlHasCameraParams(), // fitToFrame
urlHasCameraParams() ? false : true, // fitToFrame
(progressEvent) => {
if (Number.isFinite(progressEvent.loaded)) {
const loadedBytes = progressEvent.loaded
// eslint-disable-next-line no-magic-numbers
const loadedMegs = (loadedBytes / (1024 * 1024)).toFixed(2)
setLoadingMessage(`${loadingMessageBase}: ${loadedMegs} MB`)
debug().log(`CadView#loadIfc$onProgress, ${loadedBytes} bytes`)
debug(3).log(`CadView#loadIfc$onProgress, ${loadedBytes} bytes`)
}
},
(error) => {
console.warn('CadView#loadIfc$onError', error)
// TODO(pablo): error modal.
setIsLoading(false)
setAlertMessage(`Could not load file: ${ filepath}`)
setAlertMessage('Could not load file: ' + filepath)
})
Privacy.recordEvent('select_content', {
content_type: 'ifc_model',
item_id: filepath,
})
setIsLoading(false)

if (loadedModel) {
if (model) {
// Fix for https://github.com/bldrs-ai/Share/issues/91
//
// TODO(pablo): huge hack. Somehow this is getting incremented to
Expand All @@ -189,8 +188,8 @@ export default function CadView({
// leads to undefined refs e.g. in prePickIfcItem. The id should
// always be 0.
model.modelID = 0
setModel(loadedModel)
setModelStore(loadedModel)
setModel(model)
setModelStore(model)
}
}

Expand Down Expand Up @@ -218,11 +217,11 @@ export default function CadView({

/** Analyze loaded IFC model to configure UI elements. */
async function onModel() {
if (model === null) {
if (model == null) {
return
}
const rootElt = await model.ifcManager.getSpatialStructure(0, true)
if (rootElt.expressID === undefined) {
if (rootElt.expressID == undefined) {
throw new Error('Model has undefined root express ID')
}
setupLookupAndParentLinks(rootElt, elementsById)
Expand Down Expand Up @@ -274,7 +273,7 @@ export default function CadView({
}
const resultIDs = searchIndex.search(query)
selectItems(resultIDs)
setDefaultExpandedElements(resultIDs.map((id) => `${id }`))
setDefaultExpandedElements(resultIDs.map((id) => id + ''))
Privacy.recordEvent('search', {
search_term: query,
})
Expand All @@ -298,7 +297,7 @@ export default function CadView({
*/
async function setDoubleClickListener() {
window.ondblclick = async (event) => {
if (event.target && event.target.tagName === 'CANVAS') {
if (event.target && event.target.tagName == 'CANVAS') {
const item = await viewer.IFC.pickIfcItem(true)
if (item && Number.isFinite(item.modelID) && Number.isFinite(item.id)) {
const path = computeElementPath(elementsById[item.id], (elt) => elt.expressID)
Expand Down Expand Up @@ -327,14 +326,14 @@ export default function CadView({
* @param {Array} resultIDs Array of expressIDs
*/
async function selectItems(resultIDs) {
setSelectedElements(resultIDs.map((id) => `${id }`))
setSelectedElements(resultIDs.map((id) => id + ''))
try {
await viewer.pickIfcItemsByID(0, resultIDs, true)
} catch (e) {
// IFCjs will throw a big stack trace if there is not a visual
// element, e.g. for IfcSite, but we still want to proceed to
// setup its properties.
debug().log('TODO: no visual element for item ids: ', resultIDs)
debug(3).log('TODO: no visual element for item ids: ', resultIDs)
}
}

Expand Down Expand Up @@ -375,15 +374,13 @@ export default function CadView({
<SnackBarMessage
message={snackMessage ? snackMessage : loadingMessage}
type={'info'}
open={isLoading || snackMessage !== null}
/>
open={isLoading || snackMessage !== null}/>
<div className={classes.search}>
{showSearchBar && (
<SearchBar
onClickMenuCb={() => setShowNavPanel(!showNavPanel)}
showNavPanel={showNavPanel}
isOpen={showNavPanel}
/>
isOpen={showNavPanel}/>
)}
</div>
{showNavPanel &&
Expand All @@ -397,13 +394,11 @@ export default function CadView({
setExpandedElements={setExpandedElements}
pathPrefix={
pathPrefix + (modelPath.gitpath ? modelPath.getRepoPath() : modelPath.filepath)
}
/>}
}/>}
<Logo onClick={() => navToDefault(navigate, appPrefix)}/>
<div className={isDrawerOpen ?
classes.operationsGroupOpen :
classes.operationsGroup}
>
classes.operationsGroup}>
{viewer &&
<OperationsGroup
viewer={viewer}
Expand Down Expand Up @@ -454,7 +449,7 @@ function initViewer(pathPrefix, backgroundColorStr = '#abcdef') {
if (event.code === 'KeyW') {
v.clipper.deletePlane()
}
if (event.code === 'KeyA') {
if (event.code == 'KeyA') {
v.IFC.unpickIfcItems()
}
}
Expand Down

0 comments on commit 00416e5

Please sign in to comment.