Explorar el Código

Workign with graph

JoostSijm hace 4 años
padre
commit
c95dab2576
Se han modificado 2 ficheros con 9 adiciones y 8 borrados
  1. 2 1
      app/__main__.py
  2. 7 7
      app/app.py

+ 2 - 1
app/__main__.py

@@ -3,7 +3,7 @@
 import time
 import sys
 
-from app import SCHEDULER, LOGGER, RESOURCE_NAMES, job_storage, jobs
+from app import SCHEDULER, LOGGER, RESOURCE_NAMES, job_storage, jobs#, app
 
 
 def add_telegram_update_job(state_id, telegram_id, resource_type):
@@ -24,6 +24,7 @@ if __name__ == '__main__':
     # jobs.check_resources(3304, 4004, 3, False, False) # VN
     # jobs.check_resources(3304, 4004, 11, False, False) # VN
     # app.graph()
+    # sys.exit()
     # get_resources(4001, datetime.now(), 0)
     # jobs.send_telegram_update(2788, '@vn_resources', 'gold')
     # jobs.send_telegram_update(2788, '@vn_uranium_resources', 'uranium')

+ 7 - 7
app/app.py

@@ -102,9 +102,9 @@ def graph():
     date = datetime.now() # - timedelta(1)
     region_4001 = database.get_resources(4001, date, 0)
     region_4002 = database.get_resources(4002, date, 0)
-    region_4003 = database.get_resources(4003, date, 0)
-    region_4004 = database.get_resources(4004, date, 0)
-    region_4008 = database.get_resources(4008, date, 0)
+    #region_4003 = database.get_resources(4003, date, 0)
+    #region_4004 = database.get_resources(4004, date, 0)
+    #region_4008 = database.get_resources(4008, date, 0)
 
     # resource_tmp = np.random.randn(2499)+range(2500, 1, -1)
     # Make a data frame
@@ -114,9 +114,9 @@ def graph():
         'x': list(region_4001.keys()),
         'Northern Netherlands': list(region_4001.values()),
         'Eastern Netherlands': list(region_4002.values()),
-        'Western Netherlands': list(region_4003.values()),
-        'Southern Netherlands': list(region_4004.values()),
-        'Amsterdam': list(region_4008.values()),
+        #'Western Netherlands': list(region_4003.values()),
+        #'Southern Netherlands': list(region_4004.values()),
+        #'Amsterdam': list(region_4008.values()),
     })
 
     major_fmt = mdates.DateFormatter('%m-%d %H:%M')
@@ -124,7 +124,7 @@ def graph():
     fig, ax = plt.subplots()
     ax.xaxis.set_major_formatter(major_fmt)
     fig.autofmt_xdate()
-    end_date_time = date.replace(hour=19, minute=0, second=0, microsecond=0)
+    end_date_time = date.replace(hour=20, minute=0, second=0, microsecond=0)
     start_date_time = end_date_time - timedelta(hours=24)
     ax.set_xlim([start_date_time, end_date_time])
     ax.set_ylim([0, 2500])