Few more properties

scripting/luagen/properties/boolpropertylua.cpp

@@ -36,7 +36,7 @@ namespace campvis {
 
     std::string BoolPropertyLua::getLuaScript() {
         std::string ret = "";
-        ret += "getProperty(" + _property->getName() + "):setValue(" + StringUtils::toString<bool>( static_cast<BoolProperty*>(_property)->getValue() ) + ")";
+        ret += "getProperty(\"" + _property->getName() + "\"):setValue(" + StringUtils::toString<bool>( static_cast<BoolProperty*>(_property)->getValue() ) + ")";
         
         std::printf(ret.c_str());
         return ret;

scripting/luagen/properties/buttonpropertylua.cpp

@@ -22,29 +22,20 @@
 // 
 // ================================================================================================
 
-#include "buttonpropertywidget.h"
+#include "buttonpropertylua.h"
 
 #include <QPushButton>
 
 namespace campvis {
-    ButtonPropertyWidget::ButtonPropertyWidget(ButtonProperty* property, DataContainer* dataContainer, QWidget* parent /*= 0*/)
-        : AbstractPropertyWidget(property, false, dataContainer, parent)
-        , _button(0)
+    ButtonPropertyLua::ButtonPropertyLua(ButtonProperty* property, DataContainer* dataContainer)
+        : AbstractPropertyLua(property, false, dataContainer)
     {
-        _button = new QPushButton(QString::fromStdString(property->getTitle()), this);
-        connect(_button, SIGNAL(clicked(bool)), this, SLOT(onButtonClicked(bool)));
-        addWidget(_button);
     }
 
-    ButtonPropertyWidget::~ButtonPropertyWidget() {
+    ButtonPropertyLua::~ButtonPropertyLua() {
     }
 
-    void ButtonPropertyWidget::updateWidgetFromProperty() {
+    std::string ButtonPropertyLua::getLuaScript() {
+        return "-- Not necessary ButtonProperty";
     }
-
-    void ButtonPropertyWidget::onButtonClicked(bool) {
-        ButtonProperty* bp = static_cast<ButtonProperty*>(_property);
-        bp->click();
-    }
-
 }
\ No newline at end of file

scripting/luagen/properties/buttonpropertylua.h

@@ -22,52 +22,39 @@
 // 
 // ================================================================================================
 
-#ifndef BUTTONPROPERTYWIDGET_H__
-#define BUTTONPROPERTYWIDGET_H__
+#ifndef BUTTONPROPERTYLUA_H__
+#define BUTTONPROPERTYLUA_H__
 
-#include "application/gui/properties/abstractpropertywidget.h"
-#include "application/gui/properties/propertywidgetfactory.h"
+#include "abstractpropertylua.h"
+#include "propertyluafactory.h"
 #include "core/properties/buttonproperty.h"
 
 class QPushButton;
 
 namespace campvis {
     /**
-     * Widget for a Camera.
+     * Lua for a Camera.
      * For now just offering read-access.
      */
-    class ButtonPropertyWidget : public AbstractPropertyWidget {
-        Q_OBJECT;
-
+    class ButtonPropertyLua : public AbstractPropertyLua {
     public:
         /**
-         * Creates a new ButtonPropertyWidget for the property \a property.
-         * \param   property    The property the widget shall handle
-         * \param   parent      Parent Qt widget
+         * Creates a new ButtonPropertyLua for the property \a property.
+         * \param   property    The property the lua shall handle
+         * \param   parent      Parent Qt lua
          */
-        ButtonPropertyWidget(ButtonProperty* property, DataContainer* dataContainer = nullptr, QWidget* parent = 0);
+        ButtonPropertyLua(ButtonProperty* property, DataContainer* dataContainer = nullptr);
 
         /**
          * Destructor
          */
-        virtual ~ButtonPropertyWidget();
-
-    protected:
-        /**
-         * Gets called when the property has changed, so that widget can update its state.
-         */
-        virtual void updateWidgetFromProperty();
-
-    protected slots:
-        void onButtonClicked(bool);
-
-    private:
-        QPushButton* _button;
+        virtual ~ButtonPropertyLua();
 
+        std::string getLuaScript();
     };
 
     // explicitly instantiate template, so that it gets registered also over DLL boundaries.
-    template class PropertyWidgetRegistrar<ButtonPropertyWidget, ButtonProperty>;
+    template class PropertyLuaRegistrar<ButtonPropertyLua, ButtonProperty>;
 }
 
-#endif // BUTTONPROPERTYWIDGET_H__
+#endif // BUTTONPROPERTYLUA_H__

scripting/luagen/properties/camerapropertylua.cpp

+// ================================================================================================
+// 
+// This file is part of the CAMPVis Software Framework.
+// 
+// If not explicitly stated otherwise: Copyright (C) 2012-2014, all rights reserved,
+//      Christian Schulte zu Berge <christian.szb@in.tum.de>
+//      Chair for Computer Aided Medical Procedures
+//      Technische Universitaet Muenchen
+//      Boltzmannstr. 3, 85748 Garching b. Muenchen, Germany
+// 
+// For a full list of authors and contributors, please refer to the file "AUTHORS.txt".
+// 
+// Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file 
+// except in compliance with the License. You may obtain a copy of the License at
+// 
+// http://www.apache.org/licenses/LICENSE-2.0
+// 
+// Unless required by applicable law or agreed to in writing, software distributed under the 
+// License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, 
+// either express or implied. See the License for the specific language governing permissions 
+// and limitations under the License.
+// 
+// ================================================================================================
+
+#include "camerapropertywidget.h"
+
+#include <QGridLayout>
+#include <QLabel>
+#include "core/tools/stringutils.h"
+
+namespace campvis {
+    CameraPropertyWidget::CameraPropertyWidget(CameraProperty* property, DataContainer* dataContainer, QWidget* parent /*= 0*/)
+        : AbstractPropertyWidget(property, true, dataContainer, parent)
+        , _lblCameraPosition(0)
+        , _lblLookDirection(0)
+        , _lblUpVector(0)
+    {
+        _widget = new QWidget(this);
+        QGridLayout* gridLayout = new QGridLayout(_widget);
+        _widget->setLayout(gridLayout);
+
+        _lblCameraPosition = new QLabel("Position: ", _widget);
+        gridLayout->addWidget(_lblCameraPosition, 0, 0);
+        _lblFocusPosition = new QLabel("Focus: ", _widget);
+        gridLayout->addWidget(_lblFocusPosition, 1, 0);
+        _lblLookDirection = new QLabel("Look Direction: ", _widget);
+        gridLayout->addWidget(_lblLookDirection, 2, 0);
+        _lblUpVector = new QLabel("Up Vector: ", _widget);
+        gridLayout->addWidget(_lblUpVector, 3, 0);
+
+        addWidget(_widget);
+        updateWidgetFromProperty();
+    }
+
+    CameraPropertyWidget::~CameraPropertyWidget() {
+    }
+
+    void CameraPropertyWidget::updateWidgetFromProperty() {
+        CameraProperty* prop = static_cast<CameraProperty*>(_property);
+        _lblCameraPosition->setText("Position: " + QString::fromStdString(StringUtils::toString(prop->getValue().getPosition())));
+        _lblFocusPosition->setText("Focus: " + QString::fromStdString(StringUtils::toString(prop->getValue().getFocus())));
+        _lblLookDirection->setText("Look Direction: " + QString::fromStdString(StringUtils::toString(prop->getValue().getLook())));
+        _lblUpVector->setText("Up Vector: " + QString::fromStdString(StringUtils::toString(prop->getValue().getUpVector())));
+    }
+
+}
\ No newline at end of file

scripting/luagen/properties/camerapropertylua.h

+// ================================================================================================
+// 
+// This file is part of the CAMPVis Software Framework.
+// 
+// If not explicitly stated otherwise: Copyright (C) 2012-2014, all rights reserved,
+//      Christian Schulte zu Berge <christian.szb@in.tum.de>
+//      Chair for Computer Aided Medical Procedures
+//      Technische Universitaet Muenchen
+//      Boltzmannstr. 3, 85748 Garching b. Muenchen, Germany
+// 
+// For a full list of authors and contributors, please refer to the file "AUTHORS.txt".
+// 
+// Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file 
+// except in compliance with the License. You may obtain a copy of the License at
+// 
+// http://www.apache.org/licenses/LICENSE-2.0
+// 
+// Unless required by applicable law or agreed to in writing, software distributed under the 
+// License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, 
+// either express or implied. See the License for the specific language governing permissions 
+// and limitations under the License.
+// 
+// ================================================================================================
+
+#ifndef CAMERAPROPERTYWIDGET_H__
+#define CAMERAPROPERTYWIDGET_H__
+
+#include "application/gui/properties/abstractpropertywidget.h"
+#include "application/gui/properties/propertywidgetfactory.h"
+#include "core/properties/cameraproperty.h"
+
+class QLabel;
+
+namespace campvis {
+    /**
+     * Widget for a Camera.
+     * For now just offering read-access.
+     */
+    class CameraPropertyWidget : public AbstractPropertyWidget {
+        Q_OBJECT;
+
+    public:
+        /**
+         * Creates a new CameraPropertyWidget for the property \a property.
+         * \param   property    The property the widget shall handle
+         * \param   dataContainer   DataContainer to use (optional), defaults to nullptr.
+         * \param   parent      Parent Qt widget
+         */
+        CameraPropertyWidget(CameraProperty* property, DataContainer* dataContainer, QWidget* parent = 0);
+
+        /**
+         * Destructor
+         */
+        virtual ~CameraPropertyWidget();
+
+    protected:
+        /**
+         * Gets called when the property has changed, so that widget can update its state.
+         */
+        virtual void updateWidgetFromProperty();
+
+    private:
+        QWidget* _widget;
+        QLabel* _lblCameraPosition;
+        QLabel* _lblFocusPosition;
+        QLabel* _lblLookDirection;
+        QLabel* _lblUpVector;
+
+    };
+
+    // explicitly instantiate template, so that it gets registered also over DLL boundaries.
+    template class PropertyWidgetRegistrar<CameraPropertyWidget, CameraProperty>;
+}
+
+#endif // CAMERAPROPERTYWIDGET_H__
+

scripting/luagen/properties/colorpropertylua.cpp

+// ================================================================================================
+// 
+// This file is part of the CAMPVis Software Framework.
+// 
+// If not explicitly stated otherwise: Copyright (C) 2012-2014, all rights reserved,
+//      Christian Schulte zu Berge <christian.szb@in.tum.de>
+//      Chair for Computer Aided Medical Procedures
+//      Technische Universitaet Muenchen
+//      Boltzmannstr. 3, 85748 Garching b. Muenchen, Germany
+// 
+// For a full list of authors and contributors, please refer to the file "AUTHORS.txt".
+// 
+// Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file 
+// except in compliance with the License. You may obtain a copy of the License at
+// 
+// http://www.apache.org/licenses/LICENSE-2.0
+// 
+// Unless required by applicable law or agreed to in writing, software distributed under the 
+// License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, 
+// either express or implied. See the License for the specific language governing permissions 
+// and limitations under the License.
+// 
+// ================================================================================================
+
+#include "colorpropertywidget.h"
+#include "core/properties/colorproperty.h"
+
+namespace campvis {
+    ColorPropertyWidget::ColorPropertyWidget(ColorProperty* property, DataContainer* dataContainer, QWidget* parent /*= 0*/)
+        : AbstractPropertyWidget(property, false, dataContainer, parent)
+        //, _lblColorPicker(0)
+        , _colorPicker(0)
+    {
+        //_lblColorPicker = new QLabel("Change color: ", this);
+        _colorPicker = new ColorPickerWidget(QtColorTools::toQColor(property->getValue()), this);
+
+        addWidget(_colorPicker);
+
+        //connect(_colorPicker, SIGNAL(valueChanged(tgt::vec4)), this, SLOT(onColorChanged(tgt::vec4)));
+        connect(_colorPicker, SIGNAL(colorChanged(const QColor&)), this, SLOT(onColorChanged(const QColor&)));
+
+    }
+
+    ColorPropertyWidget::~ColorPropertyWidget() {
+    }
+
+    void ColorPropertyWidget::updateWidgetFromProperty() {
+        _colorPicker->blockSignals(true);
+        const tgt::vec4 val = static_cast<ColorProperty*>(_property)->getValue();
+        _colorPicker->setColor(QtColorTools::toQColor(tgt::vec4(val.x *255, val.y*255, val.z*255, val.w*255)));
+        _colorPicker->blockSignals(false);
+    }
+
+    void ColorPropertyWidget::onColorChanged(const QColor& value) {
+        ++_ignorePropertyUpdates;
+        ColorProperty* prop = static_cast<ColorProperty*>(_property);
+        tgt::vec4 val = QtColorTools::toTgtColor(_colorPicker->color());
+        prop->setValue(tgt::vec4(val.x/val.w, val.y/val.w, val.z/val.w, 1));
+        --_ignorePropertyUpdates;
+    }
+
+    void ColorPropertyWidget::onPropertyMinMaxChanged(const AbstractProperty* property) {
+        if (_ignorePropertyUpdates == 0)
+            emit s_propertyChanged(property);
+    }
+
+}

scripting/luagen/properties/colorpropertylua.h

+// ================================================================================================
+// 
+// This file is part of the CAMPVis Software Framework.
+// 
+// If not explicitly stated otherwise: Copyright (C) 2012-2014, all rights reserved,
+//      Christian Schulte zu Berge <christian.szb@in.tum.de>
+//      Chair for Computer Aided Medical Procedures
+//      Technische Universitaet Muenchen
+//      Boltzmannstr. 3, 85748 Garching b. Muenchen, Germany
+// 
+// For a full list of authors and contributors, please refer to the file "AUTHORS.txt".
+// 
+// Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file 
+// except in compliance with the License. You may obtain a copy of the License at
+// 
+// http://www.apache.org/licenses/LICENSE-2.0
+// 
+// Unless required by applicable law or agreed to in writing, software distributed under the 
+// License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, 
+// either express or implied. See the License for the specific language governing permissions 
+// and limitations under the License.
+// 
+// ================================================================================================
+
+#ifndef COLORPROPERTYWIDGET_H__
+#define COLORPROPERTYWIDGET_H__
+
+#include "application/gui/adjusterwidgets/doubleadjusterwidget.h"
+#include "application/gui/properties/abstractpropertywidget.h"
+#include "application/gui/properties/propertywidgetfactory.h"
+#include "core/properties/floatingpointproperty.h"
+#include "core/properties/colorproperty.h"
+
+#include "application/gui/qtcolortools.h"
+
+
+namespace campvis {
+    /**
+     * Widget for a ColorProperty
+     */
+    class ColorPropertyWidget : public AbstractPropertyWidget {
+        Q_OBJECT
+
+    public:
+        /**
+         * Creates a new FloatPropertyWidget for the property \a property.
+         * \param   property    The property the widget shall handle
+         * \param   dataContainer   DataContainer to use (optional), defaults to nullptr.
+         * \param   parent      Parent Qt widget
+         */
+        ColorPropertyWidget(ColorProperty* property, DataContainer* dataContainer, QWidget* parent = 0);
+
+        /**
+         * Destructor
+         */
+        virtual ~ColorPropertyWidget();
+
+    protected:
+        /**
+         * Gets called when the property has changed, so that widget can update its state.
+         */
+        virtual void updateWidgetFromProperty();
+
+    private slots:
+        /// Slot getting called when the adjuster's value changes
+        void onColorChanged(const QColor&);
+
+    private:
+        /// Slot getting called when the property's min or max value has changed, so that the widget can be updated.
+        virtual void onPropertyMinMaxChanged(const AbstractProperty* property);
+
+        //QLabel *_lblColorPicker;
+        ColorPickerWidget * _colorPicker;        ///< color picker widget allowing to change color
+
+    }; 
+
+// ================================================================================================
+
+    // explicitly instantiate template, so that it gets registered also over DLL boundaries.   
+    template class PropertyWidgetRegistrar<ColorPropertyWidget, ColorProperty>;
+
+}
+
+#endif // COLORPROPERTYWIDGET_H__

scripting/luagen/properties/datanamepropertylua.cpp

+// ================================================================================================
+// 
+// This file is part of the CAMPVis Software Framework.
+// 
+// If not explicitly stated otherwise: Copyright (C) 2012-2014, all rights reserved,
+//      Christian Schulte zu Berge <christian.szb@in.tum.de>
+//      Chair for Computer Aided Medical Procedures
+//      Technische Universitaet Muenchen
+//      Boltzmannstr. 3, 85748 Garching b. Muenchen, Germany
+// 
+// For a full list of authors and contributors, please refer to the file "AUTHORS.txt".
+// 
+// Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file 
+// except in compliance with the License. You may obtain a copy of the License at
+// 
+// http://www.apache.org/licenses/LICENSE-2.0
+// 
+// Unless required by applicable law or agreed to in writing, software distributed under the 
+// License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, 
+// either express or implied. See the License for the specific language governing permissions 
+// and limitations under the License.
+// 
+// ================================================================================================
+
+#include "datanamepropertywidget.h"
+#include "core/datastructures/datacontainer.h"
+#include "core/properties/datanameproperty.h"
+
+#include <QComboBox>
+#include <QLineEdit>
+
+namespace campvis {
+    DataNamePropertyWidget::DataNamePropertyWidget(DataNameProperty* property, DataContainer* dc, QWidget* parent /*= 0*/)
+        : AbstractPropertyWidget(property, false, dc, parent)
+        , _lineEdit(0)
+        , _combobox(0)
+    {
+        if (property->getAccessInfo() == DataNameProperty::READ) {
+            _combobox = new QComboBox(this);
+            _combobox->setEditable(true);
+
+            if (dc != 0) {
+                std::vector< std::pair<std::string, DataHandle> > tmp = dc->getDataHandlesCopy();
+                QStringList sl;
+                for (size_t i = 0; i < tmp.size(); ++i)
+                    sl.append(QString::fromStdString(tmp[i].first));
+                _combobox->addItems(sl);
+                dc->s_dataAdded.connect(this, &DataNamePropertyWidget::onDataAdded);
+                connect(this, SIGNAL(s_dataAddedQt(const QString&, QtDataHandle)), this, SLOT(onDataAddedQt(const QString&, QtDataHandle)));
+
+                setCurrentComboBoxText(QString::fromStdString(property->getValue()));
+            }
+
+            addWidget(_combobox);
+            connect(_combobox, SIGNAL(editTextChanged(const QString&)), this, SLOT(onTextChanged(const QString&)));
+        }
+        else {
+            _lineEdit = new QLineEdit(this);
+            _lineEdit->setText(QString::fromStdString(property->getValue()));
+            addWidget(_lineEdit);
+            connect(_lineEdit, SIGNAL(textChanged(const QString&)), this, SLOT(onTextChanged(const QString&)));
+        }
+    }
+
+    DataNamePropertyWidget::~DataNamePropertyWidget() {
+        if (_dataContainer != 0 && static_cast<DataNameProperty*>(_property)->getAccessInfo() == DataNameProperty::READ)
+            _dataContainer->s_dataAdded.disconnect(this);
+    }
+
+    void DataNamePropertyWidget::updateWidgetFromProperty() {
+        DataNameProperty* prop = static_cast<DataNameProperty*>(_property);
+        QString qs = QString::fromStdString(prop->getValue());
+
+        if (prop->getAccessInfo() == DataNameProperty::READ) {
+            _combobox->blockSignals(true);
+            setCurrentComboBoxText(qs);
+            _combobox->blockSignals(false);
+        }
+        else if (_lineEdit->text() != qs) {
+            _lineEdit->blockSignals(true);
+            _lineEdit->setText(qs);
+            _lineEdit->blockSignals(false);
+        }
+    }
+
+    void DataNamePropertyWidget::setCurrentComboBoxText(const QString& text) {
+        int idx = _combobox->findText(text);
+
+        if (idx != -1)
+            _combobox->setCurrentIndex(idx);
+        else
+            _combobox->setEditText(text);
+    }
+
+    void DataNamePropertyWidget::onTextChanged(const QString& text) {
+        DataNameProperty* prop = static_cast<DataNameProperty*>(_property);
+        ++_ignorePropertyUpdates;
+        prop->setValue(text.toStdString());
+        --_ignorePropertyUpdates;
+    }
+
+    void DataNamePropertyWidget::onDataAdded(std::string key, DataHandle dh) {
+        emit s_dataAddedQt(QString::fromStdString(key), dh);
+    }
+
+    void DataNamePropertyWidget::onDataAddedQt(const QString& key, QtDataHandle dh) {
+        if (_combobox->findText(key) == -1) {
+            _combobox->addItem(key);
+        }
+    }
+
+
+}

scripting/luagen/properties/datanamepropertylua.h

+// ================================================================================================
+// 
+// This file is part of the CAMPVis Software Framework.
+// 
+// If not explicitly stated otherwise: Copyright (C) 2012-2014, all rights reserved,
+//      Christian Schulte zu Berge <christian.szb@in.tum.de>
+//      Chair for Computer Aided Medical Procedures
+//      Technische Universitaet Muenchen
+//      Boltzmannstr. 3, 85748 Garching b. Muenchen, Germany
+// 
+// For a full list of authors and contributors, please refer to the file "AUTHORS.txt".
+// 
+// Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file 
+// except in compliance with the License. You may obtain a copy of the License at
+// 
+// http://www.apache.org/licenses/LICENSE-2.0
+// 
+// Unless required by applicable law or agreed to in writing, software distributed under the 
+// License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, 
+// either express or implied. See the License for the specific language governing permissions 
+// and limitations under the License.
+// 
+// ================================================================================================
+
+#ifndef DATANAMEPROPERTYWIDGET_H__
+#define DATANAMEPROPERTYWIDGET_H__
+
+#include "sigslot/sigslot.h"
+#include "core/properties/datanameproperty.h"
+#include "application/gui/qtdatahandle.h"
+#include "application/gui/properties/abstractpropertywidget.h"
+#include "application/gui/properties/propertywidgetfactory.h"
+
+class QComboBox;
+class QLineEdit;
+
+namespace campvis {
+    class DataNameProperty;
+    class DataContainer;
+    class DataHandle;
+
+    /**
+     * Widget for a DataNameProperty
+     */
+    class DataNamePropertyWidget : public AbstractPropertyWidget {