Diffusion MITK 20753f08a683

fixed merge conflicts
20753f08a683
Actions

Tags

None

Referenced Files

None

Subscribers

None

Description

fixed merge conflicts

Details

Provenance

• kleina	Authored on Nov 25 2016, 2:31 PM
• kleina	Pushed on Nov 25 2016, 2:30 PM

Parents

rMITK78777499d138: resolved issues with build on windows
rMITKa6db67d78af6: Added functionality to plot statistics on figure. Added show/hide subchart…

Branches

Unknown

Tags

Unknown

Event Timeline

• kleina committed rMITK20753f08a683: fixed merge conflicts (authored by • kleina).Nov 25 2016, 2:31 PM

Merged Changes

a6db67d78af6 Added functionality to plot statistics on figure. Added show/hide subchart…
Author
• kleina
Browse Repository
No Builds
No Audits
56ee99e39202 Added minimum size to JS-Chart and groupBox Histogram. This is the fix for Task…
Author
Klein <kleina@ad.dkfz-heidelberg.de>
Browse Repository
No Builds
No Audits
55de7fb9b866 code cleanup, added some comments
Author
• kleina
Browse Repository
No Builds
No Audits
d1170f3932af fixed x-axis-tick error
Author
• kleina
Browse Repository
No Builds
No Audits
bc95edc82c29 added possibility to switch histogram to dark_theme
Author
• kleina
Browse Repository
No Builds
No Audits
f6a0f9e9576e added binSize to Histogram and added ClearHistogram function to erase chart, if…
Author
• kleina
Browse Repository
No Builds
No Audits
da50f8df9a2e added variable m_UseLineGraph to make sure the chart type does not switch when…
Author
• kleina
Browse Repository
No Builds
No Audits
644a53e40696 Removed old implementation of histograms (QtWidgetsWeb and some classes from…
Author
• kleina
Browse Repository
No Builds
No Audits
e7916d2cbe03 Code cleanup. Moved QmitkC3Data to own header+source file. Removed unused…
Author
• kleina
Browse Repository
No Builds
No Audits
b024af13b19f disable context menu for m_WebengineView
Author
• kleina
Browse Repository
No Builds
No Audits
b4ee949ef890 added tooltip to chart
Author
• kleina
Browse Repository
No Builds
No Audits
0373b77200e6 removed title from QmitkC3jsWidget.html
Author
• kleina
Browse Repository
No Builds
No Audits
b94c3131eff1 Styling of the C3 generated chart. Lots of changes in one commit.
Author
• kleina
Browse Repository
No Builds
No Audits
740704fbe880 code cleanup for QmitkC3jsWidget
Author
• kleina
Browse Repository
No Builds
No Audits
92c074bcccd5 Add empty HTML for initialization
Author
• kleina
Browse Repository
No Builds
No Audits
6da901985a8d changed QmitkHistogramJSWidget to QmitkC3jsWidget in…
Author
• kleina
Browse Repository
No Builds
No Audits
c75841528f3c added MitkC3js module to measurementtoolbox
Author
• kleina
Browse Repository
No Builds
No Audits
cad114408267 Added Module C3js including c3 and d3
Author
• kleina
Browse Repository
No Builds
No Audits

Changes (42)

Path

Size

Packages

Modules/

QmitkC3jsWidget.h

Histogram_dark.css

QmitkC3jsWidget.html

QmitkC3Data.cpp

QmitkC3jsWidget.cpp

ModuleList.cmake

QtWidgetsExt/

O3: MITK Reviewer Group II

include/

QmitkHistogramWidget.h

O3: MITK Reviewer Group II

src/

QmitkHistogramWidget.cpp

O3: MITK Reviewer Group II

QmitkHistogramJSWidget.h

QtWidgetsWeb.qrc

QmitkHistogramJSWidget.cpp

Plugins/

org.mitk.gui.qt.measurementtoolbox/

O1: MITK Reviewer Group I

src/

internal/

QmitkImageStatisticsView.cpp

O1: MITK Reviewer Group I

QmitkImageStatisticsView.h

O1: MITK Reviewer Group I

QmitkImageStatisticsViewControls.ui

O1: MITK Reviewer Group I

rMITK20753f08a683

Modules/C3js/CMakeLists.txt

Loading...

Modules/C3js/files.cmake

Loading...

Modules/C3js/include/C3Data.h

Loading...

Modules/C3js/include/QmitkC3Data.h

Loading...

Modules/C3js/include/QmitkC3jsWidget.h

Loading...

Modules/C3js/resource/C3js.qrc

Loading...

Modules/C3js/resource/Histogram.css

Loading...

Modules/C3js/resource/Histogram.js

Loading...

Modules/C3js/resource/Histogram_dark.css

Loading...

Modules/C3js/resource/QmitkC3jsWidget.html

Loading...

Modules/C3js/resource/c3.min.css

Loading...

Modules/C3js/resource/c3.min.js

Loading...

Modules/C3js/resource/d3.min.js

Loading...

Modules/C3js/resource/empty.html

Loading...

Modules/C3js/src/C3Data.cpp

Loading...

Modules/C3js/src/QmitkC3Data.cpp

Loading...

Modules/C3js/src/QmitkC3jsWidget.cpp

Loading...

Modules/ModuleList.cmake

Loading...

Modules/QtWidgetsExt/files.cmake

Loading...

Modules/QtWidgetsExt/include/QmitkHistogramWidget.h

Loading...

Modules/QtWidgetsExt/src/QmitkHistogramWidget.cpp

Loading...

Modules/QtWidgetsWeb

Loading...

Modules/QtWidgetsWeb/CMakeLists.txt

Loading...

Modules/QtWidgetsWeb/files.cmake

Loading...

Modules/QtWidgetsWeb/include

Loading...

Modules/QtWidgetsWeb/include/QmitkHistogramJSWidget.h

Loading...

Modules/QtWidgetsWeb/resource

Loading...

Modules/QtWidgetsWeb/resource/Histogram.css

Loading...

Modules/QtWidgetsWeb/resource/Histogram.html

Loading...

Modules/QtWidgetsWeb/resource/Histogram.js

Loading...

Modules/QtWidgetsWeb/resource/QtWidgetsWeb.qrc

Loading...

Modules/QtWidgetsWeb/resource/d3.v2.js

Loading...

Modules/QtWidgetsWeb/src

Loading...

Modules/QtWidgetsWeb/src/QmitkHistogramJSWidget.cpp

Loading...

Plugins/org.mitk.gui.qt.measurementtoolbox/CMakeLists.txt

Loading...

Plugins/org.mitk.gui.qt.measurementtoolbox/src/internal/QmitkImageStatisticsView.cpp

Loading...

Plugins/org.mitk.gui.qt.measurementtoolbox/src/internal/QmitkImageStatisticsView.h

Loading...

Plugins/org.mitk.gui.qt.measurementtoolbox/src/internal/QmitkImageStatisticsViewControls.ui

Loading...