Commit 6c70f300 authored by Sebastian Eichelbaum's avatar Sebastian Eichelbaum
Browse files

[MERGE]

parents d7fa4f35 83cd2e90
......@@ -15,6 +15,7 @@ Sebastian Eichelbaum = Sebastian_Eichelbaum
cornimueller Cornelius_Mueller
mam04cvr@studserv.uni-leipzig.de Cornelius_Mueller
hlawit Mario_Hlawitschka
hlawitschka@informatik.uni-leipzig.de Mario_Hlawitschka
hlawit@informatik.uni-leipzig.de Mario_Hlawitschka
hlawitschka@ucdavis.edu Mario_Hlawitschka
mai02igw@informatik.uni-leipzig.de Robin_Ledig
......
......@@ -83,25 +83,25 @@ modules.
<h2><a name="Toolbar" />Toolbar</h2>
<table>
<tr><td><b>Icon</b></td><td><b>Name</b></td><td><b>Description</b></td></tr>
<tr><td><b>Icon&nbsp;</b></td><td><b>Name</b></td><td><b>Description</b></td></tr>
<tr><td><img src="icons/fileopen.png" width="20"></td><td>Load
Data</td><td>Loads data given in various formats like fibers (.fib), NIfTI
Dataset</td><td>Loads data given in various formats like fibers (.fib), NIfTI
images (.nii, .nii.gz) or EEG data (.cnt). Not all supported file formats
are available through this button and the dialog behind it. For some file
formats there are special modules for reading and/or writing them.</td></tr>
<tr><td><img src="icons/projOpen.png" width="20"></td><td>Load a project from
file</td><td>Opens a project file (.owp), and instantiates modules, sets their
<tr><td><img src="icons/projOpen.png" width="20"></td><td>Load Project</td><td>Opens a project file (.owp), and instantiates modules, sets their
connections and orients the scene accordingly.</td></tr>
<tr><td><img src="icons/disc.png" width="20"></td><td>Save current project to
file</td><td>Saves the current state (modules, connections, orientation of
<tr><td><img src="icons/disc.png" width="20"></td><td>Save Project</td><td>Saves the current state (modules, connections, orientation of
the scene) of OpenWalnut to a project file (.owp).</td></tr>
<tr><td><img src="icons/camera.png" width="20"></td><td>Reset main view</td><td>Rotates
<tr><td><img src="icons/image.png"
width="20"></td><td>Screenshot</td><td>Stores a snapshot image of
the main view.</td></tr>
<tr><td><img src="icons/camera.png" width="20"></td><td>Reset</td><td>Rotates
and scales the scene in the central 3D view to show the same orientation as
after program startup but zoomed to show all contents of the
scene.</td></tr>
<tr><td><img src="icons/box.png" width="20"></td><td>Create new
ROI box</td><td>Adds a new ROI box to the 3D scene and the ROI browser. See also: <a href="#ROIs">ROIs</a>.</td></tr>
<tr><td><img src="icons/box.png" width="20"></td><td>ROI</td><td>Adds a new ROI box to the 3D scene and the ROI browser. See also: <a href="#ROIs">ROIs</a>.</td></tr>
<tr><td><img src="icons/QuestionMarks.xpm" width="20"></td><td>Missing
module?</td><td>This opens the dialog that allows to customize the list of
modules that are allowed to appear in the <i>Compatible Modules</i> toolbar.</td></tr>
......
<h1>Welcome to OpenWalnut %OW_LIB_VERSION% Developmet Version!</h1>
<h1>Welcome to OpenWalnut %OW_LIB_VERSION% Development Version!</h1>
<a href="http://www.openwalnut.org/projects/openwalnut/wiki/ReleaseNotes">Release Notes</a>
<br>
<br>
......
......@@ -96,11 +96,11 @@ void WMDatasetProfile::properties()
m_snapSelectionsList->addItem( "coronal", "" );
m_snapSelectionsList->addItem( "sagittal", "" );
m_snapSelection = m_properties->addProperty( "snap to", "snap",
m_snapSelection = m_properties->addProperty( "Snap to", "snap",
m_snapSelectionsList->getSelectorFirst(), m_propCondition );
WPropertyHelper::PC_SELECTONLYONE::addTo( m_snapSelection );
m_propAddKnobTrigger = m_properties->addProperty( "Add Knob", "Press!", WPVBaseTypes::PV_TRIGGER_READY, m_propCondition );
m_propAddKnobTrigger = m_properties->addProperty( "Add knob", "Press!", WPVBaseTypes::PV_TRIGGER_READY, m_propCondition );
m_graphColor = m_properties->addProperty( "Graph color", "Description.", WColor( 0.2, 0.2, 0.2, 1.0 ) );
......@@ -109,7 +109,7 @@ void WMDatasetProfile::properties()
m_propLength->setMax( 500 );
m_propUseLength = m_properties->addProperty( "Use length", "Description.", false );
m_propInterpolate = m_properties->addProperty( "interpolate", "Description.", true );
m_propInterpolate = m_properties->addProperty( "Interpolate", "Description.", true );
m_propNumSamples = m_properties->addProperty( "Number of sample points", "Description.", 100 );
m_propNumSamples->setMin( 1 );
......
......@@ -106,31 +106,31 @@ void WMEEGView::connectors()
void WMEEGView::properties()
{
m_propCondition = boost::shared_ptr< WCondition >( new WCondition() );
m_drawElectrodes = m_properties->addProperty( "Draw Electrodes",
m_drawElectrodes = m_properties->addProperty( "Draw electrodes",
"Draw the 3D positions of the electrodes.",
true,
m_propCondition );
m_drawHeadSurface = m_properties->addProperty( "Draw Head Surface",
m_drawHeadSurface = m_properties->addProperty( "Draw head surface",
"Draw the head surface between the electrodes.",
true,
m_propCondition );
m_drawLabels = m_properties->addProperty( "Draw Labels",
m_drawLabels = m_properties->addProperty( "Draw labels",
"Draw the labels of the electrodes at their 3D positions.",
true,
m_propCondition );
m_labelsWidth = m_properties->addProperty( "Labels Width",
m_labelsWidth = m_properties->addProperty( "Labels width",
"The width of the label display in pixel.",
24 );
m_timePos = m_properties->addProperty( "Time Position",
m_timePos = m_properties->addProperty( "Time position",
"The time position in seconds where to start the graph at the left edge.",
0.0 );
m_timeRange = m_properties->addProperty( "Time Range",
m_timeRange = m_properties->addProperty( "Time range",
"The width of the graph in seconds.",
4.0 );
m_graphWidth = m_properties->addProperty( "Graph Width",
m_graphWidth = m_properties->addProperty( "Graph width",
"The width of the graph in pixel.",
992 );
m_yPos = m_properties->addProperty( "Y Position",
m_yPos = m_properties->addProperty( "Y position",
"The y position in pixel at the lower edge.",
-724.5 );
m_ySpacing = m_properties->addProperty( "Spacing",
......@@ -139,7 +139,7 @@ void WMEEGView::properties()
m_ySensitivity = m_properties->addProperty( "Sensitivity",
"The sensitivity of the graph in microvolt per pixel.",
2.0 );
m_colorSensitivity = m_properties->addProperty( "Color Sensitivity",
m_colorSensitivity = m_properties->addProperty( "Color sensitivity",
"The sensitivity of the color map. It ranges from -Color Sensitivity to +Color Sensitivity in microvolt.",
23.0 );
......
......@@ -156,13 +156,13 @@ void WMGridRenderer::properties()
{
WPropertyBase::PropertyChangeNotifierType notifier = boost::bind( &WMGridRenderer::updateNode, this, _1 );
m_bboxColor = m_properties->addProperty( "Bounding Box Color", "The color of the bounding box.", WColor( 0.3, 0.3, 0.3, 1.0 ), notifier );
m_bboxColor = m_properties->addProperty( "Bounding box color", "The color of the bounding box.", WColor( 0.3, 0.3, 0.3, 1.0 ), notifier );
m_gridColor = m_properties->addProperty( "Grid Color", "The color of the grid.", WColor( 0.1, 0.1, 0.1, 1.0 ), notifier );
m_gridColor = m_properties->addProperty( "Grid color", "The color of the grid.", WColor( 0.1, 0.1, 0.1, 1.0 ), notifier );
m_possibleModes = WItemSelection::SPtr( new WItemSelection() );
m_possibleModes->addItem( "Labels", "Show the boundary labels.", WMGridRenderer_label_xpm ); // NOTE: you can add XPM images here.
m_possibleModes->addItem( "Bounding Box", "Show the bounding box.", WMGridRenderer_boundary_xpm );
m_possibleModes->addItem( "Bounding box", "Show the bounding box.", WMGridRenderer_boundary_xpm );
m_possibleModes->addItem( "Grid", "Show the inner grid.", WMGridRenderer_grid_xpm );
// selecting all at once might be a bad idea since the grid rendering can be very very slow. So, by default, only show bbox and labels.
......
......@@ -39,12 +39,12 @@ WSegmentationAlgoLevelSetCanny::~WSegmentationAlgoLevelSetCanny()
void WSegmentationAlgoLevelSetCanny::properties()
{
m_smoothingIter = m_properties->addProperty( "Smoothing iterations.", "Number of smoothing passes.", 10, m_propCondition );
m_conductance = m_properties->addProperty( "Conductance.", "Conductance parameter for smoothing.", 1.0, m_propCondition );
m_smoothingIter = m_properties->addProperty( "Smoothing iterations", "Number of smoothing passes.", 10, m_propCondition );
m_conductance = m_properties->addProperty( "Conductance", "Conductance parameter for smoothing.", 1.0, m_propCondition );
m_conductance->setMax( 10.0 );
m_level = m_properties->addProperty( "Level.", "The isovalue.", 0.0, m_propCondition );
m_variance = m_properties->addProperty( "Variance.", "variance for the level set.", 1.0, m_propCondition );
m_threshold = m_properties->addProperty( "Threshold.", "Threshold in %.", 0.0, m_propCondition );
m_level = m_properties->addProperty( "Level", "The isovalue.", 0.0, m_propCondition );
m_variance = m_properties->addProperty( "Variance", "variance for the level set.", 1.0, m_propCondition );
m_threshold = m_properties->addProperty( "Threshold", "Threshold in %.", 0.0, m_propCondition );
}
std::string WSegmentationAlgoLevelSetCanny::getName()
......
......@@ -39,14 +39,14 @@ WSegmentationAlgoRegionGrowingConfidenceConnected::~WSegmentationAlgoRegionGrowi
void WSegmentationAlgoRegionGrowingConfidenceConnected::properties()
{
m_smoothingIter = m_properties->addProperty( "Smoothing iterations.", "Number of smoothing passes.", 10, m_propCondition );
m_conductance = m_properties->addProperty( "Conductance.", "Conductance parameter for smoothing.", 1.0, m_propCondition );
m_smoothingIter = m_properties->addProperty( "Smoothing iterations", "Number of smoothing passes.", 10, m_propCondition );
m_conductance = m_properties->addProperty( "Conductance", "Conductance parameter for smoothing.", 1.0, m_propCondition );
m_conductance->setMax( 10.0 );
m_regionGrowingIterations = m_properties->addProperty( "Iterations.", "Number of region growing iterations.", 10, m_propCondition );
m_neighborhoodRadius = m_properties->addProperty( "Neighborhood radius.", "Initial neighborhood radius.", 2, m_propCondition );
m_regionGrowingIterations = m_properties->addProperty( "Iterations", "Number of region growing iterations.", 10, m_propCondition );
m_neighborhoodRadius = m_properties->addProperty( "Neighborhood radius", "Initial neighborhood radius.", 2, m_propCondition );
m_neighborhoodRadius->setMin( 1 );
m_neighborhoodRadius->setMax( 35 );
m_multiplier = m_properties->addProperty( "Variance multiplier.", "Variance multiplier.", 2.5, m_propCondition );
m_multiplier = m_properties->addProperty( "Variance multiplier", "Variance multiplier.", 2.5, m_propCondition );
m_multiplier->setMax( 20.0 );
}
......
......@@ -37,7 +37,7 @@ WSegmentationAlgoThreshold::~WSegmentationAlgoThreshold()
void WSegmentationAlgoThreshold::properties()
{
m_threshold = m_properties->addProperty( "Threshold.", "Threshold in %.", 0.0, m_propCondition );
m_threshold = m_properties->addProperty( "Threshold", "Threshold in %.", 0.0, m_propCondition );
}
std::string WSegmentationAlgoThreshold::getName()
......
......@@ -39,10 +39,10 @@ WSegmentationAlgoWatershed::~WSegmentationAlgoWatershed()
void WSegmentationAlgoWatershed::properties()
{
m_threshold = m_properties->addProperty( "Threshold.", "Threshold in %.", 0.0, m_propCondition );
m_level = m_properties->addProperty( "Level.", "Water level in %.", 0.0, m_propCondition );
m_iter = m_properties->addProperty( "Iterations.", "Number of smoothing passes:", 10, m_propCondition );
m_conductance = m_properties->addProperty( "Conductance.", "Conductance parameter for smoothing.", 1.0, m_propCondition );
m_threshold = m_properties->addProperty( "Threshold", "Threshold in %.", 0.0, m_propCondition );
m_level = m_properties->addProperty( "Level", "Water level in %.", 0.0, m_propCondition );
m_iter = m_properties->addProperty( "Iterations", "Number of smoothing passes:", 10, m_propCondition );
m_conductance = m_properties->addProperty( "Conductance", "Conductance parameter for smoothing.", 1.0, m_propCondition );
m_conductance->setMax( 10.0 );
}
......
......@@ -273,7 +273,7 @@ void WMainWindow::setupGUI()
connect( projectLoadButton, SIGNAL( triggered( bool ) ), this, SLOT( projectLoad() ) );
connect( projectSaveButton, SIGNAL( triggered( bool ) ), this, SLOT( projectSaveAll() ) );
m_loadButton->setToolTip( "Load Data" );
m_loadButton->setToolTip( "Load a dataset from file" );
resetButton->setToolTip( "Reset main view" );
roiButton->setToolTip( "Create New ROI" );
projectLoadButton->setToolTip( "Load a project from file" );
......@@ -750,7 +750,7 @@ void WMainWindow::openOpenWalnutHelpDialog()
std::string content = readFileIntoString( filename );
QWidget* window = new QWidget( this, Qt::Window );
window->setWindowTitle( "OpenWalnut Help" );
// specify intial layout
QVBoxLayout *layout = new QVBoxLayout( window );
window->setLayout( layout );
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment