octave: libgui/graphics/annotation-dialog.cc annotate

annotate libgui/graphics/annotation-dialog.cc @ 27620:45bb5bbaf291

don't use singleton pattern for resource manager in GUI Move ownership of the resource_manager object to the base_qobject class. Store reference to resource_manager object as a member variable in most objects that need to access it. Eliminate static member functions in resource_managar class. Provide a get_resource_manager method in the base_qboject class and a global __get_resource_manager__ function for those instances where we can't easily provide local access to the resource_manager object. There are many changes to many files, but most are straightforward.

author	John W. Eaton <jwe@octave.org>
date	Fri, 01 Nov 2019 18:16:49 -0400
parents	0495b64288f7
children	028205a91a07

rev	line source
20095 c164cfc24bdd QtHandles: add annotations dialog John Donoghue <john.donoghue@ieee.org> parents: diff changeset	1 /*
c164cfc24bdd QtHandles: add annotations dialog John Donoghue <john.donoghue@ieee.org> parents: diff changeset	2
26376 00f796120a6d maint: Update copyright dates in all source files. John W. Eaton <jwe@octave.org> parents: 25955 diff changeset	3 Copyright (C) 2016-2019 John Donoghue
20095 c164cfc24bdd QtHandles: add annotations dialog John Donoghue <john.donoghue@ieee.org> parents: diff changeset	4
c164cfc24bdd QtHandles: add annotations dialog John Donoghue <john.donoghue@ieee.org> parents: diff changeset	5 This file is part of Octave.
c164cfc24bdd QtHandles: add annotations dialog John Donoghue <john.donoghue@ieee.org> parents: diff changeset	6
24534 194eb4bd202b maint: Update punctuation for GPL v3 license text. Rik <rik@octave.org> parents: 23447 diff changeset	7 Octave is free software: you can redistribute it and/or modify it
22755 3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22411 diff changeset	8 under the terms of the GNU General Public License as published by
24534 194eb4bd202b maint: Update punctuation for GPL v3 license text. Rik <rik@octave.org> parents: 23447 diff changeset	9 the Free Software Foundation, either version 3 of the License, or
22755 3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22411 diff changeset	10 (at your option) any later version.
20095 c164cfc24bdd QtHandles: add annotations dialog John Donoghue <john.donoghue@ieee.org> parents: diff changeset	11
22755 3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22411 diff changeset	12 Octave is distributed in the hope that it will be useful, but
3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22411 diff changeset	13 WITHOUT ANY WARRANTY; without even the implied warranty of
3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22411 diff changeset	14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22411 diff changeset	15 GNU General Public License for more details.
20095 c164cfc24bdd QtHandles: add annotations dialog John Donoghue <john.donoghue@ieee.org> parents: diff changeset	16
c164cfc24bdd QtHandles: add annotations dialog John Donoghue <john.donoghue@ieee.org> parents: diff changeset	17 You should have received a copy of the GNU General Public License
c164cfc24bdd QtHandles: add annotations dialog John Donoghue <john.donoghue@ieee.org> parents: diff changeset	18 along with Octave; see the file COPYING. If not, see
24534 194eb4bd202b maint: Update punctuation for GPL v3 license text. Rik <rik@octave.org> parents: 23447 diff changeset	19 <https://www.gnu.org/licenses/>.
20095 c164cfc24bdd QtHandles: add annotations dialog John Donoghue <john.donoghue@ieee.org> parents: diff changeset	20
c164cfc24bdd QtHandles: add annotations dialog John Donoghue <john.donoghue@ieee.org> parents: diff changeset	21 */
c164cfc24bdd QtHandles: add annotations dialog John Donoghue <john.donoghue@ieee.org> parents: diff changeset	22
21724 aba2e6293dd8 use "#if ..." consistently instead of "#ifdef" and "#ifndef" John W. Eaton <jwe@octave.org> parents: 21568 diff changeset	23 #if defined (HAVE_CONFIG_H)
21301 40de9f8f23a6 Use '#include "config.h"' rather than <config.h>. Rik <rik@octave.org> parents: 21203 diff changeset	24 # include "config.h"
20095 c164cfc24bdd QtHandles: add annotations dialog John Donoghue <john.donoghue@ieee.org> parents: diff changeset	25 #endif
c164cfc24bdd QtHandles: add annotations dialog John Donoghue <john.donoghue@ieee.org> parents: diff changeset	26
c164cfc24bdd QtHandles: add annotations dialog John Donoghue <john.donoghue@ieee.org> parents: diff changeset	27 #include <QColorDialog>
c164cfc24bdd QtHandles: add annotations dialog John Donoghue <john.donoghue@ieee.org> parents: diff changeset	28 #include <QPushButton>
c164cfc24bdd QtHandles: add annotations dialog John Donoghue <john.donoghue@ieee.org> parents: diff changeset	29 #include <QPalette>
c164cfc24bdd QtHandles: add annotations dialog John Donoghue <john.donoghue@ieee.org> parents: diff changeset	30
27611 0495b64288f7 use new gui_settings class instead of using QSettings directly John W. Eaton <jwe@octave.org> parents: 27417 diff changeset	31 #include "gui-settings.h"
0495b64288f7 use new gui_settings class instead of using QSettings directly John W. Eaton <jwe@octave.org> parents: 27417 diff changeset	32 #include "resource-manager.h"
0495b64288f7 use new gui_settings class instead of using QSettings directly John W. Eaton <jwe@octave.org> parents: 27417 diff changeset	33
27417 f844b1f03dcc update some header file lists in libgui sources John W. Eaton <jwe@octave.org> parents: 27276 diff changeset	34 #include "QtHandlesUtils.h"
f844b1f03dcc update some header file lists in libgui sources John W. Eaton <jwe@octave.org> parents: 27276 diff changeset	35 #include "annotation-dialog.h"
f844b1f03dcc update some header file lists in libgui sources John W. Eaton <jwe@octave.org> parents: 27276 diff changeset	36 #include "ui-annotation-dialog.h"
f844b1f03dcc update some header file lists in libgui sources John W. Eaton <jwe@octave.org> parents: 27276 diff changeset	37
20095 c164cfc24bdd QtHandles: add annotations dialog John Donoghue <john.donoghue@ieee.org> parents: diff changeset	38 using namespace QtHandles;
c164cfc24bdd QtHandles: add annotations dialog John Donoghue <john.donoghue@ieee.org> parents: diff changeset	39
23433 c9fab0bc983e maint: Use convention 'int& x' for naming references. Rik <rik@octave.org> parents: 23220 diff changeset	40 annotation_dialog::annotation_dialog (QWidget *p, const octave_value_list& pr):
20095 c164cfc24bdd QtHandles: add annotations dialog John Donoghue <john.donoghue@ieee.org> parents: diff changeset	41 QDialog (p), ui (new Ui::annotation_dialog)
c164cfc24bdd QtHandles: add annotations dialog John Donoghue <john.donoghue@ieee.org> parents: diff changeset	42 {
c164cfc24bdd QtHandles: add annotations dialog John Donoghue <john.donoghue@ieee.org> parents: diff changeset	43 props = pr;
c164cfc24bdd QtHandles: add annotations dialog John Donoghue <john.donoghue@ieee.org> parents: diff changeset	44
c164cfc24bdd QtHandles: add annotations dialog John Donoghue <john.donoghue@ieee.org> parents: diff changeset	45 init ();
c164cfc24bdd QtHandles: add annotations dialog John Donoghue <john.donoghue@ieee.org> parents: diff changeset	46 }
c164cfc24bdd QtHandles: add annotations dialog John Donoghue <john.donoghue@ieee.org> parents: diff changeset	47
c164cfc24bdd QtHandles: add annotations dialog John Donoghue <john.donoghue@ieee.org> parents: diff changeset	48 void
c164cfc24bdd QtHandles: add annotations dialog John Donoghue <john.donoghue@ieee.org> parents: diff changeset	49 annotation_dialog::init ()
c164cfc24bdd QtHandles: add annotations dialog John Donoghue <john.donoghue@ieee.org> parents: diff changeset	50 {
c164cfc24bdd QtHandles: add annotations dialog John Donoghue <john.donoghue@ieee.org> parents: diff changeset	51 ui->setupUi (this);
c164cfc24bdd QtHandles: add annotations dialog John Donoghue <john.donoghue@ieee.org> parents: diff changeset	52
27620 45bb5bbaf291 don't use singleton pattern for resource manager in GUI John W. Eaton <jwe@octave.org> parents: 27611 diff changeset	53 octave::resource_manager& rmgr
45bb5bbaf291 don't use singleton pattern for resource manager in GUI John W. Eaton <jwe@octave.org> parents: 27611 diff changeset	54 = octave::__get_resource_manager__ ("annotation_dialog::init");
45bb5bbaf291 don't use singleton pattern for resource manager in GUI John W. Eaton <jwe@octave.org> parents: 27611 diff changeset	55
45bb5bbaf291 don't use singleton pattern for resource manager in GUI John W. Eaton <jwe@octave.org> parents: 27611 diff changeset	56 octave::gui_settings *settings = rmgr.get_settings ();
20095 c164cfc24bdd QtHandles: add annotations dialog John Donoghue <john.donoghue@ieee.org> parents: diff changeset	57
c164cfc24bdd QtHandles: add annotations dialog John Donoghue <john.donoghue@ieee.org> parents: diff changeset	58 // restore last geometry
20246 6fe746def1aa Also load settings and translations in --no-gui mode (bugs #44222 and #45199) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 20181 diff changeset	59 if (settings)
23070 bef714f45999 maint: Use space after function name/before parenthesis in libgui. Rik <rik@octave.org> parents: 22755 diff changeset	60 restoreGeometry (settings->value ("annotation/geometry").toByteArray ());
20095 c164cfc24bdd QtHandles: add annotations dialog John Donoghue <john.donoghue@ieee.org> parents: diff changeset	61
c164cfc24bdd QtHandles: add annotations dialog John Donoghue <john.donoghue@ieee.org> parents: diff changeset	62 // connect signals
c164cfc24bdd QtHandles: add annotations dialog John Donoghue <john.donoghue@ieee.org> parents: diff changeset	63 connect (ui->button_box, SIGNAL (clicked (QAbstractButton *)),
c164cfc24bdd QtHandles: add annotations dialog John Donoghue <john.donoghue@ieee.org> parents: diff changeset	64 this, SLOT (button_clicked (QAbstractButton *)));
c164cfc24bdd QtHandles: add annotations dialog John Donoghue <john.donoghue@ieee.org> parents: diff changeset	65
20181 aa36fb998a4d maint: Remove unnecessary whitespace at end of lines. Rik <rik@octave.org> parents: 20109 diff changeset	66 connect (ui->edit_string, SIGNAL (textChanged (const QString&)),
20095 c164cfc24bdd QtHandles: add annotations dialog John Donoghue <john.donoghue@ieee.org> parents: diff changeset	67 this, SLOT (edit_string_changed (const QString&)));
c164cfc24bdd QtHandles: add annotations dialog John Donoghue <john.donoghue@ieee.org> parents: diff changeset	68
c164cfc24bdd QtHandles: add annotations dialog John Donoghue <john.donoghue@ieee.org> parents: diff changeset	69 connect (ui->btn_color, SIGNAL (clicked ()),
c164cfc24bdd QtHandles: add annotations dialog John Donoghue <john.donoghue@ieee.org> parents: diff changeset	70 this, SLOT (prompt_for_color ()));
c164cfc24bdd QtHandles: add annotations dialog John Donoghue <john.donoghue@ieee.org> parents: diff changeset	71
c164cfc24bdd QtHandles: add annotations dialog John Donoghue <john.donoghue@ieee.org> parents: diff changeset	72 connect (ui->btn_background_color, SIGNAL (clicked ()),
c164cfc24bdd QtHandles: add annotations dialog John Donoghue <john.donoghue@ieee.org> parents: diff changeset	73 this, SLOT (prompt_for_color ()));
c164cfc24bdd QtHandles: add annotations dialog John Donoghue <john.donoghue@ieee.org> parents: diff changeset	74
c164cfc24bdd QtHandles: add annotations dialog John Donoghue <john.donoghue@ieee.org> parents: diff changeset	75 connect (ui->btn_edge_color, SIGNAL (clicked ()),
c164cfc24bdd QtHandles: add annotations dialog John Donoghue <john.donoghue@ieee.org> parents: diff changeset	76 this, SLOT (prompt_for_color ()));
c164cfc24bdd QtHandles: add annotations dialog John Donoghue <john.donoghue@ieee.org> parents: diff changeset	77
c164cfc24bdd QtHandles: add annotations dialog John Donoghue <john.donoghue@ieee.org> parents: diff changeset	78 // set gui element to default values
c164cfc24bdd QtHandles: add annotations dialog John Donoghue <john.donoghue@ieee.org> parents: diff changeset	79 ui->cb_fit_box_to_text->setChecked (true);
23070 bef714f45999 maint: Use space after function name/before parenthesis in libgui. Rik <rik@octave.org> parents: 22755 diff changeset	80 ui->cb_horz_align->setCurrentIndex (ui->cb_horz_align->findText ("left"));
bef714f45999 maint: Use space after function name/before parenthesis in libgui. Rik <rik@octave.org> parents: 22755 diff changeset	81 ui->cb_vert_align->setCurrentIndex (ui->cb_vert_align->findText ("middle"));
20095 c164cfc24bdd QtHandles: add annotations dialog John Donoghue <john.donoghue@ieee.org> parents: diff changeset	82
c164cfc24bdd QtHandles: add annotations dialog John Donoghue <john.donoghue@ieee.org> parents: diff changeset	83 // set gui elements to any values from input properties
c164cfc24bdd QtHandles: add annotations dialog John Donoghue <john.donoghue@ieee.org> parents: diff changeset	84 set_gui_props ();
c164cfc24bdd QtHandles: add annotations dialog John Donoghue <john.donoghue@ieee.org> parents: diff changeset	85 }
c164cfc24bdd QtHandles: add annotations dialog John Donoghue <john.donoghue@ieee.org> parents: diff changeset	86
c164cfc24bdd QtHandles: add annotations dialog John Donoghue <john.donoghue@ieee.org> parents: diff changeset	87 annotation_dialog::~annotation_dialog ()
c164cfc24bdd QtHandles: add annotations dialog John Donoghue <john.donoghue@ieee.org> parents: diff changeset	88 {
c164cfc24bdd QtHandles: add annotations dialog John Donoghue <john.donoghue@ieee.org> parents: diff changeset	89 delete ui;
c164cfc24bdd QtHandles: add annotations dialog John Donoghue <john.donoghue@ieee.org> parents: diff changeset	90 }
c164cfc24bdd QtHandles: add annotations dialog John Donoghue <john.donoghue@ieee.org> parents: diff changeset	91
c164cfc24bdd QtHandles: add annotations dialog John Donoghue <john.donoghue@ieee.org> parents: diff changeset	92 // internal slots
c164cfc24bdd QtHandles: add annotations dialog John Donoghue <john.donoghue@ieee.org> parents: diff changeset	93
c164cfc24bdd QtHandles: add annotations dialog John Donoghue <john.donoghue@ieee.org> parents: diff changeset	94 void
c164cfc24bdd QtHandles: add annotations dialog John Donoghue <john.donoghue@ieee.org> parents: diff changeset	95 annotation_dialog::button_clicked (QAbstractButton *button)
c164cfc24bdd QtHandles: add annotations dialog John Donoghue <john.donoghue@ieee.org> parents: diff changeset	96 {
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22399 diff changeset	97 QDialogButtonBox::ButtonRole button_role
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22399 diff changeset	98 = ui->button_box->buttonRole (button);
20095 c164cfc24bdd QtHandles: add annotations dialog John Donoghue <john.donoghue@ieee.org> parents: diff changeset	99
27620 45bb5bbaf291 don't use singleton pattern for resource manager in GUI John W. Eaton <jwe@octave.org> parents: 27611 diff changeset	100 octave::resource_manager& rmgr
45bb5bbaf291 don't use singleton pattern for resource manager in GUI John W. Eaton <jwe@octave.org> parents: 27611 diff changeset	101 = octave::__get_resource_manager__ ("annotation_dialog::button_clicked");
45bb5bbaf291 don't use singleton pattern for resource manager in GUI John W. Eaton <jwe@octave.org> parents: 27611 diff changeset	102
45bb5bbaf291 don't use singleton pattern for resource manager in GUI John W. Eaton <jwe@octave.org> parents: 27611 diff changeset	103 octave::gui_settings *settings = rmgr.get_settings ();
20095 c164cfc24bdd QtHandles: add annotations dialog John Donoghue <john.donoghue@ieee.org> parents: diff changeset	104
c164cfc24bdd QtHandles: add annotations dialog John Donoghue <john.donoghue@ieee.org> parents: diff changeset	105 // save position
20246 6fe746def1aa Also load settings and translations in --no-gui mode (bugs #44222 and #45199) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 20181 diff changeset	106 if (settings)
6fe746def1aa Also load settings and translations in --no-gui mode (bugs #44222 and #45199) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 20181 diff changeset	107 settings->setValue ("annotation/geometry",saveGeometry ());
20095 c164cfc24bdd QtHandles: add annotations dialog John Donoghue <john.donoghue@ieee.org> parents: diff changeset	108
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22399 diff changeset	109 if (button_role == QDialogButtonBox::ApplyRole
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22399 diff changeset	110 \|\| button_role == QDialogButtonBox::AcceptRole)
20095 c164cfc24bdd QtHandles: add annotations dialog John Donoghue <john.donoghue@ieee.org> parents: diff changeset	111 {
c164cfc24bdd QtHandles: add annotations dialog John Donoghue <john.donoghue@ieee.org> parents: diff changeset	112 get_gui_props ();
c164cfc24bdd QtHandles: add annotations dialog John Donoghue <john.donoghue@ieee.org> parents: diff changeset	113 }
c164cfc24bdd QtHandles: add annotations dialog John Donoghue <john.donoghue@ieee.org> parents: diff changeset	114
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22399 diff changeset	115 if (button_role == QDialogButtonBox::RejectRole
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22399 diff changeset	116 \|\| button_role == QDialogButtonBox::AcceptRole)
20095 c164cfc24bdd QtHandles: add annotations dialog John Donoghue <john.donoghue@ieee.org> parents: diff changeset	117 close ();
c164cfc24bdd QtHandles: add annotations dialog John Donoghue <john.donoghue@ieee.org> parents: diff changeset	118 }
c164cfc24bdd QtHandles: add annotations dialog John Donoghue <john.donoghue@ieee.org> parents: diff changeset	119
c164cfc24bdd QtHandles: add annotations dialog John Donoghue <john.donoghue@ieee.org> parents: diff changeset	120 octave_value_list
c164cfc24bdd QtHandles: add annotations dialog John Donoghue <john.donoghue@ieee.org> parents: diff changeset	121 annotation_dialog::get_properties () const
c164cfc24bdd QtHandles: add annotations dialog John Donoghue <john.donoghue@ieee.org> parents: diff changeset	122 {
c164cfc24bdd QtHandles: add annotations dialog John Donoghue <john.donoghue@ieee.org> parents: diff changeset	123 return props;
c164cfc24bdd QtHandles: add annotations dialog John Donoghue <john.donoghue@ieee.org> parents: diff changeset	124 }
c164cfc24bdd QtHandles: add annotations dialog John Donoghue <john.donoghue@ieee.org> parents: diff changeset	125
c164cfc24bdd QtHandles: add annotations dialog John Donoghue <john.donoghue@ieee.org> parents: diff changeset	126 void
c164cfc24bdd QtHandles: add annotations dialog John Donoghue <john.donoghue@ieee.org> parents: diff changeset	127 annotation_dialog::get_gui_props ()
c164cfc24bdd QtHandles: add annotations dialog John Donoghue <john.donoghue@ieee.org> parents: diff changeset	128 {
c164cfc24bdd QtHandles: add annotations dialog John Donoghue <john.donoghue@ieee.org> parents: diff changeset	129 // set props to the values of the gui
c164cfc24bdd QtHandles: add annotations dialog John Donoghue <john.donoghue@ieee.org> parents: diff changeset	130 props = octave_value_list ();
c164cfc24bdd QtHandles: add annotations dialog John Donoghue <john.donoghue@ieee.org> parents: diff changeset	131
c164cfc24bdd QtHandles: add annotations dialog John Donoghue <john.donoghue@ieee.org> parents: diff changeset	132 Matrix position(1,4);
c164cfc24bdd QtHandles: add annotations dialog John Donoghue <john.donoghue@ieee.org> parents: diff changeset	133 position(0) = ui->sb_x->value ();
c164cfc24bdd QtHandles: add annotations dialog John Donoghue <john.donoghue@ieee.org> parents: diff changeset	134 position(1) = ui->sb_y->value ();
c164cfc24bdd QtHandles: add annotations dialog John Donoghue <john.donoghue@ieee.org> parents: diff changeset	135 position(2) = ui->sb_width->value ();
c164cfc24bdd QtHandles: add annotations dialog John Donoghue <john.donoghue@ieee.org> parents: diff changeset	136 position(3) = ui->sb_height->value ();
c164cfc24bdd QtHandles: add annotations dialog John Donoghue <john.donoghue@ieee.org> parents: diff changeset	137 props.append (ovl ("textbox", position));
20181 aa36fb998a4d maint: Remove unnecessary whitespace at end of lines. Rik <rik@octave.org> parents: 20109 diff changeset	138
20095 c164cfc24bdd QtHandles: add annotations dialog John Donoghue <john.donoghue@ieee.org> parents: diff changeset	139 props.append (ovl ("string", ui->edit_string->text ().toStdString ()));
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22399 diff changeset	140 props.append (ovl ("fitboxtotext",
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22399 diff changeset	141 ui->cb_fit_box_to_text->isChecked () ? "on" : "off"));
22399 f0836b5ec628 Allow translation of all the annotation dialog strings (bug #48940) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 22323 diff changeset	142
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22399 diff changeset	143 // FIXME: only "normalized" units is selectable, change the code below
22399 f0836b5ec628 Allow translation of all the annotation dialog strings (bug #48940) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 22323 diff changeset	144 // once more units are added in the UI.
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22399 diff changeset	145 std::string tmpstr;
22399 f0836b5ec628 Allow translation of all the annotation dialog strings (bug #48940) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 22323 diff changeset	146 props.append (ovl ("units", "normalized"));
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22399 diff changeset	147
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22399 diff changeset	148 tmpstr = (ui->cb_horz_align->currentIndex () == 0 ? "left" :
22399 f0836b5ec628 Allow translation of all the annotation dialog strings (bug #48940) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 22323 diff changeset	149 (ui->cb_horz_align->currentIndex () == 1 ? "center" : "right"));
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22399 diff changeset	150 props.append (ovl ("horizontalalignment", tmpstr));
22399 f0836b5ec628 Allow translation of all the annotation dialog strings (bug #48940) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 22323 diff changeset	151
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22399 diff changeset	152 tmpstr = (ui->cb_vert_align->currentIndex () == 0 ? "top" :
22399 f0836b5ec628 Allow translation of all the annotation dialog strings (bug #48940) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 22323 diff changeset	153 (ui->cb_horz_align->currentIndex () == 1 ? "middle" : "bottom"));
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22399 diff changeset	154 props.append (ovl ("verticalalignment", tmpstr));
22399 f0836b5ec628 Allow translation of all the annotation dialog strings (bug #48940) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 22323 diff changeset	155
23070 bef714f45999 maint: Use space after function name/before parenthesis in libgui. Rik <rik@octave.org> parents: 22755 diff changeset	156 tmpstr = ui->cb_font_name->currentText ().toStdString ();
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22399 diff changeset	157 props.append (ovl ("fontname", tmpstr));
22399 f0836b5ec628 Allow translation of all the annotation dialog strings (bug #48940) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 22323 diff changeset	158
20095 c164cfc24bdd QtHandles: add annotations dialog John Donoghue <john.donoghue@ieee.org> parents: diff changeset	159 props.append (ovl ("fontsize", ui->sb_font_size->value ()));
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22399 diff changeset	160 props.append (ovl ("fontweight",
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22399 diff changeset	161 ui->cb_font_bold->isChecked () ? "bold" : "normal"));
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22399 diff changeset	162 props.append (ovl ("fontangle",
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22399 diff changeset	163 ui->cb_font_italic->isChecked () ? "italic" : "normal"));
22399 f0836b5ec628 Allow translation of all the annotation dialog strings (bug #48940) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 22323 diff changeset	164 props.append (ovl ("color", Utils::toRgb (ui->btn_color->palette ().
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22399 diff changeset	165 color (QPalette::Button))));
22399 f0836b5ec628 Allow translation of all the annotation dialog strings (bug #48940) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 22323 diff changeset	166
f0836b5ec628 Allow translation of all the annotation dialog strings (bug #48940) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 22323 diff changeset	167 // FIXME: only "none" linestyle is selectable, change the code bellow
f0836b5ec628 Allow translation of all the annotation dialog strings (bug #48940) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 22323 diff changeset	168 // once more linestyles are added in the UI.
f0836b5ec628 Allow translation of all the annotation dialog strings (bug #48940) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 22323 diff changeset	169 props.append (ovl ("linestyle", "none"));
20095 c164cfc24bdd QtHandles: add annotations dialog John Donoghue <john.donoghue@ieee.org> parents: diff changeset	170 }
c164cfc24bdd QtHandles: add annotations dialog John Donoghue <john.donoghue@ieee.org> parents: diff changeset	171
c164cfc24bdd QtHandles: add annotations dialog John Donoghue <john.donoghue@ieee.org> parents: diff changeset	172 void
c164cfc24bdd QtHandles: add annotations dialog John Donoghue <john.donoghue@ieee.org> parents: diff changeset	173 annotation_dialog::set_gui_props ()
c164cfc24bdd QtHandles: add annotations dialog John Donoghue <john.donoghue@ieee.org> parents: diff changeset	174 {
c164cfc24bdd QtHandles: add annotations dialog John Donoghue <john.donoghue@ieee.org> parents: diff changeset	175 // set the gui to the values from the props
21568 3d60ed163b70 maint: Eliminate bad spacing around '='. Rik <rik@octave.org> parents: 21301 diff changeset	176 octave_idx_type len = props.length ();
20095 c164cfc24bdd QtHandles: add annotations dialog John Donoghue <john.donoghue@ieee.org> parents: diff changeset	177
c164cfc24bdd QtHandles: add annotations dialog John Donoghue <john.donoghue@ieee.org> parents: diff changeset	178 for (int i=0; i<len/2; i++)
c164cfc24bdd QtHandles: add annotations dialog John Donoghue <john.donoghue@ieee.org> parents: diff changeset	179 {
c164cfc24bdd QtHandles: add annotations dialog John Donoghue <john.donoghue@ieee.org> parents: diff changeset	180 std::string name = props(i*2).string_value ();
c164cfc24bdd QtHandles: add annotations dialog John Donoghue <john.donoghue@ieee.org> parents: diff changeset	181
c164cfc24bdd QtHandles: add annotations dialog John Donoghue <john.donoghue@ieee.org> parents: diff changeset	182 if (name == "textbox")
c164cfc24bdd QtHandles: add annotations dialog John Donoghue <john.donoghue@ieee.org> parents: diff changeset	183 {
c164cfc24bdd QtHandles: add annotations dialog John Donoghue <john.donoghue@ieee.org> parents: diff changeset	184 Matrix position = props(2*i +1).matrix_value ();
23070 bef714f45999 maint: Use space after function name/before parenthesis in libgui. Rik <rik@octave.org> parents: 22755 diff changeset	185 int nels = position.numel ();
20095 c164cfc24bdd QtHandles: add annotations dialog John Donoghue <john.donoghue@ieee.org> parents: diff changeset	186 if (nels >= 2)
c164cfc24bdd QtHandles: add annotations dialog John Donoghue <john.donoghue@ieee.org> parents: diff changeset	187 {
c164cfc24bdd QtHandles: add annotations dialog John Donoghue <john.donoghue@ieee.org> parents: diff changeset	188 ui->sb_x->setValue (position(0));
c164cfc24bdd QtHandles: add annotations dialog John Donoghue <john.donoghue@ieee.org> parents: diff changeset	189 ui->sb_y->setValue (position(1));
c164cfc24bdd QtHandles: add annotations dialog John Donoghue <john.donoghue@ieee.org> parents: diff changeset	190 }
c164cfc24bdd QtHandles: add annotations dialog John Donoghue <john.donoghue@ieee.org> parents: diff changeset	191 else
c164cfc24bdd QtHandles: add annotations dialog John Donoghue <john.donoghue@ieee.org> parents: diff changeset	192 {
c164cfc24bdd QtHandles: add annotations dialog John Donoghue <john.donoghue@ieee.org> parents: diff changeset	193 ui->sb_x->setValue (0);
c164cfc24bdd QtHandles: add annotations dialog John Donoghue <john.donoghue@ieee.org> parents: diff changeset	194 ui->sb_y->setValue (0);
c164cfc24bdd QtHandles: add annotations dialog John Donoghue <john.donoghue@ieee.org> parents: diff changeset	195 }
c164cfc24bdd QtHandles: add annotations dialog John Donoghue <john.donoghue@ieee.org> parents: diff changeset	196 if (nels >= 4)
c164cfc24bdd QtHandles: add annotations dialog John Donoghue <john.donoghue@ieee.org> parents: diff changeset	197 {
c164cfc24bdd QtHandles: add annotations dialog John Donoghue <john.donoghue@ieee.org> parents: diff changeset	198 ui->sb_width->setValue (position(2));
c164cfc24bdd QtHandles: add annotations dialog John Donoghue <john.donoghue@ieee.org> parents: diff changeset	199 ui->sb_height->setValue (position(3));
c164cfc24bdd QtHandles: add annotations dialog John Donoghue <john.donoghue@ieee.org> parents: diff changeset	200 }
26390 aabee709c13a annotation-dialog.cc: Fix static analyzer detected issues (bug #55347). Rik <rik@octave.org> parents: 26376 diff changeset	201 // FIXME: Should there be an else branch here?
aabee709c13a annotation-dialog.cc: Fix static analyzer detected issues (bug #55347). Rik <rik@octave.org> parents: 26376 diff changeset	202 // In annotation.m "textbox" is forced to have a 4-elem vector.
20095 c164cfc24bdd QtHandles: add annotations dialog John Donoghue <john.donoghue@ieee.org> parents: diff changeset	203 }
c164cfc24bdd QtHandles: add annotations dialog John Donoghue <john.donoghue@ieee.org> parents: diff changeset	204 else if (name == "string")
c164cfc24bdd QtHandles: add annotations dialog John Donoghue <john.donoghue@ieee.org> parents: diff changeset	205 {
c164cfc24bdd QtHandles: add annotations dialog John Donoghue <john.donoghue@ieee.org> parents: diff changeset	206 // FIXME: handle if is array of strings ?
20181 aa36fb998a4d maint: Remove unnecessary whitespace at end of lines. Rik <rik@octave.org> parents: 20109 diff changeset	207 ui->edit_string->setText (props(2*i +1).string_value ().c_str ());
20095 c164cfc24bdd QtHandles: add annotations dialog John Donoghue <john.donoghue@ieee.org> parents: diff changeset	208 }
c164cfc24bdd QtHandles: add annotations dialog John Donoghue <john.donoghue@ieee.org> parents: diff changeset	209 else if (name == "fitboxtotext")
c164cfc24bdd QtHandles: add annotations dialog John Donoghue <john.donoghue@ieee.org> parents: diff changeset	210 {
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22399 diff changeset	211 ui->cb_fit_box_to_text->setChecked (props(1*i +1).string_value () == "on");
20095 c164cfc24bdd QtHandles: add annotations dialog John Donoghue <john.donoghue@ieee.org> parents: diff changeset	212 }
c164cfc24bdd QtHandles: add annotations dialog John Donoghue <john.donoghue@ieee.org> parents: diff changeset	213 else if (name == "units")
20181 aa36fb998a4d maint: Remove unnecessary whitespace at end of lines. Rik <rik@octave.org> parents: 20109 diff changeset	214 {
27276 7455523fdf01 style fixes: avoid breaking lines immediately after '(' John W. Eaton <jwe@octave.org> parents: 26390 diff changeset	215 ui->cb_units->setCurrentIndex
7455523fdf01 style fixes: avoid breaking lines immediately after '(' John W. Eaton <jwe@octave.org> parents: 26390 diff changeset	216 (ui->cb_units->findText (props(1*i +1).string_value ().c_str ()));
20095 c164cfc24bdd QtHandles: add annotations dialog John Donoghue <john.donoghue@ieee.org> parents: diff changeset	217 }
c164cfc24bdd QtHandles: add annotations dialog John Donoghue <john.donoghue@ieee.org> parents: diff changeset	218 else if (name == "horizontalalignment")
c164cfc24bdd QtHandles: add annotations dialog John Donoghue <john.donoghue@ieee.org> parents: diff changeset	219 {
27276 7455523fdf01 style fixes: avoid breaking lines immediately after '(' John W. Eaton <jwe@octave.org> parents: 26390 diff changeset	220 ui->cb_horz_align->setCurrentIndex
7455523fdf01 style fixes: avoid breaking lines immediately after '(' John W. Eaton <jwe@octave.org> parents: 26390 diff changeset	221 (ui->cb_horz_align->findText (props(1*i +1).string_value ().c_str ()));
20095 c164cfc24bdd QtHandles: add annotations dialog John Donoghue <john.donoghue@ieee.org> parents: diff changeset	222 }
c164cfc24bdd QtHandles: add annotations dialog John Donoghue <john.donoghue@ieee.org> parents: diff changeset	223 else if (name == "verticalalignment")
c164cfc24bdd QtHandles: add annotations dialog John Donoghue <john.donoghue@ieee.org> parents: diff changeset	224 {
27276 7455523fdf01 style fixes: avoid breaking lines immediately after '(' John W. Eaton <jwe@octave.org> parents: 26390 diff changeset	225 ui->cb_vert_align->setCurrentIndex
7455523fdf01 style fixes: avoid breaking lines immediately after '(' John W. Eaton <jwe@octave.org> parents: 26390 diff changeset	226 (ui->cb_vert_align->findText (props(1*i +1).string_value ().c_str ()));
20095 c164cfc24bdd QtHandles: add annotations dialog John Donoghue <john.donoghue@ieee.org> parents: diff changeset	227 }
c164cfc24bdd QtHandles: add annotations dialog John Donoghue <john.donoghue@ieee.org> parents: diff changeset	228 else if (name == "fontname")
c164cfc24bdd QtHandles: add annotations dialog John Donoghue <john.donoghue@ieee.org> parents: diff changeset	229 {
27276 7455523fdf01 style fixes: avoid breaking lines immediately after '(' John W. Eaton <jwe@octave.org> parents: 26390 diff changeset	230 ui->cb_vert_align->setCurrentIndex
7455523fdf01 style fixes: avoid breaking lines immediately after '(' John W. Eaton <jwe@octave.org> parents: 26390 diff changeset	231 (ui->cb_font_name->findText (props(1*i +1).string_value ().c_str ()));
20095 c164cfc24bdd QtHandles: add annotations dialog John Donoghue <john.donoghue@ieee.org> parents: diff changeset	232 }
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22399 diff changeset	233 else if (name == "fontsize")
20095 c164cfc24bdd QtHandles: add annotations dialog John Donoghue <john.donoghue@ieee.org> parents: diff changeset	234 {
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22399 diff changeset	235 ui->sb_font_size->setValue (props(1*i +1).float_value ());
20095 c164cfc24bdd QtHandles: add annotations dialog John Donoghue <john.donoghue@ieee.org> parents: diff changeset	236 }
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22399 diff changeset	237 else if (name == "fontweight")
20095 c164cfc24bdd QtHandles: add annotations dialog John Donoghue <john.donoghue@ieee.org> parents: diff changeset	238 {
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22399 diff changeset	239 ui->cb_font_bold->setChecked (props(1*i +1).string_value () == "bold");
20095 c164cfc24bdd QtHandles: add annotations dialog John Donoghue <john.donoghue@ieee.org> parents: diff changeset	240 }
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22399 diff changeset	241 else if (name == "fontangle")
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22399 diff changeset	242 {
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22399 diff changeset	243 ui->cb_font_italic->setChecked (props(1*i +1).string_value () == "italic");
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22399 diff changeset	244 }
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22399 diff changeset	245 else if (name == "color")
20095 c164cfc24bdd QtHandles: add annotations dialog John Donoghue <john.donoghue@ieee.org> parents: diff changeset	246 {
c164cfc24bdd QtHandles: add annotations dialog John Donoghue <john.donoghue@ieee.org> parents: diff changeset	247 QColor color;
c164cfc24bdd QtHandles: add annotations dialog John Donoghue <john.donoghue@ieee.org> parents: diff changeset	248 if (props(1*i +1).is_matrix_type ())
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22399 diff changeset	249 color = Utils::fromRgb (props(2*i +1).matrix_value ());
20095 c164cfc24bdd QtHandles: add annotations dialog John Donoghue <john.donoghue@ieee.org> parents: diff changeset	250 else
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22399 diff changeset	251 color.setNamedColor (props(2*i +1).string_value ().c_str ());
20095 c164cfc24bdd QtHandles: add annotations dialog John Donoghue <john.donoghue@ieee.org> parents: diff changeset	252
c164cfc24bdd QtHandles: add annotations dialog John Donoghue <john.donoghue@ieee.org> parents: diff changeset	253 if (color.isValid ())
c164cfc24bdd QtHandles: add annotations dialog John Donoghue <john.donoghue@ieee.org> parents: diff changeset	254 ui->btn_color->setPalette (QPalette (color));
c164cfc24bdd QtHandles: add annotations dialog John Donoghue <john.donoghue@ieee.org> parents: diff changeset	255 }
c164cfc24bdd QtHandles: add annotations dialog John Donoghue <john.donoghue@ieee.org> parents: diff changeset	256
c164cfc24bdd QtHandles: add annotations dialog John Donoghue <john.donoghue@ieee.org> parents: diff changeset	257 }
c164cfc24bdd QtHandles: add annotations dialog John Donoghue <john.donoghue@ieee.org> parents: diff changeset	258
c164cfc24bdd QtHandles: add annotations dialog John Donoghue <john.donoghue@ieee.org> parents: diff changeset	259 edit_string_changed (ui->edit_string->text ());
c164cfc24bdd QtHandles: add annotations dialog John Donoghue <john.donoghue@ieee.org> parents: diff changeset	260 }
20181 aa36fb998a4d maint: Remove unnecessary whitespace at end of lines. Rik <rik@octave.org> parents: 20109 diff changeset	261
20095 c164cfc24bdd QtHandles: add annotations dialog John Donoghue <john.donoghue@ieee.org> parents: diff changeset	262 void
23433 c9fab0bc983e maint: Use convention 'int& x' for naming references. Rik <rik@octave.org> parents: 23220 diff changeset	263 annotation_dialog::edit_string_changed (const QString& str)
20095 c164cfc24bdd QtHandles: add annotations dialog John Donoghue <john.donoghue@ieee.org> parents: diff changeset	264 {
c164cfc24bdd QtHandles: add annotations dialog John Donoghue <john.donoghue@ieee.org> parents: diff changeset	265 ui->button_box->button (QDialogButtonBox::Ok)->setEnabled (str.length () > 0);
c164cfc24bdd QtHandles: add annotations dialog John Donoghue <john.donoghue@ieee.org> parents: diff changeset	266 }
c164cfc24bdd QtHandles: add annotations dialog John Donoghue <john.donoghue@ieee.org> parents: diff changeset	267
c164cfc24bdd QtHandles: add annotations dialog John Donoghue <john.donoghue@ieee.org> parents: diff changeset	268 void
c164cfc24bdd QtHandles: add annotations dialog John Donoghue <john.donoghue@ieee.org> parents: diff changeset	269 annotation_dialog::prompt_for_color ()
c164cfc24bdd QtHandles: add annotations dialog John Donoghue <john.donoghue@ieee.org> parents: diff changeset	270 {
23447 db1fdf4384dd maint: Use convention "static_cast<void >" for casting of pointers. Rik <rik@octave.org>* parents: 23433 diff changeset	271 QWidget widg = dynamic_cast<QWidget > (sender ());
20095 c164cfc24bdd QtHandles: add annotations dialog John Donoghue <john.donoghue@ieee.org> parents: diff changeset	272 if (widg)
c164cfc24bdd QtHandles: add annotations dialog John Donoghue <john.donoghue@ieee.org> parents: diff changeset	273 {
c164cfc24bdd QtHandles: add annotations dialog John Donoghue <john.donoghue@ieee.org> parents: diff changeset	274 QColor color = widg->palette ().color (QPalette::Button);
20181 aa36fb998a4d maint: Remove unnecessary whitespace at end of lines. Rik <rik@octave.org> parents: 20109 diff changeset	275
23070 bef714f45999 maint: Use space after function name/before parenthesis in libgui. Rik <rik@octave.org> parents: 22755 diff changeset	276 color = QColorDialog::getColor (color, this);
20095 c164cfc24bdd QtHandles: add annotations dialog John Donoghue <john.donoghue@ieee.org> parents: diff changeset	277
c164cfc24bdd QtHandles: add annotations dialog John Donoghue <john.donoghue@ieee.org> parents: diff changeset	278 if (color.isValid ())
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22399 diff changeset	279 {
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22399 diff changeset	280 widg->setPalette (QPalette (color));
20095 c164cfc24bdd QtHandles: add annotations dialog John Donoghue <john.donoghue@ieee.org> parents: diff changeset	281
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22399 diff changeset	282 QString css = QString ("background-color: %1; border: 1px solid %2;")
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22399 diff changeset	283 .arg (color.name ())
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22399 diff changeset	284 .arg ("#000000");
20181 aa36fb998a4d maint: Remove unnecessary whitespace at end of lines. Rik <rik@octave.org> parents: 20109 diff changeset	285
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22399 diff changeset	286 widg->setStyleSheet (css);
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22399 diff changeset	287 widg->update ();
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22399 diff changeset	288 }
20095 c164cfc24bdd QtHandles: add annotations dialog John Donoghue <john.donoghue@ieee.org> parents: diff changeset	289 }
c164cfc24bdd QtHandles: add annotations dialog John Donoghue <john.donoghue@ieee.org> parents: diff changeset	290 }

Mercurial > octave

annotate libgui/graphics/annotation-dialog.cc @ 27620:45bb5bbaf291