octave: libinterp/corefcn/graphics.in.h comparison

comparison libinterp/corefcn/graphics.in.h @ 18735:28eab2d84190

Add callbacks for root properties format and formatspacing (bug #42135). * graphics.in.h (root format and formatspacing properties) define custom get and set methods * graphics.in.h (root format property) replace allowed value "rationale" (not supported by Fformat) by "rat" * pr-output.cc: new static variable format_string * pr-output.cc (set_format_style): store the actual current format in format_string * pr-output.cc (F__compactformat__): new defun to set/get the current Vcompactformat state * pr-output.cc (F__formatstring__): new defun to set/get the current format string

author	Pantxo Diribarne <pantxo.diribarne@gmail.com>
date	Mon, 21 Apr 2014 17:17:15 +0200
parents	e42843ceff48
children	333901476119

comparison

equal deleted inserted replaced

-:adb948d7fae4
+:28eab2d84190
 #include "oct-map.h"
 #include "oct-mutex.h"
 #include "oct-refcount.h"
 #include "ov.h"
 #include "txt-eng-ft.h"
+#include "builtin-defun-decls.h"
 // FIXME: maybe this should be a configure option?
 // Matlab defaults to "Helvetica", but that causes problems for many
 // gnuplot users.
 #if !defined (OCTAVE_DEFAULT_FONTNAME)
 const Matrix& parent_pix_size = Matrix ()) const;
 // See the genprops.awk script for an explanation of the
 // properties declarations.
-// FIXME: it seems strange to me that the diary, diaryfile,
+// FIXME: Matlab defines some root properties and uses them in
-// echo, errormessage, format, formatspacing, language, and
+// the same way that Octave uses an internal static variable to
-// recursionlimit properties are here.
+// keep track of state.  set (0, "echo", "on") is equivalent
-// WTF do they have to do with graphics?
+// to Octave's echo ("on"). Properties that still dont have callbacks
-// Also note that these properties (and the monitorpositions,
+// are : diary, diaryfileecho, errormessage, language, and recursionlimit.
+// Note that these properties (and the monitorpositions,
 // pointerlocation, and pointerwindow properties) are not yet used
 // by Octave, so setting them will have no effect, and changes
 // made elswhere (say, the diary or format functions) will not
 // cause these properties to be updated.
-// ANSWER: Matlab defines these properties and uses them in
-// the same way that Octave uses an internal static variable to
-// keep track of state.  set (0, "echo", "on") is equivalent
-// to Octave's echo ("on").  Maybe someday we can connect callbacks
-// that actually call Octave's own functions for this.
 // Programming note: Keep property list sorted if new ones are added.
 BEGIN_PROPERTIES (root_figure, root)
 handle_property callbackobject Sr , graphics_handle ()
 bool_property diary , "off"
 string_property diaryfile , "diary"
 bool_property echo , "off"
 string_property errormessage , ""
 string_property fixedwidthfontname , "Courier"
-radio_property format , "+|bank|bit|hex|long|longe|longeng|longg|native-bit|native-hex|none|rational|{short}|shorte|shorteng|shortg"
+radio_property format gs , "+|bank|bit|hex|long|longe|longeng|longg|native-bit|native-hex|none|rat|{short}|shorte|shorteng|shortg"
-radio_property formatspacing , "compact|{loose}"
+radio_property formatspacing gs , "compact|{loose}"
 string_property language , "ascii"
 array_property monitorpositions , Matrix (1, 4, 0)
 array_property pointerlocation , Matrix (1, 2, 0)
 double_property pointerwindow r , 0.0
 double_property recursionlimit , 256.0
 radio_property units U , "inches|centimeters|normalized|points|{pixels}"
 END_PROPERTIES
 private:
 std::list<graphics_handle> cbo_stack;
+std::string get_formatspacing (void) const
+{
+bool iscompact = F__compactformat__ ()(0).bool_value ();
+if (iscompact)
+return std::string ("compact");
+else
+return std::string ("loose");
+}
+void set_formatspacing (const octave_value& val)
+{
+if (! error_state)
+{
+// Input checking and abrev. matching
+formatspacing.set (val, false);
+if (! error_state)
+{
+std::string strval = formatspacing.current_value ();
+if (strval == "compact")
+F__compactformat__ (ovl (true));
+else
+F__compactformat__ (ovl (false));
+formatspacing.run_listeners ();
+}
+}
+}
+std::string get_format (void) const
+{
+return F__formatstring__ ()(0).string_value ();
+}
+void set_format (const octave_value& val)
+{
+if (! error_state)
+{
+// Input checking and abrev. matching
+format.set (val, false);
+if (! error_state)
+{
+Fformat (ovl (format.current_value ()));
+format.run_listeners ();
+}
+}
+}
 };
 private:
 properties xproperties;

Mercurial > octave

comparison libinterp/corefcn/graphics.in.h @ 18735:28eab2d84190