huanld/specklepy_qt_ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' into 2.19

Browse Source
This commit is contained in:
KatKatKateryna
2024-02-23 14:24:19 +00:00
parent 4600fa5167 18435bf4af
commit ed66a0fb2e
42 changed files with 965 additions and 489 deletions
Download Patch File Download Diff File Expand all files Collapse all files
qt_ui/ConnectorBindings.py
+126
View File
@@ -0,0 +1,126 @@
from typing import Dict, List
from numpy import double
from import UpdateSavedStreams
from import UpdateSelectedStream
using static DesktopUI2.ViewModels.MappingViewModel;
namespace DesktopUI2;
public delegate void UpdateSavedStreams(List<StreamState> streams);
public delegate void UpdateSelectedStream();
class ConnectorBindings():
def __init__(self):
self.ConnectorVersion: str == Assembly.GetAssembly(GetType()).GetNameAndVersion().Version
self.ConnectorName: str == Assembly.GetAssembly(GetType()).GetNameAndVersion().Name
#SavedStreamStates: List<StreamState> == new List<StreamState>()
self.CanReceive: bool = True
'''Indicates if the connector can Receive and if that function has been implemented'''
self.CanPreviewSend: bool == False
'''Indicates if previewing send has been implemented'''
self.CanPreviewReceive: bool == False
'''Indicates if previewing receive has been implemented'''
self.CanOpen3DView: bool == False
'''Returns true if the <see cref="Open3DView"/> method is overwritten and implemented.'''
def UpdateSavedStreams(self, streams: List[StreamState]):
UpdateSavedStreams(streams)
def UpdateSelectedStream(self):
UpdateSelectedStream()
def Open3DView(self, viewCoordinates: List[double], viewName: str = ""):
'''Opens a 3D view in the host application
viewCoordinates: First three values are the camera position, second three the target.
viewName: Id or Name of the view'''
return
def GetHostAppNameVersion(self)-> str:
'''Gets the current host application name with version.'''
return
def GetHostAppName(self) -> str:
'''Gets the current host application name.'''
return
def GetFileName(self) -> str:
'''Gets the current opened/focused file's name.
Make sure to check regarding unsaved/temporary files.'''
return
def GetDocumentId(self) -> str:
'''Gets the current opened/focused file's id.
Generate one in here if the host app does not provide one.'''
return
def GetDocumentLocation(self) -> str:
'''Gets the current opened/focused file's locations.
Make sure to check regarding unsaved/temporary files.'''
return
def ResetDocument(self):
'''Clears the document state of selections and previews'''
return
def GetActiveViewName(self) -> str:
'''Gets the current opened/focused file's view, if applicable.'''
return
def GetStreamsInFile(self) -> List[StreamState]:
'''Returns the serialised clients present in the current open host file.'''
return
def WriteStreamsToFile(self, streams: List[StreamState]):
'''Writes serialised clients to the current open host file.'''
return
def AddNewStream(self, state: StreamState):
'''Adds a new client and persists the info to the host file'''
return
def PersistAndUpdateStreamInFile(self, state: StreamState):
'''Persists the stream info to the host file; if maintaining a local in memory copy, make sure to update it too.'''
return
def SendStream(self, state: StreamState, progress: ProgressViewModel) -> str:
'''Pushes a client's stream'''
return
def PreviewSend(self, state: StreamState, progress: ProgressViewModel):
'''Previews a send operation'''
def ReceiveStream(self, state: StreamState, progress: ProgressViewModel) -> StreamState:
'''Receives stream data from the server'''
def PreviewReceive(self, state: StreamState, progress: ProgressViewModel) -> StreamState:
'''Previews a receive operation'''
def GetSelectedObjects(self) -> List[str]:
'''Adds the current selection to the provided client.'''
def GetObjectsInView(self) -> List[str]:
'''Gets a list of objects in the currently active view'''
def SelectClientObjects(self, objs: List[str], deselect: bool = False):
'''clients should be able to select/preview/hover one way or another their associated objects'''
def GetSelectionFilters(self) -> List[ISelectionFilter]:
'''Should return a list of filters that the application supports.'''
def GetReceiveModes(self) -> List[ReceiveMode]:
'''Should return a list of receive modes that the application supports.'''
def GetCustomStreamMenuItems(self) -> List[MenuItem]:
'''Return a list of custom menu items for stream cards.'''
def GetSettings(self) -> List[ISetting]:
return
def ImportFamilyCommand(self, Mapping: Dict[str, List[MappingValue]] ) -> Dict[str, List[MappingValue]] :
'''Imports family symbols in Revit'''
return
qt_ui/DataStorage.py
+9 -1
View File
@@ -3,7 +3,11 @@ import inspect
from typing import List, Optional, Tuple, Union, Any
import webbrowser
from speckle.utils.panel_logging import logToUser
try:
from specklepy_qt_ui.qt_ui.utils.logger import logToUser
except ModuleNotFoundError:
from speckle.specklepy_qt_ui.qt_ui.utils.logger import logToUser
from specklepy.core.api.credentials import get_local_accounts
@@ -18,6 +22,7 @@ class DataStorage:
currentCRS = None
currentUnits = "m"
currentOriginalUnits = ""
workspace = ""
custom_lat: Optional[float] = None
custom_lon: Optional[float] = None
@@ -49,6 +54,9 @@ class DataStorage:
latestActionLayers: Optional[list] = None
latestActionUnits: str = ""
flat_report_receive: dict = {}
flat_report_latest: dict = {}
def __init__(self):
# print("hello")
# self.streamsToFollow.append(("https://speckle.xyz/streams/17b0b76d13/branches/random_tests", "", "09a0f3e41a"))
qt_ui/LogWidget.py
+41 -20
View File
@@ -9,19 +9,38 @@ import webbrowser
from specklepy.logging import metrics
from specklepy.core.api.credentials import Account
from specklepy_qt_ui.qt_ui.global_resources import (
BACKGR_COLOR,
BACKGR_COLOR_LIGHT,
BACKGR_COLOR_GREY,
BACKGR_COLOR_TRANSPARENT,
BACKGR_COLOR_HIGHLIGHT,
NEW_GREY,
NEW_GREY_HIGHLIGHT,
BACKGR_ERROR_COLOR,
BACKGR_ERROR_COLOR_LIGHT,
)
from specklepy_qt_ui.qt_ui.widget_dependencies_upgrade import DependenciesUpgradeDialog
from specklepy_qt_ui.qt_ui.widget_report import ReportDialog
try:
from specklepy_qt_ui.qt_ui.utils.global_resources import (
BACKGR_COLOR,
BACKGR_COLOR_LIGHT,
BACKGR_COLOR_GREY,
BACKGR_COLOR_TRANSPARENT,
BACKGR_COLOR_HIGHLIGHT,
NEW_GREY,
NEW_GREY_HIGHLIGHT,
BACKGR_ERROR_COLOR,
BACKGR_ERROR_COLOR_LIGHT,
)
from specklepy_qt_ui.qt_ui.widget_dependencies_upgrade import (
DependenciesUpgradeDialog,
)
from specklepy_qt_ui.qt_ui.widget_report import ReportDialog
except ModuleNotFoundError:
from speckle.specklepy_qt_ui.qt_ui.utils.global_resources import (
BACKGR_COLOR,
BACKGR_COLOR_LIGHT,
BACKGR_COLOR_GREY,
BACKGR_COLOR_TRANSPARENT,
BACKGR_COLOR_HIGHLIGHT,
NEW_GREY,
NEW_GREY_HIGHLIGHT,
BACKGR_ERROR_COLOR,
BACKGR_ERROR_COLOR_LIGHT,
)
from speckle.specklepy_qt_ui.qt_ui.widget_dependencies_upgrade import (
DependenciesUpgradeDialog,
)
from speckle.specklepy_qt_ui.qt_ui.widget_report import ReportDialog
class LogWidget(QWidget):
@@ -268,20 +287,22 @@ class LogWidget(QWidget):
def getNextBtn(self):
index = len(self.used_btns) # get the next "free" button
# print(index)
# print(self.btns)
if index >= len(self.btns):
# remove first button
print(self.layout.itemAt(0).widget())
self.layout.itemAt(0).widget().setParent(None)
# self.used_btns.clear()
self.createBtns()
index = 0
btn = self.btns[index]
# print(btn)
return btn, index
def getLastBtn(self):
index = len(self.used_btns) - 1 # get the next "free" button
btn = None
if index > 0:
btn = self.btns[index]
return btn, index
def getBtnByKeyword(self, keyword: str):
qt_ui/dockwidget_main.py
+71 -37
View File
@@ -4,37 +4,71 @@ from copy import copy
import inspect
import os
from specklepy_qt_ui.qt_ui.widget_transforms import MappingSendDialog
from specklepy_qt_ui.qt_ui.LogWidget import LogWidget
from specklepy_qt_ui.qt_ui.logger import logToUser
from specklepy_qt_ui.qt_ui.utils import constructCommitURL
from specklepy_qt_ui.qt_ui.DataStorage import DataStorage
from specklepy_qt_ui.qt_ui.global_resources import (
COLOR_HIGHLIGHT,
SPECKLE_COLOR,
SPECKLE_COLOR_LIGHT,
ICON_OPEN_WEB,
ICON_REPORT,
ICON_LOGO,
ICON_SEARCH,
ICON_DELETE,
ICON_DELETE_BLUE,
ICON_SEND,
ICON_RECEIVE,
ICON_SEND_BLACK,
ICON_RECEIVE_BLACK,
ICON_SEND_BLUE,
ICON_RECEIVE_BLUE,
COLOR,
BACKGR_COLOR,
BACKGR_COLOR_LIGHT,
ICON_XXL,
ICON_RASTER,
ICON_POLYGON,
ICON_LINE,
ICON_POINT,
ICON_GENERIC,
)
try:
from specklepy_qt_ui.qt_ui.widget_transforms import MappingSendDialog
from specklepy_qt_ui.qt_ui.LogWidget import LogWidget
from specklepy_qt_ui.qt_ui.utils.logger import logToUser
from specklepy_qt_ui.qt_ui.utils.utils import constructCommitURL
from specklepy_qt_ui.qt_ui.DataStorage import DataStorage
from specklepy_qt_ui.qt_ui.utils.global_resources import (
COLOR_HIGHLIGHT,
SPECKLE_COLOR,
SPECKLE_COLOR_LIGHT,
ICON_OPEN_WEB,
ICON_REPORT,
ICON_LOGO,
ICON_SEARCH,
ICON_DELETE,
ICON_DELETE_BLUE,
ICON_SEND,
ICON_RECEIVE,
ICON_SEND_BLACK,
ICON_RECEIVE_BLACK,
ICON_SEND_BLUE,
ICON_RECEIVE_BLUE,
COLOR,
BACKGR_COLOR,
BACKGR_COLOR_LIGHT,
ICON_XXL,
ICON_RASTER,
ICON_POLYGON,
ICON_LINE,
ICON_POINT,
ICON_GENERIC,
)
except ModuleNotFoundError:
from speckle.specklepy_qt_ui.qt_ui.widget_transforms import MappingSendDialog
from speckle.specklepy_qt_ui.qt_ui.LogWidget import LogWidget
from speckle.specklepy_qt_ui.qt_ui.utils.logger import logToUser
from speckle.specklepy_qt_ui.qt_ui.utils.utils import constructCommitURL
from speckle.specklepy_qt_ui.qt_ui.DataStorage import DataStorage
from speckle.specklepy_qt_ui.qt_ui.utils.global_resources import (
COLOR_HIGHLIGHT,
SPECKLE_COLOR,
SPECKLE_COLOR_LIGHT,
ICON_OPEN_WEB,
ICON_REPORT,
ICON_LOGO,
ICON_SEARCH,
ICON_DELETE,
ICON_DELETE_BLUE,
ICON_SEND,
ICON_RECEIVE,
ICON_SEND_BLACK,
ICON_RECEIVE_BLACK,
ICON_SEND_BLUE,
ICON_RECEIVE_BLUE,
COLOR,
BACKGR_COLOR,
BACKGR_COLOR_LIGHT,
ICON_XXL,
ICON_RASTER,
ICON_POLYGON,
ICON_LINE,
ICON_POINT,
ICON_GENERIC,
)
from specklepy.logging.exceptions import SpeckleException, GraphQLException
from specklepy.logging import metrics
@@ -775,7 +809,7 @@ class SpeckleQGISDialog(QtWidgets.QDockWidget, FORM_CLASS):
self.streamBranchDropdown.clear() # activates "populate commit"
# print(2)
if isinstance(plugin.active_stream[1], SpeckleException):
logToUser("Some Projects cannot be accessed", level=1, plugin=self)
logToUser("Some streams cannot be accessed", level=1, plugin=self)
return
elif (
plugin.active_stream is None
@@ -791,7 +825,7 @@ class SpeckleQGISDialog(QtWidgets.QDockWidget, FORM_CLASS):
[f"{branch.name}" for branch in plugin.active_stream[1].branches.items]
)
# print(4)
self.streamBranchDropdown.addItems(["Create New Model"])
self.streamBranchDropdown.addItems(["Create New Branch"])
# print(5)
if keep_branch is True:
plugin.active_branch = active_branch
@@ -830,13 +864,13 @@ class SpeckleQGISDialog(QtWidgets.QDockWidget, FORM_CLASS):
# print("________populateActiveCommitDropdown")
# print(plugin.active_commit)
if plugin.active_stream is None:
print("Active project is None")
print("Active stream is None")
return
branchName = self.streamBranchDropdown.currentText()
# print(f"CURRENT BRANCH TEXT: {branchName}")
if branchName == "":
return
if branchName == "Create New Model":
if branchName == "Create New Branch":
self.streamBranchDropdown.setCurrentText("main")
plugin.onBranchCreateClicked()
return
@@ -846,7 +880,7 @@ class SpeckleQGISDialog(QtWidgets.QDockWidget, FORM_CLASS):
# print(plugin.active_commit)
self.commitDropdown.clear()
if isinstance(plugin.active_stream[1], SpeckleException):
logToUser("Some Projects cannot be accessed", level=1, plugin=self)
logToUser("Some streams cannot be accessed", level=1, plugin=self)
return
elif plugin.active_stream[1]:
for b in plugin.active_stream[1].branches.items:
@@ -898,7 +932,7 @@ class SpeckleQGISDialog(QtWidgets.QDockWidget, FORM_CLASS):
else:
plugin.active_commit = None
self.commitDropdown.setItemText(0, "Latest version of this model")
self.commitDropdown.setItemText(0, "Latest commit from this branch")
# enable or disable web view button
# print("_________ENABLE OR DISABLE")
# print(plugin.active_commit)
qt_ui/mainWindow.py
+420 -233
View File
File diff suppressed because it is too large Load Diff
qt_ui/ui/add_stream_modal.ui
+1 -1
View File
@@ -25,7 +25,7 @@
<item row="1" column="0">
<widget class="QLabel" name="search_label">
<property name="text">
<string>Search Project by name or URL</string>
<string>Search Stream by name or URL</string>
</property>
</widget>
</item>
qt_ui/ui/create_branch.ui
+1 -1
View File
@@ -26,7 +26,7 @@
<item row="0" column="0">
<widget class="QLabel" name="name_label">
<property name="text">
<string>Model Name</string>
<string>Branch Name</string>
</property>
</widget>
</item>
qt_ui/ui/create_stream.ui
+1 -1
View File
@@ -34,7 +34,7 @@
<item row="1" column="0">
<widget class="QLabel" name="name_label">
<property name="text">
<string>Project Name</string>
<string>Stream Name</string>
</property>
</widget>
</item>
qt_ui/ui/dockwidget_main.ui
+3 -3
View File
@@ -39,7 +39,7 @@
<item row="1" column="0">
<widget class="QLabel" name="streamListLabel">
<property name="text">
<string>Project</string>
<string>Stream</string>
</property>
</widget>
</item>
@@ -77,7 +77,7 @@
<item row="2" column="0">
<widget class="QLabel" name="streamBranchLabel">
<property name="text">
<string>Model</string>
<string>Branch</string>
</property>
</widget>
</item>
@@ -87,7 +87,7 @@
<item row="3" column="0">
<widget class="QLabel" name="commitLabel">
<property name="text">
<string>Version</string>
<string>Commit</string>
</property>
</widget>
</item>
qt_ui/ui/mainWindow_main.ui
+61 -50
View File
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>SpeckleQArcGISDialog</class>
<widget class="QMainWindow" name="SpeckleQArcGISDialog">
<class>SpeckleGISDialog</class>
<widget class="QMainWindow" name="SpeckleGISDialog">
<property name="geometry">
<rect>
<x>0</x>
@@ -43,7 +43,7 @@
<item row="1" column="0">
<widget class="QLabel" name="streamListLabel">
<property name="text">
<string>Project</string>
<string>Stream</string>
</property>
</widget>
</item>
@@ -83,7 +83,7 @@
<item row="2" column="0">
<widget class="QLabel" name="streamBranchLabel">
<property name="text">
<string>Model</string>
<string>Branch</string>
</property>
</widget>
</item>
@@ -93,14 +93,26 @@
<item row="3" column="0">
<widget class="QLabel" name="commitLabel">
<property name="text">
<string>Version</string>
<string>Commit</string>
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="QComboBox" name="commitDropdown"/>
</item>
<layout class="QHBoxLayout" name="commitListButtons" stretch="20,1">
<item>
<widget class="QComboBox" name="commitDropdown"/>
</item>
<item>
<widget class="QPushButton" name="commit_web_view">
<property name="text">
<string> </string>
</property>
</widget>
</item>
</layout>
</item>
<item row="4" column="1">
<layout class="QHBoxLayout" name="horizontalLayout">
</layout>
@@ -126,6 +138,15 @@
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="reportBtn">
<property name="enabled">
<bool>true</bool>
</property>
</widget>
</item>
</layout>
</item>
@@ -178,21 +199,49 @@
<bool>true</bool>
</property>
<property name="text">
<string>Set visible layers as selection</string>
<string>Save visible layers as selection</string>
</property>
</widget>
</item>
</layout>
</item>
<item row="9" column="0">
<item row="10" column="1">
<layout class="QHBoxLayout" name="horizontalLayout" stretch="1,1">
<item>
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Expanding</enum>
</property>
</spacer>
</item>
<item>
<widget class="QPushButton" name="crsSettings">
<property name="enabled">
<bool>true</bool>
</property>
<property name="text">
<string>Set project center on Send/Receive</string>
</property>
</widget>
</item>
</layout>
</item>
<item row="11" column="0">
<widget class="QLabel" name="messageLabel">
<property name="text">
<string>Message</string>
</property>
</widget>
</item>
<item row="9" column="1">
<item row="11" column="1">
<widget class="QLineEdit" name="messageInput">
<property name="placeholderText">
<string>Sent XXX objects from ArcGIS</string>
@@ -202,7 +251,7 @@
<item row="10" column="1">
<item row="12" column="1">
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<spacer name="horizontalSpacer">
@@ -236,46 +285,8 @@
</layout>
</item>
<item row="11" column="0">
<widget class="QLabel" name="surveyPointLabel">
<property name="text">
<string>Lat, Lon</string>
</property>
</widget>
</item>
<item row="11" column="1">
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QLineEdit" name="surveyPointLat">
<property name="placeholderText">
<string>0.0</string>
</property>
</widget>
</item>
<item>
<widget class="QLineEdit" name="surveyPointLon">
<property name="placeholderText">
<string>0.0</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="saveSurveyPoint">
<property name="enabled">
<bool>true</bool>
</property>
<property name="text">
<string>Set as a project center</string>
</property>
</widget>
</item>
</layout>
</item>
<item row="12" column="1">
<item row="13" column="1">
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
qt_ui/assets/__init__.py → qt_ui/utils/__init__.py
View File
qt_ui/utils/assets/__init__.py
View File
qt_ui/assets/chart-line.png → qt_ui/utils/assets/chart-line.png
View File
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.1 KiB

After

Width:  |  Height:  |  Size: 6.1 KiB

qt_ui/assets/cube-receive-black.png → qt_ui/utils/assets/cube-receive-black.png
View File
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.9 KiB

After

Width:  |  Height:  |  Size: 2.9 KiB

qt_ui/assets/cube-receive-blue.png → qt_ui/utils/assets/cube-receive-blue.png
View File
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.0 KiB

After

Width:  |  Height:  |  Size: 3.0 KiB

qt_ui/assets/cube-receive.png → qt_ui/utils/assets/cube-receive.png
View File
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.2 KiB

After

Width:  |  Height:  |  Size: 2.2 KiB

qt_ui/assets/cube-send-black.png → qt_ui/utils/assets/cube-send-black.png
View File
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.2 KiB

After

Width:  |  Height:  |  Size: 3.2 KiB

qt_ui/assets/cube-send-blue.png → qt_ui/utils/assets/cube-send-blue.png
View File
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.2 KiB

After

Width:  |  Height:  |  Size: 3.2 KiB

qt_ui/assets/cube-send.png → qt_ui/utils/assets/cube-send.png
View File
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.5 KiB

After

Width:  |  Height:  |  Size: 2.5 KiB

qt_ui/assets/delete-blue.png → qt_ui/utils/assets/delete-blue.png
View File
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.8 KiB

After

Width:  |  Height:  |  Size: 1.8 KiB

qt_ui/assets/delete.png → qt_ui/utils/assets/delete.png
View File
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 345 B

After

Width:  |  Height:  |  Size: 345 B

qt_ui/assets/legend_generic.png → qt_ui/utils/assets/legend_generic.png
View File
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.0 KiB

After

Width:  |  Height:  |  Size: 2.0 KiB

qt_ui/assets/legend_line.png → qt_ui/utils/assets/legend_line.png
View File
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 1.7 KiB

qt_ui/assets/legend_point.png → qt_ui/utils/assets/legend_point.png
View File
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.9 KiB

After

Width:  |  Height:  |  Size: 1.9 KiB

qt_ui/assets/legend_polygon.png → qt_ui/utils/assets/legend_polygon.png
View File
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 1.7 KiB

qt_ui/assets/legend_raster.png → qt_ui/utils/assets/legend_raster.png
View File
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.0 KiB

After

Width:  |  Height:  |  Size: 2.0 KiB

qt_ui/assets/logo-slab-white@0.5x.png → qt_ui/utils/assets/logo-slab-white@0.5x.png
View File
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.0 KiB

After

Width:  |  Height:  |  Size: 2.0 KiB

qt_ui/assets/magnify.png → qt_ui/utils/assets/magnify.png
View File
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 7.1 KiB

After

Width:  |  Height:  |  Size: 7.1 KiB

qt_ui/assets/open-in-new.png → qt_ui/utils/assets/open-in-new.png
View File
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.5 KiB

After

Width:  |  Height:  |  Size: 5.5 KiB

qt_ui/utils/assets/pin-outline.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.6 KiB

qt_ui/utils/assets/pin.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.3 KiB

qt_ui/assets/size-xxl.png → qt_ui/utils/assets/size-xxl.png
View File
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 400 B

After

Width:  |  Height:  |  Size: 400 B

qt_ui/global_resources.py → qt_ui/utils/global_resources.py
+7
View File
@@ -81,3 +81,10 @@ ICON_POINT = os.path.join(
ICON_GENERIC = os.path.join(
os.path.dirname(os.path.abspath(__file__)), "assets", "legend_generic.png"
)
ICON_PIN_ACTIVE = os.path.join(
os.path.dirname(os.path.abspath(__file__)), "assets", "pin.png"
)
ICON_PIN_DISABLED = os.path.join(
os.path.dirname(os.path.abspath(__file__)), "assets", "pin-outline.png"
)
qt_ui/logger.py → qt_ui/utils/logger.py
+4 -1
View File
@@ -1,4 +1,7 @@
from specklepy_qt_ui.qt_ui.utils import splitTextIntoLines
try:
from specklepy_qt_ui.qt_ui.utils.utils import splitTextIntoLines
except ModuleNotFoundError:
from speckle.specklepy_qt_ui.qt_ui.utils.utils import splitTextIntoLines
def logToUser(
qt_ui/utils.py → qt_ui/utils/utils.py
+2
View File
@@ -2,6 +2,8 @@ from textwrap import wrap
from typing import Union
import requests
SYMBOL = "_x_x_"
def splitTextIntoLines(text: str = "", number: int = 40) -> str:
msg = ""
qt_ui/widget_add_stream.py
+16 -12
View File
@@ -2,9 +2,14 @@ import inspect
import os
from typing import List, Union
import urllib.parse
from specklepy_qt_ui.qt_ui.DataStorage import DataStorage
from specklepy_qt_ui.qt_ui.logger import logToUser
try:
from specklepy_qt_ui.qt_ui.DataStorage import DataStorage
from specklepy_qt_ui.qt_ui.utils.logger import logToUser
from specklepy_qt_ui.qt_ui.utils.utils import constructCommitURLfromServerCommit
except ModuleNotFoundError:
from speckle.specklepy_qt_ui.qt_ui.DataStorage import DataStorage
from speckle.specklepy_qt_ui.qt_ui.utils.logger import logToUser
from speckle.specklepy_qt_ui.qt_ui.utils.utils import constructCommitURLfromServerCommit
from PyQt5 import QtWidgets, uic, QtCore
from PyQt5.QtCore import pyqtSignal
@@ -16,7 +21,6 @@ from specklepy.core.api.credentials import get_local_accounts # , StreamWrapper
from specklepy.core.api.wrapper import StreamWrapper
from specklepy.logging import metrics
from specklepy_qt_ui.qt_ui.utils import constructCommitURLfromServerCommit
# This loads your .ui file so that PyQt can populate your plugin with the elements from Qt Designer
FORM_CLASS, _ = uic.loadUiType(
@@ -46,7 +50,7 @@ class AddStreamModalDialog(QtWidgets.QWidget, FORM_CLASS):
)
self.speckle_client = speckle_client
self.setupUi(self)
self.setWindowTitle("Add Speckle Project")
self.setWindowTitle("Add Speckle stream")
self.dialog_button_box.button(QtWidgets.QDialogButtonBox.Ok).setEnabled(False)
@@ -89,7 +93,7 @@ class AddStreamModalDialog(QtWidgets.QWidget, FORM_CLASS):
"Connector Action",
self.dataStorage.active_account,
{
"name": "Project Search By Name",
"name": "Stream Search By Name",
"connector_version": str(self.dataStorage.plugin_version),
},
)
@@ -149,7 +153,7 @@ class AddStreamModalDialog(QtWidgets.QWidget, FORM_CLASS):
"Connector Action",
self.dataStorage.active_account,
{
"name": "Project Search By URL",
"name": "Stream Search By URL",
"connector_version": str(self.dataStorage.plugin_version),
},
)
@@ -163,7 +167,7 @@ class AddStreamModalDialog(QtWidgets.QWidget, FORM_CLASS):
"Connector Action",
self.dataStorage.active_account,
{
"name": "Project Search By Name",
"name": "Stream Search By Name",
"connector_version": str(self.dataStorage.plugin_version),
},
)
@@ -191,7 +195,7 @@ class AddStreamModalDialog(QtWidgets.QWidget, FORM_CLASS):
self.search_results_list.clear()
if isinstance(self.stream_results, SpeckleException):
logToUser(
"Some Projects cannot be accessed",
"Some streams cannot be accessed",
level=1,
func=inspect.stack()[0][3],
)
@@ -205,7 +209,7 @@ class AddStreamModalDialog(QtWidgets.QWidget, FORM_CLASS):
if isinstance(stream, SpeckleException):
logToUser(
"Some Projects cannot be accessed",
"Some streams cannot be accessed",
level=1,
func=inspect.stack()[0][3],
)
@@ -223,7 +227,7 @@ class AddStreamModalDialog(QtWidgets.QWidget, FORM_CLASS):
try:
if isinstance(self.stream_results, SpeckleException):
logToUser(
"Selected Project cannot be accessed: "
"Selected stream cannot be accessed: "
+ str(self.stream_results.message),
level=1,
func=inspect.stack()[0][3],
@@ -261,7 +265,7 @@ class AddStreamModalDialog(QtWidgets.QWidget, FORM_CLASS):
self.close()
except Exception as e:
logToUser(
"Some Projects cannot be accessed: " + str(e),
"Some streams cannot be accessed: " + str(e),
level=1,
func=inspect.stack()[0][3],
)
qt_ui/widget_create_branch.py
+22 -30
View File
@@ -1,7 +1,11 @@
import inspect
import os
from typing import List, Tuple, Union
from specklepy_qt_ui.qt_ui.logger import logToUser
try:
from specklepy_qt_ui.qt_ui.utils.logger import logToUser
except ModuleNotFoundError:
from speckle.specklepy_qt_ui.qt_ui.utils.logger import logToUser
from PyQt5 import QtWidgets, uic, QtCore
from PyQt5.QtCore import pyqtSignal
@@ -11,50 +15,39 @@ from specklepy.core.api.client import SpeckleClient
# This loads your .ui file so that PyQt can populate your plugin with the elements from Qt Designer
FORM_CLASS, _ = uic.loadUiType(
os.path.join(os.path.join(os.path.dirname(__file__), "ui", "create_branch.ui"))
os.path.join(os.path.join(os.path.dirname(__file__), "ui", "create_branch.ui") )
)
class CreateBranchModalDialog(QtWidgets.QWidget, FORM_CLASS):
name_field: QtWidgets.QLineEdit = None
description_field: QtWidgets.QLineEdit = None
dialog_button_box: QtWidgets.QDialogButtonBox = None
speckle_client: Union[SpeckleClient, None] = None
# Events
handleBranchCreate = pyqtSignal(str, str)
#Events
handleBranchCreate = pyqtSignal(str,str)
def __init__(self, parent=None, speckle_client: SpeckleClient = None):
super(CreateBranchModalDialog, self).__init__(
parent, QtCore.Qt.WindowStaysOnTopHint
)
super(CreateBranchModalDialog,self).__init__(parent,QtCore.Qt.WindowStaysOnTopHint)
self.speckle_client = speckle_client
self.setupUi(self)
self.setWindowTitle("Create New Model")
self.setMinimumWidth(300)
self.setWindowTitle("Create New Branch")
self.name_field.textChanged.connect(self.nameCheck)
self.dialog_button_box.button(QtWidgets.QDialogButtonBox.Ok).setEnabled(False)
self.dialog_button_box.button(QtWidgets.QDialogButtonBox.Ok).clicked.connect(
self.onOkClicked
)
self.dialog_button_box.button(
QtWidgets.QDialogButtonBox.Cancel
).clicked.connect(self.onCancelClicked)
self.dialog_button_box.button(QtWidgets.QDialogButtonBox.Ok).setEnabled(False)
self.dialog_button_box.button(QtWidgets.QDialogButtonBox.Ok).clicked.connect(self.onOkClicked)
self.dialog_button_box.button(QtWidgets.QDialogButtonBox.Cancel).clicked.connect(self.onCancelClicked)
def nameCheck(self):
try:
if len(self.name_field.text()) >= 3:
self.dialog_button_box.button(QtWidgets.QDialogButtonBox.Ok).setEnabled(
True
)
else:
self.dialog_button_box.button(QtWidgets.QDialogButtonBox.Ok).setEnabled(
False
)
self.dialog_button_box.button(QtWidgets.QDialogButtonBox.Ok).setEnabled(True)
else:
self.dialog_button_box.button(QtWidgets.QDialogButtonBox.Ok).setEnabled(False)
return
except Exception as e:
logToUser(e, level=2, func=inspect.stack()[0][3])
logToUser(e, level = 2, func = inspect.stack()[0][3])
return
def onOkClicked(self):
@@ -64,17 +57,16 @@ class CreateBranchModalDialog(QtWidgets.QWidget, FORM_CLASS):
self.handleBranchCreate.emit(name, description)
self.close()
except Exception as e:
logToUser(e, level=2, func=inspect.stack()[0][3])
logToUser(e, level = 2, func = inspect.stack()[0][3])
return
def onCancelClicked(self):
try:
self.close()
except Exception as e:
logToUser(e, level=2, func=inspect.stack()[0][3])
logToUser(e, level = 2, func = inspect.stack()[0][3])
return
r"""
r'''
def onAccountSelected(self, index):
try:
account = self.speckle_accounts[index]
@@ -83,4 +75,4 @@ class CreateBranchModalDialog(QtWidgets.QWidget, FORM_CLASS):
except Exception as e:
logToUser(e, level = 2, func = inspect.stack()[0][3])
return
"""
'''
qt_ui/widget_create_stream.py
+6 -2
View File
@@ -1,7 +1,11 @@
import inspect
import os
from typing import List, Tuple, Union
from specklepy_qt_ui.qt_ui.logger import logToUser
try:
from specklepy_qt_ui.qt_ui.utils.logger import logToUser
except ModuleNotFoundError:
from speckle.specklepy_qt_ui.qt_ui.utils.logger import logToUser
from PyQt5 import QtWidgets, uic, QtCore
from PyQt5.QtCore import pyqtSignal
@@ -37,7 +41,7 @@ class CreateStreamModalDialog(QtWidgets.QWidget, FORM_CLASS):
)
self.speckle_client = speckle_client
self.setupUi(self)
self.setWindowTitle("Create New Project")
self.setWindowTitle("Create New Stream")
self.name_field.textChanged.connect(self.nameCheck)
self.dialog_button_box.button(QtWidgets.QDialogButtonBox.Ok).setEnabled(True)
qt_ui/widget_custom_crs.py
+75 -46
View File
@@ -1,80 +1,91 @@
import inspect
import os
from typing import List, Tuple, Union
from specklepy_qt_ui.qt_ui.DataStorage import DataStorage
from specklepy_qt_ui.qt_ui.logger import logToUser
try:
from specklepy_qt_ui.qt_ui.DataStorage import DataStorage
from specklepy_qt_ui.qt_ui.utils.logger import logToUser
from specklepy_qt_ui.qt_ui.utils.global_resources import COLOR
except ModuleNotFoundError:
from speckle.specklepy_qt_ui.qt_ui.DataStorage import DataStorage
from speckle.specklepy_qt_ui.qt_ui.utils.logger import logToUser
from speckle.specklepy_qt_ui.qt_ui.utils.global_resources import COLOR
from PyQt5 import QtWidgets, uic, QtCore
from PyQt5.QtWidgets import QCheckBox, QListWidgetItem, QHBoxLayout, QWidget
from PyQt5.QtWidgets import QCheckBox, QListWidgetItem, QHBoxLayout, QWidget
from PyQt5.QtCore import pyqtSignal
from specklepy.core.api.client import SpeckleClient
from specklepy_qt_ui.qt_ui.global_resources import COLOR
# This loads your .ui file so that PyQt can populate your plugin with the elements from Qt Designer
FORM_CLASS, _ = uic.loadUiType(
os.path.join(os.path.join(os.path.dirname(__file__), "ui", "custom_crs.ui") )
os.path.join(os.path.join(os.path.dirname(__file__), "ui", "custom_crs.ui"))
)
class CustomCRSDialog(QtWidgets.QWidget, FORM_CLASS):
class CustomCRSDialog(QtWidgets.QWidget, FORM_CLASS):
name_field: QtWidgets.QLineEdit = None
description_field: QtWidgets.QLineEdit = None
description: QtWidgets.QLineEdit = None
dialog_button_box: QtWidgets.QDialogButtonBox = None
saveSurveyPoint: QtWidgets.QPushButton = None
speckle_client: Union[SpeckleClient, None] = None
dataStorage: DataStorage = None
dataStorage: DataStorage = None
#Events
#handleCRSCreate = pyqtSignal(str,str)
# Events
# handleCRSCreate = pyqtSignal(str,str)
def __init__(self, parent=None):
super(CustomCRSDialog,self).__init__(parent, QtCore.Qt.WindowStaysOnTopHint)
super(CustomCRSDialog, self).__init__(parent, QtCore.Qt.WindowStaysOnTopHint)
self.setupUi(self)
self.setWindowTitle("Set project center on Send/Receive")
#self.dialog_button_box.button(QtWidgets.QDialogButtonBox.Close).clicked.connect(self.onCancelClicked)
self.dialog_button_box.button(QtWidgets.QDialogButtonBox.Cancel).setText("More Info")
self.setWindowTitle("Set project center on Send/Receive")
# self.dialog_button_box.button(QtWidgets.QDialogButtonBox.Close).clicked.connect(self.onCancelClicked)
self.dialog_button_box.button(QtWidgets.QDialogButtonBox.Cancel).setText(
"More Info"
)
self.modeDropdown.currentIndexChanged.connect(self.onModeChanged)
def onModeChanged(self):
try:
if not self: return
if not self:
return
index = self.modeDropdown.currentIndex()
if index == 1: # custom crs
if index == 1: # custom crs
self.surveyPointLat.show()
self.surveyPointLon.show()
self.degreeSignX.show()
self.degreeSignY.show()
self.label_survey.show()
self.offsetX.hide()
self.offsetY.hide()
self.label_offsets.hide()
self.offsetXDegreeSign.hide()
self.offsetYDegreeSign.hide()
self.description.setText("Use this option when you don't have to use a specific CRS.\
self.description.setText(
"Use this option when you don't have to use a specific CRS.\
\n\nThis will change your Project CRS to a new custom CRS.\
\n\nHint: right-click on the canvas -> Copy Coordinate -> EPSG:4326. ")
\n\nHint: right-click on the canvas -> Copy Coordinate -> EPSG:4326. "
)
elif index == 0: # offsets
elif index == 0: # offsets
self.surveyPointLat.hide()
self.surveyPointLon.hide()
self.degreeSignX.hide()
self.degreeSignY.hide()
self.label_survey.hide()
self.offsetX.show()
self.offsetY.show()
self.label_offsets.show()
#if self.dataStorage.currentOriginalUnits == 'degrees':
# if self.dataStorage.currentOriginalUnits == 'degrees':
self.offsetXDegreeSign.show()
self.offsetYDegreeSign.show()
units = self.dataStorage.currentOriginalUnits
if units == 'degrees':
print(units)
if units == "degrees":
self.offsetXDegreeSign.setText("°")
self.offsetYDegreeSign.setText("°")
elif units is not None:
@@ -83,49 +94,64 @@ class CustomCRSDialog(QtWidgets.QWidget, FORM_CLASS):
else:
self.offsetXDegreeSign.hide()
self.offsetYDegreeSign.hide()
try:
authid = self.dataStorage.currentCRS.authid()
except:
try:
authid = self.dataStorage.currentCRS.name
except:
authid = str(self.dataStorage.currentCRS)
text = f"Use this option when your project requires a use of a specific CRS. \
\n\nThis will only affect Speckle data properties, not your Project CRS.\
\n\nHint: your current project CRS is '{self.dataStorage.currentCRS.authid()}' and using units '{self.dataStorage.currentOriginalUnits}'."
\n\nHint: your current project CRS is '{authid}' and using units '{self.dataStorage.currentOriginalUnits}'."
if units == 'degrees':
if units == "degrees":
text += "\nThis CRS is not recommended if data was sent or needs to be \
\nreceived in a non-GIS application."
self.description.setText(text)
self.populateSurveyPoint()
self.populateOffsets()
self.populateRotation()
except Exception as e:
logToUser(e, level = 2, func = inspect.stack()[0][3])
logToUser(e, level=2, func=inspect.stack()[0][3])
return
def populateModeDropdown(self):
if not self: return
if not self:
return
try:
self.modeDropdown.clear()
self.modeDropdown.addItems(
["Add offsets / rotation to the current Project CRS", "Create custom CRS"]
[
"Add offsets / rotation to the current Project CRS",
"Create custom CRS",
]
)
except Exception as e:
logToUser(e, level = 2, func = inspect.stack()[0][3], plugin=self)
logToUser(e, level=2, func=inspect.stack()[0][3], plugin=self)
return
def populateSurveyPoint(self):
if not self:
return
try:
self.surveyPointLat.clear()
self.surveyPointLon.clear()
if self.dataStorage.custom_lat is not None and self.dataStorage.custom_lon is not None:
if (
self.dataStorage.custom_lat is not None
and self.dataStorage.custom_lon is not None
):
self.surveyPointLat.setText(str(self.dataStorage.custom_lat))
self.surveyPointLon.setText(str(self.dataStorage.custom_lon))
except Exception as e:
logToUser(e, level = 2, func = inspect.stack()[0][3], plugin=self)
logToUser(e, level=2, func=inspect.stack()[0][3], plugin=self)
return
def populateRotation(self):
if not self:
return
@@ -134,19 +160,22 @@ class CustomCRSDialog(QtWidgets.QWidget, FORM_CLASS):
if self.dataStorage.crs_rotation is not None:
self.rotation.setText(str(self.dataStorage.crs_rotation))
except Exception as e:
logToUser(e, level = 2, func = inspect.stack()[0][3], plugin=self)
logToUser(e, level=2, func=inspect.stack()[0][3], plugin=self)
return
def populateOffsets(self):
try:
self.offsetX.clear()
self.offsetY.clear()
if self.dataStorage.crs_offset_x is not None and self.dataStorage.crs_offset_y is not None:
if (
self.dataStorage.crs_offset_x is not None
and self.dataStorage.crs_offset_y is not None
):
self.offsetX.setText(str(self.dataStorage.crs_offset_x))
self.offsetY.setText(str(self.dataStorage.crs_offset_y))
except Exception as e:
logToUser(e, level = 2, func = inspect.stack()[0][3], plugin=self)
logToUser(e, level=2, func=inspect.stack()[0][3], plugin=self)
return
def onOkClicked(self):
@@ -154,5 +183,5 @@ class CustomCRSDialog(QtWidgets.QWidget, FORM_CLASS):
try:
self.close()
except Exception as e:
logToUser(e, level = 2, func = inspect.stack()[0][3])
logToUser(e, level=2, func=inspect.stack()[0][3])
return
qt_ui/widget_dependencies_upgrade.py
+10 -2
View File
@@ -3,7 +3,11 @@ import urllib3
import requests
import requests_toolbelt
from specklepy.logging import metrics
from specklepy_qt_ui.qt_ui.DataStorage import DataStorage
try:
from specklepy_qt_ui.qt_ui.DataStorage import DataStorage
except ModuleNotFoundError:
from speckle.specklepy_qt_ui.qt_ui.DataStorage import DataStorage
from PyQt5 import QtWidgets, uic, QtCore
@@ -87,7 +91,11 @@ To do it manually, you can run 2 following commands from QGIS Plugins panel->Pyt
def runSubprocess(self):
import subprocess
from speckle.utils.utils import get_qgis_python_path as path
try:
from speckle.utils.utils import get_qgis_python_path as path
except ModuleNotFoundError:
from speckle.speckle.utils.utils import get_qgis_python_path as path
result1 = subprocess.run(
[path(), "-m", "pip", "install", "requests==2.31.0"],
qt_ui/widget_report.py
+84 -48
View File
@@ -1,70 +1,83 @@
import inspect
import os
from typing import List, Tuple, Union
from specklepy_qt_ui.qt_ui.DataStorage import DataStorage
#from specklepy_qt_ui.qt_ui.logger import logToUser
try:
from specklepy_qt_ui.qt_ui.DataStorage import DataStorage
from specklepy_qt_ui.qt_ui.utils.global_resources import COLOR
from specklepy_qt_ui.qt_ui.utils.utils import SYMBOL
except ModuleNotFoundError:
from speckle.specklepy_qt_ui.qt_ui.DataStorage import DataStorage
from speckle.specklepy_qt_ui.qt_ui.utils.global_resources import COLOR
from speckle.specklepy_qt_ui.qt_ui.utils.utils import SYMBOL
# from specklepy_qt_ui.qt_ui.utils.logger import logToUser
from PyQt5 import QtWidgets, uic, QtCore
from PyQt5.QtWidgets import QCheckBox, QListWidgetItem, QHBoxLayout, QWidget
from PyQt5.QtWidgets import QCheckBox, QListWidgetItem, QHBoxLayout, QWidget
from PyQt5.QtCore import pyqtSignal
from specklepy.core.api.client import SpeckleClient
from specklepy_qt_ui.qt_ui.global_resources import COLOR
# This loads your .ui file so that PyQt can populate your plugin with the elements from Qt Designer
FORM_CLASS, _ = uic.loadUiType(
os.path.join(os.path.join(os.path.dirname(__file__), "ui", "report.ui") )
os.path.join(os.path.join(os.path.dirname(__file__), "ui", "report.ui"))
)
class ReportDialog(QtWidgets.QWidget, FORM_CLASS):
class ReportDialog(QtWidgets.QWidget, FORM_CLASS):
report_label: QtWidgets.QLabel = None
report_text: QtWidgets.QTextEdit = None
dataStorage: DataStorage = None
def __init__(self, parent=None):
super(ReportDialog,self).__init__(parent, QtCore.Qt.WindowStaysOnTopHint)
super(ReportDialog, self).__init__(parent, QtCore.Qt.WindowStaysOnTopHint)
self.setupUi(self)
self.runAllSetup()
def runAllSetup(self):
self.setWindowTitle("Report (Speckle)")
self.setWindowTitle("Report (Speckle)")
self.setMinimumWidth(500)
self.setMinimumHeight(600)
self.report_label.setWordWrap(True)
self.dialog_button_box.button(QtWidgets.QDialogButtonBox.Ok).clicked.connect(self.onOkClicked)
self.dialog_button_box.button(QtWidgets.QDialogButtonBox.Ok).clicked.connect(
self.onOkClicked
)
return
#self.dialog_button_box.button(QtWidgets.QDialogButtonBox.Cancel).setText("More Info")
# self.dialog_button_box.button(QtWidgets.QDialogButtonBox.Cancel).setText("More Info")
def assembleReport(self):
try:
if self.dataStorage is None: return
reportList = self.dataStorage.latestActionReport
if reportList is None: return
if self.dataStorage is None:
return
reportList: List[dict] = self.dataStorage.latestActionReport
if reportList is None:
return
operation = ""
total_layers = 0
total_objects = 0
text = ""
sending = True
# details
# details
last_report = ""
last_report += "Details:" + "\n"
for item in reportList:
line = "✅ "
try: # if sending
line += f'{item["feature_id"]}: {item["obj_type"]}'
try: # if sending
some_id = item["feature_id"].replace(SYMBOL, "\\")
line += f'{some_id}: {item["obj_type"]}'
operation = f"Sent at {self.dataStorage.latestActionTime}"
except: # if receiving
except: # if receiving
sending = False
line += f'{item["speckle_id"]}: {item["obj_type"]}'
some_id = item[list(item.keys())[0]].replace(SYMBOL, "\\")
line += f'{some_id}: {item["obj_type"]}' # f'{item["speckle_id"]}: {item["obj_type"]}'
operation = f"Received at {self.dataStorage.latestActionTime}"
# edit based on the type
# edit based on the type
if "Layer" in item["obj_type"]:
total_layers += 1
if item["errors"] != "":
@@ -75,61 +88,84 @@ class ReportDialog(QtWidgets.QWidget, FORM_CLASS):
if item["errors"] != "":
line += f', errors: {item["errors"]}'
line = "❌ " + line[1:]
else: total_objects += 1
else:
total_objects += 1
line = "__ " + line
last_report += line + "\n"
text += f"Operation: {operation}\n"
text += f"Total: {total_layers} layer{'' if str(total_layers).endswith('1') else 's'}, {total_objects} feature{'' if str(total_objects).endswith('1') else 's'}\n\n"
if sending is False:
if sending is False:
try:
text += f"Host application: {self.dataStorage.latestHostApp}\n\n"
except: pass
except:
pass
# layers and transformations (if applicable)
text += "Layers and transformations (if applicable):" + "\n"
for i, layer in enumerate(self.dataStorage.latestActionLayers):
#print(self.dataStorage.latestActionLayers)
name = layer #if isinstance(layer, str) else layer.name()
try:
# print(self.dataStorage.latestActionLayers)
name = layer # if isinstance(layer, str) else layer.name()
try:
transformExists = 0
for item in self.dataStorage.savedTransforms:
layer_name = item.split(" -> ")[0].split(" (\'")[0]
layer_name = item.split(" -> ")[0].split(" ('")[0]
transform_name = item.split(" -> ")[1]
if layer_name == name:
text += f"{i+1}. {layer_name} -> '{transform_name}'" + "\n"
text += (
f"{i+1}. {layer_name} -> '{transform_name}'" + "\n"
)
transformExists += 1
break
if transformExists==0:
break
if transformExists == 0:
text += f"{i+1}. {name} \n"
except Exception as e: print(e)
text += "\n"
except Exception as e:
print(e)
text += "\n"
# add info about the offsets
text += "Project CRS: " + self.dataStorage.project.crs().authid() + "\n"
try:
crs = self.dataStorage.project.crs()
text += "Project CRS: " + crs.authid() + "\n"
crs_keyword = "CRS"
except AttributeError:
crs = self.dataStorage.project.activeMap.spatialReference
crs_keyword = "Spatial Reference"
text += f"Project {crs_keyword}: " + crs.name + "\n"
units = self.dataStorage.latestActionUnits
text += "Project CRS units: " + units + f"{' (not supported, treated as Meters)' if 'degrees' in units else ''}" + "\n"
text += "Project CRS WKT: \n" + self.dataStorage.project.crs().toWkt() + "\n\n"
text += f"CRS offsets: x={self.dataStorage.crs_offset_x}, y={self.dataStorage.crs_offset_y}" + "\n"
text += f"CRS rotation: {self.dataStorage.crs_rotation}°" + "\n\n"
text += (
f"Project {crs_keyword} units: "
+ units
+ f"{' (not supported, treated as Meters)' if 'degrees' in units else ''}"
+ "\n"
)
try:
text += f"Project {crs_keyword} WKT: \n" + crs.toWkt() + "\n\n"
except:
text += f"Project {crs_keyword} WKT: \n" + crs.exportToString() + "\n\n"
text += (
f"{crs_keyword} offsets: x={self.dataStorage.crs_offset_x}, y={self.dataStorage.crs_offset_y}"
+ "\n"
)
text += f"{crs_keyword} rotation: {self.dataStorage.crs_rotation}°" + "\n\n"
text += last_report
return operation, total_layers, total_objects, text
return operation, total_layers, total_objects, text
except Exception as e:
print(e)
return
return
def applyReport(self):
def applyReport(self):
result = self.assembleReport()
if result is None:
print("no report generated")
return
return
operation, total_layers, total_objects, report = result
#self.report_label.setText(f"Operation: {operation}\nTotal: {total_layers} layer{'' if str(total_layers).endswith('1') else 's'}, {total_objects} feature{'' if str(total_objects).endswith('1') else 's'}")
# self.report_label.setText(f"Operation: {operation}\nTotal: {total_layers} layer{'' if str(total_layers).endswith('1') else 's'}, {total_objects} feature{'' if str(total_objects).endswith('1') else 's'}")
self.report_text.setText(report)
def onOkClicked(self):
self.close()
qt_ui/widget_transforms.py
+5 -1
View File
@@ -1,6 +1,10 @@
import os
from specklepy_qt_ui.qt_ui.DataStorage import DataStorage
try:
from specklepy_qt_ui.qt_ui.DataStorage import DataStorage
except ModuleNotFoundError:
from speckle.specklepy_qt_ui.qt_ui.DataStorage import DataStorage
from PyQt5 import QtWidgets, uic, QtCore