lena.jpg
src/help/filters.html
src/help/help.qrc
src/help/star.png
src/help/usage.html
src/help/usage.png
@@ -3,5 +3,5 @@ src/.obj
src/.moc
src/.rcc
src/.ui
-pid
+blindcamaleon
*~
.gitignore
@@ -20,15 +20,15 @@
#include <math.h>
#include <QInputDialog>
-Butterworth::Butterworth(bool low)
+Butterworth::Butterworth(bool high)
{
- this->low = low; // low is true
+ this->high = high;
}
char* Butterworth::desc()
{
char *d = new char[26];
- sprintf(d, "Butterworth (passa %s)", low ? "baixa" : "alta");
+ sprintf(d, "Butterworth (passa %s)", high ? "alta" : "baixa");
return d;
}
@@ -45,7 +45,7 @@ QImage* Butterworth::run(Complex* dft, int value, SimpleFilteredImage* img)
for (i = 0; i < width; i++)
for (j = 0; j < height; j++)
{
- h = H(i, j, value, img->x0(), img->y0(), low, n);
+ h = H(i, j, value, img->x0(), img->y0(), high, n);
pos = (i * height) + j;
dft[pos].setIm(dft[pos].im() * h);
dft[pos].setRe(dft[pos].re() * h);
src/butterworth.cpp
@@ -24,7 +24,7 @@
class Butterworth : public BasicFilter
{
- bool low;
+ bool high;
public:
Butterworth(bool);
QImage* run(Complex*, int, SimpleFilteredImage*);
src/butterworth.h
@@ -33,7 +33,7 @@ Complex::Complex(Complex *c)
double Complex::abso()
{
- return log(hypot(_re, _im));
+ return hypot(_re, _im);
}
double Complex::phase()
{
@@ -42,7 +42,7 @@ double Complex::phase()
double Complex::magnitude()
{
- return abs(_re + _im);
+ return abs(_re*_re + _im*_im);
}
Complex Complex::plus(Complex b)
src/complex.cpp
@@ -16,6 +16,44 @@
*/
#include "help.h"
+#include <QListWidgetItem>
+#include <QIcon>
+#include <QTextBrowser>
+#include <QStackedWidget>
+#include <QDebug>
Help::Help(PidMain *parent) : QDialog(parent)
-{ setupUi(this); }
+{
+ setupUi(this);
+
+ QListWidgetItem *usage = new QListWidgetItem(helpList);
+ usage->setIcon(QIcon(":/images/usage.png"));
+ usage->setText("Usage");
+ usage->setTextAlignment(Qt::AlignHCenter);
+ usage->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled);
+
+ QListWidgetItem *filters = new QListWidgetItem(helpList);
+ filters->setIcon(QIcon(":/images/star.png"));
+ filters->setText("Filters");
+ filters->setTextAlignment(Qt::AlignHCenter);
+ filters->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled);
+
+ helps[0] = QUrl("qrc:/html/usage.html");
+ helps[1] = QUrl("qrc:/html/filters.html");
+
+ connect(helpList, SIGNAL(currentItemChanged(QListWidgetItem*, QListWidgetItem*)),
+ this, SLOT(changePage(QListWidgetItem*, QListWidgetItem*)));
+
+ helpList->setCurrentRow(0);
+ helpList->setFlow(QListView::TopToBottom);
+}
+
+void Help::changePage(QListWidgetItem *current, QListWidgetItem* prev)
+{
+ if (!current)
+ current = prev;
+
+ helpBrowser->clear();
+ helpBrowser->setSource(helps[helpList->row(current)]);
+ helpBrowser->reload();
+}
src/help.cpp
@@ -18,16 +18,24 @@
#ifndef HELP_H
#define HELP_H
-#include <QDialog>
#include "ui_help.h"
#include "pidmain.h"
+class QDialog;
+class QStackedWidget;
+class QListWidgetItem;
+
class Help : public QDialog, public Ui::HelpDialog
{
Q_OBJECT
+ QUrl helps[2];
+
public:
Help(PidMain*);
+
+public slots:
+ void changePage(QListWidgetItem*, QListWidgetItem*);
};
#endif
src/help.h
@@ -1,20 +1,3 @@
-<!--
- * This file is part of Blind Camaleon.
- *
- * Blind Camaleon 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, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Blind Camaleon 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 Blind Camaleon. If not, see <http://www.gnu.org/licenses/lgpl-3.0.txt>.
--->
-
<ui version="4.0" >
<class>HelpDialog</class>
<widget class="QDialog" name="HelpDialog" >
@@ -49,38 +32,40 @@
</property>
<layout class="QHBoxLayout" >
<item>
- <widget class="QTextEdit" name="textEdit" >
- <property name="readOnly" >
- <bool>true</bool>
+ <widget class="QListWidget" name="helpList" >
+ <property name="maximumSize" >
+ <size>
+ <width>100</width>
+ <height>16777215</height>
+ </size>
</property>
- <property name="html" >
- <string><html><head><meta name="qrichtext" content="1" /><title>Image Editor Help</title><style type="text/css">
-p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;">
-<p style=" margin-top:16px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:x-large; font-weight:600;"><span style=" font-size:x-large;">Abrindo uma imagem</span></p>
-<ul style="-qt-list-indent: 1;"><li style=" margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:small; font-weight:600;">Ctrl+O ou File/Open</span></li></ul>
-<p style=" margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:small;">Abre uma imagem que será tratada pelo programa de varias maneiras, dependendo da opção escolhida pelo usuário.</span></p>
-<p style=" margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /></p>
-<p style=" margin-top:16px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:x-large; font-weight:600;"><span style=" font-size:x-large;">Salvar imagem atual</span></p>
-<ul style="-qt-list-indent: 1;"><li style=" margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:small; font-weight:600; color:#000000;">Ctrl+Shift+S ou File/Save</span></li></ul>
-<p style=" margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:small;">Salva a imagem atual e suas alterações que foram realizadas até este momento em um diretório a ser escolhido.</span></p>
-<p style=" margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:small;">Com este recurso você pode salvar a imagem original, sua versão em escala de cinza ou ainda o espectro de fourier</span></p>
-<p style=" margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /></p>
-<p style=" margin-top:16px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:x-large; font-weight:600;"><span style=" font-size:x-large;">Gerar escala de cinza</span></p>
-<ul style="-qt-list-indent: 1;"><li style=" margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:small; font-weight:600;">Ctrl+G ou Image/Generate Gray Scale</span> </li></ul>
-<p style=" margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:small; color:#000000;">Gera uma versão na escala de cinza da imagem, partindo do pressuposto que está é colorida. Uma função é utilizada para alterar os valores RGB(red, green, blue) de cada pixel da imagem para transformá-lo em um pixel de tom cinza.</span></p>
-<p style=" margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /></p>
-<p style=" margin-top:16px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:x-large; font-weight:600;"><span style=" font-size:x-large;">Gerar Histograma</span></p>
-<ul style="-qt-list-indent: 1;"><li style=" margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:small; font-weight:600; color:#000000;">Ctrl+H ou Image/Generate Histogram</span></li></ul>
-<p style=" margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:small;">Gera o histograma da imagem após ser transformada na versão em escala de cinza, feito com base na distribuição de freqüências de tons de cinza presentes na imagem, normalmente um gráfico de barras verticais.</span></p>
-<p style=" margin-top:16px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:x-large; font-weight:600;"><span style=" font-size:x-large;">Espectro de Fourier</span></p>
-<ul style="-qt-list-indent: 1;"><li style=" margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:small; font-weight:600; color:#000000;">Ctrl+F ou Image/Generate Fourier Spectrum</span></li></ul>
-<p style=" margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:small;">Gera o espectro de Fourier da imagem atual utilizando uma função que aplica a transformada de Fourier em uma imagem de duas dimensões. O espectro de Fourier é o gráfico da magnitude versus freqüência, aonde a freqüência corresponde a freqüência na forma de senos e cosenos.</span></p></body></html></string>
+ <property name="iconSize" >
+ <size>
+ <width>50</width>
+ <height>50</height>
+ </size>
+ </property>
+ <property name="movement" >
+ <enum>QListView::Static</enum>
+ </property>
+ <property name="flow" >
+ <enum>QListView::TopToBottom</enum>
+ </property>
+ <property name="spacing" >
+ <number>12</number>
+ </property>
+ <property name="viewMode" >
+ <enum>QListView::IconMode</enum>
</property>
</widget>
</item>
+ <item>
+ <widget class="QTextBrowser" name="helpBrowser" />
+ </item>
</layout>
</widget>
- <resources/>
+ <resources>
+ <include location="help/help.qrc" />
+ </resources>
<connections/>
</ui>
src/help.ui
@@ -62,7 +62,7 @@ ImageTabs::getSpectrum()
for (int j = 0; j < spectY; j++)
{
pos = (i * spectY) + j;
- bright = (int) dft[pos].abso();
+ bright = (int) log(dft[pos].magnitude());
spectrum->setPixel(i, j, qRgb(bright, bright, bright));
}
}
src/imagetabs.cpp
@@ -58,7 +58,7 @@ FORMS += \
simplefilter.ui \
ideal.ui
-RESOURCES += images/images.qrc
+RESOURCES += images/images.qrc help/help.qrc
RCC_DIR = .rcc
UI_DIR = .ui
src/src.pri
f42102164795c7fa33c418941325bbbc89c34a60
Carlos Júnior
carlos@milk-it.net
http://github.com/xjunior/blind-chameleon/commit/28558c3173779c713473c664cdde4c0807c2ffa8
28558c3173779c713473c664cdde4c0807c2ffa8
2008-06-06T07:40:28-07:00
2008-06-06T07:40:28-07:00
Improving help pages
6bd23bbfb1d8d893d12faeee0d434ab06c6c52b7
Carlos Júnior
carlos@milk-it.net