Converted the python examples to using requests for json requests

Author: dov

python/giv-client-marks.py

@@ -4,14 +4,11 @@
 giv.
 """
 
-import httplib
+import requests
 import random
 import math
+import json
 
-conn = httplib.HTTPConnection('localhost:8448')
-headers = {"Content-type": "application/x-www-form-urlencoded",
-           "Accept": "text/plain",
-           }
 
 for i in range(1024):
   giv_string = ("$marks fcircle\n"
@@ -22,11 +19,11 @@
     y = 256+100*math.sin((x+phase) / 512.0 * 2*3.1459)
     giv_string += "%f %f\n"%(x,y)
 
-  request = ('{"jsonrpc": "2.0", '
-             '"method": "giv_string", '
-             '"params": [\"'+giv_string+'"], '
-             '"id": %d}'%(random.randint(1,100)))
+  # Build a hash and then json.dumps() it
+  data = {
+    'jsonrpc' : '2.0',
+    'method' : 'giv_string',
+    'params' : [ giv_string ],
+    'id': random.randint(1,100)}
 
-  conn.request("POST", url="", body= request, headers=headers)
-  response = conn.getresponse()
-  print response.read()
+  r = requests.post(f'http://localhost:8448', json.dumps(data))

python/giv-client-pick-coordinate.py

@@ -1,16 +1,23 @@
 #!/usr/bin/python
 
-import httplib,json
+######################################################################
+#  An example of how to pick a coordinate with giv.
+#
+#  2023-11-26 Sun
+#  Dov Grobgeld <[email protected]>
+######################################################################
 
-conn = httplib.HTTPConnection('localhost:8448')
+import requests,json
 
-request = {'method':"pick_coordinate",
-           'params':[]} 
+def get_giv_coordinate(port=8448):
+  '''Returns x,y,button,modifiers'''
+  data = {'method':"pick_coordinate",
+          'params':[]} 
+  
+  r = requests.post(f'http://localhost:{port}', json.dumps(data))
+  res = json.loads(r.text)
+  return res['result']
 
-conn.request("POST", url='', body= json.dumps(request))
-response = json.loads(conn.getresponse().read())
-if 'error' in response:
-  print response['error']['message']
-else:
-  print response['result']
+x,y,button,modifiers = get_giv_coordinate()
+print(f'{x=} {y=} {button=} {modifiers=}')
 

python/giv-client.py

@@ -1,12 +1,13 @@
 #!/usr/bin/python
+######################################################################
+#  A minimal json client
+#
+#  2023-11-26 Sun
+#  Dov Grobgeld <[email protected]>
+######################################################################
+import requests,json
+
+data = {'method':"load_file",
+        'params':['/home/dov/github/giv/examples/maja.pgm']} # Full path!
+r = requests.post(f'http://localhost:8448', json.dumps(data))
 
-import httplib,json
-
-conn = httplib.HTTPConnection('localhost:8448')
-
-request = {'method':"load_file",
-           'params':['/home/dov/github/giv/examples/lena.pgm']} # Full path!
-
-conn.request("POST", url='', body= json.dumps(request))
-response = json.loads(conn.getresponse().read())['result']
-print response

python/giv.py

@@ -1717,7 +1717,7 @@ cb_button_press_event (GtkWidget * widget,
 
     giv_widget_popdown_balloon(GIV_WIDGET(selfp->w_imgv));
 
-    if (button!= 2 && selfp->do_pick_coordinate) {
+    if (event->button!= 2 && selfp->do_pick_coordinate) {
         double world_x, world_y;
         gtk_image_viewer_canv_coord_to_img_coord(GTK_IMAGE_VIEWER(selfp->w_imgv),
                                                  event->x, event->y,