diff options
author | Sunil Shetye | 2024-08-22 12:55:46 +0530 |
---|---|---|
committer | Sunil Shetye | 2024-08-27 13:22:39 +0530 |
commit | 303a6bc9f87efe5597900d082a326aad3b6cf4e8 (patch) | |
tree | 603fbec887249c15ec4a0f8ef1eda5d4bbc47a30 | |
parent | 7a8ad3b91426517b8b491348fc92d85f20ef0bfb (diff) | |
download | Common-Interface-Project-303a6bc9f87efe5597900d082a326aad3b6cf4e8.tar.gz Common-Interface-Project-303a6bc9f87efe5597900d082a326aad3b6cf4e8.tar.bz2 Common-Interface-Project-303a6bc9f87efe5597900d082a326aad3b6cf4e8.zip |
ignore
10 files changed, 10 insertions, 22 deletions
diff --git a/blocks/Xcos/MxGraphParser.py b/blocks/Xcos/MxGraphParser.py index 03eac3a9..6d5ff5bd 100755 --- a/blocks/Xcos/MxGraphParser.py +++ b/blocks/Xcos/MxGraphParser.py @@ -88,7 +88,7 @@ for root in model: continue cell_type = attrib['CellType'] - + if cell_type == 'Component': style = attrib['style'] componentGeometry = {} @@ -171,9 +171,9 @@ for root in model: for arrayChild in arrayElement: if arrayChild.tag == 'mxPoint': arrayelem.append(arrayChild.attrib) - + print('ARRAYELEM:', arrayelem) - + sourceVertex = attrib['sourceVertex'] targetVertex = attrib['targetVertex'] sourceType = IDLIST[sourceVertex] @@ -257,7 +257,7 @@ for root in model: geometry['height'] = mxPoint.attrib.get('height', '7') geometry['x'] = mxPoint.attrib.get('x', '0') geometry['y'] = mxPoint.attrib.get('y', '0') - + splitList.append((attribid, sourceVertex, targetVertex, sourceType, targetType, geometry, array1, array2, array3)) print('SPLIST', splitList) try: diff --git a/blocks/Xcos/links/ExplicitLink.py b/blocks/Xcos/links/ExplicitLink.py index 2a83d1e4..0e1f8ce9 100644 --- a/blocks/Xcos/links/ExplicitLink.py +++ b/blocks/Xcos/links/ExplicitLink.py @@ -7,7 +7,6 @@ def ExplicitLink(outroot, attribid, sourceVertex, targetVertex, arrayelem): parent=1, source=sourceVertex, target=targetVertex, style=func_name, value='') - # print(arrayelem) mxGeoNode = addNode(outnode, 'mxGeometry', **{'as': 'geometry'}) addNode(mxGeoNode, 'mxPoint', **{'as': 'sourcePoint', 'x': "0.0", 'y': "0.0"}) diff --git a/blocks/Xcos/ports/ExplicitInputPort.py b/blocks/Xcos/ports/ExplicitInputPort.py index b898d580..1061d62e 100644 --- a/blocks/Xcos/ports/ExplicitInputPort.py +++ b/blocks/Xcos/ports/ExplicitInputPort.py @@ -37,8 +37,6 @@ def addExplicitInputPortForSplit(outroot, splitBlock, sourceVertex, targetVertex forSplitBlock=True) edgeDict[nextAttribForSplit] = ('ExplicitLink', sourceVertex, nextAttrib, sourceType, 'ExplicitInputPort', arrayelem) - # print('ED:', edgeDict[nextAttribForSplit]) nextAttrib += 1 nextAttribForSplit += 1 - # print('ED:', inputCount, outputCount, nextAttrib, nextAttribForSplit) return (inputCount, outputCount, nextAttrib, nextAttribForSplit) diff --git a/blocks/Xcos/ports/ExplicitOutputPort.py b/blocks/Xcos/ports/ExplicitOutputPort.py index 4c07c7d6..6866db81 100644 --- a/blocks/Xcos/ports/ExplicitOutputPort.py +++ b/blocks/Xcos/ports/ExplicitOutputPort.py @@ -39,5 +39,4 @@ def addExplicitOutputPortForSplit(outroot, splitBlock, sourceVertex, targetVerte 'ExplicitOutputPort', targetType, arrayelem) nextAttrib += 1 nextAttribForSplit += 1 - # print(inputCount, outputCount, nextAttrib, nextAttribForSplit) return (inputCount, outputCount, nextAttrib, nextAttribForSplit) diff --git a/blocks/eda-frontend/src/components/SchematicEditor/Helper/ComponentDrag.js b/blocks/eda-frontend/src/components/SchematicEditor/Helper/ComponentDrag.js index c759bcfa..b4b58524 100644 --- a/blocks/eda-frontend/src/components/SchematicEditor/Helper/ComponentDrag.js +++ b/blocks/eda-frontend/src/components/SchematicEditor/Helper/ComponentDrag.js @@ -182,7 +182,6 @@ export default function LoadGrid (container, sidebar, outline) { let text = null if (cell != null) { const attribute = cell.style - // console.log(attribute) if (attribute == null) { return '' } @@ -424,7 +423,6 @@ export default function LoadGrid (container, sidebar, outline) { pt.y = p0.y pt.x = Math.min(pt.x, Math.max(p0.x, pe.x)) pt.x = Math.max(pt.x, Math.min(p0.x, pe.x)) - console.log('PT', pt) } } } else if (terminal != null && terminal.cell.geometry?.relative) { @@ -481,7 +479,7 @@ export default function LoadGrid (container, sidebar, outline) { } } } catch (e) { - console.log(e) + console.error(e) } // Updates the terminal and control points in the cloned preview. diff --git a/blocks/eda-frontend/src/components/SchematicEditor/Helper/ToolbarTools.js b/blocks/eda-frontend/src/components/SchematicEditor/Helper/ToolbarTools.js index 1495edb0..46555b64 100644 --- a/blocks/eda-frontend/src/components/SchematicEditor/Helper/ToolbarTools.js +++ b/blocks/eda-frontend/src/components/SchematicEditor/Helper/ToolbarTools.js @@ -36,7 +36,7 @@ export function saveXml (description = '') { try { xmlWireConnections() } catch (e) { - console.log('error', e) + console.error('error', e) } const enc = new mxCodec(mxUtils.createXmlDocument()) const model = graph.getModel() @@ -462,7 +462,6 @@ function parseXmlToGraph (xmlDoc, graph) { vp.geometry.offset = point vp.CellType = 'Pin' vp.ParentComponent = v1.id - // console.log("VP", vp.id, cellAttrs.id.value, v1.id) } else if (cellAttrs.edge) { // is edge const edgeId = cellAttrs.id.value @@ -472,7 +471,6 @@ function parseXmlToGraph (xmlDoc, graph) { const targetCell = graph.getModel().getCell(target) console.log('CELL', sourceCell, targetCell) console.log('ST', source, target) - // console.log(graph.getModel()) try { const edge = graph.insertEdge(parent, edgeId, null, sourceCell, targetCell) console.log('EGDE', edge) @@ -486,7 +484,7 @@ function parseXmlToGraph (xmlDoc, graph) { const yPos = Number(a.attributes.y.value) console.log('xPos', xPos, yPos) edge.geometry.points.push(new mxPoint(xPos, yPos)) - } catch (e) { console.log('error', e) } + } catch (e) { console.error('error', e) } } } if (targetCell?.edge === true) { @@ -495,7 +493,7 @@ function parseXmlToGraph (xmlDoc, graph) { } catch (e) { console.log(sourceCell) console.log(targetCell) - console.log('error', e) + console.error('error', e) } } } diff --git a/blocks/eda-frontend/src/components/SchematicEditor/SimulationProperties.js b/blocks/eda-frontend/src/components/SchematicEditor/SimulationProperties.js index 855dd9b9..0d93ee3f 100644 --- a/blocks/eda-frontend/src/components/SchematicEditor/SimulationProperties.js +++ b/blocks/eda-frontend/src/components/SchematicEditor/SimulationProperties.js @@ -95,7 +95,7 @@ export default function SimulationProperties () { dispatch(setResultTaskId(taskId)) }) .catch(function (error) { - console.log(error) + console.error(error) }) } diff --git a/blocks/eda-frontend/src/components/SchematicEditor/SimulationScreen.js b/blocks/eda-frontend/src/components/SchematicEditor/SimulationScreen.js index 5b9566f5..948e5ce1 100644 --- a/blocks/eda-frontend/src/components/SchematicEditor/SimulationScreen.js +++ b/blocks/eda-frontend/src/components/SchematicEditor/SimulationScreen.js @@ -638,7 +638,7 @@ export default function SimulationScreen ({ open, close }) { } }) .catch(function (error) { - console.log(error) + console.error(error) }) }, [dispatch, streamSimulationResult]) diff --git a/blocks/eda-frontend/src/redux/actions/saveSchematicActions.js b/blocks/eda-frontend/src/redux/actions/saveSchematicActions.js index c9236805..1595b971 100644 --- a/blocks/eda-frontend/src/redux/actions/saveSchematicActions.js +++ b/blocks/eda-frontend/src/redux/actions/saveSchematicActions.js @@ -101,7 +101,6 @@ export const fetchSchematic = (saveId) => (dispatch, getState) => { config.headers.Authorization = `Token ${token}` } - // console.log('Already Saved') api.get('save/' + saveId, config) .then( (res) => { diff --git a/blocks/eda-frontend/src/redux/reducers/schematicEditorReducer.js b/blocks/eda-frontend/src/redux/reducers/schematicEditorReducer.js index 540974df..2bb7ec76 100644 --- a/blocks/eda-frontend/src/redux/reducers/schematicEditorReducer.js +++ b/blocks/eda-frontend/src/redux/reducers/schematicEditorReducer.js @@ -27,7 +27,6 @@ export default function schematicEditorReducer (state = InitialState, action) { return accObj }, {}) newCollapse[action.payload.id] = !existingState - // console.log('Updating collapse', action.payload.id) Object.assign(state.collapse, newCollapse) return { ...state, collapse: { ...state.collapse, newCollapse } } } @@ -35,14 +34,12 @@ export default function schematicEditorReducer (state = InitialState, action) { case actions.FETCH_COMPONENTS: { const newComponents = state.components newComponents[action.payload.id] = action.payload.components - // console.log('Fetched and added ', newComponents[action.payload.id].length, 'Components') Object.assign(state.components, newComponents) return { ...state, components: { ...state.components, newComponents } } } case actions.COMPONENT_IMAGES: { const componentImages = action.payload.component_images - // console.log('Fetched and added ', componentImages.length, ' images') return { ...state, component_images: componentImages } } |