Skip to content

Commit

Permalink
#125 remove cpm and vectors properties
Browse files Browse the repository at this point in the history
  • Loading branch information
tibor-postek-m2ms committed Mar 2, 2020
1 parent 9fa536c commit 2f7e33e
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 22 deletions.
6 changes: 3 additions & 3 deletions js/components/preview/molecule/helperConstants.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ export const moleculeProperty = {
hdon: 'Hdon',
rots: 'Rots',
rings: 'Rings',
velec: 'Velec',
vectors: '#vctr',
cpd: '#cpd'
velec: 'Velec'
// vectors: '#vctr',
// cpd: '#cpd'
};
26 changes: 7 additions & 19 deletions js/components/preview/molecule/moleculeView.js
Original file line number Diff line number Diff line change
Expand Up @@ -164,23 +164,11 @@ const MoleculeView = memo(({ imageHeight, imageWidth, data }) => {
{ name: moleculeProperty.hdon, value: data.hdon },
{ name: moleculeProperty.rots, value: data.rots },
{ name: moleculeProperty.rings, value: data.rings },
{ name: moleculeProperty.velec, value: data.velec },
{ name: moleculeProperty.vectors, value: countOfVectors },
{ name: moleculeProperty.cpd, value: cmpds }
{ name: moleculeProperty.velec, value: data.velec }
// { name: moleculeProperty.vectors, value: countOfVectors },
// { name: moleculeProperty.cpd, value: cmpds }
],
[
cmpds,
countOfVectors,
data.ha,
data.hacc,
data.hdon,
data.logp,
data.mw,
data.rings,
data.rots,
data.tpsa,
data.velec
]
[data.ha, data.hacc, data.hdon, data.logp, data.mw, data.rings, data.rots, data.tpsa, data.velec]
);

// componentDidMount
Expand All @@ -197,14 +185,14 @@ const MoleculeView = memo(({ imageHeight, imageWidth, data }) => {
setOld_url: newUrl => setOldUrl(newUrl),
url,
cancel: onCancel
}),
api({ url: `${base_url}/api/vector/${data.id}` }).then(response => {
})
/* api({ url: `${base_url}/api/vector/${data.id}` }).then(response => {
const vectors = response.data.vectors['3d'];
setCountOfVectors(generateObjectList(vectors).length);
}),
api({ url: `${base_url}/api/graph/${data.id}` }).then(response => {
setCmpds(getTotalCountOfCompounds(response.data.graph));
})
})*/
]).catch(error => {
setError(error);
});
Expand Down

0 comments on commit 2f7e33e

Please sign in to comment.