# HG changeset patch # User Kai Habel # Date 1296147499 -3600 # Node ID c626741871a0d8bbbd3ed7c63cb45fa82cb7f0ee # Parent b22c00315df567b16439ddc8bd794fe2e37df133 Allow ui file function to work if gnuplot is the selected toolkit and fltk is available diff -r b22c00315df5 -r c626741871a0 scripts/ChangeLog --- a/scripts/ChangeLog Thu Jan 27 06:37:52 2011 -0500 +++ b/scripts/ChangeLog Thu Jan 27 17:58:19 2011 +0100 @@ -1,3 +1,8 @@ +2011-01-27 Kai Habel + + * plot/uigetfile.m, plot/uiputfile.m, plot/uigetdir.m: Check + for __fltk_uigetfile__. + 2011-01-27 John W. Eaton * Makefile.am (check-missing-semicolon): New rule. diff -r b22c00315df5 -r c626741871a0 scripts/plot/uigetdir.m --- a/scripts/plot/uigetdir.m Thu Jan 27 06:37:52 2011 -0500 +++ b/scripts/plot/uigetdir.m Thu Jan 27 17:58:19 2011 +0100 @@ -33,11 +33,11 @@ print_usage (); endif - if (!ischar(init_path) || !ischar(dialog_name)) + if (!ischar (init_path) || !ischar (dialog_name)) error ("uigetdir: INIT_PATH and DIALOG_NAME must be string arguments"); endif - if (any (strcmp (available_graphics_toolkits (), "fltk"))) + if (exist ("__fltk_uigetfile__") == 3) if (!isdir (init_path)) init_path = fileparts (init_path); endif diff -r b22c00315df5 -r c626741871a0 scripts/plot/uigetfile.m --- a/scripts/plot/uigetfile.m Thu Jan 27 06:37:52 2011 -0500 +++ b/scripts/plot/uigetfile.m Thu Jan 27 17:58:19 2011 +0100 @@ -150,7 +150,7 @@ error ("uigetfile: number of input arguments must be less than eight"); endif - if (any (cellfun(@(x)strcmp (x, "fltk"), available_graphics_toolkits ()))) + if (exist("__fltk_uigetfile__") == 3) [retfile, retpath, retindex] = __fltk_uigetfile__ (outargs{:}); else error ("uigetfile: fltk graphics toolkit required"); diff -r b22c00315df5 -r c626741871a0 scripts/plot/uiputfile.m --- a/scripts/plot/uiputfile.m Thu Jan 27 06:37:52 2011 -0500 +++ b/scripts/plot/uiputfile.m Thu Jan 27 17:58:19 2011 +0100 @@ -88,7 +88,7 @@ error ("uiputfile: number of input arguments must be less than four"); endif - if (any (cellfun(@(x)strcmp (x, "fltk"), available_graphics_toolkits ()))) + if (exist("__fltk_uigetfile__") == 3) [retfile, retpath, retindex] = __fltk_uigetfile__ (outargs{:}); else error ("uiputfile: fltk graphics toolkit required"); diff -r b22c00315df5 -r c626741871a0 src/ChangeLog --- a/src/ChangeLog Thu Jan 27 06:37:52 2011 -0500 +++ b/src/ChangeLog Thu Jan 27 17:58:19 2011 +0100 @@ -1,3 +1,10 @@ +2011-01-27 Kai Habel + + * DLD-FUNCTIONS/__init_fltk__.cc (__fltk_uigetfile__): Remove here. + * DLD-FUNCTIONS/__fltk_uigetfile__.cc: New file. + * DLD-FUNCTIONS/module-files: Add __fltk_uigetfile__.cc. + Bug #32190. + 2011-01-27 John W. Eaton * DLD-FUNCTIONS/dlmread.cc (Fdlmread): Skip leading whitespace diff -r b22c00315df5 -r c626741871a0 src/DLD-FUNCTIONS/__fltk_uigetfile__.cc --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/DLD-FUNCTIONS/__fltk_uigetfile__.cc Thu Jan 27 17:58:19 2011 +0100 @@ -0,0 +1,127 @@ +/* + +Copyright (C) 2010-2011 Kai Habel + +This file is part of Octave. + +Octave is free software; you can redistribute it and/or modify it +under the terms of the GNU General Public License as published by the +Free Software Foundation; either version 3 of the License, or (at your +option) any later version. + +Octave 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 General Public License +for more details. + +You should have received a copy of the GNU General Public License +along with Octave; see the file COPYING. If not, see +. + +*/ + +#ifdef HAVE_CONFIG_H +#include +#endif + +#if defined (HAVE_FLTK) + +#include +#include +#include "defun-dld.h" +#include "file-ops.h" + + +DEFUN_DLD (__fltk_uigetfile__, args, , + "-*- texinfo -*-\n\ +@deftypefn {Built-in Function} {} __fltk_uigetfile__ (@dots{})\n\ +Undocumented internal function.\n\ +@end deftypefn") +{ + + // Expected argument list + // args(0) ... FileFilter in fltk format + // args(1) ... Title + // args(2) ... Default Filename + // args(3) ... PostionValue [x,y] + // args(4) ... SelectValue "on"/"off"/"dir"/"create" + + octave_value_list fargs, retval; + + std::string file_filter = args(0).string_value(); + std::string title = args(1).string_value(); + std::string default_name = args(2).string_value(); + Matrix pos = args(3).matrix_value(); + + int multi_type = Fl_File_Chooser::SINGLE; + std::string flabel = "Filename:"; + + std::string multi = args(4).string_value(); + if (multi == "on") + multi_type = Fl_File_Chooser::MULTI; + else if (multi == "dir") + { + multi_type = Fl_File_Chooser::DIRECTORY; + flabel = "Directory:"; + } + else if (multi == "create") + multi_type = Fl_File_Chooser::CREATE; + + Fl_File_Chooser::filename_label = flabel.c_str (); + Fl_File_Chooser *fc = new Fl_File_Chooser (default_name.c_str (), file_filter.c_str (), multi_type, title.c_str ()); + fc->preview (0); + + if (multi_type == Fl_File_Chooser::CREATE) + fc->ok_label ("Save"); + + fc->show (); + + while (fc->shown ()) + Fl::wait (); + + retval(0) = octave_value(0); + retval(1) = octave_value(0); + retval(2) = octave_value(0); + + if (fc->value()) + { + int file_count = fc->count (); + std::string fname; + std::string sep = file_ops::dir_sep_str (); + std::size_t idx; + + if (file_count == 1 && multi_type != Fl_File_Chooser::DIRECTORY) + { + fname = fc->value (); + idx = fname.find_last_of (sep); + retval(0) = fname.substr (idx + 1); + } + else + { + Cell file_cell = Cell(file_count, 1); + for (octave_idx_type n = 1; n <= file_count; n++) + { + fname = fc->value (n); + idx = fname.find_last_of (sep); + file_cell(n - 1) = fname.substr (idx + 1); + } + retval(0) = file_cell; + } + + if (multi_type == Fl_File_Chooser::DIRECTORY) + retval(0) = std::string (fc->value ()); + else + { + retval(1) = std::string (fc->directory ()) + sep; + retval(2) = fc->filter_value (); + } + } + + fc->hide (); + Fl::flush (); + delete fc; + + return retval; +} + +#endif diff -r b22c00315df5 -r c626741871a0 src/DLD-FUNCTIONS/__init_fltk__.cc --- a/src/DLD-FUNCTIONS/__init_fltk__.cc Thu Jan 27 06:37:52 2011 -0500 +++ b/src/DLD-FUNCTIONS/__init_fltk__.cc Thu Jan 27 17:58:19 2011 +0100 @@ -2036,103 +2036,5 @@ return octave_value(mode_str); } -DEFUN_DLD (__fltk_uigetfile__, args, , - "-*- texinfo -*-\n\ -@deftypefn {Built-in Function} {} __fltk_uigetfile__ (@dots{})\n\ -Undocumented internal function.\n\ -@end deftypefn") -{ - // This function should be called by uigetfile.m - // Error checking should be done in uigetfile.m! - // - // Expected argument list - // args(0) ... FileFilter in fltk format - // args(1) ... Title - // args(2) ... Default Filename - // args(3) ... PostionValue [x,y] - // args(4) ... SelectValue "on"/"off"/"dir"/"create" - - std::string file_filter, title, default_name, multi; - if (args(0).is_string ()) - file_filter = args(0).string_value(); - - if (args(1).is_string ()) - title = args(1).string_value(); - - if (args(2).is_string ()) - default_name = args(2).string_value(); - - if (args(3).is_real_matrix ()) - Matrix pos = args(3).matrix_value(); - - int multi_type = Fl_File_Chooser::SINGLE; - std::string flabel = "Filename:"; - if (args(4).is_string ()) - { - multi = args(4).string_value(); - if (multi == "on") - multi_type = Fl_File_Chooser::MULTI; - else if (multi == "dir") - { - multi_type = Fl_File_Chooser::DIRECTORY; - flabel = "Directory:"; - } - else if (multi == "create") - multi_type = Fl_File_Chooser::CREATE; - } - - Fl_File_Chooser::filename_label = flabel.c_str (); - Fl_File_Chooser *fc = new Fl_File_Chooser(default_name.c_str (), file_filter.c_str (), multi_type, title.c_str ()); - fc->preview(0); - - if (multi_type == Fl_File_Chooser::CREATE) - fc->ok_label("Save"); - - fc->show(); - while (fc->shown ()) - { Fl::wait (); } - - octave_value_list fargs, retval; - - retval(0) = octave_value(0); - retval(1) = octave_value(0); - retval(2) = octave_value(0); - - if (fc->value() != NULL) - { - int file_count = fc->count (); - std::string fname; - std::string sep = file_ops::dir_sep_str (); - std::size_t idx; - - if ((file_count == 1) && (multi_type != Fl_File_Chooser::DIRECTORY)) - { - fname = fc->value (); - idx = fname.find_last_of(sep); - retval(0) = fname.substr(idx + 1); - } - else - { - Cell file_cell = Cell(file_count, 1); - for (octave_idx_type n = 1; n <= file_count; n++) - { - fname = fc->value (n); - idx = fname.find_last_of(sep); - file_cell(n - 1) = fname.substr(idx + 1); - } - retval(0) = file_cell; - } - - if (multi_type == Fl_File_Chooser::DIRECTORY) - retval(0) = std::string(fc->value ()); - else - { - retval(1) = std::string(fc->directory ()) + sep; - retval(2) = fc->filter_value(); - } - } - - return retval; -} #endif diff -r b22c00315df5 -r c626741871a0 src/DLD-FUNCTIONS/module-files --- a/src/DLD-FUNCTIONS/module-files Thu Jan 27 06:37:52 2011 -0500 +++ b/src/DLD-FUNCTIONS/module-files Thu Jan 27 17:58:19 2011 +0100 @@ -2,6 +2,7 @@ __delaunayn__.cc __dispatch__.cc __dsearchn__.cc +__fltk_uigetfile__.cc __glpk__.cc __init_fltk__.cc __lin_interpn__.cc