← Back to branch summary

~ubuntu-branches/ubuntu/quantal/gnumeric/quantal

~ubuntu-branches/ubuntu/quantal/gnumeric/quantal

« back to all changes in this revision

Viewing changes to src/sheet-filter.c

Committer: Bazaar Package Importer
Author(s): Gauvain Pocentek
Date: 2009-06-22 13:37:20 UTC
mfrom: (1.1.20 upstream) (2.1.3 sid)
Revision ID: james.westby@ubuntu.com-20090622133720-rtdazsiz2lx5q8l7

Tags: 1.9.9-1ubuntu1

* Merge from debian unstable, remaining changes:
  - Promoted gnumeric-doc to Recommends in gnumeric package for help to be
    installed automatically
  - gnumeric-gtk is a transitional package
  - gnumeric conflicts with gnumeric-gtk << 1.8.3-3ubuntu1
  - call initltool-update in po*
  - remove psiconv support (psiconv is in universe):
    o debian/control: remove B-D on libpsiconv-dev
    o debian/rules: don't pass --with-psiconv to ./configure
    o debian/gnumeric-plugins-extra.install: don't install the psiconv
      plugin

files added:
plugins/excel/xls-read-pivot.c

plugins/excel/xls-write-pivot.c

plugins/excel/xlsx-write-pivot.c

src/dialogs/chi-squared.glade

src/dialogs/data-slicer.glade

src/dialogs/dialog-analysis-tool-chi-squared.c

src/dialogs/dialog-data-slicer.c

src/gnm-cell-combo.c

src/gnm-cell-combo.h

src/gnm-command-impl.h

src/gnm-commands-slicer.c

src/gnm-commands-slicer.h

src/gnm-data-cache-source.c

src/gnm-data-cache-source.h

src/gnm-sheet-slicer-combo.c

src/gnm-sheet-slicer-combo.h

src/gnm-sheet-slicer.c

src/gnm-sheet-slicer.h

src/go-data-cache-field-impl.h

src/go-data-cache-field.c

src/go-data-cache-field.h

src/go-data-cache-impl.h

src/go-data-cache-source.c

src/go-data-cache-source.h

src/go-data-cache.c

src/go-data-cache.h

src/go-data-slicer-field-impl.h

src/go-data-slicer-field.c

src/go-data-slicer-field.h

src/go-data-slicer-impl.h

src/go-data-slicer.c

src/go-data-slicer.h

src/go-val.c

src/go-val.h

src/goffice-data.h

src/sheet-utils.c

src/sheet-utils.h

src/tools/analysis-anova.c

src/tools/analysis-anova.h

src/tools/analysis-chi-squared.c

src/tools/analysis-chi-squared.h

src/widgets/gnm-sheet-slicer-combo-foo-view.c

src/widgets/gnm-sheet-slicer-combo-foo-view.h

files removed:
plugins/excel/ms-pivot.c

plugins/excel/ms-pivot.h

src/str.c

src/str.h

files modified:
BUGS

ChangeLog

NEWS

component/gnumeric.c

configure

configure.in

debian/changelog

debian/control

doc/C/ChangeLog

doc/ChangeLog

gnumeric.spec

plugins/applix/ChangeLog

plugins/applix/applix-read.c

plugins/applix/applix-write.c

plugins/applix/boot.c

plugins/corba/ChangeLog

plugins/corba/corba-application.c

plugins/corba/corba-workbook.c

plugins/derivatives/ChangeLog

plugins/derivatives/options.c

plugins/dif/ChangeLog

plugins/dif/dif.c

plugins/excel/ChangeLog

plugins/excel/Makefile.am

plugins/excel/Makefile.in

plugins/excel/biff-types.h

plugins/excel/boot.c

plugins/excel/excel-xml-read.c

plugins/excel/excel.h

plugins/excel/ms-biff.c

plugins/excel/ms-chart.c

plugins/excel/ms-excel-read.c

plugins/excel/ms-excel-read.h

plugins/excel/ms-excel-util.c

plugins/excel/ms-excel-write.c

plugins/excel/ms-excel-write.h

plugins/excel/ms-formula-read.c

plugins/excel/ms-formula-write.c

plugins/excel/ms-obj.c

plugins/excel/plugin.xml.in

plugins/excel/xlsx-read-pivot.c

plugins/excel/xlsx-read.c

plugins/excel/xlsx-utils.c

plugins/excel/xlsx-utils.h

plugins/excel/xlsx-write.c

plugins/fn-complex/ChangeLog

plugins/fn-complex/functions.c

plugins/fn-database/ChangeLog

plugins/fn-database/functions.c

plugins/fn-date/ChangeLog

plugins/fn-date/functions.c

plugins/fn-eng/ChangeLog

plugins/fn-eng/functions.c

plugins/fn-erlang/ChangeLog

plugins/fn-erlang/functions.c

plugins/fn-financial/ChangeLog

plugins/fn-financial/functions.c

plugins/fn-info/ChangeLog

plugins/fn-info/functions.c

plugins/fn-logical/ChangeLog

plugins/fn-logical/functions.c

plugins/fn-lookup/ChangeLog

plugins/fn-lookup/functions.c

plugins/fn-math/ChangeLog

plugins/fn-math/functions.c

plugins/fn-math/plugin.xml.in

plugins/fn-r/ChangeLog

plugins/fn-r/functions.c

plugins/fn-random/ChangeLog

plugins/fn-random/functions.c

plugins/fn-stat/ChangeLog

plugins/fn-stat/functions.c

plugins/fn-string/ChangeLog

plugins/fn-string/functions.c

plugins/fn-tsa/ChangeLog

plugins/fn-tsa/functions.c

plugins/fn-tsa/plugin.xml.in

plugins/gda/ChangeLog

plugins/gda/plugin-gda.c

plugins/gnome-db/ChangeLog

plugins/gnome-glossary/ChangeLog

plugins/html/ChangeLog

plugins/html/boot.c

plugins/html/boot.h

plugins/html/html.c

plugins/html/html.h

plugins/html/html_read.c

plugins/html/latex.c

plugins/html/latex.h

plugins/html/roff.c

plugins/lotus-123/ChangeLog

plugins/lotus-123/boot.c

plugins/mps/ChangeLog

plugins/mps/mps.c

plugins/mps/parser.c

plugins/numtheory/ChangeLog

plugins/numtheory/numtheory.c

plugins/oleo/ChangeLog

plugins/oleo/boot.c

plugins/openoffice/ChangeLog

plugins/openoffice/openoffice-read.c

plugins/openoffice/openoffice-write.c

plugins/openoffice/plugin.xml.in

plugins/paradox/ChangeLog

plugins/paradox/paradox.c

plugins/perl-func/ChangeLog

plugins/perl-loader/ChangeLog

plugins/perl-loader/boot.c

plugins/perl-loader/perl-gnumeric.c

plugins/perl-loader/perl-gnumeric.h

plugins/perl-loader/perl-loader.c

plugins/plan-perfect/ChangeLog

plugins/plan-perfect/pln.c

plugins/plan-perfect/pln.h

plugins/psiconv/ChangeLog

plugins/psiconv/boot.c

plugins/psiconv/psiconv-plugin.h

plugins/psiconv/psiconv-read.c

plugins/py-func/ChangeLog

plugins/python-loader/ChangeLog

plugins/python-loader/boot.c

plugins/python-loader/gnm-py-interpreter.c

plugins/python-loader/gnm-python.c

plugins/python-loader/py-command-line.c

plugins/python-loader/py-console.c

plugins/python-loader/py-gnumeric.c

plugins/python-loader/py-gnumeric.h

plugins/python-loader/py-interpreter-selector.c

plugins/python-loader/py-interpreter-selector.h

plugins/python-loader/python-loader.c

plugins/qpro/ChangeLog

plugins/qpro/qpro-read.c

plugins/sample_datasource/ChangeLog

plugins/sample_datasource/sample_datasource.c

plugins/sc/ChangeLog

plugins/sc/sc.c

plugins/sylk/ChangeLog

plugins/sylk/sylk-write.c

plugins/sylk/sylk.c

plugins/uihello/ChangeLog

plugins/xbase/ChangeLog

plugins/xbase/boot.c

plugins/xbase/xbase.c

po-functions/ChangeLog

po-functions/POTFILES.in

po-functions/POTFILES.skip

po/ChangeLog

po/POTFILES.in

po/POTFILES.skip

po/es.po

po/he.po

samples/regress.gnumeric

schemas/gnumeric-general.schemas.in

src/GNOME_Gnumeric-gtk.xml.in

src/Makefile.am

src/Makefile.in

src/application.c

src/application.h

src/auto-format.c

src/cell-draw.c

src/cell.c

src/cellspan.h

src/clipboard.c

src/clipboard.h

src/cmd-edit.h

src/collect.c

src/command-context-stderr.c

src/command-context.h

src/commands.c

src/consolidate.c

src/dependent.c

src/dependent.h

src/dialogs/ChangeLog

src/dialogs/Makefile.am

src/dialogs/Makefile.in

src/dialogs/dialog-about.c

src/dialogs/dialog-analysis-tools.c

src/dialogs/dialog-autocorrect.c

src/dialogs/dialog-autoformat.c

src/dialogs/dialog-autosave.c

src/dialogs/dialog-cell-format.c

src/dialogs/dialog-cell-sort.c

src/dialogs/dialog-doc-metadata.c

src/dialogs/dialog-formula-guru.c

src/dialogs/dialog-function-select.c

src/dialogs/dialog-goto-cell.c

src/dialogs/dialog-hyperlink.c

src/dialogs/dialog-plugin-manager.c

src/dialogs/dialog-preferences.c

src/dialogs/dialog-printer-setup.c

src/dialogs/dialog-quit.c

src/dialogs/dialog-recent.c

src/dialogs/dialog-scenarios.c

src/dialogs/dialog-search-replace.c

src/dialogs/dialog-search.c

src/dialogs/dialog-sheet-order.c

src/dialogs/dialog-so-styled.c

src/dialogs/dialog-solver.c

src/dialogs/dialog-stf-csv-page.c

src/dialogs/dialog-stf-export.c

src/dialogs/dialog-stf-main-page.c

src/dialogs/dialog-stf.h

src/dialogs/dialogs.h

src/dialogs/help.h

src/dialogs/search.glade

src/expr-name.c

src/expr-name.h

src/expr.c

src/expr.h

src/file-autoft.c

src/file-autoft.h

src/format-template.c

src/format-template.h

src/func-builtin.c

src/func.c

src/func.h

src/gnm-datetime.c

src/gnm-datetime.h

src/gnm-format.c

src/gnm-format.h

src/gnm-graph-window.c

src/gnm-graph-window.h

src/gnm-pane.c

src/gnm-pane.h

src/gnm-plugin.c

src/gnm-plugin.h

src/gnm-so-filled.c

src/gnm-so-line.c

src/gnm-so-polygon.c

src/gnm-style-impl.h

src/gnumeric-gconf-priv.h

src/gnumeric-gconf.c

src/gnumeric-gconf.h

src/gnumeric-simple-canvas.h

src/gnumeric.h

src/graph.c

src/graph.h

src/gui-clipboard.c

src/gui-file.c

src/gui-file.h

src/gui-util.c

src/gui-util.h

src/gutils.c

src/gutils.h

src/history.c

src/hlink.c

src/hlink.h

src/input-msg.c

src/io-context-gtk.c

src/io-context-gtk.h

src/item-cursor.c

src/item-edit.c

src/libgnumeric.c

src/main-application.c

src/mathfunc.c

src/mathfunc.h

src/mstyle.c

src/mstyle.h

src/number-match.c

src/numbers.h

src/parse-util.c

src/parse-util.h

src/parser.c

src/parser.y

src/print-info.c

src/print-info.h

src/print.c

src/print.h

src/rangefunc.h

src/ranges.c

src/ranges.h

src/regression.h

src/rendered-value.c

src/rendered-value.h

src/search.c

src/search.h

src/selection.c

src/selection.h

src/session.c

src/sheet-autofill.c

src/sheet-control-gui-priv.h

src/sheet-control-gui.c

src/sheet-control-priv.h

src/sheet-control.h

src/sheet-filter-combo.h

src/sheet-filter.c

src/sheet-filter.h

src/sheet-merge.c

src/sheet-object-cell-comment.c

src/sheet-object-graph.c

src/sheet-object-graph.h

src/sheet-object-image.c

src/sheet-object-widget.c

src/sheet-object.c

src/sheet-object.h

src/sheet-style.c

src/sheet-style.h

src/sheet-view.c

src/sheet-view.h

src/sheet.c

src/sheet.h

src/solver.h

src/sort.c

src/sort.h

src/ssconvert.c

src/ssgrep.c

src/ssindex.c

src/sstest.c

src/stf-export.c

src/stf-export.h

src/stf-parse.c

src/stf.c

src/style-border.h

src/style-color.h

src/style-font.h

src/style.c

src/symbol.c

src/test-pango.c

src/tools/ChangeLog

src/tools/Makefile.am

src/tools/Makefile.in

src/tools/analysis-exp-smoothing.c

src/tools/analysis-frequency.c

src/tools/analysis-histogram.c

src/tools/analysis-kaplan-meier.c

src/tools/analysis-kaplan-meier.h

src/tools/analysis-tools.c

src/tools/analysis-tools.h

src/tools/auto-correct.c

src/tools/auto-correct.h

src/tools/dao.c

src/tools/dao.h

src/tools/data-shuffling.c

src/tools/fill-series.c

src/tools/scenarios.c

src/tools/solver/ChangeLog

src/tools/solver/glpk/ChangeLog

src/tools/solver/lp_solve/ChangeLog

src/tools/solver/solver.c

src/validation-combo.h

src/validation.c

src/validation.h

src/value-sheet.c

src/value.c

src/value.h

src/wbc-gtk-actions.c

src/wbc-gtk-edit.c

src/wbc-gtk-impl.h

src/wbc-gtk.c

src/wbc-gtk.h

src/widgets/ChangeLog

src/widgets/Makefile.am

src/widgets/Makefile.in

src/widgets/gnm-cell-combo-foo-view-impl.h

src/widgets/gnm-cell-combo-foo-view.c

src/widgets/gnm-dao.c

src/widgets/gnm-dao.h

src/widgets/gnm-filter-combo-foo-view.c

src/widgets/gnm-format-sel.h

src/widgets/gnm-notebook.c

src/widgets/gnm-validation-combo-foo-view.c

src/widgets/gnumeric-dashed-canvas-line.c

src/widgets/gnumeric-expr-entry.c

src/widgets/gnumeric-expr-entry.h

src/widgets/widget-editable-label.c

src/widgets/widget-font-selector.c

src/widgets/widget-font-selector.h

src/workbook-control-priv.h

src/workbook-control.c

src/workbook-control.h

src/workbook-priv.h

src/workbook-view.c

src/workbook-view.h

src/workbook.c

src/workbook.h

src/xml-io.c

src/xml-io.h

src/xml-sax-read.c

src/xml-sax-write.c

test/ChangeLog

test/t5900-sc.pl

test/t5901-qpro.pl

test/t5902-applix.pl

test/t5903-sylk.pl

tools/ChangeLog

Show diffs side-by-side

added added

removed removed

src/sheet-filter.c

814

814

* @filter : #GnmFilter

815

815

* @r : #GnmRange

816

816

*

817

* Does the range filter by @filter overlap with GnmRange @r

817

* Returns: %TRUE if @filter overlaps @r.

818

818

**/

819

819

gboolean

820

820

gnm_filter_overlaps_range (GnmFilter const *filter, GnmRange const *r)

821

821

{

822

822

g_return_val_if_fail (filter != NULL, FALSE);

823

g_return_val_if_fail (r != NULL, FALSE);

823

824

824

825

return range_overlap (&filter->r, r);

825

826

}

826

827

827

828

/*************************************************************************/

828

829

829

static gboolean

830

sheet_cell_or_one_below_is_not_empty (Sheet *sheet, int col, int row)

831

{

832

return !sheet_is_cell_empty (sheet, col, row) ||

833

(row < gnm_sheet_get_last_row (sheet) &&

834

!sheet_is_cell_empty (sheet, col, row+1));

835

}

836

837

830

/**

838

* gnm_sheet_filter_guess_region :

831

* gnm_sheet_filter_at_pos :

839

832

* @sheet : #Sheet

840

* @range : #GnmRange

841

833

*

834

* Returns : #GnmRange

842

835

**/

843

void

844

gnm_sheet_filter_guess_region (Sheet *sheet, GnmRange *region)

836

GnmFilter *

837

gnm_sheet_filter_at_pos (Sheet const *sheet, GnmCellPos const *pos)

845

838

{

846

int col;

847

int end_row;

848

int offset;

849

850

/* check in case only one cell selected */

851

if (region->start.col == region->end.col) {

852

int start = region->start.col;

853

/* look for previous empty column */

854

for (col = start - 1; col > 0; col--)

855

if (!sheet_cell_or_one_below_is_not_empty (sheet, col, region->start.row))

856

break;

857

region->start.col = col - 1;

858

859

/* look for next empty column */

860

for (col = start + 1; col < gnm_sheet_get_max_cols (sheet); col++)

861

if (!sheet_cell_or_one_below_is_not_empty (sheet, col, region->start.row))

862

break;

863

region->end.col = col - 1;

864

}

865

866

/* find first and last non-empty cells in region */

867

for (col = region->start.col; col <= region->end.col; col++)

868

if (sheet_cell_or_one_below_is_not_empty (sheet, col, region->start.row))

869

break;

870

871

if (col > region->end.col)

872

return; /* all empty -- give up */

873

region->start.col = col;

874

875

for (col = region->end.col; col >= region->start.col; col--)

876

if (sheet_cell_or_one_below_is_not_empty(sheet, col, region->start.row))

877

break;

878

region->end.col = col;

879

880

/* now find length of longest column */

881

for (col = region->start.col; col <= region->end.col; col++) {

882

offset = 0;

883

if (sheet_is_cell_empty(sheet, col, region->start.row))

884

offset = 1;

885

end_row = sheet_find_boundary_vertical (sheet, col,

886

region->start.row + offset, col, 1, TRUE);

887

if (end_row > region->end.row)

888

region->end.row = end_row;

889

}

839

GSList *ptr;

840

GnmRange r;

841

842

g_return_val_if_fail (IS_SHEET (sheet), NULL);

843

g_return_val_if_fail (NULL != pos, NULL);

844

845

range_init_cellpos (&r, pos);

846

for (ptr = sheet->filters; ptr != NULL ; ptr = ptr->next)

847

if (gnm_filter_overlaps_range (ptr->data, &r))

848

return ptr->data;

849

850

return NULL;

890

851

}

891

852

892

853

struct cb_remove_col_undo {

1066

1027

1067

1028

g_slist_free (filters);

1068

1029

}

1030

Older »