diff --git a/1.jpg b/1.jpg deleted file mode 100644 index 8ebe891..0000000 Binary files a/1.jpg and /dev/null differ diff --git a/2.jpg b/2.jpg deleted file mode 100644 index 57da297..0000000 Binary files a/2.jpg and /dev/null differ diff --git a/3.jpg b/3.jpg deleted file mode 100644 index 991513b..0000000 Binary files a/3.jpg and /dev/null differ diff --git a/config.py b/config.py new file mode 100644 index 0000000..4ab0d31 --- /dev/null +++ b/config.py @@ -0,0 +1,2 @@ +DEBUG = False +SECRET_KEY = b'needs_to_be_set!' \ No newline at end of file diff --git a/migrations/README b/migrations/README new file mode 100644 index 0000000..98e4f9c --- /dev/null +++ b/migrations/README @@ -0,0 +1 @@ +Generic single-database configuration. \ No newline at end of file diff --git a/migrations/alembic.ini b/migrations/alembic.ini new file mode 100644 index 0000000..f8ed480 --- /dev/null +++ b/migrations/alembic.ini @@ -0,0 +1,45 @@ +# A generic, single database configuration. + +[alembic] +# template used to generate migration files +# file_template = %%(rev)s_%%(slug)s + +# set to 'true' to run the environment during +# the 'revision' command, regardless of autogenerate +# revision_environment = false + + +# Logging configuration +[loggers] +keys = root,sqlalchemy,alembic + +[handlers] +keys = console + +[formatters] +keys = generic + +[logger_root] +level = WARN +handlers = console +qualname = + +[logger_sqlalchemy] +level = WARN +handlers = +qualname = sqlalchemy.engine + +[logger_alembic] +level = INFO +handlers = +qualname = alembic + +[handler_console] +class = StreamHandler +args = (sys.stderr,) +level = NOTSET +formatter = generic + +[formatter_generic] +format = %(levelname)-5.5s [%(name)s] %(message)s +datefmt = %H:%M:%S diff --git a/migrations/env.py b/migrations/env.py new file mode 100644 index 0000000..23663ff --- /dev/null +++ b/migrations/env.py @@ -0,0 +1,87 @@ +from __future__ import with_statement +from alembic import context +from sqlalchemy import engine_from_config, pool +from logging.config import fileConfig +import logging + +# this is the Alembic Config object, which provides +# access to the values within the .ini file in use. +config = context.config + +# Interpret the config file for Python logging. +# This line sets up loggers basically. +fileConfig(config.config_file_name) +logger = logging.getLogger('alembic.env') + +# add your model's MetaData object here +# for 'autogenerate' support +# from myapp import mymodel +# target_metadata = mymodel.Base.metadata +from flask import current_app +config.set_main_option('sqlalchemy.url', + current_app.config.get('SQLALCHEMY_DATABASE_URI')) +target_metadata = current_app.extensions['migrate'].db.metadata + +# other values from the config, defined by the needs of env.py, +# can be acquired: +# my_important_option = config.get_main_option("my_important_option") +# ... etc. + + +def run_migrations_offline(): + """Run migrations in 'offline' mode. + + This configures the context with just a URL + and not an Engine, though an Engine is acceptable + here as well. By skipping the Engine creation + we don't even need a DBAPI to be available. + + Calls to context.execute() here emit the given string to the + script output. + + """ + url = config.get_main_option("sqlalchemy.url") + context.configure(url=url) + + with context.begin_transaction(): + context.run_migrations() + + +def run_migrations_online(): + """Run migrations in 'online' mode. + + In this scenario we need to create an Engine + and associate a connection with the context. + + """ + + # this callback is used to prevent an auto-migration from being generated + # when there are no changes to the schema + # reference: http://alembic.zzzcomputing.com/en/latest/cookbook.html + def process_revision_directives(context, revision, directives): + if getattr(config.cmd_opts, 'autogenerate', False): + script = directives[0] + if script.upgrade_ops.is_empty(): + directives[:] = [] + logger.info('No changes in schema detected.') + + engine = engine_from_config(config.get_section(config.config_ini_section), + prefix='sqlalchemy.', + poolclass=pool.NullPool) + + connection = engine.connect() + context.configure(connection=connection, + target_metadata=target_metadata, + process_revision_directives=process_revision_directives, + **current_app.extensions['migrate'].configure_args) + + try: + with context.begin_transaction(): + context.run_migrations() + finally: + connection.close() + +if context.is_offline_mode(): + run_migrations_offline() +else: + run_migrations_online() diff --git a/migrations/script.py.mako b/migrations/script.py.mako new file mode 100644 index 0000000..2c01563 --- /dev/null +++ b/migrations/script.py.mako @@ -0,0 +1,24 @@ +"""${message} + +Revision ID: ${up_revision} +Revises: ${down_revision | comma,n} +Create Date: ${create_date} + +""" +from alembic import op +import sqlalchemy as sa +${imports if imports else ""} + +# revision identifiers, used by Alembic. +revision = ${repr(up_revision)} +down_revision = ${repr(down_revision)} +branch_labels = ${repr(branch_labels)} +depends_on = ${repr(depends_on)} + + +def upgrade(): + ${upgrades if upgrades else "pass"} + + +def downgrade(): + ${downgrades if downgrades else "pass"} diff --git a/migrations/versions/5b75d2439618_.py b/migrations/versions/5b75d2439618_.py new file mode 100644 index 0000000..a671492 --- /dev/null +++ b/migrations/versions/5b75d2439618_.py @@ -0,0 +1,60 @@ +"""empty message + +Revision ID: 5b75d2439618 +Revises: +Create Date: 2018-10-28 15:26:30.086363 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '5b75d2439618' +down_revision = None +branch_labels = None +depends_on = None + + +def upgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.create_table('camera_settings', + sa.Column('id', sa.Integer(), autoincrement=True, nullable=False), + sa.Column('name', sa.String(length=64), nullable=True), + sa.Column('iso', sa.Integer(), nullable=True), + sa.Column('fps', sa.Integer(), nullable=True), + sa.Column('width', sa.Integer(), nullable=True), + sa.Column('height', sa.Integer(), nullable=True), + sa.Column('fix_shutter', sa.Boolean(), nullable=True), + sa.Column('fix_wb', sa.Boolean(), nullable=True), + sa.PrimaryKeyConstraint('id') + ) + op.create_index(op.f('ix_camera_settings_name'), 'camera_settings', ['name'], unique=True) + op.create_table('dataset', + sa.Column('id', sa.Integer(), autoincrement=True, nullable=False), + sa.Column('title', sa.String(length=64), nullable=True), + sa.Column('datetime_created', sa.DateTime(), nullable=True), + sa.PrimaryKeyConstraint('id') + ) + op.create_index(op.f('ix_dataset_title'), 'dataset', ['title'], unique=False) + op.create_table('image', + sa.Column('id', sa.Integer(), autoincrement=True, nullable=False), + sa.Column('filename', sa.String(length=128), nullable=True), + sa.Column('datetime_created', sa.DateTime(), nullable=True), + sa.Column('dataset_id', sa.Integer(), nullable=True), + sa.ForeignKeyConstraint(['dataset_id'], ['dataset.id'], ), + sa.PrimaryKeyConstraint('id') + ) + op.create_index(op.f('ix_image_filename'), 'image', ['filename'], unique=True) + # ### end Alembic commands ### + + +def downgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.drop_index(op.f('ix_image_filename'), table_name='image') + op.drop_table('image') + op.drop_index(op.f('ix_dataset_title'), table_name='dataset') + op.drop_table('dataset') + op.drop_index(op.f('ix_camera_settings_name'), table_name='camera_settings') + op.drop_table('camera_settings') + # ### end Alembic commands ### diff --git a/phytopi.py b/phytopi.py index f98d5ac..2c08e3d 100644 --- a/phytopi.py +++ b/phytopi.py @@ -1 +1,6 @@ -from phytopi import app \ No newline at end of file +from phytopi import app, db +from phytopi.models import Dataset, Image + +@app.shell_context_processor +def make_shell_context(): + return {'db': db, 'Dataset': Dataset, 'Image': Image} diff --git a/phytopi/__init__.py b/phytopi/__init__.py index cd80d00..ee384c0 100644 --- a/phytopi/__init__.py +++ b/phytopi/__init__.py @@ -1,22 +1,16 @@ import os from flask import Flask +from flask_sqlalchemy import SQLAlchemy +from flask_migrate import Migrate +from phytopi.config import Config +# from phytopi.camera.camera_pi import Camera -def create_app(config_filename=None): - app = Flask(__name__, instance_relative_config=True) +app = Flask(__name__, instance_relative_config=True) - if config_filename is None: - app.config.from_pyfile('config.py', silent=True) - else: - app.config.from_pyfile(config_filename, silent=True) +app.config.from_object(Config) - try: - os.makedirs(app.instance_path) - except OSError: - pass - - from phytopi.views import frontend - - app.register_blueprint(frontend.bp) - - return app +db = SQLAlchemy(app) +migrate = Migrate(app, db) +# camera = Camera(app=app) +from phytopi import routes, models diff --git a/phytopi/camera/base_camera.py b/phytopi/camera/base_camera.py index acc5ed6..cddb753 100644 --- a/phytopi/camera/base_camera.py +++ b/phytopi/camera/base_camera.py @@ -1,5 +1,13 @@ import time import threading +from PIL import Image +from PIL import ImageDraw +from PIL import ImageFont + +from io import BytesIO + +from phytopi import db, models, app + try: from greenlet import getcurrent as get_ident except ImportError: @@ -8,7 +16,6 @@ except ImportError: except ImportError: from _thread import get_ident - class CameraEvent(object): """An Event-like class that signals all active clients when a new frame is available. @@ -54,14 +61,25 @@ class CameraEvent(object): class BaseCamera(object): thread = None # background thread that reads frames from camera frame = None # current frame is stored here by background thread - last_access = 0 # time of last client access to the camera - live_mode = True # live view? + # last_access = 0 # time of last client access to the camera + last_saved = None + timelapse_interval = None event = CameraEvent() + image_counter = 0 + camera = None + fixed_shutter = False + fixed_white_balance = False + current_dataset = None + app = None - def __init__(self): + def __init__(self, timelapse_interval=None, app=None): """Start the background camera thread if it isn't running yet.""" + if app: + BaseCamera.app = app + if timelapse_interval: + BaseCamera.timelapse_interval = timelapse_interval if BaseCamera.thread is None: - BaseCamera.last_access = time.time() + # BaseCamera.last_access = time.time() # start background frame thread BaseCamera.thread = threading.Thread(target=self._thread) @@ -71,14 +89,39 @@ class BaseCamera(object): while self.get_frame() is None: time.sleep(0) - def get_frame(self): + def set_timelapse_interval(self, interval=None): + BaseCamera.timelapse_interval = interval + + def reset_image_counter(self): + BaseCamera.image_counter = 0 + + def get_frame(self, thumbnail=False): """Return the current camera frame.""" - BaseCamera.last_access = time.time() + # BaseCamera.last_access = time.time() # wait for a signal from the camera thread BaseCamera.event.wait() BaseCamera.event.clear() + # if a thumbnail is requested, resize frame and deliver + if thumbnail: + with Image.open(BytesIO(BaseCamera.frame)) as img: + img.thumbnail((500, 500), Image.ANTIALIAS) + font = ImageFont.truetype(font='phytopi/fonts/Hack-Bold.ttf') + txt = str(time.strftime("%Y-%m-%d %H:%M:%S")) + txt_width, txt_height = font.getsize(txt) + draw = ImageDraw.Draw(img) + txt_x, txt_y = (2, 2) + draw.rectangle((0, 0, txt_x + txt_width + 2, txt_y + txt_height + 2), fill='black') + draw.text((2, 2), txt, (255, 255, 255), font=font) + if BaseCamera.timelapse_interval: + img_width, img_height = img.size + draw.ellipse([(img_width - 15, 5),(img_width-5, 15)], fill='red') + with BytesIO() as live_out: + img.save(live_out, format='JPEG') + thumbnail = live_out.getvalue() + return thumbnail + return BaseCamera.frame @staticmethod @@ -86,20 +129,28 @@ class BaseCamera(object): """"Generator that returns frames from the camera.""" raise RuntimeError('Must be implemented by subclasses.') - @classmethod - def _thread(cls): + # @classmethod + def _thread(self): """Camera background thread.""" print('Starting camera thread.') - frames_iterator = cls.frames() + frames_iterator = self.frames() for frame in frames_iterator: BaseCamera.frame = frame + BaseCamera.event.set() # send signal to clients time.sleep(0) + if self.timelapse_interval is not None: + if self.last_saved is None or time.time() - self.last_saved >= self.timelapse_interval: + self.last_saved = time.time() + timestr = time.strftime("%Y%m%d_%H%M%S", time.localtime(self.last_saved)) + filename = 'tl-{}.jpg'.format(timestr) + with open('{}/{}'.format(BaseCamera.app.config['DATA_PATH'], filename), 'wb') as f: + f.write(BaseCamera.frame) + print("Saved {}".format(filename)) + print(self.current_dataset) + db.session.add(models.Image(filename=filename, dataset_id=self.current_dataset)) + db.session.commit() + self.image_counter += 1 + + BaseCamera.thread = None - # if there hasn't been any clients asking for frames in - # the last 10 seconds then stop the thread - if time.time() - BaseCamera.last_access > 10: - frames_iterator.close() - print('Stopping camera thread due to inactivity.') - break - BaseCamera.thread = None \ No newline at end of file diff --git a/phytopi/camera/camera_dummy.py b/phytopi/camera/camera_dummy.py deleted file mode 100644 index 5b53dbf..0000000 --- a/phytopi/camera/camera_dummy.py +++ /dev/null @@ -1,14 +0,0 @@ -import time -from phytopi.camera.base_camera import BaseCamera - - -class Camera(BaseCamera): - """An emulated camera implementation that streams a repeated sequence of - files 1.jpg, 2.jpg and 3.jpg at a rate of one frame per second.""" - imgs = [open(f + '.jpg', 'rb').read() for f in ['1', '2', '3']] - - @staticmethod - def frames(): - while True: - time.sleep(1) - yield Camera.imgs[int(time.time()) % 3] \ No newline at end of file diff --git a/phytopi/camera/camera_pi.py b/phytopi/camera/camera_pi.py index 0a4c2c3..2eda902 100644 --- a/phytopi/camera/camera_pi.py +++ b/phytopi/camera/camera_pi.py @@ -1,4 +1,3 @@ - import io import time import picamera @@ -6,27 +5,39 @@ from phytopi.camera.base_camera import BaseCamera class Camera(BaseCamera): - @staticmethod - def set_live_mode(live_mode=True): - Camera.live_mode = live_mode @staticmethod def frames(): - with picamera.PiCamera() as camera: + stream = io.BytesIO() + with picamera.PiCamera(sensor_mode=3, framerate=15, resolution=(3280, 2464)) as camera: + BaseCamera.camera = camera + # camera.iso = 100 # let camera warm up - time.sleep(2) + time.sleep(60) + # if BaseCamera.fixed_shutter: + # camera.shutter_speed = camera.exposure_speed + # camera.exposure_mode = 'off' + # if BaseCamera.fixed_white_balance: + # g = camera.awb_gains + # camera.awb_mode = 'off' + # camera.awb_gains = g - if Camera.live_mode: - stream = io.BytesIO() - for _ in camera.capture_continuous(stream, 'jpeg', use_video_port=True): - # return current frame - stream.seek(0) - yield stream.read() + # camera.framerate = 15 + + # stream = io.BytesIO() + # while True: + # camera.capture(stream, 'jpeg', use_video_port=False, quality=100) + # stream.seek(0) + # yield stream.read() + # stream.seek(0) + # stream.truncate() + + for _ in camera.capture_continuous(stream, 'jpeg', use_video_port=False, quality=100): + # return current frame + stream.seek(0) + yield stream.read() - # reset stream for next frame - stream.seek(0) - stream.truncate() - else: - for filename in camera.capture_continuous('tl-{timestamp:%Y%m%d_%H%M}.jpg', 'jpg', - use_video_port=False): - yield open(filename, 'rb').read() \ No newline at end of file + # reset stream for next frame + stream.seek(0) + stream.truncate() + time.sleep(2) diff --git a/phytopi/config.py b/phytopi/config.py new file mode 100644 index 0000000..5ba4300 --- /dev/null +++ b/phytopi/config.py @@ -0,0 +1,10 @@ +import os +import binascii + +basedir = os.path.abspath(os.path.dirname(__file__)) + +class Config(object): + SECRET_KEY = os.environ.get('SECRET_KEY') or binascii.hexlify(os.urandom(24)) + DATA_PATH = os.environ.get('DATA_PATH') or os.path.join(basedir, 'static/data') + SQLALCHEMY_DATABASE_URI = os.environ.get('SQLALCHEMY_DATABASE_URI') or 'sqlite:///' + os.path.join(basedir, 'phytopi.db') + SQLALCHEMY_TRACK_MODIFICATIONS = os.environ.get('SQLALCHEMY_TRACK_MODIFICATIONS') or False \ No newline at end of file diff --git a/phytopi/fonts/Hack-Bold.ttf b/phytopi/fonts/Hack-Bold.ttf new file mode 100644 index 0000000..7ff4975 Binary files /dev/null and b/phytopi/fonts/Hack-Bold.ttf differ diff --git a/phytopi/fonts/Hack-Regular.ttf b/phytopi/fonts/Hack-Regular.ttf new file mode 100644 index 0000000..92a90cb Binary files /dev/null and b/phytopi/fonts/Hack-Regular.ttf differ diff --git a/phytopi/forms.py b/phytopi/forms.py new file mode 100644 index 0000000..7dd437c --- /dev/null +++ b/phytopi/forms.py @@ -0,0 +1,11 @@ +from flask_wtf import FlaskForm +from wtforms import StringField, IntegerField, BooleanField, SubmitField +from wtforms.validators import NumberRange, DataRequired + + +class CameraSettingsForm(FlaskForm): + camera_iso = IntegerField('ISO', validators=[NumberRange(min=0), DataRequired()]) + camera_fps = IntegerField('Framerate', validators=[NumberRange(min=1, max=60), DataRequired()]) + camera_fix_shutter = BooleanField('Fixed exposure time') + camera_fix_wb = BooleanField('Fix white balance') + submit = SubmitField('Save & Apply') \ No newline at end of file diff --git a/phytopi/models.py b/phytopi/models.py new file mode 100644 index 0000000..b49e45f --- /dev/null +++ b/phytopi/models.py @@ -0,0 +1,45 @@ +from datetime import datetime +from phytopi import db + +class Dataset(db.Model): + id = db.Column(db.Integer, primary_key=True, autoincrement=True) + title = db.Column(db.String(64), index=True) + datetime_created = db.Column(db.DateTime, default=datetime.utcnow, ) + images = db.relationship('Image', backref='dataset', lazy='dynamic') + + def __repr__(self): + return ''.format(self.datetime_created) + + def __index__(self): + return int(self.id) + +class Image(db.Model): + id = db.Column(db.Integer, primary_key=True, autoincrement=True) + filename = db.Column(db.String(128), index=True, unique=True) + datetime_created = datetime_created = db.Column(db.DateTime, default=datetime.utcnow) + dataset_id = db.Column(db.Integer, db.ForeignKey('dataset.id')) + + def __repr__(self): + return ''.format(self.filename) + +class CameraSettings(db.Model): + id = db.Column(db.Integer, primary_key=True, autoincrement=True) + name = db.Column(db.String(64), index=True, unique=True) + iso = db.Column(db.Integer, default=100) + fps = db.Column(db.Integer, default=5) + width = db.Column(db.Integer, default=3280) + height = db.Column(db.Integer, default=2464) + fix_shutter = db.Column(db.Boolean, default=False) + fix_wb = db.Column(db.Boolean, default=False) + + def __init__(self, name, iso=100, fps=5, width=3280, height=2464, fix_shutter=False, fix_wb=False): + self.name = name + self.iso = iso + self.fps = fps + self.width = width + self.height = height + self.fix_shutter = fix_shutter + self.fix_wb = fix_wb + + def __repr__(self): + return ''.format(self.name) \ No newline at end of file diff --git a/phytopi/phytopi.db b/phytopi/phytopi.db new file mode 100644 index 0000000..0519c72 Binary files /dev/null and b/phytopi/phytopi.db differ diff --git a/phytopi/routes.py b/phytopi/routes.py new file mode 100644 index 0000000..35e73b6 --- /dev/null +++ b/phytopi/routes.py @@ -0,0 +1,115 @@ +from flask import render_template, Response, flash, jsonify, request, stream_with_context, send_file + +from phytopi.camera.camera_pi import Camera +from phytopi.forms import CameraSettingsForm + +from phytopi import app +from phytopi import db +from phytopi.models import Dataset + +from io import BytesIO +import zipstream + +camera = Camera(app=app) +# camera = app.camera +save_frames = False + +@app.route('/') +@app.route('/index') +def index(): + content = {'timelapse': save_frames} + return render_template('index.html', content=content) + +@app.route('/toggle_timelapse', methods=['GET', 'POST']) +def start_stop_timelapse(): + global save_frames + global current_dataset + global camera + if save_frames: + save_frames = False + timelapse_interval = None + btn_text = "Start" + btn_class = 'btn-primary' + camera.current_dataset = None + camera.last_saved = None + print(" > switched off timelapse mode") + else: + save_frames = True + timelapse_interval = 1200 + btn_text = "Stop" + btn_class = 'btn-danger' + dataset = Dataset() + db.session.add(dataset) + db.session.commit() + camera.current_dataset = dataset.id + print(" > switched on timelapse mode") + + camera.set_timelapse_interval(timelapse_interval) + return jsonify(btn_text=btn_text, btn_class=btn_class) + + +def gen(camera): +# def gen(): + """Video streaming generator function.""" + while True: + frame = camera.get_frame(thumbnail=True) + yield (b'--frame\r\n' + b'Content-Type: image/jpeg\r\n\r\n' + frame + b'\r\n') + + +@app.route('/data') +def data(): + return Response(app.config['DATA_PATH']) + +@app.route('/video_feed') +def video_feed(): + global camera + return Response(gen(camera), + mimetype='multipart/x-mixed-replace; boundary=frame') + +@app.route('/settings', methods=['GET', 'POST']) +def settings(): + form = CameraSettingsForm() + return render_template('settings.html', form=form) + #global camera + #camera_settings = {'fps': camera.camera.framerate, + # 'iso': camera.camera.iso} + #return render_template('settings.html', settings=camera_settings) + +@app.route('/datasets') +@app.route('/datasets/') +def datasets(dataset_id=None): + if dataset_id: + dataset = Dataset.query.get(int(dataset_id)) + data = dataset.images.all() + else: + data = Dataset.query.order_by(Dataset.datetime_created.desc()).all() + + content = {'data': data, + 'id': dataset_id} + return render_template('datasets.html', content=content) + +@app.route('/datasets//delete') +def dataset_delete(dataset_id): + Dataset.query.filter_by(id=dataset_id).delete() + db.session.commit() + return datasets() + +@app.route('/datasets//download') +def dataset_download(dataset_id): + images = Dataset.query.get(int(dataset_id)).images.all() + + def generateZip(images): + zf = zipstream.ZipFile(mode='w', compression=zipstream.ZIP_DEFLATED) + for image in images: + filename = '{}/{}'.format(app.config['DATA_PATH'], image.filename) + zf.write(filename, arcname=image.filename) + for chunk in zf: + yield chunk + zf.close() + + + #return send_file(generateZip(images), attachment_filename='dataset_{}.zip'.format(dataset_id), as_attachment=True) + response = Response(stream_with_context(generateZip(images)), mimetype='application/zip') + response.headers['Content-Disposition'] = 'attachment; filename=dataset_{}.zip'.format(dataset_id) + return response diff --git a/phytopi/static/img/apple-touch-icon.png b/phytopi/static/img/apple-touch-icon.png new file mode 100644 index 0000000..d68521c Binary files /dev/null and b/phytopi/static/img/apple-touch-icon.png differ diff --git a/phytopi/static/img/favicon.ico b/phytopi/static/img/favicon.ico new file mode 100644 index 0000000..0958c8f Binary files /dev/null and b/phytopi/static/img/favicon.ico differ diff --git a/phytopi/static/img/favicon.png b/phytopi/static/img/favicon.png new file mode 100644 index 0000000..90be579 Binary files /dev/null and b/phytopi/static/img/favicon.png differ diff --git a/phytopi/static/img/icon.svg b/phytopi/static/img/icon.svg new file mode 100644 index 0000000..c505bba --- /dev/null +++ b/phytopi/static/img/icon.svg @@ -0,0 +1,54 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/phytopi/static/img/mstile-144x144.png b/phytopi/static/img/mstile-144x144.png new file mode 100644 index 0000000..e33a66e Binary files /dev/null and b/phytopi/static/img/mstile-144x144.png differ diff --git a/phytopi/templates/base.html b/phytopi/templates/base.html index 33b2d39..37f4eed 100644 --- a/phytopi/templates/base.html +++ b/phytopi/templates/base.html @@ -8,8 +8,17 @@ {% endif %} + + + + + + + + + {% if title %} {{ title }} {% else %} @@ -21,23 +30,20 @@ @@ -45,8 +51,8 @@ -
-
+
{% for message in get_flashed_messages() %}
{{ message }}
diff --git a/phytopi/templates/datasets.html b/phytopi/templates/datasets.html new file mode 100644 index 0000000..7ae789d --- /dev/null +++ b/phytopi/templates/datasets.html @@ -0,0 +1,50 @@ +{% extends "base.html" %} +{% block content%} +
+
+

{% if content.id %}Dataset{% else %}Datasets{% endif %}

+
+
+ +
+ + {% if content.id %} + + + + + + + + {% for image in content.data %} + + + + + {% endfor%} + + {% else %} + + + + + + + + + + {% for dataset in content.data %} + + + + + + + {% endfor%} + + {% endif %} +
PreviewDate/Time (UTC)
{{ image.filename }}{{ image.datetime_created }}
#TitleDate/Time (UTC)Actions
{{ dataset.id }}{% if dataset.title %}{{ dataset.title }}{% endif %}{{ dataset.datetime_created }}Download | Delete
+
+ + +{% endblock %} \ No newline at end of file diff --git a/phytopi/templates/index.html b/phytopi/templates/index.html index 1a0f905..4559ffe 100644 --- a/phytopi/templates/index.html +++ b/phytopi/templates/index.html @@ -3,13 +3,13 @@ {% block content%}
- +
-
+
- - + +
-{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/phytopi/templates/settings.html b/phytopi/templates/settings.html new file mode 100644 index 0000000..2bb0833 --- /dev/null +++ b/phytopi/templates/settings.html @@ -0,0 +1,33 @@ +{% extends "base.html" %} + +{% block content%} +
+
+

Datasets

+
+
+
+ {{ form.hidden_tag()}} +
+ + + ISO value for camera +
+
+ + + Frames per second +
+
+ + + Clamp exposure time to a fixed value after camera warmup +
+
+ + + Clamp white balance to a fixed value after camera warmup +
+ +
+{% endblock %} \ No newline at end of file diff --git a/phytopi/views/__init__.py b/phytopi/views/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/phytopi/views/frontend.py b/phytopi/views/frontend.py deleted file mode 100644 index 75d2871..0000000 --- a/phytopi/views/frontend.py +++ /dev/null @@ -1,25 +0,0 @@ -from flask import current_app, Blueprint, render_template, Response - -from phytopi.camera.camera_dummy import Camera - -bp = Blueprint('frontend', __name__, url_prefix='') - -@bp.route('/') -@bp.route('/index') -def index(): - return render_template('index.html') - -@bp.route('/start', methods=['GET', 'POST']) -def start_timelapse(): - pass - -def gen(camera): - while True: - frame = camera.get_frame() - yield (b'--frame\r\n' - b'Content-Type: image/jpeg\r\n\r\n' + frame + b'\r\n') - -@bp.route('/video_feed') -def video_feed(): - return Response(gen(Camera()), - mimetype='multipart/x-mixed-replace; boundary=frame') \ No newline at end of file diff --git a/requirements_pi.txt b/requirements_pi.txt new file mode 100644 index 0000000..1521262 --- /dev/null +++ b/requirements_pi.txt @@ -0,0 +1,19 @@ +alembic==1.0.1 +Click==7.0 +Flask==1.0.2 +Flask-Migrate==2.3.0 +Flask-SQLAlchemy==2.3.2 +Flask-WTF==0.14.2 +itsdangerous==1.1.0 +Jinja2==2.10 +Mako==1.0.7 +MarkupSafe==1.0 +picamera==1.13 +Pillow==5.3.0 +python-dateutil==2.7.5 +python-editor==1.0.3 +six==1.11.0 +SQLAlchemy==1.2.12 +Werkzeug==0.14.1 +WTForms==2.2.1 +zipstream==1.1.4