[opengtl-commits] [538] * add pc files |
[ Thread Index |
Date Index
| More lists.tuxfamily.org/opengtl-commits Archives
]
Revision: 538
Author: cyrille
Date: 2008-12-10 23:38:32 +0100 (Wed, 10 Dec 2008)
Log Message:
-----------
* add pc files
* add a color button class to allow color selection
* insert color button in the parameters widget
* finish the rgba dialog
Modified Paths:
--------------
trunk/libQtGTL/CMakeLists.txt
trunk/libQtGTL/QtGTL/CMakeLists.txt
trunk/libQtGTL/QtShiva/CMakeLists.txt
trunk/libQtGTL/QtShiva/ParametersWidget_p.cpp
trunk/libQtGTL/QtShiva/Proxy_p.cpp
trunk/libQtGTL/QtShiva/Proxy_p.h
trunk/libQtGTL/QtShiva/RgbaDialog_p.cpp
trunk/libQtGTL/QtShiva/RgbaDialog_p.h
trunk/libQtGTL/QtShiva/SpinBoxSliderConnector_p.cpp
trunk/libQtGTL/QtShiva/SpinBoxSliderConnector_p.h
trunk/libQtGTL/QtShiva/UiRgbaDialog.ui
trunk/libQtGTL/examples/QtShiva/MainWindow.ui
Added Paths:
-----------
trunk/libQtGTL/QtGTL/QtGTL.pc.cmake
trunk/libQtGTL/QtShiva/ColorButton_p.cpp
trunk/libQtGTL/QtShiva/ColorButton_p.h
trunk/libQtGTL/QtShiva/QtShiva.pc.cmake
Modified: trunk/libQtGTL/CMakeLists.txt
===================================================================
--- trunk/libQtGTL/CMakeLists.txt 2008-12-10 22:37:05 UTC (rev 537)
+++ trunk/libQtGTL/CMakeLists.txt 2008-12-10 22:38:32 UTC (rev 538)
@@ -2,8 +2,19 @@
find_package(Qt4 REQUIRED)
+
set(LIB_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/)
+set(INCLUDE_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/include/)
+set(BIN_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/bin/)
+set(QTGTL_VERSION 0.9.0)
+set(QTGTL_LIB_VERSION ${QTGTL_VERSION})
+set(QTGTL_LIB_SOVERSION "0.0")
+
+set(QTSHIVA_VERSION ${QTGTL_VERSION})
+set(QTSHIVA_LIB_VERSION ${QTGTL_VERSION})
+set(QTSHIVA_LIB_SOVERSION ${QTGTL_LIB_SOVERSION})
+
cmake_minimum_required(VERSION 2.6)
include_directories( ${CMAKE_CURRENT_SOURCE_DIR} )
@@ -11,4 +22,3 @@
add_subdirectory( examples )
add_subdirectory( QtShiva )
add_subdirectory( QtGTL )
-
Modified: trunk/libQtGTL/QtGTL/CMakeLists.txt
===================================================================
--- trunk/libQtGTL/QtGTL/CMakeLists.txt 2008-12-10 22:37:05 UTC (rev 537)
+++ trunk/libQtGTL/QtGTL/CMakeLists.txt 2008-12-10 22:38:32 UTC (rev 538)
@@ -17,3 +17,10 @@
install(TARGETS QtGTL DESTINATION ${LIB_INSTALL_DIR} )
install( FILES QImageBuffer.h QImageImage.h DESTINATION ${INCLUDE_INSTALL_DIR}/QtGTL )
+
+# Set the ABI version of the library
+set_target_properties(QtGTL PROPERTIES VERSION ${QTGTL_LIB_VERSION} SOVERSION ${QTGTL_LIB_SOVERSION} )
+
+# Create and install pc file
+configure_file("QtGTL.pc.cmake" "${CMAKE_CURRENT_BINARY_DIR}/QtGTL.pc" @ONLY)
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/QtGTL.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
Added: trunk/libQtGTL/QtGTL/QtGTL.pc.cmake
===================================================================
--- trunk/libQtGTL/QtGTL/QtGTL.pc.cmake (rev 0)
+++ trunk/libQtGTL/QtGTL/QtGTL.pc.cmake 2008-12-10 22:38:32 UTC (rev 538)
@@ -0,0 +1,11 @@
+prefix=@CMAKE_INSTALL_PREFIX@
+exec_prefix=@CMAKE_INSTALL_PREFIX@
+libdir=@LIB_INSTALL_DIR@
+includedir=@INCLUDE_INSTALL_DIR@
+
+Name: QtGTL
+Description: Qt Wrappers for Graphics Transformation Language
+Version: @QTGTL_VERSION@
+Requires:
+Libs: -L${libdir} -lGTLCore -lQtGTL
+Cflags: -I${includedir}
Modified: trunk/libQtGTL/QtShiva/CMakeLists.txt
===================================================================
--- trunk/libQtGTL/QtShiva/CMakeLists.txt 2008-12-10 22:37:05 UTC (rev 537)
+++ trunk/libQtGTL/QtShiva/CMakeLists.txt 2008-12-10 22:38:32 UTC (rev 538)
@@ -8,6 +8,7 @@
set(libQtShiva_SRCS
ParametersWidget.cpp
# Private
+ ColorButton_p.cpp
ColorConversions_p.cpp
ParametersWidget_p.cpp
SpinBoxSliderConnector_p.cpp
@@ -24,4 +25,11 @@
target_link_libraries( QtShiva ${QT_QTGUI_LIBRARY} ${OPENSHIVA_LIBRARIES} )
install(TARGETS QtShiva DESTINATION ${LIB_INSTALL_DIR} )
-install( FILES ParametersWidget.h DESTINATION ${INCLUDE_INSTALL_DIR}/QtGTL )
+install( FILES ParametersWidget.h DESTINATION ${INCLUDE_INSTALL_DIR}/QtShiva )
+
+# Set the ABI version of the library
+set_target_properties(QtShiva PROPERTIES VERSION ${QTSHIVA_LIB_VERSION} SOVERSION ${QTSHIVA_LIB_SOVERSION} )
+
+# Create and install pc file
+configure_file("QtShiva.pc.cmake" "${CMAKE_CURRENT_BINARY_DIR}/QtShiva.pc" @ONLY)
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/QtShiva.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
Added: trunk/libQtGTL/QtShiva/ColorButton_p.cpp
===================================================================
--- trunk/libQtGTL/QtShiva/ColorButton_p.cpp (rev 0)
+++ trunk/libQtGTL/QtShiva/ColorButton_p.cpp 2008-12-10 22:38:32 UTC (rev 538)
@@ -0,0 +1,64 @@
+/*
+ * Copyright (c) 2008 Cyrille Berger <cberger@xxxxxxxxxxx>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation;
+ * version 2 of the license.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#include "ColorButton_p.h"
+
+#include "RgbaDialog_p.h"
+
+#include <QPainter>
+
+using namespace QtShiva;
+
+ColorButton::ColorButton( QWidget* _parent ) : QPushButton( _parent )
+{
+ connect( this, SIGNAL(released()), SLOT(activated()));
+}
+
+ColorButton::~ColorButton()
+{
+}
+
+#include <iostream>
+
+void ColorButton::setCurrentColor( const QColor& _color )
+{
+ m_color = _color;
+ QPixmap px( 100, 30 );
+ QPainter pa( &px );
+ pa.fillRect( 0, 0, 100, 30, _color );
+ setIcon(px);
+ emit(colorChanged( m_color ) );
+}
+
+const QColor& ColorButton::currentColor() const
+{
+ return m_color;
+}
+
+void ColorButton::activated()
+{
+ RgbaDialog dialog( this );
+ dialog.setColor( m_color );
+ if(dialog.exec() == QDialog::Accepted )
+ {
+ setCurrentColor( dialog.color() );
+ }
+}
+
+#include "ColorButton_p.moc"
Property changes on: trunk/libQtGTL/QtShiva/ColorButton_p.cpp
___________________________________________________________________
Name: svn:keywords
+ Id
Name: svn:eol-style
+ native
Added: trunk/libQtGTL/QtShiva/ColorButton_p.h
===================================================================
--- trunk/libQtGTL/QtShiva/ColorButton_p.h (rev 0)
+++ trunk/libQtGTL/QtShiva/ColorButton_p.h 2008-12-10 22:38:32 UTC (rev 538)
@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 2008 Cyrille Berger <cberger@xxxxxxxxxxx>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation;
+ * version 2 of the license.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef _QTSHIVA_COLOR_BUTTON_P_H_
+#define _QTSHIVA_COLOR_BUTTON_P_H_
+
+#include <QPushButton>
+
+namespace QtShiva {
+ /**
+ * @ingroup QtShiva
+ * @internal
+ */
+ class ColorButton : public QPushButton {
+ Q_OBJECT
+ public:
+ ColorButton( QWidget* _parent );
+ ~ColorButton();
+ void setCurrentColor( const QColor& _color );
+ const QColor& currentColor() const;
+ signals:
+ void colorChanged( const QColor& );
+ private slots:
+ void activated();
+ private:
+ QColor m_color;
+ };
+}
+
+#endif
Property changes on: trunk/libQtGTL/QtShiva/ColorButton_p.h
___________________________________________________________________
Name: svn:keywords
+ Id
Name: svn:eol-style
+ native
Modified: trunk/libQtGTL/QtShiva/ParametersWidget_p.cpp
===================================================================
--- trunk/libQtGTL/QtShiva/ParametersWidget_p.cpp 2008-12-10 22:37:05 UTC (rev 537)
+++ trunk/libQtGTL/QtShiva/ParametersWidget_p.cpp 2008-12-10 22:38:32 UTC (rev 538)
@@ -32,8 +32,9 @@
#include <QTabWidget>
#include <QSlider>
+#include "ColorButton_p.h"
+#include "Proxy_p.h"
#include "SpinBoxSliderConnector_p.h"
-#include "Proxy_p.h"
using namespace QtShiva;
@@ -169,7 +170,17 @@
break;
case GTLCore::Metadata::ParameterEntry::RgbColorWidget:
-
+ {
+ ColorButton* colorButton = new ColorButton( _parent );
+ const std::vector< GTLCore::Value >* valArr = _parameterEntry->defaultValue().asArray();
+ Q_ASSERT( valArr );
+ Q_ASSERT( valArr->size() >= 3 );
+ double r = (*valArr)[0].asFloat() * 255;
+ double g = (*valArr)[1].asFloat() * 255;
+ double b = (*valArr)[2].asFloat() * 255;
+ colorButton->setCurrentColor( QColor(r,g,b ) );
+ _gridLayout->addWidget(colorButton, _layoutIndex, 1, 1, 1);
+ }
break;
}
}
Modified: trunk/libQtGTL/QtShiva/Proxy_p.cpp
===================================================================
--- trunk/libQtGTL/QtShiva/Proxy_p.cpp 2008-12-10 22:37:05 UTC (rev 537)
+++ trunk/libQtGTL/QtShiva/Proxy_p.cpp 2008-12-10 22:38:32 UTC (rev 538)
@@ -43,4 +43,9 @@
m_kernel->setParameter( m_name, (float)v );
}
+void Proxy::setColor( const QColor& )
+{
+
+}
+
#include "Proxy_p.moc"
Modified: trunk/libQtGTL/QtShiva/Proxy_p.h
===================================================================
--- trunk/libQtGTL/QtShiva/Proxy_p.h 2008-12-10 22:37:05 UTC (rev 537)
+++ trunk/libQtGTL/QtShiva/Proxy_p.h 2008-12-10 22:38:32 UTC (rev 538)
@@ -27,6 +27,8 @@
class Kernel;
}
+class QColor;
+
namespace QtShiva {
class Proxy : public QObject {
Q_OBJECT
@@ -36,6 +38,7 @@
public slots:
void setIntValue( int );
void setDoubleValue( double );
+ void setColor( const QColor& );
private:
GTLCore::String m_name;
OpenShiva::Kernel* m_kernel;
Added: trunk/libQtGTL/QtShiva/QtShiva.pc.cmake
===================================================================
--- trunk/libQtGTL/QtShiva/QtShiva.pc.cmake (rev 0)
+++ trunk/libQtGTL/QtShiva/QtShiva.pc.cmake 2008-12-10 22:38:32 UTC (rev 538)
@@ -0,0 +1,11 @@
+prefix=@CMAKE_INSTALL_PREFIX@
+exec_prefix=@CMAKE_INSTALL_PREFIX@
+libdir=@LIB_INSTALL_DIR@
+includedir=@INCLUDE_INSTALL_DIR@
+
+Name: QtShiva
+Description: Qt Wrapers for the Shiva Kernel Transformation Language
+Version: @QTSHIVA_VERSION@
+Requires:
+Libs: -L${libdir} -lOpenShiva -lQtShiva
+Cflags: -I${includedir}
Modified: trunk/libQtGTL/QtShiva/RgbaDialog_p.cpp
===================================================================
--- trunk/libQtGTL/QtShiva/RgbaDialog_p.cpp 2008-12-10 22:37:05 UTC (rev 537)
+++ trunk/libQtGTL/QtShiva/RgbaDialog_p.cpp 2008-12-10 22:38:32 UTC (rev 538)
@@ -29,12 +29,16 @@
{
m_rgbaDialog->setupUi( this );
+ connect( m_rgbaDialog->triangleSelector, SIGNAL(colorChanged(const QColor& )), SLOT(triangleColorChanged(const QColor&) ) );
+
m_connectors[0] = new SpinBoxSliderConnector( this, m_rgbaDialog->doubleSpinBoxRed, m_rgbaDialog->sliderRed );
connect( m_connectors[0], SIGNAL(valueChanged(double)), SLOT(spinBoxesValuesChanged()));
m_connectors[1] = new SpinBoxSliderConnector( this, m_rgbaDialog->doubleSpinBoxGreen, m_rgbaDialog->sliderGreen );
connect( m_connectors[1], SIGNAL(valueChanged(double)), SLOT(spinBoxesValuesChanged()));
m_connectors[2] = new SpinBoxSliderConnector( this, m_rgbaDialog->doubleSpinBoxBlue, m_rgbaDialog->sliderBlue );
connect( m_connectors[2], SIGNAL(valueChanged(double)), SLOT(spinBoxesValuesChanged()));
+ m_connectors[3] = new SpinBoxSliderConnector( this, m_rgbaDialog->doubleSpinBoxAlpha, m_rgbaDialog->sliderAlpha );
+ connect( m_connectors[3], SIGNAL(valueChanged(double)), SLOT(spinBoxesValuesChanged()));
}
RgbaDialog::~RgbaDialog()
@@ -48,6 +52,15 @@
return c;
}
+void RgbaDialog::setColor( const QColor& c)
+{
+ bool v = m_rgbaDialog->triangleSelector->blockSignals( true );
+ m_rgbaDialog->triangleSelector->setQColor( c );
+ triangleColorChanged( c );
+ m_connectors[3]->setValue( c.alpha() / 255.0 );
+ m_rgbaDialog->triangleSelector->blockSignals( v );
+}
+
void RgbaDialog::triangleColorChanged( const QColor& c)
{
m_connectors[0]->setValue( c.red() / 255.0 );
@@ -56,5 +69,8 @@
}
void RgbaDialog::spinBoxesValuesChanged()
{
-
+ QColor c( m_connectors[0]->value() * 255, m_connectors[1]->value() * 255, m_connectors[2]->value() * 255 );
+ m_rgbaDialog->triangleSelector->setQColor( c );
}
+
+#include "RgbaDialog_p.moc"
Modified: trunk/libQtGTL/QtShiva/RgbaDialog_p.h
===================================================================
--- trunk/libQtGTL/QtShiva/RgbaDialog_p.h 2008-12-10 22:37:05 UTC (rev 537)
+++ trunk/libQtGTL/QtShiva/RgbaDialog_p.h 2008-12-10 22:38:32 UTC (rev 538)
@@ -29,16 +29,18 @@
class SpinBoxSliderConnector;
class RgbaDialog : public QDialog {
+ Q_OBJECT
public:
RgbaDialog( QWidget* );
~RgbaDialog();
QColor color();
+ void setColor( const QColor& );
private slots:
void triangleColorChanged( const QColor& );
void spinBoxesValuesChanged();
private:
Ui_RgbaDialog* m_rgbaDialog;
- SpinBoxSliderConnector* m_connectors[3];
+ SpinBoxSliderConnector* m_connectors[4];
};
}
Modified: trunk/libQtGTL/QtShiva/SpinBoxSliderConnector_p.cpp
===================================================================
--- trunk/libQtGTL/QtShiva/SpinBoxSliderConnector_p.cpp 2008-12-10 22:37:05 UTC (rev 537)
+++ trunk/libQtGTL/QtShiva/SpinBoxSliderConnector_p.cpp 2008-12-10 22:38:32 UTC (rev 538)
@@ -34,6 +34,11 @@
{
}
+double SpinBoxSliderConnector::value() const
+{
+ return m_spinBox->value();
+}
+
void SpinBoxSliderConnector::setValue( double _value )
{
m_spinBox->setValue( _value );
Modified: trunk/libQtGTL/QtShiva/SpinBoxSliderConnector_p.h
===================================================================
--- trunk/libQtGTL/QtShiva/SpinBoxSliderConnector_p.h 2008-12-10 22:37:05 UTC (rev 537)
+++ trunk/libQtGTL/QtShiva/SpinBoxSliderConnector_p.h 2008-12-10 22:38:32 UTC (rev 538)
@@ -32,6 +32,7 @@
public:
SpinBoxSliderConnector( QObject* _parent, QDoubleSpinBox* _spinBox, QSlider* _slider );
~SpinBoxSliderConnector();
+ double value() const;
void setValue( double _value );
private slots:
void spinBoxValueChanged( double _value );
Modified: trunk/libQtGTL/QtShiva/UiRgbaDialog.ui
===================================================================
--- trunk/libQtGTL/QtShiva/UiRgbaDialog.ui 2008-12-10 22:37:05 UTC (rev 537)
+++ trunk/libQtGTL/QtShiva/UiRgbaDialog.ui 2008-12-10 22:38:32 UTC (rev 538)
@@ -49,7 +49,17 @@
</widget>
</item>
<item row="3" column="1" colspan="2" >
- <widget class="QDoubleSpinBox" name="doubleSpinBoxGreen" />
+ <widget class="QDoubleSpinBox" name="doubleSpinBoxGreen" >
+ <property name="minimum" >
+ <double>0.000000000000000</double>
+ </property>
+ <property name="maximum" >
+ <double>1.000000000000000</double>
+ </property>
+ <property name="singleStep" >
+ <double>0.100000000000000</double>
+ </property>
+ </widget>
</item>
<item row="4" column="0" colspan="3" >
<widget class="QSlider" name="sliderGreen" >
@@ -66,7 +76,17 @@
</widget>
</item>
<item row="5" column="1" colspan="2" >
- <widget class="QDoubleSpinBox" name="doubleSpinBoxBlue" />
+ <widget class="QDoubleSpinBox" name="doubleSpinBoxBlue" >
+ <property name="minimum" >
+ <double>0.000000000000000</double>
+ </property>
+ <property name="maximum" >
+ <double>1.000000000000000</double>
+ </property>
+ <property name="singleStep" >
+ <double>0.100000000000000</double>
+ </property>
+ </widget>
</item>
<item row="6" column="0" colspan="3" >
<widget class="QSlider" name="sliderBlue" >
@@ -83,7 +103,17 @@
</widget>
</item>
<item row="7" column="1" colspan="2" >
- <widget class="QDoubleSpinBox" name="doubleSpinBoxAlpha" />
+ <widget class="QDoubleSpinBox" name="doubleSpinBoxAlpha" >
+ <property name="minimum" >
+ <double>0.000000000000000</double>
+ </property>
+ <property name="maximum" >
+ <double>1.000000000000000</double>
+ </property>
+ <property name="singleStep" >
+ <double>0.100000000000000</double>
+ </property>
+ </widget>
</item>
<item row="8" column="0" colspan="3" >
<widget class="QSlider" name="sliderAlpha" >
@@ -93,7 +123,14 @@
</widget>
</item>
<item row="1" column="1" colspan="2" >
- <widget class="QDoubleSpinBox" name="doubleSpinBoxRed" />
+ <widget class="QDoubleSpinBox" name="doubleSpinBoxRed" >
+ <property name="maximum" >
+ <double>1.000000000000000</double>
+ </property>
+ <property name="singleStep" >
+ <double>0.100000000000000</double>
+ </property>
+ </widget>
</item>
</layout>
</item>
Modified: trunk/libQtGTL/examples/QtShiva/MainWindow.ui
===================================================================
--- trunk/libQtGTL/examples/QtShiva/MainWindow.ui 2008-12-10 22:37:05 UTC (rev 537)
+++ trunk/libQtGTL/examples/QtShiva/MainWindow.ui 2008-12-10 22:38:32 UTC (rev 538)
@@ -44,11 +44,9 @@
</style></head><body style=" font-family:'DejaVu Sans'; font-size:9pt; font-weight:400; font-style:normal;">
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">&lt;</p>
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> parameters: &lt;</p>
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> blueness: &lt; </p>
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> type: float;</p>
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> minValue: 0;</p>
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> maxValue: 1.0;</p>
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> defaultValue: 0.5;</p>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> color: &lt; </p>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> type: rgb;</p>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> defaultValue: {1.0, 0.0, 0.0};</p>
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> &gt;;</p>
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> &gt;;</p>
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">&gt;;</p>
@@ -56,7 +54,9 @@
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans Serif'; font-size:10pt;">{</p>
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans Serif'; font-size:10pt;"> void evaluatePixel(out pixel result)</p>
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans Serif'; font-size:10pt;"> {</p>
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans Serif'; font-size:10pt;"> result[0] = <span style=" font-family:'DejaVu Sans'; font-size:9pt;">blueness</span>;</p>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans Serif'; font-size:10pt;"> result[0] = <span style=" font-family:'DejaVu Sans'; font-size:9pt;">color[0]</span>;</p>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans Serif'; font-size:10pt;"> result[1] = <span style=" font-family:'DejaVu Sans'; font-size:9pt;">color[1]</span>;</p>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans Serif'; font-size:10pt;"> result[2] = <span style=" font-family:'DejaVu Sans'; font-size:9pt;">color[2]</span>;</p>
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans Serif'; font-size:10pt;"> }</p>
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans Serif'; font-size:10pt;">}</p>
<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans Serif'; font-size:10pt;"></p></body></html></string>