This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h | |
index 4f93a4de48..8604de245a 100644 | |
--- a/Marlin/Configuration.h | |
+++ b/Marlin/Configuration.h | |
@@ -1,6 +1,6 @@ | |
/** | |
* Marlin 3D Printer Firmware | |
- * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin] | |
+ * Copyright (c) 2021 MarlinFirmware [https://github.com/MarlinFirmware/Marlin] | |
* |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
let | |
pkgs = import <nixpkgs> { }; | |
fenix = pkgs.callPackage "${ | |
fetchTarball "https://github.com/nix-community/fenix/archive/main.tar.gz" | |
}" | |
{ }; | |
in | |
pkgs.mkShell { | |
buildInputs = [ | |
pkgs.wayland |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/edit_documentation_here/source/conf.py b/edit_documentation_here/source/conf.py | |
index ac57e1d..80b505e 100644 | |
--- a/edit_documentation_here/source/conf.py | |
+++ b/edit_documentation_here/source/conf.py | |
@@ -21,7 +21,7 @@ myst_enable_extensions = ["colon_fence"] | |
templates_path = ['_templates'] | |
exclude_patterns = [] | |
- | |
+numfig = True |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/invesalius/gui/network/text_panel.py b/invesalius/gui/network/text_panel.py | |
index ce22c2e0..6c6a5d31 100644 | |
--- a/invesalius/gui/network/text_panel.py | |
+++ b/invesalius/gui/network/text_panel.py | |
@@ -5,6 +5,7 @@ from invesalius import inv_paths | |
import wx.gizmos as gizmos | |
import wx | |
import os | |
+import pathlib | |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
import unittest | |
from unittest.mock import MagicMock | |
import invesalius.i18n as i18n | |
_ = i18n.InstallLanguage('en') | |
from invesalius.data.geometry import * | |
class TestBox(unittest.TestCase): |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
import sys | |
import vtk | |
def getInlet_and_Outlets(mesh): | |
fillHoles = vtk.vtkFillHolesFilter() | |
fillHoles.SetInputData(mesh) | |
fillHoles.SetHoleSize(1000.0) | |
fillHoles.Update() |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
import sys | |
import vtk | |
colors = vtk.vtkNamedColors() | |
reader = vtk.vtkSTLReader() | |
reader.SetFileName(sys.argv[1]) | |
reader.Update() |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/invesalius/data/viewer_slice.py b/invesalius/data/viewer_slice.py | |
index ff6344ed..bba882b3 100644 | |
--- a/invesalius/data/viewer_slice.py | |
+++ b/invesalius/data/viewer_slice.py | |
@@ -682,14 +682,14 @@ class Viewer(wx.Panel): | |
mposx, mposy = wx.GetMousePosition() | |
cposx, cposy = self.interactor.ScreenToClient((mposx, mposy)) | |
mx, my = cposx, self.interactor.GetSize()[1] - cposy | |
- if sys.platform == 'darwin': | |
- # It's needed to mutiple by scale factor in HighDPI because of |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/setup.py b/setup.py | |
index 9f69c998..2b923001 100644 | |
--- a/setup.py | |
+++ b/setup.py | |
@@ -12,8 +12,8 @@ from Cython.Build import cythonize | |
from Cython.Distutils import build_ext | |
if sys.platform == "darwin": | |
- unix_copt = ["-Xpreprocessor", "-fopenmp", "-lomp"] | |
- unix_lopt = ["-Xpreprocessor", "-fopenmp", "-lomp"] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
❯ nix-shell --show-trace | |
building '/nix/store/p4jwrw756b2ps1076m3zly5rs8y5hhsz-mach_nix_file.drv'... | |
Some requirements could not be resolved. | |
Top level requirements: | |
openvino==2022.1.0 | |
Providers: | |
{'_default': ['wheel', 'sdist', 'nixpkgs'], | |
'gdal': ['nixpkgs'], | |
'pip': ['nixpkgs', 'sdist'], |
NewerOlder