[Kst] branches/work/kst/kst1kde4/kst/src
Andrew Walker
arwalker at sumusltd.com
Wed Feb 24 02:47:42 CET 2010
SVN commit 1095337 by arwalker:
continue kst1kde4
M +4 -4 libkst/kstobject.h
M +34 -77 plugins/CMakeLists.txt
A plugins/crosscorrelation_bruteforce (directory)
A plugins/crosscorrelation_bruteforce/CMakeLists.txt
A plugins/crosscorrelation_bruteforce/Makefile.am
A plugins/crosscorrelation_bruteforce/crosscorrelate.cpp [License: GPL (v2+)]
A plugins/crosscorrelation_bruteforce/crosscorrelate.h [License: GPL (v2+)]
A plugins/crosscorrelation_bruteforce/kstobject_crosscorrelate_bruteforce.desktop
A plugins/planckUtils (directory)
A plugins/planckUtils/CMakeLists.txt
A plugins/planckUtils/latestDate (directory)
A plugins/planckUtils/latestDate/CMakeLists.txt
A plugins/planckUtils/latestDate/kstobject_planckLatestDate.desktop
A plugins/planckUtils/latestDate/planckLatestDate.cpp [License: GPL (v2+)]
A plugins/planckUtils/latestDate/planckLatestDate.h [License: GPL (v2+)]
A plugins/reverse (directory)
A plugins/reverse/CMakeLists.txt
A plugins/reverse/kstobject_reverse.desktop
A plugins/reverse/reverse.cpp [License: GPL (v2+)]
A plugins/reverse/reverse.h [License: GPL (v2+)]
M +1 -1 widgets/comboboxselection.ui
M +23 -16 widgets/comboboxselection_i.cpp
M +3 -3 widgets/comboboxselection_i.h
M +1 -1 widgets/kstbackbuffer.cpp
M +2 -2 widgets/kstbackbuffer.h
--- branches/work/kst/kst1kde4/kst/src/libkst/kstobject.h #1095336:1095337
@@ -38,13 +38,13 @@
// if the API for one changes, the other doesn't have to be updated also...
//
-#define KST_CURRENT_DATASOURCE_KEY 0x00000007
+#define KST_CURRENT_DATASOURCE_KEY 0x00000008
-#define KST_KEY_DATASOURCE_PLUGIN(x) extern "C" Q_UINT32 key_##x() { return KST_CURRENT_DATASOURCE_KEY; }
+#define KST_KEY_DATASOURCE_PLUGIN(x) extern "C" quint32 key_##x() { return KST_CURRENT_DATASOURCE_KEY; }
-#define KST_CURRENT_DATAOBJECT_KEY 0x00000006
+#define KST_CURRENT_DATAOBJECT_KEY 0x00000007
-#define KST_KEY_DATAOBJECT_PLUGIN(x) extern "C" Q_UINT32 key_##x() { return KST_CURRENT_DATAOBJECT_KEY; }
+#define KST_KEY_DATAOBJECT_PLUGIN(x) extern "C" quint32 key_##x() { return KST_CURRENT_DATAOBJECT_KEY; }
class KstObjectPrivate;
--- branches/work/kst/kst1kde4/kst/src/plugins/CMakeLists.txt #1095336:1095337
@@ -1,78 +1,35 @@
-find_package(KDE4 REQUIRED)
+add_subdirectory(bin)
+add_subdirectory(binnedmap)
+add_subdirectory(periodogram)
+add_subdirectory(phase)
+add_subdirectory(statistics)
+add_subdirectory(chop)
+add_subdirectory(crossspectrum)
+add_subdirectory(syncbin)
+add_subdirectory(effective_bandwidth)
+add_subdirectory(despike)
+add_subdirectory(cumulative_sum)
+add_subdirectory(differentiation)
+add_subdirectory(shift)
+add_subdirectory(discretizing_filters)
+add_subdirectory(lfidifference)
+add_subdirectory(combine)
+add_subdirectory(trim)
+add_subdirectory(convert_time)
+add_subdirectory(normalization)
+add_subdirectory(crosscorrelation_bruteforce)
+add_subdirectory(planckUtils)
+add_subdirectory(reverse)
-add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
-
-include(KDE4Defaults)
-
-include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/src/libkstmath ${CMAKE_SOURCE_DIR}/src/libkst ${CMAKE_CURRENT_SOURCE_DIR} ${KDE4_INCLUDES} ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} )
-
-#add_subdirectory(bin)
-#add_subdirectory(binnedmap)
-#add_subdirectory(chop)
-#add_subdirectory(combine)
-#add_subdirectory(convert_time)
-#add_subdirectory(convolution)
-#add_subdirectory(correlation)
-#add_subdirectory(crossspectrum)
-#add_subdirectory(cumulative_sum)
-#add_subdirectory(despike)
-#add_subdirectory(differentiation)
-#add_subdirectory(discretizing_filters)
-#add_subdirectory(editor)
-#add_subdirectory(effective_bandwidth)
-#add_subdirectory(filters)
-add_subdirectory(fits)
-#add_subdirectory(fits_nonlinear)
-#add_subdirectory(interpolations)
-#add_subdirectory(lfidifference)
-#add_subdirectory(noise_addtion)
-#add_subdirectory(normalization)
-#add_subdirectory(pass_filters)
-#add_subdirectory(periodogram)
-#add_subdirectory(phase)
-#add_subdirectory(shift)
-#add_subdirectory(statistics)
-#add_subdirectory(syncbin)
-#add_subdirectory(trim)
-
-
-
-message(STATUS "${CMAKE_CURRENT_SOURCE_DIR}: skipped subdir $(NOISE_SUBDIR)")
-message(STATUS "${CMAKE_CURRENT_SOURCE_DIR}: skipped subdir $(FITS_SUBDIR)")
-message(STATUS "${CMAKE_CURRENT_SOURCE_DIR}: skipped subdir $(FITSNONLINEAR_SUBDIR)")
-message(STATUS "${CMAKE_CURRENT_SOURCE_DIR}: skipped subdir $(INTERPOLATIONS_SUBDIR)")
-message(STATUS "${CMAKE_CURRENT_SOURCE_DIR}: skipped subdir $(PASS_FILTERS_SUBDIR)")
-message(STATUS "${CMAKE_CURRENT_SOURCE_DIR}: skipped subdir $(CORRELATION_SUBDIR)")
-message(STATUS "${CMAKE_CURRENT_SOURCE_DIR}: skipped subdir $(CONVOLUTION_SUBDIR)")
-
-########### install files ###############
-
-
-
-
-#original Makefile.am contents follow:
-
-#if include_noise_plugins
-#NOISE_SUBDIR=noise_addition
-#endif
-#if include_fits_plugins
-#FITS_SUBDIR=fits
-#endif
-#if include_fitsnonlinear_plugins
-#FITSNONLINEAR_SUBDIR=fits_nonlinear
-#endif
-#if include_interpolations_plugins
-#INTERPOLATIONS_SUBDIR=interpolations
-#endif
-#if include_pass_filters_plugins
-#PASS_FILTERS_SUBDIR=pass_filters
-#endif
-#if include_convolution_plugins
-#CONVOLUTION_SUBDIR=convolution
-#endif
-#if include_correlation_plugins
-#CORRELATION_SUBDIR=correlation
-#endif
-#
-#SUBDIRS=bin binnedmap periodogram phase statistics chop crossspectrum syncbin effective_bandwidth despike $(NOISE_SUBDIR) $(FITS_SUBDIR) $(FITSNONLINEAR_SUBDIR) $(INTERPOLATIONS_SUBDIR) $(PASS_FILTERS_SUBDIR) $(CORRELATION_SUBDIR) $(CONVOLUTION_SUBDIR) cumulative_sum differentiation shift discretizing_filters lfidifference combine trim convert_time normalization
-#
+IF (KST_HAVE_GSL)
+ add_subdirectory(noise_addition)
+ add_subdirectory(fits)
+ add_subdirectory(fits_nonlinear)
+ add_subdirectory(interpolations)
+ add_subdirectory(spectral_normalization)
+ add_subdirectory(pass_filters)
+ add_subdirectory(convolution)
+ add_subdirectory(correlation)
+ELSE (KST_HAVE_GSL)
+ message(STATUS "========== some plugins will not be compiled. Install gsl to add this functionality")
+ENDIF (KST_HAVE_GSL)
--- branches/work/kst/kst1kde4/kst/src/widgets/comboboxselection.ui #1095336:1095337
@@ -18,7 +18,7 @@
</property>
<layout class="QGridLayout">
<item row="1" column="0" rowspan="1" colspan="4">
- <widget class="Q3ListBox" name="_listBox">
+ <widget class="QListWidget" name="_listBox">
<item>
<property name="text">
<string>New Item</string>
--- branches/work/kst/kst1kde4/kst/src/widgets/comboboxselection_i.cpp #1095336:1095337
@@ -16,20 +16,21 @@
***************************************************************************/
// include files for Qt
-#include <qlineedit.h>
-#include <qlistbox.h>
-#include <qpushbutton.h>
-#include <qregexp.h>
-#include <qstringlist.h>
+#include <QLineEdit>
+#include <QListWidget>
+#include <QPushButton>
+#include <QRegExp>
+#include <QStringList>
// include files for KDE
// application specific includes
#include "comboboxselection_i.h"
-ComboBoxSelectionI::ComboBoxSelectionI(QWidget *parent, const char* name, bool modal,
- WFlags fl)
-: ComboBoxSelection(parent, name, modal, fl) {
+ComboBoxSelectionI::ComboBoxSelectionI(QWidget *parent, const char* name, bool modal, Qt::WindowFlags fl)
+: QWidget(parent, fl) {
+ setupUi((QDialog*)this);
+
connect(OK, SIGNAL(clicked()), this, SLOT(ok()));
connect(Cancel, SIGNAL(clicked()), this, SLOT(close()));
connect(_lineEdit, SIGNAL(textChanged(const QString &)), this, SLOT(sort()));
@@ -54,7 +55,10 @@
void ComboBoxSelectionI::changed() {
- if (_listBox->selectedItem()) {
+ QList<QListWidgetItem*> items;
+
+ items = _listBox->selectedItems();
+ if (items.count() > 0) {
OK->setEnabled(true);
} else {
OK->setEnabled(false);
@@ -73,26 +77,29 @@
search.prepend("*");
search.append("*");
}
- QRegExp regexp(search, false, true);
+ QRegExp regexp(search, Qt::CaseInsensitive, QRegExp::Wildcard);
OK->setEnabled(false);
_listBox->clear();
for (i=0; i<(int)_strs.count(); i++) {
if (regexp.exactMatch(_strs[i])) {
- _listBox->insertItem(_strs[i]);
+ _listBox->insertItem(0, _strs[i]);
}
}
- _listBox->sort();
+ _listBox->sortItems();
}
void ComboBoxSelectionI::ok() {
- if (_listBox->selectedItem() != 0L) {
- _selected = _listBox->selectedItem()->text();
+ QList<QListWidgetItem*> items;
+
+ items = _listBox->selectedItems();
+ if (items.count() > 0) {
+ _selected = items.first()->text();
}
- accept();
+// accept();
}
-#include "comboboxselection_i.moc"
+//#include "comboboxselection_i.moc"
--- branches/work/kst/kst1kde4/kst/src/widgets/comboboxselection_i.h #1095336:1095337
@@ -18,13 +18,13 @@
#ifndef COMBOBOXSELECTIONI_H
#define COMBOBOXSELECTIONI_H
-#include "comboboxselection.h"
+#include "ui_comboboxselection.h"
-class ComboBoxSelectionI : public ComboBoxSelection {
+class ComboBoxSelectionI : public QWidget, public Ui_ComboBoxSelection {
Q_OBJECT
public:
ComboBoxSelectionI(QWidget* parent = 0, const char* name = 0,
- bool modal = FALSE, WFlags fl = 0 );
+ bool modal = FALSE, Qt::WindowFlags fl = 0 );
virtual ~ComboBoxSelectionI();
void addString(const QString &str);
void reset();
--- branches/work/kst/kst1kde4/kst/src/widgets/kstbackbuffer.cpp #1095336:1095337
@@ -18,7 +18,7 @@
#include "kstbackbuffer.h"
KstBackBuffer::KstBackBuffer(int depth)
-: _buffer(0, 0, depth, QPixmap::MemoryOptim) {
+: _buffer(0, 0) {
}
--- branches/work/kst/kst1kde4/kst/src/widgets/kstbackbuffer.h #1095336:1095337
@@ -18,8 +18,8 @@
#ifndef KSTBACKBUFFER_H
#define KSTBACKBUFFER_H
-#include <qpainter.h>
-#include <qpixmap.h>
+#include <QPainter>
+#include <QPixmap>
class KstBackBuffer {
public:
More information about the Kst
mailing list