diff --git a/annotated.html b/annotated.html index 57fa9364..e552ff84 100644 --- a/annotated.html +++ b/annotated.html @@ -87,22 +87,22 @@
Here are the classes, structs, unions and interfaces with brief descriptions:
-
[detail level 123]
+
[detail level 12]
- - - - - - - + + + + + + - +
 NGempyre
 CEventQueue
 CIdList
 CEventMap
 CElementRepresents all HTML elements on UI
 CRectRect
 CEventEvent received
 CUiThe application UI
 CCanvasElementGraphics element
 CBitmapBitmap for Gempyre Graphics
 CFrameComposer
    +
 CElementRepresents all HTML elements on UI
 CEventEvent received
 CUiThe application UI
 CBitmapBitmap for Gempyre Graphics
 CDialogDialogs for file access
 CCanvasElementGraphics element
 CFrameComposer
  • wrap up Javascript draw commands
 CDialogDialogs for file access
 CRectRect
 NGempyreUtils
 CLogWriterParent class for LogWriters
diff --git a/annotated_dup.js b/annotated_dup.js index 93a0dfef..45f468b7 100644 --- a/annotated_dup.js +++ b/annotated_dup.js @@ -7,10 +7,11 @@ var annotated_dup = [ "Element", "classGempyre_1_1Element.html", "classGempyre_1_1Element" ], [ "Event", "structGempyre_1_1Event.html", "structGempyre_1_1Event" ], [ "Ui", "classGempyre_1_1Ui.html", "classGempyre_1_1Ui" ], - [ "CanvasElement", "classGempyre_1_1CanvasElement.html", "classGempyre_1_1CanvasElement" ], [ "Bitmap", "classGempyre_1_1Bitmap.html", "classGempyre_1_1Bitmap" ], + [ "Dialog", "classGempyre_1_1Dialog.html", "classGempyre_1_1Dialog" ], + [ "CanvasElement", "classGempyre_1_1CanvasElement.html", "classGempyre_1_1CanvasElement" ], [ "FrameComposer", "classGempyre_1_1FrameComposer.html", "classGempyre_1_1FrameComposer" ], - [ "Dialog", "classGempyre_1_1Dialog.html", "classGempyre_1_1Dialog" ] + [ "Rect", "structGempyre_1_1Rect.html", "structGempyre_1_1Rect" ] ] ], [ "GempyreUtils", null, [ [ "LogWriter", "classGempyreUtils_1_1LogWriter.html", "classGempyreUtils_1_1LogWriter" ] diff --git a/classGempyre_1_1Bitmap-members.html b/classGempyre_1_1Bitmap-members.html index 0eb25508..facfad5e 100644 --- a/classGempyre_1_1Bitmap-members.html +++ b/classGempyre_1_1Bitmap-members.html @@ -95,10 +95,10 @@ Bitmap(Bitmap &&other)=defaultGempyre::Bitmap Bitmap(const Bitmap &other)=defaultGempyre::Bitmap Bitmap(const std::vector< uint8_t > &image_data)Gempyre::Bitmap - clip(const Element::Rect &rect) constGempyre::Bitmap + clip(const Gempyre::Rect &rect) constGempyre::Bitmap clone() constGempyre::Bitmap create(int width, int height)Gempyre::Bitmap - draw_rect(const Element::Rect &rect, Color::type color)Gempyre::Bitmap + draw_rect(const Gempyre::Rect &rect, Color::type color)Gempyre::Bitmap empty() constGempyre::Bitmap Gempyre::CanvasElement (defined in Gempyre::Bitmap)Gempyre::Bitmapfriend height() constGempyre::Bitmap diff --git a/classGempyre_1_1Bitmap.html b/classGempyre_1_1Bitmap.html index 0f58816d..cf04e66f 100644 --- a/classGempyre_1_1Bitmap.html +++ b/classGempyre_1_1Bitmap.html @@ -95,7 +95,7 @@

Bitmap for Gempyre Graphics. More...

-

#include <gempyre_graphics.h>

+

#include <gempyre_bitmap.h>

@@ -163,10 +163,10 @@ void  - - - + + + - - - + + + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + +

Public Member Functions

swap (Bitmap &other)
 Swap bitmap data with another.
 
-void draw_rect (const Element::Rect &rect, Color::type color)
 Draw a rect with a color in bitmap.
 
+void draw_rect (const Gempyre::Rect &rect, Color::type color)
 Draw a rect with a color in bitmap.
 
void merge (int x, int y, const Bitmap &other)
 Draw a Bitmap on this bitmap - merge alpha.
@@ -192,10 +192,10 @@
 Draw a Bitmap withing extents on this bitmap - replace area.

 
-Bitmap clip (const Element::Rect &rect) const
 Create a new bitmap from part of bitmap.
 
+Bitmap clip (const Gempyre::Rect &rect) const
 Create a new bitmap from part of bitmap.
 
bool empty () const
 return true if there is not data
@@ -469,7 +469,7 @@

gempyre_graphics.h +
  • include/gempyre_bitmap.h
  • diff --git a/classGempyre_1_1Bitmap.js b/classGempyre_1_1Bitmap.js index 5fd985ae..8cdba506 100644 --- a/classGempyre_1_1Bitmap.js +++ b/classGempyre_1_1Bitmap.js @@ -7,10 +7,10 @@ var classGempyre_1_1Bitmap = [ "Bitmap", "classGempyre_1_1Bitmap.html#ae802302d5ef52c0ce4e32935d9413d14", null ], [ "~Bitmap", "classGempyre_1_1Bitmap.html#a9ce10102506714f048f8475dbcb9d9da", null ], [ "Bitmap", "classGempyre_1_1Bitmap.html#af50b0da150ee60b0e0b969b7aacb4a02", null ], - [ "clip", "classGempyre_1_1Bitmap.html#af5a68ed9a946f32627a144ff079d1064", null ], + [ "clip", "classGempyre_1_1Bitmap.html#a14f86985b940108428a42af202fe2bfe", null ], [ "clone", "classGempyre_1_1Bitmap.html#a1491b8d9d3ae761892d175f573267132", null ], [ "create", "classGempyre_1_1Bitmap.html#a0bd41db0d02ed28264699b0ebdf19913", null ], - [ "draw_rect", "classGempyre_1_1Bitmap.html#ad82dcde6704dc294334c05bc22b3d289", null ], + [ "draw_rect", "classGempyre_1_1Bitmap.html#a858a01d42dbb1ba4a634f788fb3ddb44", null ], [ "empty", "classGempyre_1_1Bitmap.html#a016e37fbfad186e8633bfb437d7ef85e", null ], [ "height", "classGempyre_1_1Bitmap.html#a5f5b596ee2032c3e942421315a997101", null ], [ "merge", "classGempyre_1_1Bitmap.html#ae46011028fa6e70b93953b0ff2929ac5", null ], diff --git a/classGempyre_1_1CanvasElement-members.html b/classGempyre_1_1CanvasElement-members.html index 742ab310..3aa1610e 100644 --- a/classGempyre_1_1CanvasElement-members.html +++ b/classGempyre_1_1CanvasElement-members.html @@ -124,23 +124,24 @@

    paint_image(const std::string &imageId, int x, int y, const Element::Rect &clippingRect={0, 0, 0, 0}) constGempyre::CanvasElement
    paint_image(const std::string &imageId, const Element::Rect &targetRect, const Element::Rect &clippingRect={0, 0, 0, 0}) constGempyre::CanvasElement
    parent() constGempyre::Element
    rect() constGempyre::Element
    remove()Gempyre::Element
    remove_attribute(const std::string &attr)Gempyre::Element
    set_attribute(const std::string &attr, const std::string &value)Gempyre::Element
    set_attribute(const std::string &attr)Gempyre::Element
    set_html(const std::string &htmlText)Gempyre::Element
    set_style(const std::string &style, const std::string &value)Gempyre::Element
    styles(const std::vector< std::string > &keys) constGempyre::Element
    subscribe(const std::string &name, const SubscribeFunction &handler, const std::vector< std::string > &properties={}, const std::chrono::milliseconds &throttle=0ms)Gempyre::Element
    SubscribeFunction typedefGempyre::Element
    type() constGempyre::Element
    ui() constGempyre::Elementinline
    ui()Gempyre::Elementinline
    values() constGempyre::Element
    Values typedefGempyre::Element
    ~CanvasElement()Gempyre::CanvasElement
    ~Element()Gempyre::Elementvirtual
    Rect typedefGempyre::Element
    rect() constGempyre::Element
    remove()Gempyre::Element
    remove_attribute(const std::string &attr)Gempyre::Element
    set_attribute(const std::string &attr, const std::string &value)Gempyre::Element
    set_attribute(const std::string &attr)Gempyre::Element
    set_html(const std::string &htmlText)Gempyre::Element
    set_style(const std::string &style, const std::string &value)Gempyre::Element
    styles(const std::vector< std::string > &keys) constGempyre::Element
    subscribe(const std::string &name, const SubscribeFunction &handler, const std::vector< std::string > &properties={}, const std::chrono::milliseconds &throttle=0ms)Gempyre::Element
    SubscribeFunction typedefGempyre::Element
    type() constGempyre::Element
    ui() constGempyre::Elementinline
    ui()Gempyre::Elementinline
    values() constGempyre::Element
    Values typedefGempyre::Element
    ~CanvasElement()Gempyre::CanvasElement
    ~Element()Gempyre::Elementvirtual
    diff --git a/classGempyre_1_1CanvasElement.html b/classGempyre_1_1CanvasElement.html index dd16fe98..c9903b5b 100644 --- a/classGempyre_1_1CanvasElement.html +++ b/classGempyre_1_1CanvasElement.html @@ -143,6 +143,9 @@ using SubscribeFunction = std::function< void(const Event &)>  Callback function for event subscriptions. More...
      +using Rect = Gempyre::Rect + compatibility More...
    +  @@ -178,10 +181,10 @@ - + - + @@ -290,7 +293,7 @@ +std::optional< Rect >  - + - + @@ -790,7 +793,7 @@

    - + diff --git a/classGempyre_1_1Element-members.html b/classGempyre_1_1Element-members.html index b16a26f7..70ccc661 100644 --- a/classGempyre_1_1Element-members.html +++ b/classGempyre_1_1Element-members.html @@ -105,21 +105,22 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + +

    Public Member Functions

    std::string add_image (const std::string &url, const std::function< void(const std::string &id)> &loaded=nullptr)
     Add an image into HTML DOM tree. More...
     
    void paint_image (const std::string &imageId, int x, int y, const Element::Rect &clippingRect={0, 0, 0, 0}) const
    void paint_image (const std::string &imageId, int x, int y, const Element::Rect &clippingRect={0, 0, 0, 0}) const
     Draw image at position. More...
     
    void paint_image (const std::string &imageId, const Element::Rect &targetRect, const Element::Rect &clippingRect={0, 0, 0, 0}) const
    void paint_image (const std::string &imageId, const Element::Rect &targetRect, const Element::Rect &clippingRect={0, 0, 0, 0}) const
     Draw image in rectangle. More...
     
    void draw (const CommandList &canvasCommands)
     Get this element type, mostly a HTML tag.
     
    -std::optional< Rectrect () const
    rect () const
     Get this element UI rect. I.e area it occupies on screen (if applicable)
     
    @@ -683,7 +686,7 @@

    Note
    canvas_element.draw_completed([this]() {draw_frame();}, Gempyre::CanvasElement::DrawNotify::Kick);
    ui.start_periodic(50ms, [this]() {animate();});
    -
    const Ui & ui() const
    Get Ui.
    Definition: gempyre.h:123
    +
    const Ui & ui() const
    Get Ui.
    Definition: gempyre.h:98
    TimerId start_periodic(const std::chrono::milliseconds &ms, const std::function< void(TimerId id)> &timerFunc)
    Start a periodic timer.
    @@ -732,13 +735,13 @@

    const Element::Rectconst Element::Rect targetRect,
    const Element::Rectconst Element::Rect clippingRect = {0, 0, 0, 0} 
    const Element::Rectconst Element::Rect clippingRect = {0, 0, 0, 0} 
    operator=(Element &&other)Gempyre::Elementinline
    parent() constGempyre::Element
    rect() constGempyre::Element
    remove()Gempyre::Element
    remove_attribute(const std::string &attr)Gempyre::Element
    set_attribute(const std::string &attr, const std::string &value)Gempyre::Element
    set_attribute(const std::string &attr)Gempyre::Element
    set_html(const std::string &htmlText)Gempyre::Element
    set_style(const std::string &style, const std::string &value)Gempyre::Element
    styles(const std::vector< std::string > &keys) constGempyre::Element
    subscribe(const std::string &name, const SubscribeFunction &handler, const std::vector< std::string > &properties={}, const std::chrono::milliseconds &throttle=0ms)Gempyre::Element
    SubscribeFunction typedefGempyre::Element
    type() constGempyre::Element
    ui() constGempyre::Elementinline
    ui()Gempyre::Elementinline
    values() constGempyre::Element
    Values typedefGempyre::Element
    ~Element()Gempyre::Elementvirtual
    Rect typedefGempyre::Element
    remove()Gempyre::Element
    remove_attribute(const std::string &attr)Gempyre::Element
    set_attribute(const std::string &attr, const std::string &value)Gempyre::Element
    set_attribute(const std::string &attr)Gempyre::Element
    set_html(const std::string &htmlText)Gempyre::Element
    set_style(const std::string &style, const std::string &value)Gempyre::Element
    styles(const std::vector< std::string > &keys) constGempyre::Element
    subscribe(const std::string &name, const SubscribeFunction &handler, const std::vector< std::string > &properties={}, const std::chrono::milliseconds &throttle=0ms)Gempyre::Element
    SubscribeFunction typedefGempyre::Element
    type() constGempyre::Element
    ui() constGempyre::Elementinline
    ui()Gempyre::Elementinline
    values() constGempyre::Element
    Values typedefGempyre::Element
    ~Element()Gempyre::Elementvirtual
    diff --git a/classGempyre_1_1Element.html b/classGempyre_1_1Element.html index 3436bbfa..6dfcf295 100644 --- a/classGempyre_1_1Element.html +++ b/classGempyre_1_1Element.html @@ -83,7 +83,6 @@
    -Classes | Public Types | Public Member Functions | Friends | @@ -104,12 +103,6 @@
    [legend]
    - - - - -

    -Classes

    struct  Rect
     Rect. More...
     
    + + +

    Public Types

    @@ -127,6 +120,9 @@
    using SubscribeFunction = std::function< void(const Event &)>
     Callback function for event subscriptions. More...
     
    using Rect = Gempyre::Rect
     compatibility More...
     
    @@ -217,7 +213,7 @@ +std::optional< Rect >  +FrameComposer  +FrameComposer  +FrameComposer  +FrameComposer  +FrameComposer  +FrameComposer  + + diff --git a/dir_d44c64559bbebec7f509842c48db8b23.js b/dir_d44c64559bbebec7f509842c48db8b23.js index e444bfeb..72c7a513 100644 --- a/dir_d44c64559bbebec7f509842c48db8b23.js +++ b/dir_d44c64559bbebec7f509842c48db8b23.js @@ -1,7 +1,9 @@ var dir_d44c64559bbebec7f509842c48db8b23 = [ [ "gempyre.h", "gempyre_8h.html", "gempyre_8h" ], + [ "gempyre_bitmap.h", "gempyre__bitmap_8h.html", "gempyre__bitmap_8h" ], [ "gempyre_client.h", "gempyre__client_8h_source.html", null ], [ "gempyre_graphics.h", "gempyre__graphics_8h.html", "gempyre__graphics_8h" ], + [ "gempyre_types.h", "gempyre__types_8h_source.html", null ], [ "gempyre_utils.h", "gempyre__utils_8h.html", "gempyre__utils_8h" ] ]; \ No newline at end of file diff --git a/files.html b/files.html index 8e12db31..3656c4a4 100644 --- a/files.html +++ b/files.html @@ -90,9 +90,11 @@
    [detail level 12]

    Public Member Functions

     Get this element type, mostly a HTML tag.
     
    -std::optional< Rectrect () const
    rect () const
     Get this element UI rect. I.e area it occupies on screen (if applicable)
     
    @@ -234,6 +230,23 @@

    Detailed Description

    Represents all HTML elements on UI.

    Member Typedef Documentation

    + +

    ◆ Rect

    + +
    +
    + +

    compatibility

    +
    See also
    Gempyre::Rect.
    + +
    +

    ◆ SubscribeFunction

    diff --git a/classGempyre_1_1Element.js b/classGempyre_1_1Element.js index 9fe076e9..15267b21 100644 --- a/classGempyre_1_1Element.js +++ b/classGempyre_1_1Element.js @@ -1,8 +1,8 @@ var classGempyre_1_1Element = [ - [ "Rect", "structGempyre_1_1Element_1_1Rect.html", "structGempyre_1_1Element_1_1Rect" ], [ "Attributes", "classGempyre_1_1Element.html#a37b71d8798552e875ee55384433f5847", null ], [ "Elements", "classGempyre_1_1Element.html#aa6c53fa35f8b2d3bac68e16b3ae57715", null ], + [ "Rect", "classGempyre_1_1Element.html#ad661778373709e125ae4ae2c304984fe", null ], [ "SubscribeFunction", "classGempyre_1_1Element.html#a0871ed2126a4911a895080d967df32a5", null ], [ "Values", "classGempyre_1_1Element.html#afb2ecf9f84e40c7fb2df08a789b4e3be", null ], [ "Element", "classGempyre_1_1Element.html#ae0c0152d289b144d76d81e9bd6335c27", null ], diff --git a/classGempyre_1_1FrameComposer.html b/classGempyre_1_1FrameComposer.html index d76735ff..66077d19 100644 --- a/classGempyre_1_1FrameComposer.html +++ b/classGempyre_1_1FrameComposer.html @@ -117,21 +117,21 @@
     Copy constructor.
     
    -FrameComposer stroke_rect (const Gempyre::Element::Rect &r)
    stroke_rect (const Gempyre::Element::Rect &r)
     Visit the Mozialla documentation
     
    FrameComposer stroke_rect (double x, double y, double w, double h)
     
    -FrameComposer clear_rect (const Gempyre::Element::Rect &r)
    clear_rect (const Gempyre::Element::Rect &r)
     Visit the Mozialla documentation
     
    FrameComposer clear_rect (double x, double y, double w, double h)
     
    -FrameComposer fill_rect (const Gempyre::Element::Rect &r)
    fill_rect (const Gempyre::Element::Rect &r)
     Visit the Mozialla documentation
     
    @@ -182,7 +182,7 @@
     Visit the Mozialla documentation
     
    -FrameComposer rect (const Gempyre::Element::Rect &r)
    rect (const Gempyre::Element::Rect &r)
     Visit the Mozialla documentation
     
    @@ -241,14 +241,14 @@
     Visit the Mozialla documentation
     
    -FrameComposer draw_image (const std::string &id, const Gempyre::Element::Rect &rect)
    draw_image (const std::string &id, const Gempyre::Element::Rect &rect)
     Visit the Mozialla documentation
     
    FrameComposer draw_image (const std::string &id, double x, double y, double w, double h)
     
    -FrameComposer draw_image (const std::string &id, const Gempyre::Element::Rect &clip, const Gempyre::Element::Rect &rect)
    draw_image (const std::string &id, const Gempyre::Element::Rect &clip, const Gempyre::Element::Rect &rect)
     Visit the Mozialla documentation
     
    diff --git a/classes.html b/classes.html index a5cdb834..13d4f28f 100644 --- a/classes.html +++ b/classes.html @@ -111,7 +111,7 @@
    LogWriter (GempyreUtils)
    R
    -
    Element::Rect (Gempyre)
    +
    Rect (Gempyre)
    U
    Ui (Gempyre)
    diff --git a/dir_d44c64559bbebec7f509842c48db8b23.html b/dir_d44c64559bbebec7f509842c48db8b23.html index 2cd4456a..d6333894 100644 --- a/dir_d44c64559bbebec7f509842c48db8b23.html +++ b/dir_d44c64559bbebec7f509842c48db8b23.html @@ -91,6 +91,8 @@ Files
    file  gempyre.h [code]
     
    file  gempyre_bitmap.h [code]
     
    file  gempyre_graphics.h [code]
     
    file  gempyre_utils.h [code]
    - - - + + + + +
      include
     gempyre.h
     gempyre_client.h
     gempyre_graphics.h
     gempyre_utils.h
     gempyre_bitmap.h
     gempyre_client.h
     gempyre_graphics.h
     gempyre_types.h
     gempyre_utils.h
    diff --git a/functions.html b/functions.html index 14319fff..732b4b63 100644 --- a/functions.html +++ b/functions.html @@ -109,12 +109,12 @@

    - a -