Mercurial > octave
view libinterp/operators/op-pm-sm.cc @ 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 | e88a07dec498 |
line wrap: on
line source
//////////////////////////////////////////////////////////////////////// // // Copyright (C) 2009-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 (HAVE_CONFIG_H) # include "config.h" #endif #include "errwarn.h" #include "ovl.h" #include "ov.h" #include "ov-typeinfo.h" #include "ops.h" #include "ov-perm.h" #include "ov-re-sparse.h" OCTAVE_NAMESPACE_BEGIN // permutation matrix by sparse matrix ops DEFBINOP (mul_pm_sm, perm_matrix, sparse_matrix) { const octave_perm_matrix& v1 = dynamic_cast<const octave_perm_matrix&> (a1); const octave_sparse_matrix& v2 = dynamic_cast<const octave_sparse_matrix&> (a2); if (v2.rows () == 1 && v2.columns () == 1) { double d = v2.scalar_value (); return octave_value (v1.sparse_matrix_value () * d); } else if (v1.rows () == 1 && v1.columns () == 1) return octave_value (v2.sparse_matrix_value ()); else return v1.perm_matrix_value () * v2.sparse_matrix_value (); } DEFBINOP (ldiv_pm_sm, perm_matrix, sparse_matrix) { const octave_perm_matrix& v1 = dynamic_cast<const octave_perm_matrix&> (a1); const octave_sparse_matrix& v2 = dynamic_cast<const octave_sparse_matrix&> (a2); return v1.perm_matrix_value ().inverse () * v2.sparse_matrix_value (); } // sparse matrix by diagonal matrix ops DEFBINOP (mul_sm_pm, sparse_matrix, perm_matrix) { const octave_sparse_matrix& v1 = dynamic_cast<const octave_sparse_matrix&> (a1); const octave_perm_matrix& v2 = dynamic_cast<const octave_perm_matrix&> (a2); if (v1.rows () == 1 && v1.columns () == 1) { double d = v1.scalar_value (); return octave_value (d * v2.sparse_matrix_value ()); } else if (v2.rows () == 1 && v2.columns () == 1) return octave_value (v1.sparse_matrix_value ()); else return v1.sparse_matrix_value () * v2.perm_matrix_value (); } DEFBINOP (div_sm_pm, sparse_matrix, perm_matrix) { const octave_sparse_matrix& v1 = dynamic_cast<const octave_sparse_matrix&> (a1); const octave_perm_matrix& v2 = dynamic_cast<const octave_perm_matrix&> (a2); return v1.sparse_matrix_value () * v2.perm_matrix_value ().inverse (); } void install_pm_sm_ops (octave::type_info& ti) { INSTALL_BINOP_TI (ti, op_mul, octave_perm_matrix, octave_sparse_matrix, mul_pm_sm); INSTALL_BINOP_TI (ti, op_ldiv, octave_perm_matrix, octave_sparse_matrix, ldiv_pm_sm); INSTALL_BINOP_TI (ti, op_mul, octave_sparse_matrix, octave_perm_matrix, mul_sm_pm); INSTALL_BINOP_TI (ti, op_div, octave_sparse_matrix, octave_perm_matrix, div_sm_pm); } OCTAVE_NAMESPACE_END