This commit is contained in:
neo 2024-10-09 12:07:41 +02:00
parent 7ee96d63dd
commit 6467307957
5 changed files with 59 additions and 8 deletions

View File

@ -0,0 +1,49 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
width="1200"
height="700"
viewBox="0 0 1200 700"
version="1.1"
id="svg5"
xml:space="preserve"
inkscape:version="1.2.2 (1:1.2.2+202212051550+b0a8486541)"
sodipodi:docname="DEFAULT.svg"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns="http://www.w3.org/2000/svg"
xmlns:svg="http://www.w3.org/2000/svg"><sodipodi:namedview
id="namedview7"
pagecolor="#505050"
bordercolor="#eeeeee"
borderopacity="1"
inkscape:showpageshadow="0"
inkscape:pageopacity="0"
inkscape:pagecheckerboard="0"
inkscape:deskcolor="#505050"
inkscape:document-units="mm"
showgrid="false"
inkscape:zoom="1.0570734"
inkscape:cx="365.15913"
inkscape:cy="357.59106"
inkscape:window-width="2560"
inkscape:window-height="1023"
inkscape:window-x="0"
inkscape:window-y="0"
inkscape:window-maximized="1"
inkscape:current-layer="layer1" /><defs
id="defs2" /><g
inkscape:label="Layer 1"
inkscape:groupmode="layer"
id="layer1"><text
xml:space="preserve"
style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#ff7f2a;fill-opacity:1;stroke:#aa4400"
x="277.31964"
y="373.9111"
id="text226"><tspan
sodipodi:role="line"
id="tspan224"
x="277.31964"
y="373.9111"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:53.3333px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;stroke:#aa4400;fill:#ff7f2a">DISEGNO NON DISPONIBILE</tspan></text></g></svg>

After

Width:  |  Height:  |  Size: 2.0 KiB

View File

@ -1,6 +1,6 @@
[machine]
description = TEST-LINUX
instruction_folder = st-ten-1
#instruction_folder = st-ten-1
image_for_warning= st-ten-1
@ -16,7 +16,7 @@ vision_saver: absent
vision: absent
screwdriver: absent
fixture_id: absent
digital_io: absent
digital_io: present
external_flush_blow: absent
[tecna_t3]

View File

@ -10,7 +10,7 @@ opencv-python-headless
peewee
pillow
pycoral
pymodbus
pymodbus==3.6.8
pyqt5
pyqt5-tools
pyserial

View File

@ -8,7 +8,7 @@ import platform
import signal
import sys
sys.argv.append("--sim-io")
sys.argv.append("--system-id=test-windows")
#sys.argv.append("--system-id=test-windows")
if platform.system().lower() == "windows":
sys.path.append(f"{os.getcwd()}\src\components")
@ -124,7 +124,9 @@ try:
def read_recipes(self):
self.recipes = {}
for recipe_num in range(1, self.components["tecna_t3"].max_program_number+1):
max_num_recipes=self.components["tecna_t3"].max_program_number
logging.info(f"NUMBER OF RECIPES TO BE READ: {max_num_recipes}")
for recipe_num in range(1, max_num_recipes+1):
logging.info(f"READING RECIPE #{recipe_num}")
self.recipes[recipe_num] = self.components["tecna_t3"].read_recipe(recipe_num)

View File

@ -28,7 +28,7 @@ class Test_Instructions(Test_Test):
self.layout = QVBoxLayout()
self.layout.addWidget(self.svg_widget)
self.svg_w.setLayout(self.layout)
self.svg_path=os.path.join("config","instruction_images",self.config["machine"]["instruction_folder"],"")
self.svg_path=os.path.join("config","instruction_images",self.config["machine"].get("instruction_folder","generic"),"")
self.timer = QTimer()
self.timer.timeout.connect(self.toggle_icons)
self.expected_input_state=True
@ -54,7 +54,7 @@ class Test_Instructions(Test_Test):
self.svg_root = etree.parse(svg_path)
self.svg_str = etree.tostring(self.svg_root)
self.svg_str=etree.tostring(self.svg_root)
self.expected_input_state = True if step.type == "instruction" else False
self.expected_input_state = True if step.step_type == "instruction" else False
self.monitored_ids=self.svg_root.xpath(f'''.//*[starts-with(@id, 'sensor_')]''')
@ -152,7 +152,7 @@ class Test_Instructions(Test_Test):
QApplication.processEvents()
def get(self, data=None, override=False):
if self.parent_assembly_widget().parent().step.type == "select_recipe":
if self.parent_assembly_widget().parent().step.step_type == "select_recipe":
self.stop()
return
if self.done: # avoid proccessing if completed