mirror of
https://github.com/leaders-of-digital-9-task/dicom-viewer.git
synced 2024-11-22 02:16:32 +03:00
add all
This commit is contained in:
parent
8b38958aac
commit
5a18ce3659
8
.vscode/settings.json
vendored
8
.vscode/settings.json
vendored
|
@ -1,3 +1,9 @@
|
||||||
{
|
{
|
||||||
"liveServer.settings.port": 5501
|
"liveServer.settings.port": 5501,
|
||||||
|
"liveServer.settings.https": {
|
||||||
|
"enable": false, //set it true to enable the feature.
|
||||||
|
"cert": "D:\\https\\primary.crt", //full path of the certificate
|
||||||
|
"key": "D:\\https\\private.key", //full path of the private key
|
||||||
|
"passphrase": "12345"
|
||||||
|
}
|
||||||
}
|
}
|
|
@ -25,8 +25,8 @@
|
||||||
|
|
||||||
.layerGroup {
|
.layerGroup {
|
||||||
display: inline-block;
|
display: inline-block;
|
||||||
height: 250px;
|
height: 100%;
|
||||||
width: 250px;
|
width: 100%;
|
||||||
}
|
}
|
||||||
|
|
||||||
.layer {
|
.layer {
|
||||||
|
|
73
index.js
73
index.js
|
@ -6,13 +6,14 @@ var circleFactory = new dwv.tool.draw.CircleFactory();
|
||||||
var roiFactory = new dwv.tool.draw.RoiFactory();
|
var roiFactory = new dwv.tool.draw.RoiFactory();
|
||||||
var freeHandFactory = new dwv.tool.draw.FreeHandFactory();
|
var freeHandFactory = new dwv.tool.draw.FreeHandFactory();
|
||||||
var rulerFactory = new dwv.tool.draw.RulerFactory();
|
var rulerFactory = new dwv.tool.draw.RulerFactory();
|
||||||
|
var rectFactory = new dwv.tool.draw.RectangleFactory();
|
||||||
schema = []
|
schema = []
|
||||||
|
|
||||||
|
|
||||||
var tools = {
|
var tools = {
|
||||||
Scroll: {},
|
Scroll: {},
|
||||||
Draw: {
|
Draw: {
|
||||||
options: ['Circle', 'Roi', 'FreeHand', 'Ruler'],
|
options: ['Circle', 'Roi', 'FreeHand', 'Ruler', 'Rectangle'],
|
||||||
type: 'factory',
|
type: 'factory',
|
||||||
events: ['drawcreate', 'drawchange', 'drawmove', 'drawdelete']
|
events: ['drawcreate', 'drawchange', 'drawmove', 'drawdelete']
|
||||||
},
|
},
|
||||||
|
@ -35,14 +36,13 @@ app.init({
|
||||||
parent.postMessage({'type': 'getDicom', data: ""}, "*")
|
parent.postMessage({'type': 'getDicom', data: ""}, "*")
|
||||||
|
|
||||||
app.addEventListener('load', function () {
|
app.addEventListener('load', function () {
|
||||||
app.setTool('Draw');
|
|
||||||
app.setDrawShape('Ruler')
|
|
||||||
|
|
||||||
setTimeout(() => {
|
setTimeout(() => {
|
||||||
console.log(postRuler())
|
console.log(postRuler())
|
||||||
}, 3000)
|
}, 3000)
|
||||||
|
|
||||||
app.getActiveLayerGroup().getActiveDrawLayer().getKonvaStage().addEventListener('mouseup', () => {
|
app.getActiveLayerGroup().getActiveDrawLayer().getKonvaStage().addEventListener('mouseup', () => {
|
||||||
|
console.log(app.getActiveLayerGroup().getActiveDrawLayer().getKonvaLayer())
|
||||||
setTimeout(() => {
|
setTimeout(() => {
|
||||||
parent.postMessage({'type': 'returnDraws', data: postDraws()}, "*")
|
parent.postMessage({'type': 'returnDraws', data: postDraws()}, "*")
|
||||||
//console.log({'type': 'returnDraws', data: postDraws()})
|
//console.log({'type': 'returnDraws', data: postDraws()})
|
||||||
|
@ -59,6 +59,7 @@ function loadSchema(schema) {
|
||||||
picSchema.set(schema[i].url, schema[i].figures)
|
picSchema.set(schema[i].url, schema[i].figures)
|
||||||
urls.push(schema[i].url)
|
urls.push(schema[i].url)
|
||||||
}
|
}
|
||||||
|
app.loadURLs(urls)
|
||||||
return [urls, picSchema]
|
return [urls, picSchema]
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -175,6 +176,30 @@ function createRoi(circleData) {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function createRectangle(rectangleData) {
|
||||||
|
app.setTool('Draw');
|
||||||
|
var styles = app.getToolboxController().getSelectedTool().style
|
||||||
|
points = rectangleData.points.map((e) => {
|
||||||
|
return new dwv.math.Point2D(e.x, e.y)
|
||||||
|
})
|
||||||
|
|
||||||
|
var draw = rectFactory.create(
|
||||||
|
points,
|
||||||
|
styles,
|
||||||
|
app.getActiveLayerGroup().getActiveViewLayer().getViewController()
|
||||||
|
)
|
||||||
|
draw.id(dwv.math.guid());
|
||||||
|
draw.draggable(true)
|
||||||
|
draw.addEventListener('mouseover', () => {
|
||||||
|
document.body.style.cursor = 'pointer'
|
||||||
|
})
|
||||||
|
draw.addEventListener('mouseout', () => {
|
||||||
|
document.body.style.cursor = 'default'
|
||||||
|
})
|
||||||
|
posGroup = app.getActiveLayerGroup().getActiveDrawLayer().getDrawController().getCurrentPosGroup()
|
||||||
|
posGroup.add(draw)
|
||||||
|
app.getActiveLayerGroup().getActiveDrawLayer().getKonvaLayer().listening(true)
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
function createDraws(drawsData) {
|
function createDraws(drawsData) {
|
||||||
|
@ -191,6 +216,9 @@ function createDraws(drawsData) {
|
||||||
if (e.type == 'Ruler') {
|
if (e.type == 'Ruler') {
|
||||||
createRuler(e.data)
|
createRuler(e.data)
|
||||||
}
|
}
|
||||||
|
if (e.type == 'Rectangle') {
|
||||||
|
createRectangle(e.data)
|
||||||
|
}
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -247,8 +275,31 @@ function postRois() {
|
||||||
}
|
}
|
||||||
|
|
||||||
function postDraws() {
|
function postDraws() {
|
||||||
console.log(postRois())
|
return JSON.parse(JSON.stringify(
|
||||||
return JSON.parse(JSON.stringify(postCircles().concat(postRois()).concat(postFreeHand())))
|
postCircles().concat(postRois()).concat(postFreeHand()).concat(postRuler()).concat(postRects())
|
||||||
|
))
|
||||||
|
}
|
||||||
|
|
||||||
|
function postRects() {
|
||||||
|
roisAttrs = []
|
||||||
|
// setTimeout(() => {
|
||||||
|
// console.log(roisAttrs.concat(app.getActiveLayerGroup().getActiveDrawLayer().getKonvaLayer().find('.rectangle-group')), 'rect')
|
||||||
|
// }, 1000)
|
||||||
|
roisAttrs = roisAttrs.concat(app.getActiveLayerGroup().getActiveDrawLayer().getKonvaLayer().find('.rectangle-group').map((e) => {
|
||||||
|
return e.children.filter((e) => e.attrs.name == 'shape').map(e => {return {attrs: e.attrs, parent: e.parent.attrs}})
|
||||||
|
}))
|
||||||
|
return roisAttrs.flat().map((e) => {
|
||||||
|
e.attrs.points = [e.attrs.x, e.attrs.y, e.attrs.x+e.attrs.width, e.attrs.y+e.attrs.height]
|
||||||
|
var points = [];
|
||||||
|
for (var i = 0; i < e.attrs.points.length; i+=2) {
|
||||||
|
points.push({x: e.attrs.points[i], y: e.attrs.points[i+1]})
|
||||||
|
}
|
||||||
|
return {
|
||||||
|
type: 'Rectangle',
|
||||||
|
points: points,
|
||||||
|
id: e.parent.id
|
||||||
|
}
|
||||||
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
function postFreeHand() {
|
function postFreeHand() {
|
||||||
|
@ -302,7 +353,7 @@ function receiveMessage(event)
|
||||||
} else if(data.type == "setTool"){
|
} else if(data.type == "setTool"){
|
||||||
if (data.data == "null"){
|
if (data.data == "null"){
|
||||||
app.setTool('Scroll');
|
app.setTool('Scroll');
|
||||||
} else if (data.data == 'Roi' || data.data == 'Circle' || data.data == 'FreeHand' || data.data == 'Ruler'){
|
} else if (data.data == 'Roi' || data.data == 'Circle' || data.data == 'FreeHand' || data.data == 'Ruler' || data.data == 'Rectangle'){
|
||||||
app.setTool('Draw');
|
app.setTool('Draw');
|
||||||
app.setDrawShape(data.data);
|
app.setDrawShape(data.data);
|
||||||
}
|
}
|
||||||
|
@ -406,18 +457,14 @@ function setFrame(frameNumber) {
|
||||||
loadPictures(
|
loadPictures(
|
||||||
schema[1].get(schema[0][frameNumber])
|
schema[1].get(schema[0][frameNumber])
|
||||||
)
|
)
|
||||||
|
app.setTool('Draw')
|
||||||
}
|
}
|
||||||
|
|
||||||
function loadPictures(pictures) {
|
function loadPictures(pictures) {
|
||||||
// app.deleteDraws()
|
// app.deleteDraws()
|
||||||
deleteDraws()
|
deleteDraws()
|
||||||
pictures.map((e) => {
|
pictures.map((e) => {
|
||||||
if (e.type == 'Circle') {
|
createDraws(e)
|
||||||
createCircle(e)
|
|
||||||
}
|
|
||||||
else if (e.type == 'Roi') {
|
|
||||||
createRoi(e)
|
|
||||||
}
|
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -425,6 +472,8 @@ function deleteDraws() {
|
||||||
app.getActiveLayerGroup().getActiveDrawLayer().getKonvaStage().find('.circle-group').map((e) => e.destroy())
|
app.getActiveLayerGroup().getActiveDrawLayer().getKonvaStage().find('.circle-group').map((e) => e.destroy())
|
||||||
app.getActiveLayerGroup().getActiveDrawLayer().getKonvaStage().find('.roi-group').map((e) => e.destroy())
|
app.getActiveLayerGroup().getActiveDrawLayer().getKonvaStage().find('.roi-group').map((e) => e.destroy())
|
||||||
app.getActiveLayerGroup().getActiveDrawLayer().getKonvaStage().find('.freeHand-group').map((e) => e.destroy())
|
app.getActiveLayerGroup().getActiveDrawLayer().getKonvaStage().find('.freeHand-group').map((e) => e.destroy())
|
||||||
|
app.getActiveLayerGroup().getActiveDrawLayer().getKonvaStage().find('.rectangle-group').map((e) => e.destroy())
|
||||||
|
app.getActiveLayerGroup().getActiveDrawLayer().getKonvaStage().find('.ruler-group').map((e) => e.destroy())
|
||||||
}
|
}
|
||||||
|
|
||||||
app.addEventListener('slicechange', function () {
|
app.addEventListener('slicechange', function () {
|
||||||
|
|
Loading…
Reference in New Issue
Block a user