Skip to content

GitLab

Commit 0771deaf authored by Holger Brand's avatar Holger Brand
Browse files

Add an adjusted copy of the RADRIS_MainGUI; add submodule gitversion.

parent 295e7cf3
Expand all Hide whitespace changes
Inline Side-by-side
GUI/S2GT_MainGUI/S2GT_MainGUI.lvclass 0 → 100644
View file @ 0771deaf
This diff is collapsed.
S2GT.ico 0 → 100644
View file @ 0771deaf
S2GT.ico

5.3 KB

S2GT.ini
View file @ 0771deaf
......@@ -485,4 +485,13 @@ CSPP_BaseActor:CSPP_BaseActor.WebPubMode=-1
CSPP_GUIActor:CSPP_GUIActor.AssociatedActor="PR4000"
CSPP_GUIActor:CSPP_GUIActor.AssociatedPVProxy="PR4000Proxy"
CSPP_GUIActor:CSPP_GUIActor.StopAssociatedActor=False
[S2GT_MainGUI]
LVClassPath="S2GT_MainGUI.lvlib:S2GT_MainGUI.lvclass"
CSPP_BaseActor:CSPP_BaseActor.ErrorDialog=True
S2GT_MainGUI:S2GT_MainGUI.DSCAlarmViewer="DSCAlarmViewer"
S2GT_MainGUI:S2GT_MainGUI.DSCTrendViewer="DSCTrendViewer"
S2GT_MainGUI:S2GT_MainGUI.ObjectManager="ObjectManager"
S2GT_MainGUI:S2GT_MainGUI.Watchdog="Watchdog"
S2GT_MainGUI:S2GT_MainGUI.LS218="LS218"
S2GT_MainGUI:S2GT_MainGUI.PR4000="PR4000"
S2GT_MainGUI:S2GT_MainGUI.Valve="Valve"
S2GT.lvproj
View file @ 0771deaf
......@@ -477,6 +477,7 @@ Die sprachspezifischen Genehmigungen und Beschränkungen unter der Lizenz sind d
<Item Name="EUPL v.1.1 - Lizenz.rtf" Type="Document" URL="../EUPL v.1.1 - Lizenz.rtf"/>
</Item>
<Item Name="GUI" Type="Folder">
<Item Name="S2GT_MainGUI.lvlib" Type="Library" URL="../GUI/S2GT_MainGUI.lvlib"/>
<Item Name="Valve FP-Binding.vi" Type="VI" URL="../GUI/Valve FP-Binding.vi"/>
</Item>
<Item Name="instr.lib" Type="Folder">
......@@ -484,6 +485,7 @@ Die sprachspezifischen Genehmigungen und Beschränkungen unter der Lizenz sind d
<Item Name="PR4000F.lvlib" Type="Library" URL="../instr.lib/PR4000F/PR4000F.lvlib"/>
</Item>
<Item Name="lib.lib" Type="Folder">
<Item Name="GitControl.lvlib" Type="Library" URL="../lib.lib/gitversioninfo/GitControl.lvlib"/>
<Item Name="HGF_FGV_File.lvlib" Type="Library" URL="../lib.lib/HGF_FGV_File/HGF_FGV_File.lvlib"/>
</Item>
<Item Name="Packages" Type="Folder">
......@@ -586,6 +588,7 @@ Die sprachspezifischen Genehmigungen und Beschränkungen unter der Lizenz sind d
<Item Name="User" Type="Folder"/>
<Item Name="README.md" Type="Document" URL="../README.md"/>
<Item Name="Release_Notes.md" Type="Document" URL="../Release_Notes.md"/>
<Item Name="S2GT.ico" Type="Document" URL="../S2GT.ico"/>
<Item Name="S2GT.ini" Type="Document" URL="../S2GT.ini"/>
<Item Name="S2GT_Content.vi" Type="VI" URL="../S2GT_Content.vi"/>
<Item Name="S2GT_Main.vi" Type="VI" URL="../S2GT_Main.vi"/>
......@@ -594,13 +597,17 @@ Die sprachspezifischen Genehmigungen und Beschränkungen unter der Lizenz sind d
<Item Name="8.6CompatibleGlobalVar.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/config.llb/8.6CompatibleGlobalVar.vi"/>
<Item Name="Acquire Semaphore.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/semaphor.llb/Acquire Semaphore.vi"/>
<Item Name="AddNamedSemaphorePrefix.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/semaphor.llb/AddNamedSemaphorePrefix.vi"/>
<Item Name="ALM_Alarm_Status.vi" Type="VI" URL="/&lt;vilib&gt;/lvdsc/alarm/internal/ALM_Alarm_Status.vi"/>
<Item Name="ALM_Clear_UD_Alarm.vi" Type="VI" URL="/&lt;vilib&gt;/lvdsc/alarm/internal/ALM_Clear_UD_Alarm.vi"/>
<Item Name="ALM_Error_Resolve.vi" Type="VI" URL="/&lt;vilib&gt;/lvdsc/alarm/internal/ALM_Error_Resolve.vi"/>
<Item Name="ALM_Get_Alarms.vi" Type="VI" URL="/&lt;vilib&gt;/lvdsc/alarm/internal/ALM_Get_Alarms.vi"/>
<Item Name="ALM_Get_User_Name.vi" Type="VI" URL="/&lt;vilib&gt;/lvdsc/alarm/internal/ALM_Get_User_Name.vi"/>
<Item Name="ALM_GetTagURLs.vi" Type="VI" URL="/&lt;vilib&gt;/lvdsc/alarm/internal/ALM_GetTagURLs.vi"/>
<Item Name="ALM_Make_Summary.vi" Type="VI" URL="/&lt;vilib&gt;/lvdsc/alarm/internal/ALM_Make_Summary.vi"/>
<Item Name="ALM_Set_UD_Alarm.vi" Type="VI" URL="/&lt;vilib&gt;/lvdsc/alarm/internal/ALM_Set_UD_Alarm.vi"/>
<Item Name="ALM_Set_UD_Event.vi" Type="VI" URL="/&lt;vilib&gt;/lvdsc/alarm/internal/ALM_Set_UD_Event.vi"/>
<Item Name="ALM_Test_For_Valid_Alarm.vi" Type="VI" URL="/&lt;vilib&gt;/lvdsc/alarm/internal/ALM_Test_For_Valid_Alarm.vi"/>
<Item Name="ALM_Test_Zero.vi" Type="VI" URL="/&lt;vilib&gt;/lvdsc/alarm/internal/ALM_Test_Zero.vi"/>
<Item Name="Application Directory.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/file.llb/Application Directory.vi"/>
<Item Name="Beep.vi" Type="VI" URL="/&lt;vilib&gt;/Platform/system.llb/Beep.vi"/>
<Item Name="BuildErrorSource.vi" Type="VI" URL="/&lt;vilib&gt;/Platform/fileVersionInfo.llb/BuildErrorSource.vi"/>
......@@ -868,6 +875,7 @@ Die sprachspezifischen Genehmigungen und Beschränkungen unter der Lizenz sind d
<Item Name="GetRTHostConnectedProp.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/error.llb/GetRTHostConnectedProp.vi"/>
<Item Name="High Resolution Relative Seconds.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/High Resolution Relative Seconds.vi"/>
<Item Name="HIST_FormatTagname&amp;ProcessFilterSpec.vi" Type="VI" URL="/&lt;vilib&gt;/lvdsc/historical/internal/alarm/HIST_FormatTagname&amp;ProcessFilterSpec.vi"/>
<Item Name="Is Path and Not Empty.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/file.llb/Is Path and Not Empty.vi"/>
<Item Name="Longest Line Length in Pixels.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/error.llb/Longest Line Length in Pixels.vi"/>
<Item Name="LVBoundsTypeDef.ctl" Type="VI" URL="/&lt;vilib&gt;/Utility/miscctls.llb/LVBoundsTypeDef.ctl"/>
<Item Name="LVRectTypeDef.ctl" Type="VI" URL="/&lt;vilib&gt;/Utility/miscctls.llb/LVRectTypeDef.ctl"/>
......@@ -968,8 +976,10 @@ Die sprachspezifischen Genehmigungen und Beschränkungen unter der Lizenz sind d
<Item Name="Simple Error Handler.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/error.llb/Simple Error Handler.vi"/>
<Item Name="Space Constant.vi" Type="VI" URL="/&lt;vilib&gt;/dlg_ctls.llb/Space Constant.vi"/>
<Item Name="STR_ASCII-Unicode.vi" Type="VI" URL="/&lt;vilib&gt;/registry/registry.llb/STR_ASCII-Unicode.vi"/>
<Item Name="subDisplayMessage.vi" Type="VI" URL="/&lt;vilib&gt;/express/express output/DisplayMessageBlock.llb/subDisplayMessage.vi"/>
<Item Name="subFile Dialog.vi" Type="VI" URL="/&lt;vilib&gt;/express/express input/FileDialogBlock.llb/subFile Dialog.vi"/>
<Item Name="Subscribe All Local Processes.vi" Type="VI" URL="/&lt;vilib&gt;/lvdsc/controls/Alarms and Events/internal/Subscribe All Local Processes.vi"/>
<Item Name="System Exec.vi" Type="VI" URL="/&lt;vilib&gt;/Platform/system.llb/System Exec.vi"/>
<Item Name="TagReturnType.ctl" Type="VI" URL="/&lt;vilib&gt;/Utility/error.llb/TagReturnType.ctl"/>
<Item Name="Three Button Dialog CORE.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/error.llb/Three Button Dialog CORE.vi"/>
<Item Name="Three Button Dialog.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/error.llb/Three Button Dialog.vi"/>
......@@ -1042,26 +1052,31 @@ Die sprachspezifischen Genehmigungen und Beschränkungen unter der Lizenz sind d
</Item>
</Item>
<Item Name="Build Specifications" Type="Build">
<Item Name="CSPP-Template" Type="EXE">
<Item Name="S2GT App" Type="EXE">
<Property Name="App_copyErrors" Type="Bool">true</Property>
<Property Name="App_INI_aliasGUID" Type="Str">{773E39E1-BBD6-4173-9460-6FE7C7522091}</Property>
<Property Name="App_INI_GUID" Type="Str">{A41324B4-1D83-44D0-AB6D-155F8178B03C}</Property>
<Property Name="App_INI_itemID" Type="Ref"></Property>
<Property Name="App_INI_itemID" Type="Ref">/My Computer/S2GT.ini</Property>
<Property Name="App_serverConfig.httpPort" Type="Int">8002</Property>
<Property Name="App_useFFRTE" Type="Bool">true</Property>
<Property Name="App_winsec.certificate" Type="Str">Brand Holger (Brand)</Property>
<Property Name="App_winsec.description" Type="Str">http://timestamp.verisign.com</Property>
<Property Name="App_winsec.timestamp" Type="Str">http://timestamp.verisign.com/scripts/timstamp.dll</Property>
<Property Name="Bld_autoIncrement" Type="Bool">true</Property>
<Property Name="Bld_buildCacheID" Type="Str">{95E968AE-FBA3-4AF4-B59D-842A4FF56C3A}</Property>
<Property Name="Bld_buildSpecName" Type="Str">CSPP-Template</Property>
<Property Name="Bld_buildSpecName" Type="Str">S2GT App</Property>
<Property Name="Bld_excludeInlineSubVIs" Type="Bool">true</Property>
<Property Name="Bld_excludeLibraryItems" Type="Bool">true</Property>
<Property Name="Bld_excludePolymorphicVIs" Type="Bool">true</Property>
<Property Name="Bld_localDestDir" Type="Path">/D/builds/NI_AB_PROJECTNAME/App</Property>
<Property Name="Bld_postActionVIID" Type="Ref">/My Computer/Packages/Core/CSPP_Post-Build Action.vi</Property>
<Property Name="Bld_preActionVIID" Type="Ref">/My Computer/lib.lib/GitControl.lvlib/Pre-Build Action.vi</Property>
<Property Name="Bld_previewCacheID" Type="Str">{6211658F-9962-4EFC-81EE-AF45E75227E4}</Property>
<Property Name="Bld_supportedLanguage[0]" Type="Str">English</Property>
<Property Name="Bld_supportedLanguageCount" Type="Int">1</Property>
<Property Name="Bld_userLogFile" Type="Path">/D/builds/CSPP-Template/App/CSPP-Template_log.txt</Property>
<Property Name="Destination[0].destName" Type="Str">CSPP-Template.exe</Property>
<Property Name="Destination[0].path" Type="Path">/D/builds/NI_AB_PROJECTNAME/App/CSPP-Template.exe</Property>
<Property Name="Bld_userLogFile" Type="Path">/D/builds/S2GT/App/S2GT_BuildLog.txt</Property>
<Property Name="Destination[0].destName" Type="Str">S2GT.exe</Property>
<Property Name="Destination[0].path" Type="Path">/D/builds/NI_AB_PROJECTNAME/App/S2GT.exe</Property>
<Property Name="Destination[0].path.type" Type="Str">&lt;none&gt;</Property>
<Property Name="Destination[0].preserveHierarchy" Type="Bool">true</Property>
<Property Name="Destination[0].type" Type="Str">App</Property>
......@@ -1070,53 +1085,66 @@ Die sprachspezifischen Genehmigungen und Beschränkungen unter der Lizenz sind d
<Property Name="Destination[1].path.type" Type="Str">&lt;none&gt;</Property>
<Property Name="DestinationCount" Type="Int">2</Property>
<Property Name="Exe_cmdLineArgs" Type="Bool">true</Property>
<Property Name="Exe_iconItemID" Type="Ref">/My Computer/S2GT.ico</Property>
<Property Name="Exe_VardepHideDeployDlg" Type="Bool">true</Property>
<Property Name="Exe_VardepUndeployOnExit" Type="Bool">true</Property>
<Property Name="Source[0].itemID" Type="Str">{B474D4AD-F621-46B3-9DF4-EBC7B4A95452}</Property>
<Property Name="Source[0].itemID" Type="Str">{AE8E8552-95D3-4A54-ACD3-CE2A0E61D2DF}</Property>
<Property Name="Source[0].type" Type="Str">Container</Property>
<Property Name="Source[1].destinationIndex" Type="Int">0</Property>
<Property Name="Source[1].itemID" Type="Ref"></Property>
<Property Name="Source[1].Library.allowMissingMembers" Type="Bool">true</Property>
<Property Name="Source[1].itemID" Type="Ref">/My Computer/README.md</Property>
<Property Name="Source[1].sourceInclusion" Type="Str">Include</Property>
<Property Name="Source[1].type" Type="Str">Library</Property>
<Property Name="Source[10].destinationIndex" Type="Int">1</Property>
<Property Name="Source[10].itemID" Type="Ref">/My Computer/SV.lib/S2GT.lvlib</Property>
<Property Name="Source[10].Library.allowMissingMembers" Type="Bool">true</Property>
<Property Name="Source[10].destinationIndex" Type="Int">0</Property>
<Property Name="Source[10].itemID" Type="Ref">/My Computer/Packages/CSPP_Vacuum/CSPP_PR4000.lvlib/CSPP_PR4000.ini</Property>
<Property Name="Source[10].sourceInclusion" Type="Str">Include</Property>
<Property Name="Source[10].type" Type="Str">Library</Property>
<Property Name="Source[11].destinationIndex" Type="Int">0</Property>
<Property Name="Source[11].itemID" Type="Ref">/My Computer/Packages/LS218/LS218.ini</Property>
<Property Name="Source[11].sourceInclusion" Type="Str">Include</Property>
<Property Name="Source[12].destinationIndex" Type="Int">0</Property>
<Property Name="Source[12].itemID" Type="Ref">/My Computer/Packages/CSPP_Vacuum/CSPP_PR4000.lvlib/CSPP_PR4000.xml</Property>
<Property Name="Source[12].sourceInclusion" Type="Str">Include</Property>
<Property Name="Source[13].destinationIndex" Type="Int">1</Property>
<Property Name="Source[13].itemID" Type="Ref">/My Computer/Packages/Utilities/CSPP_SystemMonitor_SV.lvlib</Property>
<Property Name="Source[13].Library.allowMissingMembers" Type="Bool">true</Property>
<Property Name="Source[13].sourceInclusion" Type="Str">Include</Property>
<Property Name="Source[13].type" Type="Str">Library</Property>
<Property Name="Source[14].destinationIndex" Type="Int">0</Property>
<Property Name="Source[14].itemID" Type="Ref">/My Computer/S2GT.ini</Property>
<Property Name="Source[14].sourceInclusion" Type="Str">Include</Property>
<Property Name="Source[2].destinationIndex" Type="Int">0</Property>
<Property Name="Source[2].itemID" Type="Ref">/My Computer/README.md</Property>
<Property Name="Source[2].sourceInclusion" Type="Str">Include</Property>
<Property Name="Source[2].itemID" Type="Ref">/My Computer/S2GT_Main.vi</Property>
<Property Name="Source[2].sourceInclusion" Type="Str">TopLevel</Property>
<Property Name="Source[2].type" Type="Str">VI</Property>
<Property Name="Source[3].destinationIndex" Type="Int">0</Property>
<Property Name="Source[3].itemID" Type="Ref">/My Computer/S2GT_Main.vi</Property>
<Property Name="Source[3].sourceInclusion" Type="Str">TopLevel</Property>
<Property Name="Source[3].type" Type="Str">VI</Property>
<Property Name="Source[3].itemID" Type="Ref">/My Computer/Release_Notes.md</Property>
<Property Name="Source[3].sourceInclusion" Type="Str">Include</Property>
<Property Name="Source[4].destinationIndex" Type="Int">0</Property>
<Property Name="Source[4].itemID" Type="Ref">/My Computer/Release_Notes.md</Property>
<Property Name="Source[4].itemID" Type="Ref">/My Computer/Packages/DSC/CSPP_DSC.ini</Property>
<Property Name="Source[4].sourceInclusion" Type="Str">Include</Property>
<Property Name="Source[5].destinationIndex" Type="Int">0</Property>
<Property Name="Source[5].itemID" Type="Ref"></Property>
<Property Name="Source[5].itemID" Type="Ref">/My Computer/Packages/ObjectManager/CSPP_ObjectManager.ini</Property>
<Property Name="Source[5].sourceInclusion" Type="Str">Include</Property>
<Property Name="Source[6].destinationIndex" Type="Int">0</Property>
<Property Name="Source[6].itemID" Type="Ref">/My Computer/Packages/DSC/CSPP_DSC.ini</Property>
<Property Name="Source[6].itemID" Type="Ref">/My Computer/Packages/Utilities/CSPP_Utilities.ini</Property>
<Property Name="Source[6].sourceInclusion" Type="Str">Include</Property>
<Property Name="Source[7].destinationIndex" Type="Int">0</Property>
<Property Name="Source[7].itemID" Type="Ref">/My Computer/Packages/ObjectManager/CSPP_ObjectManager.ini</Property>
<Property Name="Source[7].itemID" Type="Ref">/My Computer/Packages/Core/CSPP_Core.ini</Property>
<Property Name="Source[7].sourceInclusion" Type="Str">Include</Property>
<Property Name="Source[8].destinationIndex" Type="Int">0</Property>
<Property Name="Source[8].itemID" Type="Ref">/My Computer/Packages/Utilities/CSPP_Utilities.ini</Property>
<Property Name="Source[8].destinationIndex" Type="Int">1</Property>
<Property Name="Source[8].itemID" Type="Ref">/My Computer/SV.lib/S2GT.lvlib</Property>
<Property Name="Source[8].Library.allowMissingMembers" Type="Bool">true</Property>
<Property Name="Source[8].sourceInclusion" Type="Str">Include</Property>
<Property Name="Source[8].type" Type="Str">Library</Property>
<Property Name="Source[9].destinationIndex" Type="Int">0</Property>
<Property Name="Source[9].itemID" Type="Ref">/My Computer/Packages/Core/CSPP_Core.ini</Property>
<Property Name="Source[9].itemID" Type="Ref">/My Computer/Packages/BNT_DAQmx/BNT_DAQmx.lvlib/BNT_DAQmx.ini</Property>
<Property Name="Source[9].sourceInclusion" Type="Str">Include</Property>
<Property Name="SourceCount" Type="Int">11</Property>
<Property Name="SourceCount" Type="Int">15</Property>
<Property Name="TgtF_companyName" Type="Str">GSI Helmholtzzentrum für Schwerionenforschung GmbH</Property>
<Property Name="TgtF_fileDescription" Type="Str">CSPP-Template</Property>
<Property Name="TgtF_internalName" Type="Str">CSPP-Template</Property>
<Property Name="TgtF_legalCopyright" Type="Str">Copyright © 2017 GSI Helmholtzzentrum für Schwerionenforschung GmbH</Property>
<Property Name="TgtF_productName" Type="Str">CSPP-Template</Property>
<Property Name="TgtF_fileDescription" Type="Str">S2GT App</Property>
<Property Name="TgtF_internalName" Type="Str">S2GT App</Property>
<Property Name="TgtF_legalCopyright" Type="Str">Copyright © 2019 GSI Helmholtzzentrum für Schwerionenforschung GmbH</Property>
<Property Name="TgtF_productName" Type="Str">S2GT App</Property>
<Property Name="TgtF_targetfileGUID" Type="Str">{20017911-8940-4421-B57F-6FCEEB0905B6}</Property>
<Property Name="TgtF_targetfileName" Type="Str">CSPP-Template.exe</Property>
<Property Name="TgtF_targetfileName" Type="Str">S2GT.exe</Property>
</Item>
</Item>
</Item>
......
S2GT_Content.vi
View file @ 0771deaf
No preview for this file type
gitversioninfo @ 798faaed
Subproject commit 798faaeda64c73d646363ecc6435d12ea540855a
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

https://git.gsi.de is provided by CIT-HPC | GSI Helmholtzzentrum fuer Schwerionenforschung GmbH | Imprint (in German) | Privacy policy