diff --git a/hicbrowser/client/html/index.html b/hicbrowser/client/html/index.html index 76be64c..a5d94d6 100644 --- a/hicbrowser/client/html/index.html +++ b/hicbrowser/client/html/index.html @@ -8,15 +8,15 @@ HiCBrowser - - + + -
+
@@ -24,7 +24,7 @@
- +
@@ -50,21 +50,21 @@

HiCBrowser

- - + +
- - + +
- - + +
@@ -74,8 +74,8 @@

HiCBrowser

- - + + + diff --git a/hicbrowser/views.py b/hicbrowser/views.py index d7f739b..1af2c03 100644 --- a/hicbrowser/views.py +++ b/hicbrowser/views.py @@ -128,6 +128,7 @@ def check_static_img_folders(): return dir_path + '/images' +app = Flask(__name__) def main(config_file, port, numProc, template_folder=None, debug=False): @@ -139,7 +140,7 @@ def main(config_file, port, numProc, template_folder=None, debug=False): sys.stderr.write("setting template folder to\n {}\n".format(template_folder)) kwargs['template_folder'] = template_folder - app = Flask(__name__, **kwargs) + #app = Flask(__name__, **kwargs) from flask import Blueprint img_path = check_static_img_folders() @@ -147,6 +148,7 @@ def main(config_file, port, numProc, template_folder=None, debug=False): # register an static path for images using Blueprint images_static = Blueprint('site', __name__, static_url_path='/images', + template_folder=template_folder, static_folder=img_path) app.register_blueprint(images_static) @@ -277,10 +279,10 @@ def browser(query): img_code = [] img_content = [] for trp_idx in range(len(trp_list)): - figure_path = "/get_image?region={}:{}-{}&id={}".format(chromosome, _range[0], _range[1], trp_idx) + figure_path = "get_image?region={}:{}-{}&id={}".format(chromosome, _range[0], _range[1], trp_idx) img_code.append(figure_path) - figure_content_path = "/get_image?region={}:|+start+|-|+end+|&id={}".format(chromosome, trp_idx) + figure_content_path = "get_image?region={}:|+start+|-|+end+|&id={}".format(chromosome, trp_idx) img_content.append(figure_content_path) tracks.append(img_code) @@ -291,10 +293,10 @@ def browser(query): img_code = [] img_content = [] for trp_idx in range(len(trp_list)): - figure_path = "/get_image?region={}:{}-{}&id={}".format(chromosome, start, end, trp_idx) + figure_path = "get_image?region={}:{}-{}&id={}".format(chromosome, start, end, trp_idx) img_code.append(figure_path) - figure_content_path = "/get_image?region={}:|+start+|-|+end+|&id={}".format(chromosome, trp_idx) + figure_content_path = "get_image?region={}:|+start+|-|+end+|&id={}".format(chromosome, trp_idx) img_content.append(figure_content_path) tracks.append(img_code) @@ -372,4 +374,11 @@ def get_image(): return None # run the app - app.run(host='0.0.0.0', debug=debug, use_reloader=False, port=port, processes=numProc) + # app.run(host='0.0.0.0', debug=debug, use_reloader=False, port=port, processes=numProc) + +main(config_file='/data/browserConfig.ini', port=8080, template_folder=None, numProc=1, debug=True) + +if __name__ == "__main__": + # run the app + app.run(host='0.0.0.0', debug=True, use_reloader=False, port=8080, processes=2) +