deblan/deblan.io-murph
deblan/deblan.io-murph
1
0
Fork 0
Code Issues Pull requests 1 Projects Releases Wiki Activity

add files in StlMesh

Browse source
This commit is contained in:
Simon Vieille 2021-10-20 14:17:13 +02:00
parent 478d584047
commit 9415ddfccd
7 changed files with 151 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
assets/css/app.scss
View file

@ -795,6 +795,16 @@ $links: (
padding-left: 10px;
padding-right: 10px;
}
&-file {
ul {
margin-top: 0;
}
}
&-name {
min-width: 100px;
}
}
@media screen and (max-width: 1280px) {

26
src/Controller/StlMeshController.php
View file

@ -26,26 +26,40 @@ class StlMeshController extends PageController
}
/**
* @Route("/mesh/download/{stlMesh}", name="mesh_download")
* @Route("/mesh/download/{stlMesh}/{key}", name="mesh_download")
*/
public function download(StlMesh $stlMesh): Response
public function download(StlMesh $stlMesh, int $key): Response
{
$response = new BinaryFileResponse($stlMesh->getFile());
$file = $stlMesh->getFiles()[--$key] ?? null;
if (null === $file) {
throw $this->createNotFoundException();
}
$response = new BinaryFileResponse($file['file']);
$response->setContentDisposition(
ResponseHeaderBag::DISPOSITION_ATTACHMENT,
str_replace('.bin', '.stl', basename($stlMesh->getFile()))
sprintf('%s.stl', $file['name'])
);
return $response;
}
/**
* @Route("/mesh/viewer/{stlMesh}", name="mesh_viewer")
* @Route("/mesh/viewer/{stlMesh}/{key}", name="mesh_viewer")
*/
public function viewer(StlMesh $stlMesh): Response
public function viewer(StlMesh $stlMesh, int $key): Response
{
$file = $stlMesh->getFiles()[--$key] ?? null;
if (null === $file) {
throw $this->createNotFoundException();
}
return $this->render('page/mesh/viewer.html.twig', [
'mesh' => $stlMesh,
'file' => $file,
'key' => $key + 1,
]);
}
}

31
src/Entity/StlMesh.php
View file

@ -38,6 +38,11 @@ class StlMesh implements EntityInterface
*/
private $file;
/**
* @ORM\Column(type="array", nullable=true)
*/
private $files = [];
/**
* @ORM\Column(type="string", length=255, nullable=true)
*/
@ -107,4 +112,30 @@ class StlMesh implements EntityInterface
return $this;
}
public function getFiles(): ?array
{
$this->files = (array) $this->files;
usort($this->files, function($a, $b) {
if ($a['position'] > $b['position']) {
return 1;
}
if ($a['position'] < $b['position']) {
return -1;
}
return 0;
});
return $this->files;
}
public function setFiles(?array $files): self
{
$this->files = $files;
return $this;
}
}

51
src/Form/StlFileType.php Normal file
View file

@ -0,0 +1,51 @@
<?php
namespace App\Form;
use Symfony\Component\Form\AbstractType;
use Symfony\Component\Form\FormBuilderInterface;
use Symfony\Component\OptionsResolver\OptionsResolver;
use App\Core\Form\FileManager\FilePickerType;
use Symfony\Component\Form\Extension\Core\Type\HiddenType;
use Symfony\Component\Validator\Constraints\NotBlank;
use Symfony\Component\Form\Extension\Core\Type\TextType;
class StlFileType extends AbstractType
{
public function buildForm(FormBuilderInterface $builder, array $options)
{
$builder->add('position', HiddenType::class);
$builder->add(
'name',
TextType::class,
[
'label' => 'Nom',
'required' => true,
'attr' => [
],
'constraints' => [
new NotBlank(),
],
]
);
$builder->add(
'file',
FilePickerType::class,
[
'label' => false,
'required' => true,
'constraints' => [
],
]
);
}
public function configureOptions(OptionsResolver $resolver)
{
$resolver->setDefaults([
// Configure your form options here
]);
}
}

20
src/Form/StlMeshType.php
View file

@ -2,14 +2,15 @@
namespace App\Form;
use App\Core\Form\FileManager\FilePickerType;
use App\Core\Form\Type\CollectionType as MurphCollectionType;
use App\Entity\StlMesh;
use Symfony\Component\Form\AbstractType;
use Symfony\Component\Form\Extension\Core\Type\TextareaType;
use Symfony\Component\Form\Extension\Core\Type\TextType;
use Symfony\Component\Form\FormBuilderInterface;
use Symfony\Component\OptionsResolver\OptionsResolver;
use Symfony\Component\Validator\Constraints\NotBlank;
use App\Core\Form\FileManager\FilePickerType;
use Symfony\Component\Form\Extension\Core\Type\TextareaType;
use Symfony\Component\Form\Extension\Core\Type\TextType;
class StlMeshType extends AbstractType
{
@ -57,6 +58,19 @@ class StlMeshType extends AbstractType
]
);
$builder->add(
'files',
MurphCollectionType::class,
[
'label' => 'Fichiers STL',
'entry_type' => StlFileType::class,
'by_reference' => false,
'allow_add' => true,
'allow_delete' => true,
'prototype' => true,
'collection_name' => 'stlfiles',
]
);
$builder->add(
'preview',

35
templates/page/mesh/default.html.twig
View file

@ -30,26 +30,31 @@
<div class="col-4 mesh-wrapper">
<div class="mesh">
<div class="mesh-preview">
<a data-modal href="{{ path('mesh_viewer', {stlMesh: mesh.id}) }}">
<img src="{{ asset(mesh.preview)|imagine_filter('mesh_preview_filter') }}" alt="{{ mesh.label }}">
</a>
<img src="{{ asset(mesh.preview)|imagine_filter('mesh_preview_filter') }}" alt="{{ mesh.label }}">
</div>
<h2 class="mesh-title">{{ mesh.label }}</h2>
<div class="mesh-description">
{{ mesh.description|murph_url|file_attributes|markdown('post') }}
<ul class="list--inline">
<li>
<a class="button small mesh-viewer" data-modal href="{{ path('mesh_viewer', {stlMesh: mesh.id}) }}">
Visualiser en 3D
</a>
</li>
<li>
<a class="button small" target="_blank" href="{{ path('mesh_download', {stlMesh: mesh.id}) }}">
Télécharger
</a>
</li>
</ul>
{% for key, item in mesh.files %}
<div class="mesh-file">
<ul class="list--inline">
<li class="mesh-name">
{{ item.name }}
</li>
<li>
<a class="button small mesh-viewer" data-modal href="{{ path('mesh_viewer', {stlMesh: mesh.id, key: key + 1}) }}">
Voir en 3D
</a>
</li>
<li>
<a class="button small" target="_blank" href="{{ path('mesh_download', {stlMesh: mesh.id, key: key + 1}) }}">
Télécharger
</a>
</li>
</ul>
</div>
{% endfor %}
</div>
</div>
</div>

4
templates/page/mesh/viewer.html.twig
View file

@ -2,12 +2,12 @@
<html lang="en">
<head>
<meta charset="UTF-8">
<title>{{ mesh.label }}</title>
<title>{{ mesh.label }} / {{ file.name }}</title>
{{ encore_entry_link_tags('viewer') }}
</head>
<body>
<div id="mesh-viewer" data-file="{{ path('mesh_download', {stlMesh: mesh.id}) }}"></div>
<div id="mesh-viewer" data-file="{{ path('mesh_download', {stlMesh: mesh.id, key: key}) }}"></div>
<script src="{{ asset('stl_viewer/stl_viewer.min.js') }}"></script>
{{ encore_entry_script_tags('viewer') }}