Mercurial > hg > octave-nkf
view scripts/plot/tetramesh.m @ 15848:424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
* file-editor-tab.cc, file-editor-tab.h (file_editor_tab::~file_editor_tab):
Add. Delete lexer to prevent memory leak. Delete _edit_area to prevent memory
leak. (file_editor_tab::conditional_close): Add. Simple slot that uses QWidget
pointer as unique ID, not for function call.
(file_editor_tab::file_name_query): Add. Simple slot that signals file name to
whomever is connected. (file_editor_tab::find,
file_editor_tab : public QWidget): Removed use of exec() and keep a pointer to
the find_dialog as a member. Toggle hide()/show() via a connected slot to
toggle visibility as desired.
* file-editor.cc, file-editor.h, file-editor-tab.cc file-editor-tab.h
(file_editor : public file_editor_interface, file_editor_tab : public QWidget,
file_editor_tab::file_editor_tab, file_editor_tab::closeEvent,
file_editor_tab::load_file, file_editor_tab::new_file,
file_editor_tab::run_file): Remove _file_editor pointer member from
file_editor_tab and rid file_editor::get_main_window from file_editor. There
should be no need for such information about higher-level hierarchy inside
lower-level objects. (file_editor::request_open_file,
file_editor_tab::open_file): Move QFileDialog to file_editor::request_open_file
and delete file_editor_tab::open_file since most of the remaining functionality
is in file_editor_tab::load_file. (file_editor::active_editor_tab): Deleted.
(file_editor::fetab_change_request, file_editor_tab::change_editor_state):
Added to initiate a request for the editor tab to change focus.
(file_editor_tab::editor_state_changed): Added arguments to pass the copy
status and the directory path so that editor doesn't have to call functions for
such information. (file_editor::handle_editor_state_changed): Add copying
directory of the file_editor_tab to the current editing directory.
(file_editor::check_conflict_save, file_editor_tab::editor_check_conflict_save,
file_editor_tab::save_file_as, file_editor_tab::handle_save_file_as_answer):
Moved a portion of the save-file-as dialog mechanism to the file_editor where
all file names can be obtained to check for conflict with already open files.
The new signal indicates to the editor that a name check be done, and in turn
the editor signals the tab to save the file.
* main-window.cc, file-editor.cc, file-editor.h, file-editor-interface.h
(file_editor::terminal, file_editor : public file_editor_interface,
file_editor_interface : public QDockWidget): Since file_editor_tab no longer
looks up to main_window, remove _main_window and _terminal from file_editor and
file_editor_interface, as well as file_editor::terminal.
* file-editor-tab.cc (file_editor_tab::file_has_changed): Make the dialog
boxes non-modal and use slots to handle user answers.
(file_editor_tab::closeEvent): Remove portion that accesses upper hierarchy
member functions, can find better approaches.
(file_editor_tab::file_editor_tab): Make there no parent for QsciScintilla so
that window modality can be set to individual editor.
* file-editor-tab.cc, file-editor.cc (file_editor_tab::load_file): Use show()
member rather than exec() and set modality to window so that rest of
application may function. Return a QString with message rather than a boolean.
* file-editor-tab.cc, (file_editor_tab::file_has_changed): Remove static
variable alreadyAsking. Multiple file_editor_tabs are using this code so do
not want to block recognition of multiple file having changed on disk
(bug #37406). Instead, simply stop tracking via the file watcher.
(file_editor_tab::save_file, file_editor_tab::save_file_as,
file_editor_tab::handle_save_file_as_answer,
file_editor_tab::handle_save_file_as_answer_close): Added a remove_on_success
variable. Changed the QFileDialog to WindowModal and created slots to handle
file selected signal and finished signal. Signal/slot connects vary based upon
remove_on_success setting. (file_editor_tab::check_file_modified): Changed the
QFileDialog to NonModal and attach some slots. Editor tab can't be parent in
case deleted, so use read-only state of the editor area.
* file-editor-tab.h (file_editor_tab : public QWidget): New signals for
file_editor for tab and file name management. (file_editor_tab::get_file_name):
Delete.
* file-editor.h (file_editor : public file_editor_interface): Make QStringList
sessionFileNames a member of file_editor so that it can retain data between
file_editor_tab signals. Also can be used for checking precense of filenames
and prevent opening multiple copies (bug #36869) Added signals for file editor
tabs--settings_changed, fetab_close_request, and query_file_name. Three new
slots for tab and file name management.
* file-editor-interface.h, file-editor.h
(file_editor_interface::add_file_editor_tab, file_editor::add_file_editor_tab):
Made the text name for the tab an input variable.
* file-editor.cc (file_editor::~file_editor): Replace dynamic_cast with simple
signal querying all file editor tabs for file names which end up in
savedSessionTabs. (file_editor::handle_file_name_changed): Dynamic cast not
necessary since QObject and QWidget are compatible.
(file_editor::handle_tab_close_request): Replace dynamic_cast with signal to
request file_editor_tab with associated tabID tag should close.
(file_editor::handle_tab_remove_request): Rename of handle_tab_close_request.
Instead of dynamic cast, loop through pointers comparing QWidget* to QObject*,
if same tag remove tab via index and also delete which fixes a memory leak.
(file_editor::handle_add_filename_to_list): Simple slot that uses append() of
the list member functions. (file_editor::notice_settings): Rather than dynamic
cast, emit signal for the file_editor_tabs. (file_editor::add_file_editor_tab):
New variety of connections for improved flow. (file_editor::request_open_file):
Given error messages are made WindowModal, the tab shouldn't be delete if file
open is not successful. The file_editor_tab takes care of that.
(file_editor::request_open_file): Added check and message box for the
requested file already open in editor. For the non-interactive overloaded
version, open a message dialog box to tell the user file not found, e.g.,
could not find file in the settings when launched.
(file_editor::request_open_file): Inquire file names and update list before
checking for existence of files. Supply empty title to editor tab then have
file_editor_tab update name.
* file-editor-tab.h, file-editor-tab.cc, file-editor.cc
(file_editor_tab::run_file): New signal process_octave_code.
(file_editor::add_file_editor_tab): Connect signal process_octave_code to
file_editor's parent's slot handle_command_double_clicked.
author | Daniel J Sebald <daniel.sebald@ieee.org> |
---|---|
date | Sun, 23 Dec 2012 14:33:48 -0600 |
parents | c2dbdeaa25df |
children | ddac88d32d6a |
line wrap: on
line source
## Copyright (C) 2012 Martin Helm ## ## 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 ## <http://www.gnu.org/licenses/>. ## -*- texinfo -*- ## @deftypefn {Function File} {} tetramesh (@var{T}, @var{X}) ## @deftypefnx {Function File} {} tetramesh (@var{T}, @var{X}, @var{C}) ## @deftypefnx {Function File} {} tetramesh (@dots{}, @var{property}, @var{val}, @dots{}) ## @deftypefnx {Function File} {@var{h} =} tetramesh (@dots{}) ## ## Display the tetrahedrons defined in the m-by-4 matrix @var{T} ## as 3-D patches. @var{T} is typically the output of a Delaunay triangulation ## of a 3-D set of points. Every row of @var{T} contains four indices into ## the n-by-3 matrix @var{X} of the vertices of a tetrahedron. Every row in ## @var{X} represents one point in 3-D space. ## ## The vector @var{C} specifies the color of each tetrahedron as an index ## into the current colormap. The default value is 1:m where m is the number ## of tetrahedrons; the indices are scaled to map to the full range of the ## colormap. If there are more tetrahedrons than colors in the colormap then ## the values in @var{C} are cyclically repeated. ## ## Calling @code{tetramesh (@dots{}, "property", "value", @dots{})} passes all ## property/value pairs directly to the patch function as additional arguments. ## ## The optional return value @var{h} is a vector of patch handles where each ## handle represents one tetrahedron in the order given by @var{T}. ## A typical use case for @var{h} is to turn the respective patch "visible" ## property "on" or "off". ## ## Type @code{demo tetramesh} to see examples on using @code{tetramesh}. ## @seealso{delaunay3, delaunayn, trimesh, patch} ## @end deftypefn ## Author: Martin Helm <martin@mhelm.de> function h = tetramesh (varargin) [reg, prop] = parseparams (varargin); if (length (reg) < 2 || length (reg) > 3) print_usage (); endif T = reg{1}; X = reg{2}; if (! ismatrix (T) || columns (T) != 4) error ("tetramesh: T must be a n-by-4 matrix"); endif if (! ismatrix (X) || columns (X) != 3) error ("tetramesh: X must be a n-by-3 matrix"); endif size_T = rows (T); colmap = colormap (); if (length (reg) < 3) size_colmap = rows (colmap); C = mod ((1:size_T)' - 1, size_colmap) + 1; if (size_T < size_colmap && size_T > 1) ## expand to the available range of colors C = floor ((C - 1) * (size_colmap - 1) / (size_T - 1)) + 1; endif else C = reg{3}; if (! isvector (C) || size_T != length (C)) error ("tetramesh: C must be a vector of the same length as T"); endif endif h = zeros (1, size_T); if (strcmp (graphics_toolkit (), "gnuplot")) ## tiny reduction of the tetrahedron size to help gnuplot by ## avoiding identical faces with different colors for i = 1:size_T [th, p] = __shrink__ ([1 2 3 4], X(T(i, :), :), 1 - 1e-7); hvec(i) = patch ("Faces", th, "Vertices", p, "FaceColor", colmap(C(i), :), prop{:}); endfor else for i = 1:size_T th = [1 2 3; 2 3 4; 3 4 1; 4 1 2]; hvec(i) = patch ("Faces", th, "Vertices", X(T(i, :), :), "FaceColor", colmap(C(i), :), prop{:}); endfor endif if (nargout > 0) h = hvec; endif endfunction ## shrink the tetrahedron relative to its center of gravity function [tri, p] = __shrink__ (T, X, sf) midpoint = repmat (sum (X(T, :), 1) / 4, 12, 1); p = [X([1 2 3], :); X([2 3 4], :); X([3 4 1], :); X([4 1 2], :)]; p = sf * (p - midpoint) + midpoint; tri = reshape (1:12, 3, 4)'; endfunction %!demo %! clf; %! d = [-1 1]; %! [x,y,z] = meshgrid (d, d, d); %! x = [x(:); 0]; %! y = [y(:); 0]; %! z = [z(:); 0]; %! tetra = delaunay3 (x, y, z); %! X = [x(:) y(:) z(:)]; %! colormap (jet (64)); %! h = tetramesh (tetra, X); %! set (h(1:2:end), "Visible", "off"); %! axis equal; %! view (30, 20); %! title ("Using jet (64), every other tetrahedron invisible"); %!demo %! clf; %! d = [-1 1]; %! [x,y,z] = meshgrid (d, d, d); %! x = [x(:); 0]; %! y = [y(:); 0]; %! z = [z(:); 0]; %! tetra = delaunay3 (x, y, z); %! X = [x(:) y(:) z(:)]; %! colormap (gray (256)); %! tetramesh (tetra, X, 21:20:241, "EdgeColor", "w"); %! axis equal; %! view (30, 20); %! title ("Using gray (256) and white edges");