q3dviewer 1.1.5__tar.gz → 1.1.7__tar.gz

q3dviewer-1.1.7/PKG-INFO

@@ -0,0 +1,235 @@
+Metadata-Version: 2.1
+Name: q3dviewer
+Version: 1.1.7
+Summary: A library designed for quickly deploying a 3D viewer.
+Home-page: https://github.com/scomup/q3dviewer
+Author: Liu Yang
+Classifier: Programming Language :: Python :: 3
+Classifier: License :: OSI Approved :: MIT License
+Classifier: Operating System :: OS Independent
+Description-Content-Type: text/markdown
+License-File: LICENSE
+Requires-Dist: numpy
+Requires-Dist: pyside6
+Requires-Dist: PyOpenGL
+Requires-Dist: meshio
+Requires-Dist: pypcd4
+Requires-Dist: pye57
+Requires-Dist: laspy
+Requires-Dist: imageio
+Requires-Dist: imageio[ffmpeg]
+Requires-Dist: matplotlib
+
+
+![q3dviewer Logo](imgs/logo.png)
+
+[![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
+[![PyPI version](https://badge.fury.io/py/q3dviewer.svg)](https://badge.fury.io/py/q3dviewer)
+
+`q3dviewer` is a library designed for quickly deploying a 3D viewer. It is based on Qt and provides efficient OpenGL items for displaying 3D objects (e.g., point clouds, cameras, and 3D Gaussians). You can use it to visualize your 3D data or set up an efficient viewer application. It is inspired by PyQtGraph but focuses more on efficient 3D rendering.
+
+
+To show how to use `q3dviewer` as a library, we also provide some [very useful tools](#tools).
+
+
+## Installation
+
+To install `q3dviewer`, execute the following command in your terminal on either Linux or Windows:
+
+```bash
+pip install q3dviewer
+```
+
+### Note for Windows Users
+
+- Ensure that you have a Python 3 environment set up:
+  - Download and install Python 3 from the [official Python website](https://www.python.org/downloads/).
+  - During installation, make sure to check the "Add Python to PATH" option.
+
+### Note for Linux Users
+
+If you encounter an error related to loading the shared library `libxcb-cursor.so.0` on Ubuntu 20.04 or 22.04, please install `libxcb-cursor0`:
+
+```bash
+sudo apt-get install libxcb-cursor0
+```
+
+## Tools
+
+Once installed, you can directly use the following tools:
+
+### 1. Cloud Viewer
+
+A tool for visualizing point cloud files (LAS, PCD, PLY, E57). Launch it by executing the following command in your terminal:
+
+```sh
+cloud_viewer
+```
+
+*Alternatively*, if the path is not set (though it's not recommended):
+
+```sh
+python3 -m q3dviewer.tools.cloud_viewer
+```
+
+**Basic Operations**
+* Load files: Drag and drop point cloud files onto the window (multiple files are OK).
+* `M` key: Display the visualization settings screen for point clouds, background color, etc.
+* `Left mouse button` & `W, A, S, D` keys: Move the viewpoint on the horizontal plane.
+* `Z, X` keys: Move in the direction the screen is facing.
+* `Right mouse button` & `Arrow` keys: Rotate the viewpoint while keeping the screen center unchanged.
+* `Shift` + `Right mouse button` & `Arrow` keys: Rotate the viewpoint while keeping the camera position unchanged.
+
+For example, you can download and view point clouds of Tokyo in LAS format from the following link:
+
+[Tokyo Point Clouds](https://www.geospatial.jp/ckan/dataset/tokyopc-23ku-2024/resource/7807d6d1-29f3-4b36-b0c8-f7aa0ea2cff3)
+
+![Cloud Viewer Screenshot](https://qiita-image-store.s3.ap-northeast-1.amazonaws.com/0/149168/03c981c6-1aec-e5b9-4536-e07e1e56ff29.png)
+
+Press `M` on your keyboard to display a menu on the screen, where you can modify visualization settings for each item. For example, you can adjust various settings such as shape, size, color, and transparency for `CloudItem`.
+
+![Cloud Viewer Settings](https://qiita-image-store.s3.ap-northeast-1.amazonaws.com/0/149168/deeb996a-e419-58f4-6bc2-535099b1b73a.png)
+
+### 2. ROS Viewer
+
+A high-performance SLAM viewer compatible with ROS, serving as an alternative to RVIZ.
+
+```sh
+roscore &
+ros_viewer
+```
+
+### 3. Film Maker
+
+Would you like to create a video from point cloud data? With Film Maker, you can easily create videos with simple operations. Just edit keyframes using the user-friendly GUI, and the software will automatically interpolate the keyframes to generate the video.
+
+```sh
+film_maker
+```
+
+**Basic Operations**
+* File loading & viewpoint movement: Same as Cloud_Viewer
+* Space key to add a keyframe.
+* Delete key to remove a keyframe.
+* Play button: Automatically play the video (pressing again will stop playback)
+* Record checkbox: When checked, actions will be automatically recorded during playback
+
+Film Maker GUI: 
+
+![film_maker_demo.gif](imgs/film_maker_demo.gif)
+
+The demo video demonstrating how to use Film Maker utilizes the [cloud data of Kyobashi Station Area](https://www.geospatial.jp/ckan/dataset/kyoubasiekisyuuhen_las) located in Osaka, Japan.
+
+### 4. Gaussian Viewer
+
+A simple viewer for 3D Gaussians. See [EasyGaussianSplatting](https://github.com/scomup/EasyGaussianSplatting) for more information.
+
+```sh
+gaussian_viewer  # Drag and drop your Gaussian file onto the window
+```
+
+![Gaussian Viewer GIF](https://qiita-image-store.s3.ap-northeast-1.amazonaws.com/0/149168/441e6f5a-214d-f7c1-11bf-5fa79e63b38e.gif)
+
+### 5. LiDAR-LiDAR Calibration Tools
+
+A tool to compute the relative pose between two LiDARs. It allows for both manual adjustment in the settings screen and automatic calibration.
+
+```sh
+lidar_calib --lidar0=/YOUR_LIDAR0_TOPIC --lidar1=/YOUR_LIDAR1_TOPIC
+```
+
+![LiDAR Calibration](https://qiita-image-store.s3.ap-northeast-1.amazonaws.com/0/149168/5a8a9903-a42a-8322-1d23-0cbecd3fa99a.png)
+
+### 6. LiDAR-Camera Calibration Tools
+
+A tool for calculating the relative pose between a LiDAR and a camera. It allows for manual adjustment in the settings screen and real-time verification of LiDAR point projection onto images.
+
+```sh
+lidar_cam_calib --lidar=/YOUR_LIDAR_TOPIC --camera=/YOUR_CAMERA_TOPIC --camera_info=/YOUR_CAMERA_INFO_TOPIC
+```
+
+![LiDAR-Camera Calibration](https://qiita-image-store.s3.ap-northeast-1.amazonaws.com/0/149168/f8359820-2ae7-aa37-6577-0fa035f4dd95.png)
+
+## Using as a Library
+
+Using the examples above, you can easily customize and develop your own 3D viewer with `q3dviewer`. Below is a coding example.
+
+### Custom 3D Viewer
+
+```python
+#!/usr/bin/env python3
+
+import q3dviewer as q3d  # Import q3dviewer
+
+def main():
+    # Create a Qt application
+    app = q3d.QApplication([])
+
+    # Create various 3D items
+    axis_item = q3d.AxisItem(size=0.5, width=5)
+    grid_item = q3d.GridItem(size=10, spacing=1)
+
+    # Create a viewer
+    viewer = q3d.Viewer(name='example')
+    
+    # Add items to the viewer
+    viewer.add_items({
+        'grid': grid_item,
+        'axis': axis_item,
+    })
+
+    # Show the viewer & run the Qt application
+    viewer.show()
+    app.exec()
+
+if __name__ == '__main__':
+    main()
+```
+
+`q3dviewer` provides the following 3D items:
+
+- **AxisItem**: Displays coordinate axes or the origin position.
+- **CloudItem**: Displays point clouds.
+- **CloudIOItem**: Displays point clouds with input/output capabilities.
+- **GaussianItem**: Displays 3D Gaussians.
+- **GridItem**: Displays grids.
+- **ImageItem**: Displays 2D images.
+- **Text2DItem**: Displays 2D text.
+- **LineItem**: Displays lines or trajectories.
+
+### Developing Custom Items
+
+In addition to the standard 3D items provided, you can visualize custom 3D items with simple coding. Below is a sample:
+
+```python
+from OpenGL.GL import *
+import numpy as np
+import q3dviewer as q3d
+from q3dviewer.Qt.QtWidgets import QLabel, QSpinBox
+
+class YourItem(q3d.BaseItem):
+    def __init__(self):
+        super(YourItem, self).__init__()
+        # Necessary initialization
+
+    def add_setting(self, layout):
+        # Initialize the settings screen
+        label = QLabel("Add your setting:")
+        layout.addWidget(label)
+        box = QSpinBox()
+        layout.addWidget(box)
+
+    def set_data(self, data):
+        # Obtain the data you want to visualize
+        pass
+
+    def initialize_gl(self):
+        # OpenGL initialization settings (if needed)
+        pass
+
+    def paint(self):
+        # Visualize 3D objects using OpenGL
+        pass
+```
+
+Enjoy using `q3dviewer`!

{q3dviewer-1.1.5 → q3dviewer-1.1.7}/README.md

@@ -4,7 +4,7 @@
 [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
 [![PyPI version](https://badge.fury.io/py/q3dviewer.svg)](https://badge.fury.io/py/q3dviewer)
 
-`q3dviewer` is a library designed for quickly deploying a 3D viewer. It is based on Qt (PySide6) and provides efficient OpenGL items for displaying 3D objects (e.g., point clouds, cameras, and 3D Gaussians). You can use it to visualize your 3D data or set up an efficient viewer application. It is inspired by PyQtGraph but focuses more on efficient 3D rendering.
+`q3dviewer` is a library designed for quickly deploying a 3D viewer. It is based on Qt and provides efficient OpenGL items for displaying 3D objects (e.g., point clouds, cameras, and 3D Gaussians). You can use it to visualize your 3D data or set up an efficient viewer application. It is inspired by PyQtGraph but focuses more on efficient 3D rendering.
 
 
 To show how to use `q3dviewer` as a library, we also provide some [very useful tools](#tools).
@@ -183,7 +183,7 @@ In addition to the standard 3D items provided, you can visualize custom 3D items
 from OpenGL.GL import *
 import numpy as np
 import q3dviewer as q3d
-from PySide6.QtWidgets import QLabel, QSpinBox
+from q3dviewer.Qt.QtWidgets import QLabel, QSpinBox
 
 class YourItem(q3d.BaseItem):
     def __init__(self):

q3dviewer-1.1.7/q3dviewer/Qt/__init__.py

@@ -0,0 +1,68 @@
+#!/usr/bin/env python3
+
+"""
+Copyright 2024 Panasonic Advanced Technology Development Co.,Ltd. (Liu Yang)
+Distributed under MIT license. See LICENSE for more information.
+"""
+
+"""
+You can use the following code to set the Q3D_QT_IMPL environment variable
+# tested for PyQt5, PySide2 and PySide6
+# -------------------------------
+in your python script before importing QT:
+    import os
+    os.environ['Q3D_QT_IMPL'] = 'PySide6'
+or in your bash:
+    export Q3D_QT_IMPL=PyQt5
+# -------------------------------
+"""
+
+import importlib.util
+import builtins
+import sys
+import os
+
+
+Q3D_QT_IMPL = os.environ.get('Q3D_QT_IMPL')
+Q3D_DEBUG = os.environ.get('Q3D_DEBUG')
+
+if Q3D_QT_IMPL not in ['PyQt5', 'PySide2', 'PySide6']:
+    Q3D_QT_IMPL = None
+
+if Q3D_QT_IMPL is None:
+    if importlib.util.find_spec('PyQt5') is not None:
+        Q3D_QT_IMPL = 'PyQt5'
+    elif importlib.util.find_spec('PySide6') is not None:
+        Q3D_QT_IMPL = 'PySide6'
+    else:
+        raise ImportError('No Qt binding found. Please install PySide6.')
+
+
+def import_module(name):
+    module = builtins.__import__(f'{Q3D_QT_IMPL}.{name}').__dict__[name]
+    sys.modules[f'{__name__}.{name}'] = module
+
+
+def load_qt():
+    if Q3D_DEBUG is not None:
+        print(f'Using {Q3D_QT_IMPL} as Qt binding.')
+
+    # register common Qt modules
+    modules = ['QtCore', 'QtGui', 'QtWidgets']
+    for name in modules:
+        import_module(name)
+    # register OpenGL modules for PySide6
+    if Q3D_QT_IMPL == 'PySide6':
+        import_module('QtOpenGLWidgets')
+        sys.modules[f'{__name__}.QtWidgets'].QOpenGLWidget = sys.modules[f'{__name__}.QtOpenGLWidgets'].QOpenGLWidget
+    # make PyQt5 and PySide6 modules compatible
+    if Q3D_QT_IMPL == 'PyQt5':
+        sys.modules[f'{__name__}.QtCore'].Signal = sys.modules[f'{__name__}.QtCore'].pyqtSignal
+        sys.modules[f'{__name__}.QtCore'].Slot = sys.modules[f'{__name__}.QtCore'].pyqtSlot
+        sys.modules[f'{__name__}.QtCore'].Property = sys.modules[f'{__name__}.QtCore'].pyqtProperty
+    # Handle exec() for PySide2
+    if Q3D_QT_IMPL == 'PySide2':
+        sys.modules[f'{__name__}.QtWidgets'].QApplication.exec = sys.modules[f'{__name__}.QtWidgets'].QApplication.exec_
+
+
+load_qt()

q3dviewer-1.1.7/q3dviewer/__init__.py

@@ -0,0 +1,14 @@
+import time
+t1 = time.time()
+from q3dviewer.custom_items import *
+t2 = time.time()
+from q3dviewer.glwidget import *
+from q3dviewer.viewer import *
+from q3dviewer.base_item import *
+from q3dviewer.base_glwidget import *
+t3 = time.time()
+
+from q3dviewer.Qt import Q3D_DEBUG
+if Q3D_DEBUG:
+    print("Import custom items: ", t2 - t1)
+    print("Import base q3dviewer: ", t3 - t2)

{q3dviewer-1.1.5 → q3dviewer-1.1.7}/q3dviewer/base_glwidget.py

@@ -6,13 +6,14 @@ Distributed under MIT license. See LICENSE for more information.
 from OpenGL.GL import *
 from math import radians, tan
 import numpy as np
-from PySide6 import QtCore, QtGui, QtOpenGLWidgets
+from q3dviewer.Qt import QtCore, QtGui
 from q3dviewer.utils.maths import frustum, euler_to_matrix, makeT
+from q3dviewer.Qt.QtWidgets import QOpenGLWidget
 
 
-class BaseGLWidget(QtOpenGLWidgets.QOpenGLWidget):
+class BaseGLWidget(QOpenGLWidget):
     def __init__(self, parent=None):
-        QtOpenGLWidgets.QOpenGLWidget.__init__(self, parent)
+        QOpenGLWidget.__init__(self, parent)
         self.setFocusPolicy(QtCore.Qt.FocusPolicy.ClickFocus)
         self.reset()
         self._fov = 60

{q3dviewer-1.1.5 → q3dviewer-1.1.7}/q3dviewer/base_item.py

@@ -2,11 +2,10 @@
 Copyright 2024 Panasonic Advanced Technology Development Co.,Ltd. (Liu Yang)
 Distributed under MIT license. See LICENSE for more information.
 """
+from q3dviewer.Qt.QtCore import QObject
 
-from PySide6 import QtCore
-import numpy as np
 
-class BaseItem(QtCore.QObject):
+class BaseItem(QObject):
     _next_id = 0
     
     def __init__(self):

q3dviewer-1.1.7/q3dviewer/custom_items/__init__.py

@@ -0,0 +1,9 @@
+from q3dviewer.custom_items.axis_item import AxisItem
+from q3dviewer.custom_items.cloud_item import CloudItem
+from q3dviewer.custom_items.cloud_io_item import CloudIOItem
+from q3dviewer.custom_items.gaussian_item import GaussianItem
+from q3dviewer.custom_items.frame_item import FrameItem
+from q3dviewer.custom_items.grid_item import GridItem
+from q3dviewer.custom_items.text_item import Text2DItem
+from q3dviewer.custom_items.image_item import ImageItem
+from q3dviewer.custom_items.line_item import LineItem

{q3dviewer-1.1.5 → q3dviewer-1.1.7}/q3dviewer/custom_items/axis_item.py

@@ -2,11 +2,10 @@
 Copyright 2024 Panasonic Advanced Technology Development Co.,Ltd. (Liu Yang)
 Distributed under MIT license. See LICENSE for more information.
 """
-
 from q3dviewer.base_item import BaseItem
 from OpenGL.GL import *
 import numpy as np
-from PySide6.QtWidgets import QDoubleSpinBox
+from q3dviewer.Qt.QtWidgets import QDoubleSpinBox
 
 
 class AxisItem(BaseItem):

{q3dviewer-1.1.5 → q3dviewer-1.1.7}/q3dviewer/custom_items/cloud_io_item.py

@@ -6,7 +6,7 @@ Distributed under MIT license. See LICENSE for more information.
 from q3dviewer.custom_items.cloud_item import CloudItem
 from pathlib import Path
 import os
-from PySide6.QtWidgets import QPushButton, QLabel, QLineEdit, QMessageBox
+from q3dviewer.Qt.QtWidgets import QPushButton, QLabel, QLineEdit, QMessageBox
 from q3dviewer.utils.cloud_io import save_pcd, save_ply, save_e57, save_las, load_pcd, load_ply, load_e57, load_las
 
 class CloudIOItem(CloudItem):
@@ -38,12 +38,16 @@ class CloudIOItem(CloudItem):
         cloud = self.buff[:self.valid_buff_top]
         func = None
         if self.save_path.endswith(".pcd"):
+            from q3dviewer.utils.cloud_io import save_pcd
             func = save_pcd
         elif self.save_path.endswith(".ply"):
+            from q3dviewer.utils.cloud_io import save_ply
             func = save_ply
         elif self.save_path.endswith(".e57"):
+            from q3dviewer.utils.cloud_io import save_e57
             func = save_e57
         elif self.save_path.endswith(".las"):
+            from q3dviewer.utils.cloud_io import save_las
             func = save_las
         elif self.save_path.endswith(".tif") or self.save_path.endswith(".tiff"):
             print("Do not support save as tif type!")
@@ -61,12 +65,16 @@ class CloudIOItem(CloudItem):
     def load(self, file, append=False):
         # print("Try to load %s ..." % file)
         if file.endswith(".pcd"):
+            from q3dviewer.utils.cloud_io import load_pcd
             cloud = load_pcd(file)
         elif file.endswith(".ply"):
+            from q3dviewer.utils.cloud_io import load_ply
             cloud = load_ply(file)
         elif file.endswith(".e57"):
+            from q3dviewer.utils.cloud_io import load_e57
             cloud = load_e57(file)
         elif file.endswith(".las"):
+            from q3dviewer.utils.cloud_io import load_las
             cloud = load_las(file)
         else:
             print("Not supported file type.")

{q3dviewer-1.1.5 → q3dviewer-1.1.7}/q3dviewer/custom_items/cloud_item.py

@@ -7,13 +7,15 @@ Distributed under MIT license. See LICENSE for more information.
 import numpy as np
 from q3dviewer.base_item import BaseItem
 from OpenGL.GL import *
+from OpenGL.GL import shaders
+
 import threading
 import os
-from PySide6.QtWidgets import QLabel, QLineEdit, QDoubleSpinBox, \
-    QComboBox, QCheckBox
-from OpenGL.GL import shaders
-from q3dviewer.utils import *
+from q3dviewer.Qt.QtWidgets import QLabel, QLineEdit, QDoubleSpinBox, QComboBox, QCheckBox
 from q3dviewer.utils.range_slider import RangeSlider
+from q3dviewer.utils import set_uniform
+from q3dviewer.utils import text_to_rgba
+from q3dviewer.Qt import Q3D_DEBUG
 
 
 # draw points with color (x, y, z, color)
@@ -38,7 +40,7 @@ class CloudItem(BaseItem):
         except ValueError:
             print(f"Invalid color: {color}, please use matplotlib color format")
             exit(1)
-        self.mode_table = {'FLAT': 0,  'I': 1,  'RGB': 2}
+        self.mode_table = {'FLAT': 0,  'I': 1,  'RGB': 2, 'GRAY': 3}
         self.point_type_table = {'PIXEL': 0, 'SQUARE': 1, 'SPHERE': 2}
         self.color_mode = self.mode_table[color_mode]
         self.CAPACITY = 10000000  # 10MB * 3 (x,y,z, color) * 4
@@ -87,6 +89,7 @@ class CloudItem(BaseItem):
         self.combo_color.addItem("flat color")
         self.combo_color.addItem("intensity")
         self.combo_color.addItem("RGB")
+        self.combo_color.addItem("gray")
         self.combo_color.setCurrentIndex(self.color_mode)
         self.combo_color.currentIndexChanged.connect(self._on_color_mode)
         layout.addWidget(self.combo_color)
@@ -125,10 +128,13 @@ class CloudItem(BaseItem):
             self.edit_rgb.show()
         elif (index == self.mode_table['I']):  # flat color
             self.slider_v.show()
+        elif (index == self.mode_table['GRAY']):  # flat color
+            self.slider_v.show()
+
         self.need_update_setting = True
 
     def set_color_mode(self, color_mode):
-        if color_mode in {'FLAT', 'RGB', 'I'}:
+        if color_mode in {'FLAT', 'RGB', 'I', 'GRAY'}:
             try:
                 self.combo_color.setCurrentIndex(self.mode_table[color_mode])
             except:
@@ -143,14 +149,15 @@ class CloudItem(BaseItem):
             self.box_size.setPrefix("Set size (pixel): ")
             self.box_size.setDecimals(0)
             self.box_size.setSingleStep(1)
-            self.box_size.setValue(1)
-            self.size = 1
+            self.size = np.ceil(self.size)
+            self.box_size.setValue(self.size)
         else:
             self.box_size.setPrefix("Set size (meter): ")
             self.box_size.setDecimals(2)
             self.box_size.setSingleStep(0.01)
-            self.box_size.setValue(0.01)
-            self.size = 0.01
+            if self.size >= 1:
+                self.size = self.size * 0.01
+            self.box_size.setValue(self.size)
         self.need_update_setting = True
 
     def set_alpha(self, alpha):
@@ -237,7 +244,8 @@ class CloudItem(BaseItem):
             buff_capacity = self.buff.shape[0]
             while (new_buff_top > buff_capacity):
                 buff_capacity += self.CAPACITY
-            print("[Cloud Item] Update capacity to %d" % buff_capacity)
+            if Q3D_DEBUG is not None:
+                print("[Cloud Item] Update capacity to %d" % buff_capacity)
             new_buff = np.empty((buff_capacity), self.data_type)
             new_buff[:self.add_buff_loc] = self.buff[:self.add_buff_loc]
             new_buff[self.add_buff_loc:new_buff_top] = self.wait_add_data

{q3dviewer-1.1.5 → q3dviewer-1.1.7}/q3dviewer/custom_items/frame_item.py

@@ -4,11 +4,11 @@ Distributed under MIT license. See LICENSE for more information.
 """
 
 from q3dviewer.base_item import BaseItem
-from OpenGL.GL import *
 import numpy as np
+from OpenGL.GL import *
 from OpenGL.GL import shaders
-from q3dviewer.utils import *
-
+from q3dviewer.utils import set_uniform
+from q3dviewer.utils import text_to_rgba
 
 # Vertex and Fragment shader source code
 vertex_shader_source = """

{q3dviewer-1.1.5 → q3dviewer-1.1.7}/q3dviewer/custom_items/gaussian_item.py

@@ -8,9 +8,9 @@ from q3dviewer.base_item import BaseItem
 from OpenGL.GL import *
 import numpy as np
 import os
-from PySide6.QtWidgets import QComboBox, QLabel
+from q3dviewer.Qt.QtWidgets import QComboBox, QLabel
 from OpenGL.GL import shaders
-from q3dviewer.utils import *
+from q3dviewer.utils import set_uniform
 
 
 def div_round_up(x, y):

{q3dviewer-1.1.5 → q3dviewer-1.1.7}/q3dviewer/custom_items/grid_item.py

@@ -5,9 +5,9 @@ Distributed under MIT license. See LICENSE for more information.
 
 from q3dviewer.base_item import BaseItem
 from OpenGL.GL import *
-from PySide6.QtWidgets import QLabel, QDoubleSpinBox, QLineEdit
+from q3dviewer.Qt.QtWidgets import QDoubleSpinBox
 import numpy as np
-from q3dviewer.utils.maths import text_to_rgba
+from q3dviewer.utils import text_to_rgba
 
 
 class GridItem(BaseItem):

{q3dviewer-1.1.5 → q3dviewer-1.1.7}/q3dviewer/custom_items/image_item.py

@@ -5,9 +5,10 @@ Distributed under MIT license. See LICENSE for more information.
 
 from q3dviewer.base_item import BaseItem
 from OpenGL.GL import *
+
 import numpy as np
 from OpenGL.GL import shaders
-from PySide6.QtWidgets import QLabel, QSpinBox, QCheckBox
+from q3dviewer.Qt.QtWidgets import QSpinBox, QCheckBox
 
 
 # Vertex and Fragment shader source code

{q3dviewer-1.1.5 → q3dviewer-1.1.7}/q3dviewer/custom_items/line_item.py

@@ -7,8 +7,8 @@ from q3dviewer.base_item import BaseItem
 from OpenGL.GL import *
 import numpy as np
 import threading
-from PySide6.QtWidgets import QLabel, QLineEdit, QDoubleSpinBox
-from q3dviewer.utils.maths import text_to_rgba
+from q3dviewer.Qt.QtWidgets import QLabel, QLineEdit, QDoubleSpinBox
+from q3dviewer.utils import text_to_rgba
 
 
 class LineItem(BaseItem):

{q3dviewer-1.1.5 → q3dviewer-1.1.7}/q3dviewer/custom_items/text_item.py

@@ -3,10 +3,9 @@ Copyright 2024 Panasonic Advanced Technology Development Co.,Ltd. (Liu Yang)
 Distributed under MIT license. See LICENSE for more information.
 """
 
-from PySide6 import QtCore, QtGui
+from q3dviewer.Qt import QtCore, QtGui
 from q3dviewer.base_item import BaseItem
-from OpenGL.GL import *
-from q3dviewer.utils.maths import text_to_rgba
+from q3dviewer.utils import text_to_rgba
 
 
 class Text2DItem(BaseItem):
@@ -16,12 +15,12 @@ class Text2DItem(BaseItem):
         """All keyword arguments are passed to set_data()"""
         BaseItem.__init__(self)
         self.pos = (20, 50)
-        try:
-            self.rgb = text_to_rgba(self.color)
-        except ValueError:
-            raise ValueError("Invalid color format. Use mathplotlib color format.")
         self.text = ''
         self.font = QtGui.QFont('Helvetica', 16)
+
+        self.rgb = text_to_rgba('w')
+        if 'pos' in kwds:
+            self.pos = kwds['pos']
         self.set_data(**kwds)
 
     def set_data(self, **kwds):
@@ -47,7 +46,6 @@ class Text2DItem(BaseItem):
     def set_color(self, color):
         try:
             self.rgb = text_to_rgba(color)
-            self.color = color
         except ValueError:
             print("Invalid color format. Use mathplotlib color format.")
 

{q3dviewer-1.1.5 → q3dviewer-1.1.7}/q3dviewer/glwidget.py

@@ -3,13 +3,11 @@ Copyright 2024 Panasonic Advanced Technology Development Co.,Ltd. (Liu Yang)
 Distributed under MIT license. See LICENSE for more information.
 """
 
-from PySide6 import QtCore
-from PySide6.QtWidgets import QWidget, QComboBox, QVBoxLayout, QHBoxLayout, QLabel, QLineEdit, QCheckBox, QGroupBox
-from PySide6.QtGui import QKeyEvent, QVector3D
-from OpenGL.GL import *
-import numpy as np
+from q3dviewer.Qt import QtCore
+from q3dviewer.Qt.QtWidgets import QWidget, QComboBox, QVBoxLayout, QLabel, QLineEdit, QCheckBox, QGroupBox
+from q3dviewer.Qt.QtGui import QKeyEvent
 from q3dviewer.base_glwidget import BaseGLWidget
-from q3dviewer.utils.maths import text_to_rgba
+from q3dviewer.utils import text_to_rgba
 
 class SettingWindow(QWidget):
     def __init__(self):

{q3dviewer-1.1.5 → q3dviewer-1.1.7}/q3dviewer/shaders/cloud_vert.glsl

@@ -62,6 +62,15 @@ void main()
         c.y = float((value & uint(0x0000FF00)) >> 8)/255.;
         c.x = float((value & uint(0x00FF0000)) >> 16)/255.;
     }
+    else if(color_mode == 3)
+    {
+        uint intensity = value >> 24;
+        float range = vmax - vmin;
+        float value = 1.0 - (float(intensity) - vmin) / range;
+        c.z = value;
+        c.y = value;
+        c.x = value;
+    }
     else
     {
         c.z = float( uint(flat_rgb) & uint(0x000000FF))/255.;

{q3dviewer-1.1.5 → q3dviewer-1.1.7}/q3dviewer/tools/cloud_viewer.py

@@ -7,8 +7,8 @@ Distributed under MIT license. See LICENSE for more information.
 
 import numpy as np
 import q3dviewer as q3d
-from PySide6.QtWidgets import QVBoxLayout, QProgressBar, QDialog, QLabel
-from PySide6.QtCore import QThread, Signal
+from q3dviewer.Qt.QtWidgets import QVBoxLayout, QProgressBar, QDialog, QLabel
+from q3dviewer.Qt.QtCore import QThread, Signal
 
 
 class ProgressDialog(QDialog):