Conversation
@@ -80,6 +87,7 @@ | |||
import { EventBus } from '../../main.js' | |||
import TreeView from './TreeView' | |||
import OpenDicom from './OpenDICOM' | |||
const dirname = require('path-dirname') |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hmm, seems like this module cannot be used with import
? I thought import dirname from 'path-dirname'
would work.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Well, yes, it works like you thought. I was confused by this this obstacle for the cornerstone
and cornerstone-tools
. Thanks for pointing that out!
d49288b
to
06122d2
Compare
Image loading is also a part of this PR that also shows currently running case, allows user to import and start new case after preview image, as it was described in documentation. |
FYI I've started a discussion here #236 (comment) regarding the potential feature conflict.. |
baefcbc
to
4c1420f
Compare
|
||
|
||
@api_view(['POST']) | ||
def case_available(request): |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There is no need to create a new method. cases/
will do just fine.
class="btn btn-primary float-left case-btn"> | ||
Create new case | ||
</button> | ||
<a href="#/report-and-export" class="btn btn-primary float-left case-btn">Start case</a> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
As far as I understood from this comment we should have multiple cases running same time. So there is no need to have Start case button. At least until there is no any role for it :)
class="btn btn-primary float-left case-btn"> | ||
Create new case | ||
</button> | ||
<a href="#/report-and-export" class="btn btn-primary float-left case-btn">Start case</a> | ||
</template> | ||
<template v-else> | ||
<p class="card-text">No images imported.</p> | ||
</template> | ||
<button class="btn btn-warning float-right" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please, remove this button(Show\Hide import) and make the tree view always visible, there is nothing else to show on this page. The only role of this page is to select a file and start the case, so there is no reason to require user to do extra clicks.
@@ -123,10 +136,28 @@ | |||
// TODO: handle error | |||
}) | |||
}, | |||
async fetchExistedCases (series) { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
fetchExistedCases
-> fetchExistingCases
@@ -141,6 +172,9 @@ | |||
</script> | |||
|
|||
<style lang="scss" scoped> | |||
.case-btn { | |||
margin-left: 1% |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Bootstrap has classes like ml-1
, ml-2
etc. for margins. Check this.
@@ -141,6 +172,9 @@ | |||
</script> | |||
|
|||
<style lang="scss" scoped> | |||
.case-btn { | |||
margin-left: 1% | |||
} | |||
.left { | |||
float: left; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You can use Bootstrap class .pull-left
for this.
One more thing, since you have fixed the DICOM viewer - user can scroll through slices now. So, clicking on last folder should actually show the image. No need to show list of files. You can use my code here. |
Thanks for reviewing @Serhiy-Shekhovtsov :) |
Hey @vessemer, I assume you got all these comments, etc.? :) |
No rush of course but the build seems to be failing and, alas, we need to resolve these conflicts :) |
Gentle ping on this? :) |
74ebeb6
to
7530822
Compare
7530822
to
79ecca7
Compare
@Serhiy-Shekhovtsov no worries. tests are now passing and conflicts have been fixed. |
@Serhiy-Shekhovtsov Thanks so much. However, I still see two remaining conflcts? :) |
Great job @vessemer! Few small comments from my side:
|
Turns out I forgot the I'm getting this: vue_1 | DONE Compiled successfully in 25960ms18:58:35
vue_1 |
vue_1 | > Listening at http://0.0.0.0:8080
vue_1 |
vue_1 | [HPM] Error occurred while trying to proxy request /api/images/ from 52.207.235.82:8080 to http://interface:8000 (ENOTFOUND) (https://nodejs.org/api/errors.html#errors_common_system_errors) |
@vessemer Ping on this? :) |
Anyone else seeing an |
Re-ran everything and it's looking good now! |
@Serhiy-Shekhovtsov great suggestions above. I've just fixed the conflicts so this PR should be merged soon. Mind submitting issues and accompanying PRs of your ideas? |
Great job @vessemer! Once the tests complete (and hopefully pass!) do you mind rebasing everything to 1 commit? Thanks! |
We should not show the list of files under last folder. Because once we switch to real data - we'll see hundreds of files there. It will make it complicated for user to browse the tree and this list doesn't do any help, cause the DICOM viewer should already support scrolling through slices. This is still not fixed, right? |
@Serhiy-Shekhovtsov correct. |
3611f1c
to
49ce1ac
Compare
There's a |
Case manager Handy case selection some fixes
49ce1ac
to
cc82522
Compare
FYI, @pjbull and I are in the midst of a cleanup and refactor right now that will take these changes into account - we can mark this is semi-accepted (thanks @vessemer and @Serhiy-Shekhovtsov for all the footwork). We'll credit appropriately. [cc @reubano] |
@isms Don't forget to re-ping here once done so we can resolve the conflicts :) |
@lamby All set from my perspective - we can close this and acknowledge contributors with full points. (This PR was really helpful in framing how we wanted things to work here, it just ended up being too far from the major refactored version to merge as-is. It otherwise would have been merged 👍) |
@isms Done! Many thanks all o/ |
Import image series implementation.
Reference to official issue
This addresses #145
Screenshots:
CLA