Mercurial > octave
view liboctave/numeric/Quad.h @ 31006:35d37e433532 stable
replace use of depreciated QDesktopWidget in GUI
* gui-utils.cc: include QApplication, QRect and QScreen;
(get_screen_geometry): return QRect with geometry of primary screen;
(adjust_to_screen): adjust given QRect to be completely on the screen
that contains the largest part of the QRect, use a default geometry if
no part is on an available screen
* gui-utils.h: include QRect;
new function get_screen_geometry and adjust_to_screen
* community-news.cc: do not include QDesktopWidget, but gui-utils.h;
(get_screen_geometry); move function to gui-utils.cc;
* community-news.h: move get_screen_geometry to gui-utils.h
* find-dialog.cc: do not include QDesktopWidget, but gui-utils.h;
(restore_settings): use new function adjust_to_screen
* main-window.cc: do not include QDesktopWidget, but gui-utils.h;
(get_screen_geometry: move function to gui-utils.cc
* main-window.h: move function get_screen_geometry to gui.utils.h;
* octave-dock-widget.cc: do not include QDesktopWidget, but gui-utils.h
QScreen and QWindow;
(handle_settings): use adjust_to_screen and QGuiApplication->primaryScreen
* release-notes.cc: do not include QDesktopWidget, but gui-utils.h
and QScreen;
(get_screen_geometry): move to gui-utils.cc;
* release-notes.h: move get:screen_geometry to gui-utils.h
* terminal-dock-widget.cc: do not include QDesktopWidget but QScreen;
(terminal_dock_widget): use QGuiApplication->primaryScreen instead
of QDesktopWidget->screenGeometry
* welcome-wizard.cc: remove include of QDesktopWidget
author | Torsten Lilge <ttl-octave@mailbox.org> |
---|---|
date | Sun, 30 Jan 2022 16:41:44 +0100 |
parents | 796f54d4ddbf |
children | 597f3ee61a48 |
line wrap: on
line source
//////////////////////////////////////////////////////////////////////// // // Copyright (C) 1993-2022 The Octave Project Developers // // See the file COPYRIGHT.md in the top-level directory of this // distribution or <https://octave.org/copyright/>. // // 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 // <https://www.gnu.org/licenses/>. // //////////////////////////////////////////////////////////////////////// #if ! defined (octave_Quad_h) #define octave_Quad_h 1 #include "octave-config.h" #include "dColVector.h" #include "fColVector.h" typedef double (*integrand_fcn) (double x); typedef float (*float_integrand_fcn) (float x); #include "Quad-opts.h" class OCTAVE_API Quad : public Quad_options { public: Quad (integrand_fcn fcn) : Quad_options (), m_f (fcn), m_ff () { } Quad (float_integrand_fcn fcn) : Quad_options (), m_f (), m_ff (fcn) { } virtual ~Quad (void) = default; virtual double integrate (void) { octave_idx_type ier, neval; double abserr; return do_integrate (ier, neval, abserr); } virtual float float_integrate (void) { octave_idx_type ier, neval; float abserr; return do_integrate (ier, neval, abserr); } virtual double integrate (octave_idx_type& ier) { octave_idx_type neval; double abserr; return do_integrate (ier, neval, abserr); } virtual float float_integrate (octave_idx_type& ier) { octave_idx_type neval; float abserr; return do_integrate (ier, neval, abserr); } virtual double integrate (octave_idx_type& ier, octave_idx_type& neval) { double abserr; return do_integrate (ier, neval, abserr); } virtual float float_integrate (octave_idx_type& ier, octave_idx_type& neval) { float abserr; return do_integrate (ier, neval, abserr); } virtual double integrate (octave_idx_type& ier, octave_idx_type& neval, double& abserr) { return do_integrate (ier, neval, abserr); } virtual float float_integrate (octave_idx_type& ier, octave_idx_type& neval, float& abserr) { return do_integrate (ier, neval, abserr); } virtual double do_integrate (octave_idx_type& ier, octave_idx_type& neval, double& abserr) = 0; virtual float do_integrate (octave_idx_type& ier, octave_idx_type& neval, float& abserr) = 0; protected: integrand_fcn m_f; float_integrand_fcn m_ff; }; class OCTAVE_API DefQuad : public Quad { public: DefQuad (integrand_fcn fcn) : Quad (fcn), m_lower_limit (0.0), m_upper_limit (1.0), m_singularities () { } DefQuad (integrand_fcn fcn, double ll, double ul) : Quad (fcn), m_lower_limit (ll), m_upper_limit (ul), m_singularities () { } DefQuad (integrand_fcn fcn, double ll, double ul, const ColumnVector& sing) : Quad (fcn), m_lower_limit (ll), m_upper_limit (ul), m_singularities (sing) { } DefQuad (integrand_fcn fcn, const ColumnVector& sing) : Quad (fcn), m_lower_limit (0.0), m_upper_limit (1.0), m_singularities (sing) { } ~DefQuad (void) = default; double do_integrate (octave_idx_type& ier, octave_idx_type& neval, double& abserr); OCTAVE_NORETURN float do_integrate (octave_idx_type& ier, octave_idx_type& neval, float& abserr); private: double m_lower_limit; double m_upper_limit; ColumnVector m_singularities; }; class OCTAVE_API IndefQuad : public Quad { public: enum IntegralType { bound_to_inf, neg_inf_to_bound, doubly_infinite }; IndefQuad (integrand_fcn fcn) : Quad (fcn), m_bound (0.0), m_type (bound_to_inf) { } IndefQuad (integrand_fcn fcn, double b, IntegralType t) : Quad (fcn), m_bound (b), m_type (t) { } ~IndefQuad (void) = default; double do_integrate (octave_idx_type& ier, octave_idx_type& neval, double& abserr); OCTAVE_NORETURN float do_integrate (octave_idx_type& ier, octave_idx_type& neval, float& abserr); private: double m_bound; IntegralType m_type; }; class OCTAVE_API FloatDefQuad : public Quad { public: FloatDefQuad (float_integrand_fcn fcn) : Quad (fcn), m_lower_limit (0.0), m_upper_limit (1.0), m_singularities () { } FloatDefQuad (float_integrand_fcn fcn, float ll, float ul) : Quad (fcn), m_lower_limit (ll), m_upper_limit (ul), m_singularities () { } FloatDefQuad (float_integrand_fcn fcn, float ll, float ul, const FloatColumnVector& sing) : Quad (fcn), m_lower_limit (ll), m_upper_limit (ul), m_singularities (sing) { } FloatDefQuad (float_integrand_fcn fcn, const FloatColumnVector& sing) : Quad (fcn), m_lower_limit (0.0), m_upper_limit (1.0), m_singularities (sing) { } ~FloatDefQuad (void) = default; OCTAVE_NORETURN double do_integrate (octave_idx_type& ier, octave_idx_type& neval, double& abserr); float do_integrate (octave_idx_type& ier, octave_idx_type& neval, float& abserr); private: float m_lower_limit; float m_upper_limit; FloatColumnVector m_singularities; }; class OCTAVE_API FloatIndefQuad : public Quad { public: enum IntegralType { bound_to_inf, neg_inf_to_bound, doubly_infinite }; FloatIndefQuad (float_integrand_fcn fcn) : Quad (fcn), m_bound (0.0), m_type (bound_to_inf) { } FloatIndefQuad (float_integrand_fcn fcn, double b, IntegralType t) : Quad (fcn), m_bound (b), m_type (t) { } ~FloatIndefQuad (void) = default; OCTAVE_NORETURN double do_integrate (octave_idx_type& ier, octave_idx_type& neval, double& abserr); float do_integrate (octave_idx_type& ier, octave_idx_type& neval, float& abserr); private: float m_bound; IntegralType m_type; }; #endif