Skip to content

Commit

Permalink
solved conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
tvcastillod committed Jul 19, 2023
2 parents 057c22d + 2bba1b9 commit 91b62cc
Show file tree
Hide file tree
Showing 21 changed files with 766 additions and 19 deletions.
76 changes: 76 additions & 0 deletions docs/source/_static/css/comp-soft.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
.comp-soft-wrapper {

width: 700px;
margin: 0 auto;

--s: 150px; /* size */
--m: 8px; /* margin */
--f: calc(1.732 * var(--s) + 4 * var(--m) - 1px);
}

@media (max-width: 767px) {
.comp-soft-wrapper {

width: 100vw;
margin: 0 auto;
}
}

.comp-soft-section {
width: 100vw;
background-color: var(--colorPrimaryDark);
padding: 50px 0;
}

.comp-soft-title {
display: flex;
justify-content: center;
width: 100%;
margin-bottom: 20px;

letter-spacing: 1.5px;
font-size: 27px;
font-weight: bold;

color: white;
}

.comp-soft-container {
display: flex;
justify-content: center;
}

@media (max-width: 767px) {
.comp-soft-container {
flex-wrap: wrap;
justify-content: space-evenly;
}
}

.comp-soft-container .comp-soft {
width: var(--s);
min-width: var(--s);
margin: var(--m) var(--m) 0;
height: var(--s);
font-size:initial;
border-radius: 50%;
background: white;
box-shadow: rgba(0, 0, 0, 0.24) 0px 3px 8px;
}

@media (max-width: 767px) {
.comp-soft-container .comp-soft {
margin: var(--m);
}
}

.comp-soft-image-holder {
display: flex;
align-items: center;
height: var(--s);
justify-content: center;
}

.comp-soft-image-holder img {
max-width: 80%;
}
38 changes: 38 additions & 0 deletions docs/source/_static/css/sponsors.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
.sponsors-wrapper {
margin: 50px 0;
width: 100%;
}

.sponsors-title {
display: flex;
justify-content: center;
width: 100%;
margin-bottom: 20px;

letter-spacing: 1.5px;
font-size: 27px;
font-weight: bold;
}

.sponsors {
display: flex;
flex-direction: row;
justify-content: center;
align-items: center;
}

@media (max-width: 767px) {
.sponsors {
flex-direction: column;
}
}

.sponsors-logo {
width: 220px;
height: 200px;

padding: 0 10px;

display: flex;
align-items: center;
}
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/source/_static/images/comp-soft/autodesk.jpg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/source/_static/images/comp-soft/houdini.jpg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/source/_static/images/comp-soft/modo.jpg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/source/_static/images/comp-soft/sketchup.jpg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/source/_static/images/comp-soft/unity.jpg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/source/_static/images/sponsors/gsoc.jpg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/source/_static/images/sponsors/iu.jpg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/source/_static/images/sponsors/luddy.jpg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
90 changes: 74 additions & 16 deletions docs/source/_templates/home.html
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@

<link rel="stylesheet" href="_static/css/util.css" />
<link rel="stylesheet" href="_static/css/main.css" />
<link rel="stylesheet" href="_static/css/sponsors.css" />
<link rel="stylesheet" href="_static/css/comp-soft.css" />
<link rel="stylesheet" href="_static/css/navbar.css" />

<link rel="stylesheet" href="_static/vendor/vars.css" />
Expand Down Expand Up @@ -265,7 +267,7 @@ <h3 class="h-card__title">Engineering</h3>
<p class="h-card__content">FURY is a powerful tool for engineers and visualisation experts. It allows them to create high-quality visualisations quickly and easily, without the need for extensive programming knowledge. Its functional programming paradigm and support for large data sets make it an ideal tool for visualising complex systems and data, such as those used in engineering and scientific research.
</p>

<a class="h-card__button" href="auto_tutorials/05_animation/viz_robot_arm_animation.html">
<a class="h-card__button" href="auto_examples/10_animation/viz_robot_arm_animation.html">
View More
<i class="fas fa-external-link-alt"></i>
</a>
Expand All @@ -285,7 +287,7 @@ <h3 class="h-card__title">Physics</h3>
<p class="h-card__content">FURY's ability to create stunning visualisations of complex physical phenomena. For example, FURY can be used to create detailed visualisations of fluid dynamics, such as the flow of water or gas. It can also be used to visualise the motion of particles in a simulation.
</p>

<a class="h-card__button" href="auto_examples/viz_brownian_motion.html">
<a class="h-card__button" href="auto_examples/04_demos/viz_brownian_motion.html">
View More
<i class="fas fa-external-link-alt"></i>
</a>
Expand All @@ -305,7 +307,7 @@ <h3 class="h-card__title">Chemistry</h3>
<p class="h-card__content">FURY can be used to create detailed visualisations of the structure of molecules, including their bonding and interactions. It can also be used to visualise the motion of atoms and molecules in a simulation, such as the motion of atoms and molecules in a material.
</p>

<a class="h-card__button" href="auto_examples/collision-particles.html">
<a class="h-card__button" href="auto_examples/04_demos/collision-particles.html">
View More
<i class="fas fa-external-link-alt"></i>
</a>
Expand All @@ -325,7 +327,7 @@ <h3 class="h-card__title">Astronomy</h3>
<p class="h-card__content">FURY can be used to create detailed visualisations of the structure of galaxies, including the distribution of stars, gas, and dust. It can also be used to visualise the motion of celestial bodies in a simulation, such as the motion of stars and planets in a solar system.
</p>

<a class="h-card__button" href="auto_examples/viz_tesseract.html">
<a class="h-card__button" href="auto_examples/04_demos/viz_tesseract.html">
View More
<i class="fas fa-external-link-alt"></i>
</a>
Expand All @@ -345,7 +347,7 @@ <h3 class="h-card__title">Aerospace</h3>
<p class="h-card__content">FURY can easily create 3D visualizations of aerodynamic simulations, which can help engineers understand the performance of an aircraft in different flight conditions. This can be done by importing the simulation data into FURY and then using the library's built-in functions to create 3D models of the aircraft, along with visualizations of the airflow patterns and other important parameters.
</p>

<a class="h-card__button" href="auto_tutorials/01_introductory/viz_texture.html">
<a class="h-card__button" href="auto_examples/01_introductory/viz_texture.html">
View More
<i class="fas fa-external-link-alt"></i>
</a>
Expand All @@ -365,7 +367,7 @@ <h3 class="h-card__title">Biology</h3>
<p class="h-card__content">With FURY, researchers can create detailed models of cells and organelles, such as the mitochondria, ribosomes, and endoplasmic reticulum. This allows for a more in-depth understanding of the structure and function of these important cellular components.
</p>

<a class="h-card__button" href="auto_examples/viz_bundles.html">
<a class="h-card__button" href="auto_examples/04_demos/viz_bundles.html">
View More
<i class="fas fa-external-link-alt"></i>
</a>
Expand All @@ -385,7 +387,7 @@ <h3 class="h-card__title">Data Science</h3>
<p class="h-card__content">One of the key features of FURY is its ability to handle large amounts of data. This makes it perfect for data scientists who need to work with large datasets, as well as for visualizers who need to create interactive and engaging visualizations.
</p>

<a class="h-card__button" href="auto_tutorials/01_introductory/viz_morphing.html">
<a class="h-card__button" href="auto_examples/01_introductory/viz_morphing.html">
View More
<i class="fas fa-external-link-alt"></i>
</a>
Expand All @@ -405,7 +407,7 @@ <h3 class="h-card__title">Network Science</h3>
<p class="h-card__content">One of the key features of FURY is its ability to handle large and complex networks. It can handle millions of nodes and edges, and can display the network in a variety of different ways, including node-link diagrams, matrix plots, and force-directed layouts. This allows users to explore their networks in a variety of different ways, and to find the best way to visualize their data.
</p>

<a class="h-card__button" href="auto_examples/viz_network_animated.html">
<a class="h-card__button" href="auto_examples/04_demos/viz_network_animated.html">
View More
<i class="fas fa-external-link-alt"></i>
</a>
Expand All @@ -425,7 +427,7 @@ <h3 class="h-card__title">Mathematics</h3>
<p class="h-card__content">FURY allows users to easily visualise complex mathematical data in a way that is easy to understand. For example, a mathematician studying a complex equation could use FURY to create a 3D plot of the equation's solutions, which would make it much easier to understand the behaviour of the equation.
</p>

<a class="h-card__button" href="auto_examples/viz_animated_surfaces.html">
<a class="h-card__button" href="auto_examples/04_demos/viz_animated_surfaces.html">
View More
<i class="fas fa-external-link-alt"></i>
</a>
Expand Down Expand Up @@ -557,14 +559,70 @@ <h3 class="h-card__title">Mathematics</h3>





<div id="backtotop"><a href="#" id="backtotop-color"></a></div>
<section class="comp-soft-section">
<h3 class="comp-soft-title">
Compatibility
</h3>
<div class="comp-soft-wrapper">
<div class="comp-soft-container">
<div class="comp-soft">
<div class="comp-soft-image-holder">
<img src="_static/images/comp-soft/blender.jpg" alt="">
</div>
</div>
<div class="comp-soft">
<div class="comp-soft-image-holder">
<img src="_static/images/comp-soft/unity.jpg" alt="">
</div>
</div>
<div class="comp-soft">
<div class="comp-soft-image-holder">
<img src="_static/images/comp-soft/autodesk.jpg" alt="">
</div>
</div>
<div class="comp-soft">
<div class="comp-soft-image-holder">
<img src="_static/images/comp-soft/adobedimension.jpg" width="100" alt="">
</div>
</div>
</div>
<div class="comp-soft-container">
<div class="comp-soft">
<div class="comp-soft-image-holder">
<img src="_static/images/comp-soft/houdini.jpg" alt="">
</div>
</div>
<div class="comp-soft">
<div class="comp-soft-image-holder">
<img src="_static/images/comp-soft/modo.jpg" alt="">
</div>
</div>
<div class="comp-soft">
<div class="comp-soft-image-holder">
<img src="_static/images/comp-soft/sketchup.jpg" alt="">
</div>
</div>
</div>
</div>
</section>





<section class="sponsors-wrapper">
<h3 class="sponsors-title">
Our Sponsors
</h3>
<div class="container sponsors">
<div class="sponsors-logo">
<img src="_static/images/sponsors/luddy.jpg" alt="Luddy">
</div>
<div class="sponsors-logo">
<img src="_static/images/sponsors/gsoc.jpg" alt="GSoC">
</div>
<div class="sponsors-logo">
<img src="_static/images/sponsors/iu.jpg" alt="IU">
</div>
</div>
</section>

<footer id="footer" class="footer">
<div class="container">
Expand All @@ -587,7 +645,7 @@ <h5>About</h5>
<li class="link-list"><a class="footer-link" href="installation.html"><i class="fa fa-angle-double-right"></i>
Download
</a></li>
<li class="link-list"><a class="footer-link" href="auto_tutorials/index.html"><i class="fa fa-angle-double-right"></i>
<li class="link-list"><a class="footer-link" href="auto_examples/index.html"><i class="fa fa-angle-double-right"></i>
Tutorials
</a></li>
</ul>
Expand Down
30 changes: 30 additions & 0 deletions docs/source/posts/2023/2023-06-24-week-4-praneeth.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
Week 4: Exam Preparations and Reviewing
=======================================

.. post:: June 24, 2023
:author: Praneeth Shetty
:tags: google
:category: gsoc

What did I do this week?
------------------------

This week, amidst end-semester exams, I managed to accomplish a few notable tasks. Let's dive into the highlights:

1. Merging **CardUI**: The PR `#398 <https://github.com/fury-gl/fury/pull/398>`_ introduced the **CardUI** to the UI system of FURY. After a successful review and test check, it was merged into the codebase.

2. Revisiting PR `#540 <https://github.com/fury-gl/fury/pull/540>`_: I restarted working on PR `#540 <https://github.com/fury-gl/fury/pull/540>`_ as I wasn't satisfied with the previous approach when I checked it for rebasing. I took the opportunity to update the code and ensure that the unit tests passed successfully. Although there are a few issues remaining in the tests, I am determined to resolve them and move forward with the implementation. This PR aims to improve the usage of the **numpy_to_vtk_image_data** utility function.

3. Independent Scrollbar Consideration: We are currently evaluating the necessity of making the Scrollbar an independent element. Currently it is only used by the **ListBox2D**, we are exploring various use cases to determine if there are other scenarios where the Scrollbar can be employed independently. This evaluation will help us make an informed decision about its future implementation.

4. PR Reviews: In the brief intervals between exams, I utilized the time to review two PRs: `#446 <https://github.com/fury-gl/fury/pull/446>`_ - Resize panel and `#460 <https://github.com/fury-gl/fury/pull/460>`_ - Tree UI.

Did I get stuck anywhere?
-------------------------

No, fortunately, I didn't encounter any major obstacles or challenges during my tasks this week.

What is coming up next?
-----------------------

Once the exams are over, I am eagerly looking forward to making a full comeback to development. My immediate plans include addressing the remaining issues in PR `#540 <https://github.com/fury-gl/fury/pull/540>`_ and completing the pending tasks. I will also catch up on any missed discussions and sync up with the team to align our goals for the upcoming weeks.
60 changes: 60 additions & 0 deletions docs/source/posts/2023/2023-06-26-week-4-joaodellagli.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
Week 4: Nothing is Ever Lost
============================

.. post:: June 26, 2023
:author: João Victor Dell Agli Floriano
:tags: google
:category: gsoc


Welcome again to another weekly blogpost! Today, let's talk about the importance of guidance throughout a project.

Last Week's Effort
-----------------------
So, last week my project was struggling with some supposedly simple in concept, yet intricate in execution issues. If you recall from
my :doc:`last blogpost <2023-06-19-week-3-joaodellagli>`, I could not manage to make the Framebuffer Object setup work, as its method,
``SetContext()``, wasn't being able to generate the FBO inside OpenGL. Well, after some (more) research about that as I also dived in my
plan B, that involved studying numba as a way to accelerate a data structure I implemented on my PR `#783 <https://github.com/fury-gl/fury/pull/783>`_,
me and one of my mentors decided we needed a pair programming session, that finally happened on thursday. After that session,
we could finally understand what was going on.

Where the Problem Was
---------------------
Apparently, for the FBO generation to work, it is first needed to initialize the context interactor:

::

FBO = vtk.vtkOpenGLFramebufferObject()

manager.window.SetOffScreenRendering(True) # so the window doesn't show up, but important for later as well
manager.initialize() # missing part that made everything work

FBO.SetContext(manager.window) # Sets the context for the FBO. Finally, it works
FBO.PopulateFramebuffer(width, height, True, 1, vtk.VTK_UNSIGNED_CHAR, False, 24, 0) # And now I could populate the FBO with textures


This simple missing line of code was responsible for ending weeks of suffer, as after that, I called:
::
print("FBO of index:", FBO.GetFBOIndex())
print("Number of color attachments:", FBO.GetNumberOfColorAttachments())

That outputted:
::
FBO of index: 4
Number of color attachments: 1

That means the FBO generation was successful! One explanation that seems reasonable to me on why was that happening is that, as it was
not initialized, the context was being passed ``null`` to the ``SetContext()`` method, that returned without any warning of what was happening.

Here, I would like to point out how my mentor was **essential** to this solution to come: I had struggled for some time with that, and could
not find a way out, but a single session of synchronous pair programming where I could expose clearly my problem and talk to someone
way more experienced than I, someone designated for that, was my way out of this torment, so value your mentors! Thanks Bruno!


This Week's Goals
-----------------
Now, with the FBO working, I plan to finally *render* something to it. For this week, I plan to come back to my original plan and
experiment with simple shaders just as a proof of concept that the FBO will be really useful for this project. I hope the road is less
bumpier by now and I don't step on any other complicated problem.

Wish me luck!

0 comments on commit 91b62cc

Please sign in to comment.