Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

API: Limited "presentation state" support (GE proposal) #141

Draft
wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

API: Limited "presentation state" support (GE proposal) #141

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1fb232a
API: Extend API with "presentation state" support
forderud Aug 4, 2019
b2b9c6a
Update DummyLoader after API upgrade
Feb 19, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions DummyLoader/Image3dSource.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,10 @@ class ATL_NO_VTABLE Image3dSource :

HRESULT STDMETHODCALLTYPE GetSopInstanceUID(/*out*/BSTR *uid_str) override;

HRESULT STDMETHODCALLTYPE GetPresentationState(IPresentationState *) override {
return E_NOTIMPL;
}

DECLARE_REGISTRY_RESOURCEID(IDR_Image3dSource)

BEGIN_COM_MAP(Image3dSource)
Expand Down
19 changes: 19 additions & 0 deletions Image3dAPI/IImage3d.idl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,6 +274,22 @@ cpp_quote("#else")
cpp_quote("static_assert(sizeof(EcgSeries) == 2*8+2*4, \"EcgSeries size mismatch\");")
cpp_quote("#endif")


[object,
oleautomation, // use "automation" marshaler (oleaut32.dll)
uuid(DCAC585F-3EC1-4440-96B6-83090408B027),
helpstring("Interface for retrieving the default slice/rendering 'views' of the 3D data.")]
interface IPresentationState : IUnknown {
[helpstring("Get number of default slice/rendering views.\n"
"Shall return 0 if no default views are available.")]
HRESULT GetViewCount ([out, retval] unsigned int * count);

[helpstring("Get slice/rendering view by index.\n"
"The views shall by sorted by 'importance'. Clients unable to display all views should therefore display the first 'N' views.\n"
"Slices are indicated by the 'dir3' vector being empty, whereas it is non-empty for renderings.")]
HRESULT GetView ([in] unsigned int index, [out, retval] Cart3dGeom * view);
};

[ object,
oleautomation, // use "automation" marshaler (oleaut32.dll)
uuid(D483D815-52DD-4750-8CA2-5C6C489588B6),
Expand All @@ -297,6 +313,9 @@ interface IImage3dSource : IUnknown {
[helpstring("Get ECG data if available [optional]. Shall return S_OK with an empty EcgSeries if EGC is not available.")]
HRESULT GetECG ([out,retval] EcgSeries * ecg);

[helpstring("Get presentation state corresponding to the 'views' shown on screen when the data was originally stored [optional].")]
HRESULT GetPresentationState (IPresentationState * pstate);

[helpstring("")]
HRESULT GetProbeInfo ([out,retval] ProbeInfo * probe);

Expand Down
1 change: 1 addition & 0 deletions Image3dAPI/UNREGISTER_Image3dAPI.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ for %%P in (32 64) do (
:: IImage3d.idl
reg delete "HKCR\Interface\{D483D815-52DD-4750-8CA2-5C6C489588B6}" /f /reg:%%P 2> NUL
reg delete "HKCR\Interface\{CD30759B-EB38-4469-9CA5-4DF75737A31B}" /f /reg:%%P 2> NUL
reg delete "HKCR\Interface\{DCAC585F-3EC1-4440-96B6-83090408B027}" /f /reg:%%P 2> NUL
)

::pause