Commit 364a946b authored by Bartosz Borucki's avatar Bartosz Borucki

Merge branch 'simple_pro_cleanup' into 'develop'

Simple/Pro cleanup

See merge request !69
parents f5eab779 42729e40
Pipeline #19773492 passed with stage
in 0 seconds
main.class=pl.edu.icm.visnow.applications.DicomSegmentation
run.jvmargs=-Xmx2G -XX:+AggressiveOpts
main.class=pl.edu.icm.visnow.lib.experimental.CMC.Pointer2D
jar.index=false
main.class=pl.edu.icm.visnow.lib.experimental.CMC.Pointer3D
jar.index=false
$label=VisNow Basic
deploy.title=VisNow
deploy.version=1.3
help.arg=-basic
deploy.startclass=pl.edu.icm.visnow.system.main.VisNow
deploy.installername=setup_visnow_v${deploy.version}
jar.index=false
run.jvmargs=-Xmx6G -XX:+AggressiveOpts
$label=VisNow Pro
main.class=pl.edu.icm.visnow.system.main.VisNowPro
deploy.title=VisNow
deploy.version=1.3-Pro
help.arg=-pro
deploy.startclass=pl.edu.icm.visnow.system.main.VisNowPro
deploy.installername=setup_visnow_v${deploy.version}
jar.index=false
run.jvmargs=-Xmx28G -XX:+AggressiveOpts
$label=VisNow Simple
main.class=pl.edu.icm.visnow.system.main.VisNowSimple
deploy.title=VisNow
deploy.version=1.3-Simple
help.arg=-simple
deploy.startclass=pl.edu.icm.visnow.system.main.VisNowSimple
deploy.installername=setup_visnow_v${deploy.version}
jar.index=false
run.jvmargs=-Xmx6G -XX:+AggressiveOpts
$label=VisNow Simple + debug
main.class=pl.edu.icm.visnow.system.main.VisNowSimple
jar.index=false
run.jvmargs=-Xmx6G -XX:+AggressiveOpts
run.jvmargs=-Xmx1G
jar.index=false
jar.index=false
application.args=-debug
\ No newline at end of file
main.class=pl.edu.icm.visnow.lib.experimental.know.neurosurgery.HydrocephalitisApplication
......@@ -125,7 +125,7 @@ file.reference.mysql-connector-java-5.1.15-bin.jar=libs/mysql-connector-java-5.1
annotation.processing.enabled=true
file.reference.javaws.jar=/opt/java/jdk/jre/lib/javaws.jar
file.reference.j3d-org-loader-stl_1.1.0.jar=libs/j3d-org-loader-stl_1.1.0.jar
run.jvmargs=-Xmx12G -XX\:+AggressiveOpts
run.jvmargs=-Xmx6G -XX:+AggressiveOpts
build.generated.sources.dir=${build.dir}/generated-sources
file.reference.swingx-all-1.6.4.jar=libs/swingx-all-1.6.4.jar
file.reference.colt.jar=libs/colt.jar
......@@ -170,6 +170,8 @@ deploy.vendor=ICM UW
application.homepage=http\://visnow.icm.edu.pl
javac.classpath=\
${file.reference.bcprov-jdk15on-1.49.jar}:\
${file.reference.JSciC-1.1-SNAPSHOT-sources.jar}:\
${file.reference.JSciC-1.1-SNAPSHOT-with-dependencies.jar}:\
${file.reference.AAlog4j-1.2.17.jar}:\
${file.reference.gridftp-2.1-SNAPSHOT.jar}:\
${file.reference.gss-2.1-SNAPSHOT.jar}:\
......@@ -186,8 +188,6 @@ javac.classpath=\
${file.reference.benojt.jar}:\
${file.reference.blas.jar}:\
${file.reference.blas_simple.jar}:\
${file.reference.JSciC-1.1-SNAPSHOT-sources.jar}:\
${file.reference.JSciC-1.1-SNAPSHOT-with-dependencies.jar}:\
${file.reference.cayenne-1.2.1.jar}:\
${file.reference.clibwrapper_jiio.jar}:\
${file.reference.colt.jar}:\
......
<library name="internal">
<!--
This library contains internal VisNow modules for acquiring,
analysing and displaying data.
-->
<core package="pl.edu.icm.visnow.lib.basic.viewers.Viewer2D"/>
<core package="pl.edu.icm.visnow.lib.basic.viewers.Viewer3D"/>
<core package="pl.edu.icm.visnow.lib.basic.viewers.FieldViewer3D"/>
<core package="pl.edu.icm.visnow.lib.basic.viewers.FieldViewer1DNew"/>
<core package="pl.edu.icm.visnow.lib.basic.viewers.MultiViewer3D"/>
<folder name="readers" autohelpfile="pl.edu.icm.visnow.lib.basic.readers.help_folder.html">
<core package="pl.edu.icm.visnow.lib.basic.readers.ReadVisNowField"/>
<core package="pl.edu.icm.visnow.lib.basic.readers.ReadVTK"/>
<core package="pl.edu.icm.visnow.lib.basic.readers.material_science.ReadVASP"/>
<folder name="regular data readers" autohelpfile="pl.edu.icm.visnow.lib.basic.readers.medreaders.help_folder.html" open="yes">
<core package="pl.edu.icm.visnow.lib.basic.readers.medreaders.ReadDICOM"/>
<core package="pl.edu.icm.visnow.lib.basic.readers.ReadAVSField"/>
<core package="pl.edu.icm.visnow.lib.basic.readers.ReadCSV"/>
<core package="pl.edu.icm.visnow.lib.basic.readers.ReadImage"/>
<core package="pl.edu.icm.visnow.lib.basic.readers.VolumeReader"/>
<core package="pl.edu.icm.visnow.lib.basic.readers.GaussianCubeReader"/>
</folder>
<folder name="irregular data readers" open="yes">
<core package="pl.edu.icm.visnow.lib.basic.readers.ReadOBJ"/>
<core package="pl.edu.icm.visnow.lib.basic.readers.ExtendedReadGADGET2"/>
<core package="pl.edu.icm.visnow.lib.basic.readers.ReadEnSightGoldCase"/>
<core package="pl.edu.icm.visnow.lib.basic.readers.ReadFluent"/>
<core package="pl.edu.icm.visnow.lib.basic.readers.ReadSTL"/>
<core package="pl.edu.icm.visnow.lib.basic.readers.ExtendedReadGADGET2"/>
</folder>
</folder>
<folder name="test objects" autohelpfile="pl.edu.icm.visnow.lib.basic.testdata.help_folder.html" autosort="yes">
<core package="pl.edu.icm.visnow.lib.basic.testdata.TestField"/>
<core package="pl.edu.icm.visnow.lib.basic.testdata.TestLineMesh"/>
<core package="pl.edu.icm.visnow.lib.basic.testdata.TestCells"/>
<core package="pl.edu.icm.visnow.lib.basic.testdata.TestPoints"/>
<core package="pl.edu.icm.visnow.lib.basic.testdata.VNLogo"/>
<core package="pl.edu.icm.visnow.lib.basic.testdata.TestIrregularFieldFlow"/>
<core package="pl.edu.icm.visnow.lib.basic.testdata.ColorCube"/>
</folder>
<folder name="utilities" autohelpfile="pl.edu.icm.visnow.lib.basic.utilities.help_folder.html" autosort="yes">
<core package="pl.edu.icm.visnow.lib.basic.filters.FieldCombiner"/>
<core package="pl.edu.icm.visnow.lib.basic.filters.AccumulateTimesteps"/>
<core package="pl.edu.icm.visnow.lib.basic.utilities.FieldStats"/>
<core package="pl.edu.icm.visnow.lib.basic.utilities.Loop"/>
</folder>
<folder name="geometry filters" autohelpfile="pl.edu.icm.visnow.lib.basic.filters.help_folder_geometry.html" autosort="yes">
<core package="pl.edu.icm.visnow.lib.basic.filters.RadialCoordinates"/>
<core package="pl.edu.icm.visnow.lib.basic.filters.TransformGeometry"/>
<core package="pl.edu.icm.visnow.lib.basic.filters.ComponentOperations"/>
<core package="pl.edu.icm.visnow.lib.basic.filters.RegularToIrregularField"/>
<core package="pl.edu.icm.visnow.lib.basic.filters.Triangulation"/>
<core package="pl.edu.icm.visnow.lib.basic.filters.Boundaries"/>
<core package="pl.edu.icm.visnow.lib.basic.filters.GeometricCrop"/>
</folder>
<folder name="data filters" autohelpfile="pl.edu.icm.visnow.lib.basic.filters.help_folder_data.html" autosort="yes">
<core package="pl.edu.icm.visnow.lib.basic.filters.ComponentCalculator"/>
<core package="pl.edu.icm.visnow.lib.basic.filters.ComponentOperations"/>
<core package="pl.edu.icm.visnow.lib.basic.filters.CropDown"/>
<core package="pl.edu.icm.visnow.lib.basic.filters.SimpleProjection"/>
<core package="pl.edu.icm.visnow.lib.basic.filters.AddMargins"/>
<core package="pl.edu.icm.visnow.lib.basic.filters.RegularFieldDifferentialOperations"/>
<core package="pl.edu.icm.visnow.lib.basic.filters.InterpolationToRegularField"/>
<core package="pl.edu.icm.visnow.lib.basic.filters.MulticomponentHistogram"/>
<core package="pl.edu.icm.visnow.lib.basic.filters.CellToNode"/>
<core package="pl.edu.icm.visnow.lib.basic.mappers.ObjectFlow"/>
<core package="pl.edu.icm.visnow.lib.basic.filters.InterpolateToMesh"/>
</folder>
<folder name="smoothing and denoising" autohelpfile="pl.edu.icm.visnow.lib.basic.filters.help_folder_smoothing.html" autosort="yes">
<core package="pl.edu.icm.visnow.lib.basic.filters.SplineInterpolation"/>
<core package="pl.edu.icm.visnow.lib.basic.filters.GaussianFilter"/>
<core package="pl.edu.icm.visnow.lib.basic.filters.AnisotropicDenoiser"/>
<core package="pl.edu.icm.visnow.lib.basic.filters.LocalOperations"/>
<core package="pl.edu.icm.visnow.lib.basic.filters.SmoothDown"/>
<core package="pl.edu.icm.visnow.lib.basic.filters.PeronaMalikDiffusion"/>
</folder>
<folder name="general mappers and accessories" autohelpfile="pl.edu.icm.visnow.lib.basic.mappers.help_folder_3d.html" autosort="yes">
<core package="pl.edu.icm.visnow.lib.basic.mappers.FieldMapper"/>
<core package="pl.edu.icm.visnow.lib.basic.mappers.Axes3D"/>
<core package="pl.edu.icm.visnow.lib.basic.mappers.Glyphs"/>
<core package="pl.edu.icm.visnow.lib.basic.mappers.TextGlyphs"/>
<core package="pl.edu.icm.visnow.lib.basic.mappers.TubeGlyphs"/>
<core package="pl.edu.icm.visnow.lib.basic.mappers.LineSlice"/>
<core package="pl.edu.icm.visnow.lib.basic.mappers.LineProbe"/>
<core package="pl.edu.icm.visnow.lib.basic.mappers.ObjectFlow"/>
<core package="pl.edu.icm.visnow.lib.basic.mappers.ScaleCells"/>
<core package="pl.edu.icm.visnow.lib.basic.mappers.CellCenters"/>
<core package="pl.edu.icm.visnow.lib.basic.mappers.Trajectories"/>
<core package="pl.edu.icm.visnow.lib.basic.utilities.Annotations"/>
</folder>
<folder name="3D field mappers" autohelpfile="pl.edu.icm.visnow.lib.basic.mappers.help_folder_3d.html" autosort="yes">
<core package="pl.edu.icm.visnow.lib.basic.mappers.Isosurface"/>
<core package="pl.edu.icm.visnow.lib.basic.mappers.Isovolume"/>
<core package="pl.edu.icm.visnow.lib.basic.mappers.LineSlice"/>
<core package="pl.edu.icm.visnow.lib.basic.mappers.SurfaceComponents"/>
<core package="pl.edu.icm.visnow.lib.basic.mappers.VolumeRenderer"/>
<core package="pl.edu.icm.visnow.lib.basic.mappers.PlanarSlice"/>
<core package="pl.edu.icm.visnow.lib.basic.mappers.RegularFieldSlice"/>
<core package="pl.edu.icm.visnow.lib.basic.mappers.InterpolatedSlice"/>
<core package="pl.edu.icm.visnow.lib.basic.mappers.Streamlines"/>
<core package="pl.edu.icm.visnow.lib.basic.mappers.VectorFieldDisplacement"/>
<core package="pl.edu.icm.visnow.lib.basic.mappers.ObjectFlow"/>
<core package="pl.edu.icm.visnow.lib.basic.mappers.AnimatedStream"/>
</folder>
<folder name="2D field mappers" autohelpfile="pl.edu.icm.visnow.lib.basic.mappers.help_folder_2d.html" autosort="yes">
<core package="pl.edu.icm.visnow.lib.basic.mappers.LineSlice"/>
<core package="pl.edu.icm.visnow.lib.basic.mappers.Isolines"/>
<core package="pl.edu.icm.visnow.lib.basic.mappers.Graph3D"/>
<core package="pl.edu.icm.visnow.lib.basic.mappers.RibbonPlot"/>
<core package="pl.edu.icm.visnow.lib.basic.mappers.CityPlot"/>
<core package="pl.edu.icm.visnow.lib.basic.mappers.Graph"/>
</folder>
<folder name="writers" autohelpfile="pl.edu.icm.visnow.lib.basic.writers.help_folder.html">
<core package="pl.edu.icm.visnow.lib.basic.writers.VolumeWriter"/>
<core package="pl.edu.icm.visnow.lib.basic.writers.FieldWriter"/>
<core package="pl.edu.icm.visnow.lib.basic.writers.UCDWriter"/>
<core package="pl.edu.icm.visnow.lib.basic.writers.WriteOBJ"/>
</folder>
</library>
<html><head><title>ColormapEditor</title><meta content="text/html; charset=UTF-8" http-equiv="content-type"><style type="text/css"> .lst-kix_m4yuwvhy6d6-6 > li:before{content:"● "}.lst-kix_m4yuwvhy6d6-5 > li:before{content:"■ "}.lst-kix_cxp5lbx8lp48-7 > li:before{content:"○ "}.lst-kix_cxp5lbx8lp48-3 > li:before{content:"● "}.lst-kix_cxp5lbx8lp48-2 > li:before{content:"■ "}ul.lst-kix_m4yuwvhy6d6-0{list-style-type:none}ul.lst-kix_m4yuwvhy6d6-1{list-style-type:none}ul.lst-kix_m4yuwvhy6d6-2{list-style-type:none}ul.lst-kix_m4yuwvhy6d6-3{list-style-type:none}.lst-kix_cxp5lbx8lp48-5 > li:before{content:"■ "}.lst-kix_m4yuwvhy6d6-4 > li:before{content:"○ "}.lst-kix_cxp5lbx8lp48-4 > li:before{content:"○ "}ul.lst-kix_cxp5lbx8lp48-0{list-style-type:none}.lst-kix_cxp5lbx8lp48-1 > li:before{content:"○ "}.lst-kix_cxp5lbx8lp48-0 > li:before{content:"● "}ul.lst-kix_cxp5lbx8lp48-4{list-style-type:none}ul.lst-kix_cxp5lbx8lp48-3{list-style-type:none}ul.lst-kix_cxp5lbx8lp48-2{list-style-type:none}.lst-kix_m4yuwvhy6d6-0 > li:before{content:"● "}ul.lst-kix_cxp5lbx8lp48-1{list-style-type:none}ul.lst-kix_cxp5lbx8lp48-8{list-style-type:none}ul.lst-kix_cxp5lbx8lp48-7{list-style-type:none}ul.lst-kix_cxp5lbx8lp48-6{list-style-type:none}ul.lst-kix_cxp5lbx8lp48-5{list-style-type:none}.lst-kix_m4yuwvhy6d6-1 > li:before{content:"○ "}.lst-kix_m4yuwvhy6d6-8 > li:before{content:"■ "}.lst-kix_cxp5lbx8lp48-8 > li:before{content:"■ "}ul.lst-kix_m4yuwvhy6d6-7{list-style-type:none}ul.lst-kix_m4yuwvhy6d6-6{list-style-type:none}.lst-kix_m4yuwvhy6d6-2 > li:before{content:"■ "}ul.lst-kix_m4yuwvhy6d6-5{list-style-type:none}ul.lst-kix_m4yuwvhy6d6-4{list-style-type:none}.lst-kix_cxp5lbx8lp48-6 > li:before{content:"● "}.lst-kix_m4yuwvhy6d6-7 > li:before{content:"○ "}ul.lst-kix_m4yuwvhy6d6-8{list-style-type:none}.lst-kix_m4yuwvhy6d6-3 > li:before{content:"● "}</style></head>
<body>
<table width="100%" border="0">
<tr>
<td align="left">
<img src="../../images/horizontal.png" width="200" height="64"/>
</td>
<td align="right">
<img src="../../images/icm_logo.png" width="120" height="64"/>
</td>
</tr>
</table>
<hr><p style="height:11pt;color:#000000;direction:ltr;font-size:11pt;margin:0;font-family:'Arial';padding:0"><span></span></p><p style="color:#000000;direction:ltr;font-size:11pt;margin:0;font-family:'Arial';padding:0"><span style="font-weight:bold">COLORMAP EDITOR</span></p><hr><p style="height:11pt;color:#000000;direction:ltr;font-size:11pt;margin:0;font-family:'Arial';padding:0"><span></span></p><p style="height:11pt;color:#000000;direction:ltr;font-size:11pt;margin:0;font-family:'Arial';padding:0"><span></span></p><p style="color:#000000;direction:ltr;font-size:11pt;margin:0;font-family:'Arial';padding:0"><span>The colormap editor is raised by choosing Edit -&gt; Colormap Editor.</span></p><p style="height:11pt;color:#000000;direction:ltr;font-size:11pt;margin:0;font-family:'Arial';padding:0"><span></span></p><p style="color:#000000;direction:ltr;font-size:11pt;margin:0;font-family:'Arial';padding:0"><img height="383" src="images/image00.jpg" width="430"></p><p style="height:11pt;color:#000000;direction:ltr;font-size:11pt;margin:0;font-family:'Arial';padding:0"><span></span></p><p style="color:#000000;direction:ltr;font-size:11pt;margin:0;font-family:'Arial';padding:0"><span>The colormap editor enables the user to design his or her own colormaps. It lists all predefined and user defined colormaps. </span></p><p style="height:11pt;color:#000000;direction:ltr;font-size:11pt;margin:0;font-family:'Arial';padding:0"><span></span></p><p style="color:#000000;direction:ltr;font-size:11pt;margin:0;font-family:'Arial';padding:0"><span>The colormap slider at the bottom of the colormap editor shows the exact structure of a chosen colormap. The slider enables edition of user defined colormaps.</span></p><p style="height:11pt;color:#000000;direction:ltr;font-size:11pt;margin:0;font-family:'Arial';padding:0"><span></span></p><p style="color:#000000;direction:ltr;font-size:11pt;margin:0;font-family:'Arial';padding:0"><img height="192" src="images/image01.jpg" width="412"></p><p style="height:11pt;color:#000000;direction:ltr;font-size:11pt;margin:0;font-family:'Arial';padding:0"><span></span></p><p style="color:#000000;direction:ltr;font-size:11pt;margin:0;font-family:'Arial';padding:0"><span>The menu on the right hand side of the colormap editor contains the following options:</span></p><p style="height:11pt;color:#000000;direction:ltr;font-size:11pt;margin:0;font-family:'Arial';padding:0"><span></span></p><ul class="lst-kix_m4yuwvhy6d6-0 start" style="margin:0;padding:0"><li style="margin-right:0;color:#000000;direction:ltr;font-size:11pt;margin-left:36pt;margin-bottom:0;font-family:'Arial';margin-top:0;padding:0"><span style="font-weight:bold">new</span><span>: starts the design proces of a new colormap &nbsp;</span></li><li style="margin-right:0;color:#000000;direction:ltr;font-size:11pt;margin-left:36pt;margin-bottom:0;font-family:'Arial';margin-top:0;padding:0"><span style="font-weight:bold">export</span><span>: exports a chosen colormap to file</span></li><li style="margin-right:0;color:#000000;direction:ltr;font-size:11pt;margin-left:36pt;margin-bottom:0;font-family:'Arial';margin-top:0;padding:0"><span style="font-weight:bold">rename</span><span>: renames a chosen colormap</span></li><li style="margin-right:0;color:#000000;direction:ltr;font-size:11pt;margin-left:36pt;margin-bottom:0;font-family:'Arial';margin-top:0;padding:0"><span style="font-weight:bold">duplicate</span><span>: duplicates a chosen colormap</span></li><li style="margin-right:0;color:#000000;direction:ltr;font-size:11pt;margin-left:36pt;margin-bottom:0;font-family:'Arial';margin-top:0;padding:0"><span style="font-weight:bold">delete</span><span>: deletes a chosen user defined colormap</span></li><li style="margin-right:0;color:#000000;direction:ltr;font-size:11pt;margin-left:36pt;margin-bottom:0;font-family:'Arial';margin-top:0;padding:0"><span style="font-weight:bold">import</span><span>: imports a colormap from file</span></li><li style="margin-right:0;color:#000000;direction:ltr;font-size:11pt;margin-left:36pt;margin-bottom:0;font-family:'Arial';margin-top:0;padding:0"><span style="font-weight:bold">reset</span><span>: resets a chosen colormap to its original parameters</span></li></ul><p style="height:11pt;color:#000000;direction:ltr;font-size:11pt;margin:0;font-family:'Arial';padding:0"><span></span></p><p style="height:11pt;color:#000000;direction:ltr;font-size:11pt;margin:0;font-family:'Arial';padding:0"><span></span></p><hr><p style="height:11pt;color:#000000;direction:ltr;font-size:11pt;margin:0;font-family:'Arial';padding:0"><span></span></p><p style="color:#000000;direction:ltr;font-size:11pt;margin:0;font-family:'Arial';padding:0"><span style="font-weight:bold">The structure of a 1D colormap</span></p><p style="height:11pt;color:#000000;direction:ltr;font-size:11pt;margin:0;font-family:'Arial';padding:0"><span></span></p><p style="color:#000000;direction:ltr;font-size:11pt;margin:0;font-family:'Arial';padding:0"><span>A colormap consists of a series of control points at chosen positions with dedicated colors. In between control points the color values are approximated linearly. </span></p><hr><p style="height:11pt;color:#000000;direction:ltr;font-size:11pt;margin:0;font-family:'Arial';padding:0"><span></span></p><p style="color:#000000;direction:ltr;font-size:11pt;margin:0;font-family:'Arial';padding:0"><span style="font-weight:bold">Designing a colormap</span></p><p style="height:11pt;color:#000000;direction:ltr;font-size:11pt;margin:0;font-family:'Arial';padding:0"><span></span></p><p style="color:#000000;direction:ltr;font-size:11pt;margin:0;font-family:'Arial';padding:0"><span>Start to build a new colormap by:</span></p><p style="height:11pt;color:#000000;direction:ltr;font-size:11pt;margin:0;font-family:'Arial';padding:0"><span></span></p><ul class="lst-kix_cxp5lbx8lp48-0 start" style="margin:0;padding:0"><li style="margin-right:0;color:#000000;direction:ltr;font-size:11pt;margin-left:36pt;margin-bottom:0;font-family:'Arial';margin-top:0;padding:0"><span>duplicating an existent colormap or</span></li><li style="margin-right:0;color:#000000;direction:ltr;font-size:11pt;margin-left:36pt;margin-bottom:0;font-family:'Arial';margin-top:0;padding:0"><span>chosing the option new.</span></li></ul><p style="height:11pt;color:#000000;direction:ltr;font-size:11pt;margin:0;font-family:'Arial';padding:0"><span></span></p><p style="color:#000000;direction:ltr;font-size:11pt;margin:0;font-family:'Arial';padding:0"><span>The second way raises a dialog window for the new colormap name. In both cases the new colormap is listed at the very bottom of the colormap list. </span></p><p style="height:11pt;color:#000000;direction:ltr;font-size:11pt;margin:0;font-family:'Arial';padding:0"><span></span></p><p style="color:#000000;direction:ltr;font-size:11pt;margin:0;font-family:'Arial';padding:0"><span>Choose the new/duplicated colormap from the list. In order to set appropriate control points double click left mouse button at the left or right endpoint marker of the color slider. The duplicated marker can be moved to an appropriate position of the slider. The number in the marker determines the position of the marker in a scale from 0 to 100.</span></p><p style="color:#000000;direction:ltr;font-size:11pt;margin:0;font-family:'Arial';padding:0"><span>Right mouse click at the marker raises the color editor. Choose a color from the three available Swatches, HSB and RGB tabs.</span></p><p style="color:#000000;direction:ltr;font-size:11pt;margin:0;font-family:'Arial';padding:0"><span>In order to delete a marker drag it away from the slider using left mouse button. </span></p></body></html>
\ No newline at end of file
......@@ -166,7 +166,6 @@ public class DicomSegmentation
volumeRenderer = _volumeSegmentation.getVolRender();
volumeRenderer.getDataMappingParams().getTransparencyParams().setPrototypeMap(dataTransparencyMap);
dataProvider = _volumeSegmentation.getDp();
_volumeSegmentation.getSegUI().setPresentation(true);
_gparams = _volumeSegmentation.getGparams();
_currentField = null;
_ui = new GUI();
......
......@@ -68,28 +68,21 @@ public class AutoHelpGenerator
//paths realtive to project/src
public static final String MODULE_HELP_TEMPLATE = "pl/edu/icm/visnow/autohelp/resources/module_help_template.html";
public static final String MODULE_MAP_TEMPLATE_PRO = "pl/edu/icm/visnow/autohelp/resources/vnhelp_MAP_template_pro.xml";
public static final String MODULE_TOC_TEMPLATE_PRO = "pl/edu/icm/visnow/autohelp/resources/vnhelp_TOC_template_pro.xml";
public static final String MODULE_MAP_TEMPLATE_SIMPLE = "pl/edu/icm/visnow/autohelp/resources/vnhelp_MAP_template_simple.xml";
public static final String MODULE_TOC_TEMPLATE_SIMPLE = "pl/edu/icm/visnow/autohelp/resources/vnhelp_TOC_template_simple.xml";
public static final String MODULE_MAP_TEMPLATE = "pl/edu/icm/visnow/autohelp/resources/vnhelp_MAP_template.xml";
public static final String MODULE_TOC_TEMPLATE = "pl/edu/icm/visnow/autohelp/resources/vnhelp_TOC_template.xml";
public static final String AUTOHELP_ROOT = "doc/vnautohelp";
//paths realtive to AUTOHELP_ROOT
public static final String AUTOHELP_MODULES_DIR = "help/modules";
public static final String AUTOHELP_MODULE_IMAGES_DIR = "help/modules/resources";
public static final String LIBRARY_XML_PRO = "extended_library.xml";
public static final String LIBRARY_XML_SIMPLE = "extended_library.xml";
public static final String HELP_PACKAGE_PRO = "help_resources_pro";
public static final String HELP_PACKAGE_SIMPLE = "help_resources";
public static final String LIBRARY_XML = "library.xml";
public static final String HELP_PACKAGE = "help_resources";
protected final ArrayList<String> modules;
protected final ArrayList<String> moduleBases;
protected final String srcDir;
protected TypesMap typesMap;
protected ArrayList<String> folders;
//this variable is used for pro/simple selection when no external argument is given to main
private static boolean buildPro = true;
public AutoHelpGenerator(String srcDir, ArrayList<String> modules, ArrayList<String> moduleBases, TypesMap typesMap, ArrayList<String> folders)
{
this.srcDir = srcDir;
......@@ -101,24 +94,13 @@ public class AutoHelpGenerator
public static void main(String[] args) throws IOException
{
if (args != null && args.length == 1) {
buildPro = (args[0].equals("-pro"));
}
String workDir = System.getProperty("user.dir");
String srcDir = workDir + File.separator + "src";
String libraryXml