Commit Graph

91 Commits

Author SHA1 Message Date
Jean-Philippe Andre 877e122e7a elementary_test: remove ELM_LIB_QUICKLAUNCH
Refer to the previous commits for the reason.
Remove all #ifndef ELM_LIB_QUICKLAUNCH from the test files.
2013-11-05 10:05:01 +09:00
Daniel Juyung Seo 6397761c6a elm_test: Fixed formatting. tab to space.
Changed tab to space before working on the code.
Kinda surprised by the number of tabs we had.
2013-10-14 19:12:32 +09:00
Daniel Juyung Seo 22998b5622 test_map.c: fixed indentation. it was wrong even before my last commit. 2013-09-21 20:28:40 +09:00
Daniel Juyung Seo d20dffdf9e test_map.c: show longitude/latitude information about the current mouse position. 2013-09-21 20:24:31 +09:00
Daniel Juyung Seo 4d8823af96 test_map.c: changed mouse down event local variable name down -> ev for consistency. 2013-09-21 18:39:35 +09:00
Daniel Juyung Seo 83db5ad972 elm_test: __UNUSED__ -> EINA_UNUSED. 2013-09-01 10:18:03 +09:00
Daniel Juyung Seo 264bbe0d8f elm test: Correct elm_win_resize_object_set() usage. Call evas_object_size_hint_weight_set() before calling elm_win_resize_object_set().
SVN revision: 79281
2012-11-14 10:49:45 +00:00
Daniel Juyung Seo f1febd3afa elm test_map.c: Fixed infinite menu creation bug. Remove menu on map deletion. Patch by Bluezery <ohpowel@gmail.com>
SVN revision: 78098
2012-10-17 02:43:50 +00:00
Michael BOUCHAUD a1661712da elementary: elm_map use now image proxy and do some cleaning in theme, big thx to Bluezery !
SVN revision: 77939
2012-10-12 14:51:45 +00:00
Gustavo Lima Chaves bbf0a4345e [elm] And now remove deprecated calls usage (WRT
icon/image thing).



SVN revision: 71473
2012-05-28 21:50:11 +00:00
Bluezery bfff7d7836 From: Bluezery <ohpowel@gmail.com>
Subject: [E-devel] [Patch][elm_map] Add New "loaded" signal

I want to add new "loaded" signal to elementary map. This signal
notify users when all map tiles are loaded. Timer is used for this signal.
Currently "tile,loaded" can be used for each separated tile.  So the
users are hard to know whether all tiles are loaded or not.
Please review this patch.



SVN revision: 71406
2012-05-24 10:07:56 +00:00
Bluezery 3bada185c3 From: Bluezery <ohpowel@gmail.com>
Subject: [E-devel] [Patch][elm_map] Add elm_map_overlays_get &
elm_map_overlay_visible_get

I want to add 2 new APIs (elm_map_overlays_get & elm_map_overlay_visible_get).

There are no way to get the group overlays because group overlay,
something like virtual overlay, is created and deleted dynamically.
So elm_map_overlays_get returns total overlay's list and user can get
any type of overlays including group overlays.
Overlays which is grouped can not be visible. Because overlay grouping
is performed by elm_map, user do not know whether overlays are visible
or not. So elm_map_overlay_visible_get is added for this reason.



SVN revision: 71354
2012-05-23 10:29:03 +00:00
Daniel Juyung Seo 7f2fc8ef80 elm bin: Use convenient utility function elm_win_util_standard_add()
instead of elm_win_add() + elm_bg_add(). This is for normal style
(ELM_WIN_BASIC) window.

SVN revision: 69848
2012-04-02 06:20:28 +00:00
Daniel Juyung Seo e838d6d2f2 Revert a wrong commit. Un-wanted files are committed together.
Revert "elm bin: Use convenient utility function elm_win_util_standard_add() instead of elm_win_add() + elm_bg_add(). This is for normal style (ELM_WIN_BASIC) window."

This reverts commit 31b24a0edb0028528d7c859070e03236ba42867b.

SVN revision: 69847
2012-04-02 06:20:22 +00:00
Daniel Juyung Seo b4308ab089 elm bin: Use convenient utility function elm_win_util_standard_add() instead of elm_win_add() + elm_bg_add(). This is for normal style (ELM_WIN_BASIC) window.
SVN revision: 69845
2012-04-02 06:07:58 +00:00
Mike Blumenkrantz cf8ab5c674 for the last time: CONFIG.H ALWAYS GETS INCLUDED FIRST. AAAAAAAALLLLLLLLLLLLLLLLLLLLLLLWAAAAAAAAAAAAAAAAAAAAAAAAAAAYYYYYYYYYYYYYYYYYYYYYSSSSSSSSSSSSSSSSSSS
SVN revision: 69764
2012-03-29 19:27:13 +00:00
Bluezery 9e3b73137b From: Bluezery <ohpowel@gmail.com>
Subject: [E-devel] [Patch][elm_map] Add line, polygon, circle, scale
overlay

This patch adds new overlay APIs (line, polygon, circle, scale) for elm_map.
These overlays are adhered to map even though zooming, panning.
You can test these by doing "elementary_test --> click mouse right -->
overlay"



SVN revision: 69562
2012-03-22 10:40:04 +00:00
Bluezery 6309c07b04 From: Bluezery <ohpowel@gmail.com>
Subject: [E-devel] [Patch][elm_map] Map overlay color & grouping &
route Fix

This is patch for elm_map

1. Default and Class overlay can be set color by
elm_map_overlay_color_set().
2. Fix test application  for map API testing more.
3. Fix grouping for enabling group callbacks. If overlay group is
clicked, callback will be called.
And elm_map_overlay_group_members_set() API will be added later to get
list of overlays in the group.
4. Simplify route overlay: Previously, many polygon objects are needed
for one route overlay.
But now  just one is needed.



SVN revision: 69554
2012-03-22 05:23:19 +00:00
Sanjeev BA 1e1f9f6dd9 elm_map - Bug fix and cleanup.
Author : Bluezery <ohpowel@gmail.com>

SVN revision: 69519
2012-03-20 07:37:59 +00:00
Jiyoun Park 346b8647a2 remove code related with
ELM_MAP_ROUTE_SOURCE_
elm_map_utils_rotate_coord
elm_map_utils_convert_
elm_map_utils_downloading_status_get
elm_map_canvas_to_geo_convert
elm_map_geo_region_
elm_map_source_zoom_
elm_map_source_name
elm_map_route_source
elm_map_max_marker_per
elm_map_paused_markers

elm_map_name_remove
which was deprecated


SVN revision: 69167
2012-03-10 10:07:27 +00:00
cnook 6477874b2f From: cnook <kimcinoo@gmail.com>
Subject: [E-devel] [Patch][elementary_test] test_label

I have attached a patch for test_label. Please review the patch and
give any feedbacks. Thanks.



SVN revision: 68949
2012-03-07 13:50:37 +00:00
Bluezery 8479b5f328 From: Bluezery <ohpowel@gmail.com>
Subject: [E-devel]  [Patch][elm_map] Change & Add map APIs

I rename & add some APIs.
As previously discussed, I categorized map APIs.
(http://marc.info/?l=enlightenment-devel&m=132685497711772&w=2)

1) Zoom
elm_map_zoom_set/get
elm_map_zoom_mode_set/get
elm_map_zoom_min_set/get
elm_map_zoom_max_set/get

2) Region - Geographic coordinates (region)
elm_map_region_get
elm_map_region_show/bring_in
elm_map_canvas_to_region_convert

I will not use "_geo_" in map APIs. All map APIs are basically used by
geographic coordinates.

3) Property
elm_map_paused_set/get
elm_map_rotate_set/get
elm_map_wheel_disabled_set/get
elm_map_user_agent_set/get

4) Overlay
elm_map_overlay_add/del
elm_map_overlay_xxx
elm_map_overlay_class_xxx
elm_map_overlay_bubble_xxx
elm_map_overlay_route_xxx

I will add line, rectangle, poi overlays  ASAP.

5) Source - External Provider  (Tile, Route, Name, )
elm_map_sources_get
elm_map_source_set/get

I will add more provider ASAP such as POI, etc.

6) Route
elm_map_route_add/del
elm_map_route_distance_get
elm_map_route_node_get
elm_map_route_waypoints_get

7) Name
elm_map_name_add/del
elm_map_route_address_get
elm_map_route_region_get

6) Route and 7) Name do not return visible objects actually.  Those
just return data.
I don't know "_add" suffix is correct for none visible objects.
I cannot decide yet whether those should be removed from map widget.
But current trends are that route, geocoding are  tightly coupled with
Map.

If Apps want to use only data, just use elm_map_route_add().
If not, use elm_map_route_add() & elm_map_overlay_route_add().
Also name overlay could be added in the future.

8) Miscellaneous
elm_map_tile_load_status_get

9) Signals
Basic events : "clicked", "clicked,double", "press", "longpressed",
Scroller events: "scroll", "scroll,xxx,xxx"
Zoom events: "zoom,start/stop/change"
Source (provider) events: "tile,load/loaded/loaded,fail" ,
"route,load/loaded/loaded,fail", "name,load/loaded/loaded,fail"

There are some big patches. I think diff program do not make exact
diff. :D.
Anyway, it's  better to maintain if this can be in before API fix
(elementary 1.0).
Because after these change, It is hard to maintain old APIs.

PS) Documentations and some minor bugs are remained yet.



SVN revision: 68915
2012-03-07 09:28:08 +00:00
Carsten Haitzler fca8286e0d track bubble deprecation.
SVN revision: 68682
2012-03-05 08:37:28 +00:00
Bluezery 4de5c80ede From: Bluezery <ohpowel@gmail.com>
Subject: [E-devel] [Patch][elm_map] Add overlay in the map

I made a overlay APIs in the map. This will replace the marker APIs.
I hope that markers will be deleted before elementary 1.0 release.
This was discussed before in
http://marc.info/?l=enlightenment-devel&m=132685497711772&w=2

Marker only supports layout style overlay. So only icon and image are
suitable for marker.  For now on, overlay can support any evas object
and also layout style.
Currently overlay support default, bubble, and class types.  And more
types will be added (Polyline, Polygon, scale, POI etc.).
I made a Elm_Map_Overlay opaque structure for handling general overlay
properties (hide, pause, show, etc.) and coordinates or internal
content (icon, content, etc.) for those different types.
Class type overlay is something like mixture of previous marker group
and marker class.
If member overlays in the same class are closed, they will be grouped.
(Same functionality as previous maker group.) The group's properties
and contents are defined by using general overlay functions.  (New
functionality)
This defined properties and contents can be be propagated to member
overlays appended to this class.  (Same functionality as previous
maker class.)

There are some missing functionalities remained. Group callbacks are
not supported yet in the overlays.
So images inside group bubble can not be shown. I will implement this
feature.

After this patch, I will fix signals and function names before
elementary 1.0 releases.




SVN revision: 68672
2012-03-05 04:18:33 +00:00
Bluezery acf31ec4cd From: Bluezery <ohpowel@gmail.com>
Subject: [E-devel] [Patch][elm_map] Refactoring Elementary Map

I have done refactoring & code clean-up in elm_map.  Event if this
patch have much changes, refactoring & code clean-up jobs almost
always do.
Anyway, code is shortened and optimized I think.
 I have done following jobs in my patch.
 
 (1) Always change child size
 Scroller Child size is changed when integer zoom level is changed
 before. This makes bugs which mouse pointer is not correct on the map
 when map is dragging.
 Now, scroller child size is always changed when double zoom level is
changed.

(2) Evas map
Evas map is used for rotation & zooming before. But now it is used for
only rotation. evas_object_resize() can do zooming because (1) makes
child size always changed.

(3) Grid & Marker & Route, etc.
Because of (1), all coordinate calculations are all changed. So grid &
marker & route should be changed.
When I have fixed these, I have these split into small function
(create, free, update, place, etc.)
So these can be easily reused for other purpose ( I will add overlay
later.)
Also marker size is not changed and is not rotated anymore because
marker's coordinate is just rotated and evas_map is not used for
marker.

And grouping algorithm is somewhat changed. Each marker can be group
leader and if other markers (followers) are closed to leader, markers
are grouped.

Actually _marker_place() function do almost everything. (place marker,
bubble, group & make group, etc.)

Bubbles go along with parent object. (show, hide, move) and this is
created when marker & group are opened.
At now, bubble display bugs are all fixed.

As before, grid is created when elm_map_add() or tile source is
changed. And I add _grid_item_* functions for each 256x256 tile
management.  So grid_place() function can be simple now.

(4) Download idler
Before download is not a job or idler and is integrated with grid
calculation.
I have separated this into independent idler. So now, download idler
do download jobs when idler time.

(5) Zoom
I have made one zoom_do() function.  This does all zoom jobs. At now,
pinch_zoom & wheel_zoom & animated zoom do not much jobs. just call
zoom_do().

(6) Delayed jobs
As I know, evas is based on a retained mode and calculation can be do
later. So sometimes elm_map APIs can not  do the jobs correctly.
For example, elm_map_marker_list_show() or elm_map_zoom_set() can not
be used right after elm_map_add()  because window size and pan size
can be 0.   (refer map_example_02.c)
So when APIs related such calculation are called. These are deferred
and calculated later when _pan_calculate() is called.

5) Code clean-up
I have removed unused variables & functions.  and rearranged struct &
functions & declaration & static variables, etc.
Instead of "if (!wd) return; ", I changed this by macro,
"EINA_SAFETY_ON_NULL_RETURN(wd);". This is better for function
entrance check. Also ELM_NEW is used instead of calloc or malloc.

Aboves are all related each other. So it can be hard to split this
file. If these should be splitted, I'm going to freak ;D.
This patch does no harm!!!! :D.
 After this patch, I will add overlay APIs based on this patch.  I
 doubt whether I will add this before elementary 1.0 release.  :(
 


SVN revision: 68207
2012-02-21 08:01:22 +00:00
Carsten Haitzler 6636c616bf aah we'll take bluz' patch then instead of my fixing
SVN revision: 68206
2012-02-21 07:59:19 +00:00
Carsten Haitzler c31c89176a and other part of bluez map commit
SVN revision: 68193
2012-02-21 03:25:24 +00:00
Bluezery 80a3a87fa9 From: Bluezery <ohpowel@gmail.com>
Subject: [E-devel]  [Patch][elm_map] Fix zoom & rotated coordinates bug

In my point of view, elm_map did not consider zooming & rotation by
using Evas_Map initially.
There are no problems if you use only elm_map_zoom_set(). But if you
use pinch gesture or wheel to do subtle zooming & rotating, the
calculations of coordinates are not correct currently.

I have fixed these problem and also made some utility APIs for user
convenience.
I made following 3 APIs.
1. elm_map_utils_size_get()
Currently users can only get integer zoom level by using
elm_map_zoom_get().
So if user want to calculate full map size, user should calculate
pow(2.0, zoom level) * tile size.  Furthermore, user assumes tile size
as 256. (tile size can be changed!!)
Also it's not correct sometimes because Evas_map is used for subtle
zooming between zoom levels.
Above APIs return correct full map size.

2. elm_map_utils_region_get()
It can used for getting left top coordinates, center coordinates and
width, height of currently shown map area.

3. elm_map_utils_convert_canvas_into_geo()
Currently it is hard to converting x, y coordinates to geographical
longitude, latitude because of subtle zooming & rotating.
If use wants to get it, user uses combination of above functions and
more. It is harsh job.
This function is used for getting longitude, latitude from x, y
coordinates of current viewport.



SVN revision: 67286
2012-01-18 03:55:40 +00:00
Bluezery 03e6f69c3d From: Bluezery <ohpowel@gmail.com>
Subject: [E-devel] [Patch][elm_map] Bug fix for map test

This patch is for test map.
This fixes two simple bugs.
1. Max zoom level can be changed depends on the map source, not always 18.
2. $HOME can be NULL.



SVN revision: 66154
2011-12-13 10:39:53 +00:00
ChunEon Park 25d9ba0731 elementary/map
I have using elementary_test for testing elementary map widget.
But it use invalid object for signal callback. I have changed win --> map.
Also I have fixed invalid log message.

Signed-Off-By: TaeHwan Kim(ohpowel@gmail.com)
Signed-Off-By: ChunEon Park(hermet@hermet.pe.kr)



SVN revision: 65886
2011-12-05 05:04:24 +00:00
ChunEon Park 468985fa84 elementary/menu - Elm_Menu_Item -> Elm_Object_Item
SVN revision: 65596
2011-11-25 10:57:39 +00:00
Boris Faure 1112d30a41 elm: change elm_object_content_part_set/get/unset to elm_object_part_content_set/get/unset
SVN revision: 65349
2011-11-17 21:02:31 +00:00
ChunEon Park 236192cd9a elementary - modified content_set/get/unset part names to be simple names.
Previous part names are just the swallow part names
but in modified version, the part names chaned to simpler meaning names to use.

i.e for button

elm_object_content_part_set(button, "elm.swallow.icon", icon);
-> elm_object_content_part_set(button, "icon", icon);




SVN revision: 65295
2011-11-16 12:51:53 +00:00
ChunEon Park 7ea44dee3b elementary/test_map.c - Those test code should not be committed.
maybe raster you. 



SVN revision: 65071
2011-11-11 16:47:05 +00:00
Bluezery 84f0b47a95 From: Bluezery <ohpowel@gmail.com>
Subject: [E-devel] [elm_map] ecore_file_download_full() should be used
properly

elm_map only checked that returned job is NULL.
But ecore_file_download_full() returns EINA_FALSE when error occurred.
So return value should be checked for proper usage.
Please review this simple bug fix



SVN revision: 64794
2011-11-06 06:11:57 +00:00
Sangho Park 4739f9fe16 Elementary Map: remove unused vbox
Actually.. rollback to r64370.


SVN revision: 64638
2011-11-02 08:14:02 +00:00
Sung W. Park 86dc87bb2c From: "Sung W. Park" <sungwoo@gmail.com>
Subject: [E-devel] [E-Devel][Patch] Evas GL Color Format Enum change
(and ElmGLview changes accordingly)

I'm submitting a patch that changes the color format for Evas GL.

When I first wrote Evas_GL, I just had EVAS_GL_RGB_8 and EVAS_GL_RGBA_8 and etc
but it was misleading for some people.  It was more of a filler since I couldn't decide on
a name.  I'm finally changing it to make it more clear.



SVN revision: 64491
2011-10-28 11:08:23 +00:00
ChunEon Park 8d85b136bf elementary/button -> use elm_object_content_set/get/unset
SVN revision: 64370
2011-10-25 01:23:25 +00:00
Daniel Juyung Seo d473e343eb elm test: Refactoring. Changed 1 to EINA_TRUE for Eina_Bool parameter of elm_win_autodel_set() API.
SVN revision: 61695
2011-07-25 14:22:19 +00:00
Mike McCormack 0295f4d56e elementary: elm_label_label_ -> elm_object_text
Clear deprecated warnings.

Signed-off-by: Mike McCormack <mj.mccormack@samsung.com>

SVN revision: 60798
2011-06-29 06:41:31 +00:00
Daniel Juyung Seo a4705d7d9d elm test_map: Fixed 'unused parameter' warnings.
SVN revision: 60746
2011-06-28 07:02:37 +00:00
Jonathan Atton d47854c49f elm: add elm_route: widget to display a route on elm_map. Currently the widget use lines, in the futur it will use edje
SVN revision: 60703
2011-06-26 17:36:18 +00:00
Jonathan Atton 4717eea85d elm: do not include config.h
SVN revision: 60687
2011-06-25 17:48:55 +00:00
Jonathan Atton 6b88bee7e5 elm_map: use emap
SVN revision: 60684
2011-06-25 14:30:10 +00:00
Daniel Juyung Seo 5b30088911 Elm: Use 'canvas' API and structure rather than 'output' API and
structure.

'canvas' and 'output' are same. So we need to deprecate one of them
later(may be evas 2.0 or so.) After I discuss this with raster, I've
got to use 'canvas' not 'output'. So I fixed elementary codes.


SVN revision: 60268
2011-06-13 11:26:08 +00:00
Sangho Park 92060c1ed5 Elementary map: add APIs for setting min,max zoom level
SVN revision: 59704
2011-05-26 12:40:29 +00:00
Sangho Park 0203bfdb0e Elementary Map: --warns (-Wshadow)
SVN revision: 59562
2011-05-21 08:59:19 +00:00
Sangho Park 1a547f902f Elementary map: split route & track (watchwolf's suggestion)
SVN revision: 59548
2011-05-20 05:55:15 +00:00
Sangho Park 2c7fc83f40 Elementary map:
> fix ZOOM_AUTO_FILL, FIT bug
  > fix wheel bug  when paused is set


SVN revision: 59257
2011-05-07 06:32:34 +00:00
Sangho Park 0a07dc8225 Elementary map:
> --bug of zoom
   > API change (double elm_map_zoom_get() -> int elm_map_zoom_get())


SVN revision: 59216
2011-05-05 15:15:43 +00:00