diff --git a/.gitignore b/.gitignore index f7275bbbd035b827023cbae18954c0703b200c34..b607d6c5d4a32fea76be2e1deb81e16d8bde9881 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,5 @@ venv/ + +.idea/ + +.vscode/ diff --git a/dockerfile b/dockerfile index 0fb91db90b80bea34cb6afe13f338ec2d3f59973..e2e4f687f5c9f0602bd455f53fc2d984f6b010f1 100644 --- a/dockerfile +++ b/dockerfile @@ -3,15 +3,15 @@ FROM python:3.11 # WORKDIR /usr/src/app ENV GIT_SSL_NO_VERIFY=1 # Set the environment variable for the HTTP proxy -ENV http_proxy="http://webproxy.bs.ptb.de:8080" -ENV https_proxy="http://webproxy.bs.ptb.de:8080" +#ENV http_proxy="http://webproxy.bs.ptb.de:8080" +#ENV https_proxy="http://webproxy.bs.ptb.de:8080" # Set the environment variable for the NO_PROXY # This ensures that the proxy is not used for ptb.de -ENV no_proxy="ptb.de" +#ENV no_proxy="ptb.de" # Install any needed packages specified in requirements.txt -RUN git clone https://dockerPull:Fu7bxBnYeyhq8Xz8seHS@gitlab1.ptb.de/digitaldynamicmeasurement/dsi-parser-frontend +RUN git clone https://gitlab1.ptb.de/digitaldynamicmeasurement/dsi-parser-frontend.git #RUN pip install --proxy=webproxy.bs.ptb.de:8080 --no-cache-dir -r dsi-parser-frontend/requirements.txt diff --git a/main.py b/main.py index 1bed85bda19eeca9d00cf323918ccd8428145c0f..bda33e5afe9b0a1ba0347688e71360faac2f37a1 100644 --- a/main.py +++ b/main.py @@ -7,7 +7,7 @@ import itertools import math import bokehCssPTB from urllib.parse import quote -from dsiParser import dsiParser,format_special_scale_factor +from dsiUnits import dsiUnit from bokeh.plotting import curdoc,figure from bokeh.layouts import column, row from bokeh.models import FileInput, Div, CustomJS, Button, TabPanel, Tabs, Dropdown, TextInput, Button, MathText, Label, Arrow, NormalHead,CheckboxGroup @@ -63,8 +63,7 @@ class dsiparserInput(): def parseInput(self): self.results.children = [] input = self.dsiInput.value - p = dsiParser() - resultTree = p.parse(input) + resultTree = dsiUnit(input) parsingMessages = [] if resultTree.valid: diff --git a/requirements.txt b/requirements.txt index eb910b886f4a96e119fadaa44af8519f96c1ccfc..3d806be6209a9ef30b6e9095c9ab9ea375f985ab 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,4 @@ bokeh~=3.3.2 --e git+https://dockerPull:-jVp9LBaxeKp9HKAe9dw@gitlab1.ptb.de/digitaldynamicmeasurement/bokehCssPtb.git#egg=bokehCssPTB --e git+https://dockerPull:pYngV-zkWjSXmve9yEpx@gitlab1.ptb.de/digitaldynamicmeasurement/python_dsi_latex_converter.git@release#egg=dsiParser +#-e git+https://dockerPull:-jVp9LBaxeKp9HKAe9dw@gitlab1.ptb.de/digitaldynamicmeasurement/bokehCssPtb.git#egg=bokehCssPTB +-e git+https://gitlab1.ptb.de/digitaldynamicmeasurement/bokehCssPtb.git#egg=bokehCssPTB +dsiUnits~=2.2.1