Commit dd6388b5 authored by Christian Schulte zu Berge's avatar Christian Schulte zu Berge
Browse files

Introducing StringProperty as specific class, which has a display type.

Depending on StringProperty's display type, its property widget shows either just the QLineEdit, or additionally a browse button that pops up a QFileDialog for either loading or saving a file, or choosing a directory.

closes #43
parent 3d5ed98c
......@@ -30,6 +30,7 @@
#include "core/pipeline/abstractprocessor.h"
#include "core/properties/buttonproperty.h"
#include "core/properties/datanameproperty.h"
#include "core/properties/stringproperty.h"
namespace campvis {
/**
......
......@@ -73,9 +73,9 @@ namespace campvis {
, p_NumLevels("NumLevels", "Number of Levels", 10, 1, 15)
, p_computeSamples("ComputeSamples", "Compute Samples")
, p_showSamples("ShowSamples", "Show Samples", false)
, p_sampleFile("SampleFile", "Sample File", "")
, p_sampleFile("SampleFile", "Sample File", "", StringProperty::SAVE_FILENAME)
, p_saveSamples("SaveSamples", "Save Samples")
, p_controlpointFile("ControlpointFile", "Control Point File", "C:\\temp\\us_small.cps")
, p_controlpointFile("ControlpointFile", "Control Point File", "C:\\temp\\us_small.cps", StringProperty::SAVE_FILENAME)
, p_saveCPs("SaveCPs", "Save Control Points")
, p_loadCPs("LoadCPs", "Load Control Points")
, p_activeLayer("ActiveLayer", "Active Layer", 0, 0, 0)
......
......@@ -44,6 +44,7 @@
#include "core/properties/numericproperty.h"
#include "core/properties/transferfunctionproperty.h"
#include "core/properties/cameraproperty.h"
#include "core/properties/stringproperty.h"
#include "modules/manualsegmentation/tools/tissuesegmentation.h"
......
......@@ -52,7 +52,7 @@ namespace campvis {
: VisualizationProcessor(viewportSizeProp)
, p_inputImage("InputImage", "Input Image", "", DataNameProperty::READ)
, p_outputImage("OutputImage", "Output Image", "GlMorphologyFilter.out", DataNameProperty::WRITE)
, p_filterOperation("FilterOperation", "Operations to Apply ([edoc]+)", "ed")
, p_filterOperation("FilterOperation", "Operations to Apply ([edoc]+)", "ed", StringProperty::BASIC_STRING)
, p_structuringElement("StructuringElement", "Structuring Element", structuringElementOptions, 2)
, _erosionFilter(nullptr)
, _dilationFilter(nullptr)
......
......@@ -31,6 +31,7 @@
#include "core/pipeline/visualizationprocessor.h"
#include "core/properties/datanameproperty.h"
#include "core/properties/optionproperty.h"
#include "core/properties/stringproperty.h"
namespace tgt {
class Shader;
......
......@@ -29,7 +29,7 @@
#include "gtest/gtest.h"
#include "core/properties/genericproperty.h"
#include "core/properties/stringproperty.h"
#include "core/properties/abstractproperty.h"
#include "core/pipeline/abstractprocessor.h"
......
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