Home
Phabricator
Search
Configure Global Search
Log In
Paths
Table of Contents
t
Hide Panel
f
Keyboard Reference
?
Diffusion
MITK
961c68ca5ad4
Merge branch 'T19932-labSetup' into T19932-labSetupIntegrationAugust2017
961c68ca5ad4
Actions
Edit Commit
Download Raw Diff
Edit Related Objects...
Edit Tasks
Subscribe
Mute Notifications
Award Token
Flag For Later
Tags
None
Referenced Files
None
Subscribers
None
Description
Merge branch 'T19932-labSetup' into T19932-labSetupIntegrationAugust2017
Conflicts:
Plugins/PluginList.cmake
Plugins/org.mitk.gui.qt.ultrasound/src/internal/UltrasoundSupport.cpp
Details
Provenance
•
kirchnth
Authored on Aug 2 2017, 8:34 PM
•
kirchnth
Pushed on Aug 2 2017, 8:33 PM
Parents
rMITK8a029d820d0a: this now actually scans multiple angles -Thomas
rMITKd993ade5821d: Merge branch 'T23108-MlTrackingUpdates'
Branches
Unknown
Tags
Unknown
Event Timeline
•
kirchnth
committed
rMITK961c68ca5ad4: Merge branch 'T19932-labSetup' into T19932-labSetupIntegrationAugust2017
(authored by
•
kirchnth
).
Aug 2 2017, 8:34 PM
2017-08-02 20:34:14 (UTC+2)
Merged Changes
This commit merges a very large number of changes. Only the first 50 are shown.
8a029d820d0a
this now actually scans multiple angles -Thomas
Author
•
sattler
Browse Repository
No Builds
No Audits
853e410257c4
this fixes an issue where PA signal was mixed in US data
Author
•
sattler
Browse Repository
No Builds
No Audits
4315bf74229c
- fixed speedOfSound paramter for PA, it's now updated if it changes…
Author
•
sattler
Browse Repository
No Builds
No Audits
d44d52c136d9
-Now the raw US data is being saved, too!
Author
•
sattler
Browse Repository
No Builds
No Audits
f51553a82347
T19932 -rewrote a part of the lasercontrol GUI, so that the…
Author
•
sattler
Browse Repository
No Builds
No Audits
7f4f10acad03
T19932 -save USImages and settings used for Transmission/Receiving/Beamforming
Author
•
sattler
Browse Repository
No Builds
No Audits
915038840591
T19932 just changed spacing of raw images to [us]
Author
•
sattler
Browse Repository
No Builds
No Audits
399998152341
T19932 -stuff Thomas didn't commit -fixed raw spacing ([s])
Author
•
sattler
Browse Repository
No Builds
No Audits
7702c5e670d1
ScaleLegendOverlay is now ScaleLegendAnnotation making those changes necessary…
Author
•
sattler
Browse Repository
No Builds
No Audits
87917046eb33
Merge remote-tracking branch 'origin/T2662-darkStyle2017' into T19932-labSetup
Author
•
sattler
Browse Repository
No Builds
No Audits
2e171c1b5cfc
Merge branch 'T19932-hardwareControlUnited' into T19932-labSetup
Author
•
sattler
Browse Repository
No Builds
No Audits
daff1168ec34
Merge branch 'T2662-darkStyle2017' of https://phabricator.mitk.org/source/mitk…
Author
•
kirchnth
Browse Repository
No Builds
No Audits
a9fc822825d2
optimizing the spin box
Author
•
kirchnth
Browse Repository
No Builds
No Audits
c9d736a2ff7d
Merge branch 'T2662-darkStyle2017' of https://phabricator.mitk.
Author
•
petersej
Browse Repository
No Builds
No Audits
99fa0dacfc66
Start implementing dark icon theme
Author
•
petersej
Browse Repository
No Builds
No Audits
bf7e5904e082
font choices are now persistent
Author
•
kirchnth
Browse Repository
No Builds
No Audits
0a803bc68ad2
renamed "darkStyle2017" to "darkstyle"
Author
•
kirchnth
Browse Repository
No Builds
No Audits
14d903f8e4ee
added new font selection feature in themes preference page. todo: make the font…
Author
•
kirchnth
Browse Repository
No Builds
No Audits
fbaaa0408054
a variety of style changes and fixes
Author
•
kirchnth
Browse Repository
No Builds
No Audits
87414b8314ec
now with working blueberry close tab buttons and working QmitkRenderWindowMenu…
Author
•
kirchnth
Browse Repository
No Builds
No Audits
0da8fcc01c87
a lot of style fixes/changes - i would call this an ok version to start with
Author
•
kirchnth
Browse Repository
No Builds
No Audits
d7132f6b29a3
removed a custom stylesheet in Multilablesegmentationutils because it overwrote…
Author
•
kirchnth
Browse Repository
No Builds
No Audits
bccd8abe629d
paths are relative and work (exept for blueberry things ... todo) and the theme…
Author
•
kirchnth
Browse Repository
No Builds
No Audits
f734baaa1780
T19932 -added a way to switch energy compensation on and off
Author
•
sattler
Browse Repository
No Builds
No Audits
5de4cd58105c
T19932 -opening and closing the PausViewer Plugin while running the US Module…
Author
•
sattler
Browse Repository
No Builds
No Audits
c7697f1e47d1
next try for a new darktheme this is adapted from a qt theme by Colin Duquesnoy…
Author
•
sattler
Browse Repository
No Builds
Concern Raised
ed4b9e12d100
T19932 -Removed the seperate windows for US and PA images -PAUSViewer Plugin…
Author
•
sattler
Browse Repository
No Builds
No Audits
f19ff5fef667
removed disfunct pausmultiwidgeteditor
Author
•
sattler
Browse Repository
No Builds
No Audits
c570726f373a
created plugins for simultaneous viewing of PAT and US ... the pausmultiwidget…
Author
•
sattler
Browse Repository
No Builds
No Audits
e918891b66b1
fixed a typo
Author
•
sattler
Browse Repository
No Builds
No Audits
33f60d538f86
these are uncomitted changes by franz ... tztztz
Author
•
sattler
Browse Repository
No Builds
No Audits
d62bfb4fb073
-made some code look nicer
Author
•
sattler
Browse Repository
No Builds
No Audits
a265558bb823
T19932 -just small fixes
Author
•
sattler
Browse Repository
No Builds
No Audits
d0667204eec2
T19932 -made the windows look much nicer -added a nice levelwindow! but it's…
Author
•
sattler
Browse Repository
No Builds
No Audits
2bb6da52940d
T19932 - made beamformed and raw seperately saveable (finished) - removed…
Author
•
sattler
Browse Repository
No Builds
No Audits
e14248890379
T19932 -added a scale (needs some serious tuning) -saving the raw images works…
Author
•
sattler
Browse Repository
No Builds
No Audits
6734e5af8276
new default values for qpat purposes
Author
•
sattler
Browse Repository
No Builds
No Audits
e76f52f0be04
T19932 -we now have seperate windows for PA and US images -did some setup for…
Author
•
sattler
Browse Repository
No Builds
No Audits
ed4e4f2628f8
T19932 -GUI updates -implemented overlays -setup new RenderWindows
Author
•
sattler
Browse Repository
No Builds
No Audits
d749029ee6b4
T19932
Author
•
sattler
Browse Repository
No Builds
No Audits
323e88b5e2d3
T19932 -fixed bugs -found out how to add overlays and set up some stuff -found…
Author
•
sattler
Browse Repository
No Builds
No Audits
240f5b693a5a
T19932 -compensation works now as it should, and places the fluence…
Author
•
sattler
Browse Repository
No Builds
No Audits
bb098f4413a8
T19932 -fixed error when resizing fluence images
Author
•
sattler
Browse Repository
No Builds
No Audits
df2427f3894c
T19932 - correction for energy values is now being done
Author
•
sattler
Browse Repository
No Builds
No Audits
18ba3e7fcdfb
T19932 -fixed the saving of the energy values and timestamps of ophir
Author
•
sattler
Browse Repository
No Builds
No Audits
63436025e76a
T19932 - Fluence compensation works now, only thing left to do is to load all…
Author
•
sattler
Browse Repository
No Builds
No Audits
44f92e15f837
T19932 -resampling can be set now in the gui -set up lots of things so…
Author
•
sattler
Browse Repository
No Builds
No Audits
296d4ae20b04
Finished T19939 calibrated tuning
Author
•
sattler
Browse Repository
No Builds
No Audits
a968e7ad95cc
gui stuff
Author
•
sattler
Browse Repository
No Builds
No Audits
1ca2ad51d85b
T19855 -the timestamps of the pyro get saved now
Author
•
sattler
Browse Repository
No Builds
No Audits