terminology

2.18 fixes for arcgis

qt_ui/ConnectorBindings.py

@@ -1,126 +0,0 @@
-
-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

@@ -5,7 +5,7 @@ import webbrowser
 
 try:
     from specklepy_qt_ui.qt_ui.utils.logger import logToUser
-except ModuleNotFoundError: 
+except ModuleNotFoundError:
     from speckle.specklepy_qt_ui.qt_ui.utils.logger import logToUser
 
 from specklepy.core.api.credentials import get_local_accounts
@@ -22,6 +22,7 @@ class DataStorage:
     currentCRS = None
     currentUnits = "m"
     currentOriginalUnits = ""
+    workspace = ""
 
     custom_lat: Optional[float] = None
     custom_lon: Optional[float] = None
@@ -53,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

@@ -21,9 +21,11 @@ try:
         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_dependencies_upgrade import (
+        DependenciesUpgradeDialog,
+    )
     from specklepy_qt_ui.qt_ui.widget_report import ReportDialog
-except ModuleNotFoundError: 
+except ModuleNotFoundError:
     from speckle.specklepy_qt_ui.qt_ui.utils.global_resources import (
         BACKGR_COLOR,
         BACKGR_COLOR_LIGHT,
@@ -35,7 +37,9 @@ except ModuleNotFoundError:
         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_dependencies_upgrade import (
+        DependenciesUpgradeDialog,
+    )
     from speckle.specklepy_qt_ui.qt_ui.widget_report import ReportDialog
 
 
@@ -283,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

@@ -809,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 streams cannot be accessed", level=1, plugin=self)
+                logToUser("Some Projects cannot be accessed", level=1, plugin=self)
                 return
             elif (
                 plugin.active_stream is None
@@ -825,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 Branch"])
+            self.streamBranchDropdown.addItems(["Create New Model"])
             # print(5)
             if keep_branch is True:
                 plugin.active_branch = active_branch
@@ -864,13 +864,13 @@ class SpeckleQGISDialog(QtWidgets.QDockWidget, FORM_CLASS):
             # print("________populateActiveCommitDropdown")
             # print(plugin.active_commit)
             if plugin.active_stream is None:
-                print("Active stream is None")
+                print("Active project is None")
                 return
             branchName = self.streamBranchDropdown.currentText()
             # print(f"CURRENT BRANCH TEXT: {branchName}")
             if branchName == "":
                 return
-            if branchName == "Create New Branch":
+            if branchName == "Create New Model":
                 self.streamBranchDropdown.setCurrentText("main")
                 plugin.onBranchCreateClicked()
                 return
@@ -880,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 streams cannot be accessed", level=1, plugin=self)
+                logToUser("Some Projects cannot be accessed", level=1, plugin=self)
                 return
             elif plugin.active_stream[1]:
                 for b in plugin.active_stream[1].branches.items:
@@ -932,7 +932,7 @@ class SpeckleQGISDialog(QtWidgets.QDockWidget, FORM_CLASS):
             else:
                 plugin.active_commit = None
 
-            self.commitDropdown.setItemText(0, "Latest commit from this branch")
+            self.commitDropdown.setItemText(0, "Latest version of this model")
             # enable or disable web view button
             # print("_________ENABLE OR DISABLE")
             # print(plugin.active_commit)

qt_ui/ui/add_stream_modal.ui

@@ -25,7 +25,7 @@
        <item row="1" column="0">
         <widget class="QLabel" name="search_label">
          <property name="text">
-          <string>Search Stream by name or URL</string>
+          <string>Search Project by name or URL</string>
          </property>
         </widget>
        </item>

qt_ui/ui/create_branch.ui

@@ -26,7 +26,7 @@
        <item row="0" column="0">
         <widget class="QLabel" name="name_label">
          <property name="text">
-          <string>Branch Name</string>
+          <string>Model Name</string>
          </property>
         </widget>
        </item>

qt_ui/ui/create_stream.ui

@@ -34,7 +34,7 @@
        <item row="1" column="0">
         <widget class="QLabel" name="name_label">
          <property name="text">
-          <string>Stream Name</string>
+          <string>Project Name</string>
          </property>
         </widget>
        </item>

qt_ui/ui/dockwidget_main.ui

@@ -39,7 +39,7 @@
         <item row="1" column="0">
          <widget class="QLabel" name="streamListLabel">
           <property name="text">
-           <string>Stream</string>
+           <string>Project</string>
           </property>
          </widget>
         </item>
@@ -77,7 +77,7 @@
         <item row="2" column="0">
          <widget class="QLabel" name="streamBranchLabel">
           <property name="text">
-           <string>Branch</string>
+           <string>Model</string>
           </property>
          </widget>
         </item>
@@ -87,7 +87,7 @@
         <item row="3" column="0">
          <widget class="QLabel" name="commitLabel">
           <property name="text">
-           <string>Commit</string>
+           <string>Version</string>
           </property>
          </widget>
         </item>

qt_ui/ui/mainWindow_main.ui

@@ -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>Stream</string>
+           <string>Project</string>
           </property>
          </widget>
         </item>
@@ -83,7 +83,7 @@
         <item row="2" column="0">
          <widget class="QLabel" name="streamBranchLabel">
           <property name="text">
-           <string>Branch</string>
+           <string>Model</string>
           </property>
          </widget>
         </item>
@@ -93,14 +93,26 @@
         <item row="3" column="0">
          <widget class="QLabel" name="commitLabel">
           <property name="text">
-           <string>Commit</string>
+           <string>Version</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/utils/global_resources.py

@@ -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/utils/utils.py

@@ -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

@@ -50,7 +50,7 @@ class AddStreamModalDialog(QtWidgets.QWidget, FORM_CLASS):
         )
         self.speckle_client = speckle_client
         self.setupUi(self)
-        self.setWindowTitle("Add Speckle stream")
+        self.setWindowTitle("Add Speckle Project")
 
         self.dialog_button_box.button(QtWidgets.QDialogButtonBox.Ok).setEnabled(False)
 
@@ -93,7 +93,7 @@ class AddStreamModalDialog(QtWidgets.QWidget, FORM_CLASS):
                         "Connector Action",
                         self.dataStorage.active_account,
                         {
-                            "name": "Stream Search By Name",
+                            "name": "Project Search By Name",
                             "connector_version": str(self.dataStorage.plugin_version),
                         },
                     )
@@ -153,7 +153,7 @@ class AddStreamModalDialog(QtWidgets.QWidget, FORM_CLASS):
                         "Connector Action",
                         self.dataStorage.active_account,
                         {
-                            "name": "Stream Search By URL",
+                            "name": "Project Search By URL",
                             "connector_version": str(self.dataStorage.plugin_version),
                         },
                     )
@@ -167,7 +167,7 @@ class AddStreamModalDialog(QtWidgets.QWidget, FORM_CLASS):
                         "Connector Action",
                         self.dataStorage.active_account,
                         {
-                            "name": "Stream Search By Name",
+                            "name": "Project Search By Name",
                             "connector_version": str(self.dataStorage.plugin_version),
                         },
                     )
@@ -195,7 +195,7 @@ class AddStreamModalDialog(QtWidgets.QWidget, FORM_CLASS):
             self.search_results_list.clear()
             if isinstance(self.stream_results, SpeckleException):
                 logToUser(
-                    "Some streams cannot be accessed",
+                    "Some Projects cannot be accessed",
                     level=1,
                     func=inspect.stack()[0][3],
                 )
@@ -209,7 +209,7 @@ class AddStreamModalDialog(QtWidgets.QWidget, FORM_CLASS):
 
                 if isinstance(stream, SpeckleException):
                     logToUser(
-                        "Some streams cannot be accessed",
+                        "Some Projects cannot be accessed",
                         level=1,
                         func=inspect.stack()[0][3],
                     )
@@ -227,7 +227,7 @@ class AddStreamModalDialog(QtWidgets.QWidget, FORM_CLASS):
         try:
             if isinstance(self.stream_results, SpeckleException):
                 logToUser(
-                    "Selected stream cannot be accessed: "
+                    "Selected Project cannot be accessed: "
                     + str(self.stream_results.message),
                     level=1,
                     func=inspect.stack()[0][3],
@@ -265,7 +265,7 @@ class AddStreamModalDialog(QtWidgets.QWidget, FORM_CLASS):
                     self.close()
                 except Exception as e:
                     logToUser(
-                        "Some streams cannot be accessed: " + str(e),
+                        "Some Projects cannot be accessed: " + str(e),
                         level=1,
                         func=inspect.stack()[0][3],
                     )

qt_ui/widget_create_branch.py

@@ -15,39 +15,50 @@ 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):
 
+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 Branch")
+        self.setWindowTitle("Create New Model")
+        self.setMinimumWidth(300)
 
         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):
@@ -57,16 +68,17 @@ 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]
@@ -75,4 +87,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

@@ -41,7 +41,7 @@ class CreateStreamModalDialog(QtWidgets.QWidget, FORM_CLASS):
         )
         self.speckle_client = speckle_client
         self.setupUi(self)
-        self.setWindowTitle("Create New Stream")
+        self.setWindowTitle("Create New Project")
 
         self.name_field.textChanged.connect(self.nameCheck)
         self.dialog_button_box.button(QtWidgets.QDialogButtonBox.Ok).setEnabled(True)

qt_ui/widget_custom_crs.py

@@ -6,7 +6,7 @@ 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: 
+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
@@ -26,7 +26,7 @@ FORM_CLASS, _ = uic.loadUiType(
 
 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
@@ -84,6 +84,7 @@ class CustomCRSDialog(QtWidgets.QWidget, FORM_CLASS):
                 self.offsetYDegreeSign.show()
 
                 units = self.dataStorage.currentOriginalUnits
+                print(units)
                 if units == "degrees":
                     self.offsetXDegreeSign.setText("°")
                     self.offsetYDegreeSign.setText("°")
@@ -94,9 +95,17 @@ class CustomCRSDialog(QtWidgets.QWidget, FORM_CLASS):
                     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":
                     text += "\nThis CRS is not recommended if data was sent or needs to be \

qt_ui/widget_dependencies_upgrade.py

@@ -6,7 +6,7 @@ from specklepy.logging import metrics
 
 try:
     from specklepy_qt_ui.qt_ui.DataStorage import DataStorage
-except ModuleNotFoundError: 
+except ModuleNotFoundError:
     from speckle.specklepy_qt_ui.qt_ui.DataStorage import DataStorage
 
 from PyQt5 import QtWidgets, uic, QtCore
@@ -91,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

@@ -5,9 +5,11 @@ from typing import List, Tuple, Union
 try:
     from specklepy_qt_ui.qt_ui.DataStorage import DataStorage
     from specklepy_qt_ui.qt_ui.utils.global_resources import COLOR
-except ModuleNotFoundError: 
+    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
 
@@ -50,7 +52,7 @@ class ReportDialog(QtWidgets.QWidget, FORM_CLASS):
         try:
             if self.dataStorage is None:
                 return
-            reportList = self.dataStorage.latestActionReport
+            reportList: List[dict] = self.dataStorage.latestActionReport
             if reportList is None:
                 return
 
@@ -66,11 +68,13 @@ class ReportDialog(QtWidgets.QWidget, FORM_CLASS):
             for item in reportList:
                 line = "✅ "
                 try:  # if sending
-                    line += f'{item["feature_id"]}: {item["obj_type"]}'
+                    some_id = item["feature_id"].replace(SYMBOL, "\\")
+                    line += f'{some_id}: {item["obj_type"]}'
                     operation = f"Sent at {self.dataStorage.latestActionTime}"
                 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
@@ -121,22 +125,31 @@ class ReportDialog(QtWidgets.QWidget, FORM_CLASS):
             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: "
+                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 += (
-                "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}"
+                f"{crs_keyword} 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"{crs_keyword} rotation: {self.dataStorage.crs_rotation}°" + "\n\n"
 
             text += last_report