diff --git a/Main/Types/TraceLabSDK.Types.dll b/Main/Types/TraceLabSDK.Types.dll index 38f6585..c3c9048 100755 Binary files a/Main/Types/TraceLabSDK.Types.dll and b/Main/Types/TraceLabSDK.Types.dll differ diff --git a/Main/Types/TraceLabSDK.Types.jar b/Main/Types/TraceLabSDK.Types.jar index 131bbb2..61f71fc 100644 Binary files a/Main/Types/TraceLabSDK.Types.jar and b/Main/Types/TraceLabSDK.Types.jar differ diff --git a/Main/Types/TraceLabSDK.Types.pdb b/Main/Types/TraceLabSDK.Types.pdb index 98c68fb..13ab0f1 100644 Binary files a/Main/Types/TraceLabSDK.Types.pdb and b/Main/Types/TraceLabSDK.Types.pdb differ diff --git a/Main/WebService/Bin/TraceLab.Core.dll b/Main/WebService/Bin/TraceLab.Core.dll index e430637..be50dcc 100644 Binary files a/Main/WebService/Bin/TraceLab.Core.dll and b/Main/WebService/Bin/TraceLab.Core.dll differ diff --git a/Main/WebService/Bin/TraceLab.Core.pdb b/Main/WebService/Bin/TraceLab.Core.pdb index 357c292..31e38e5 100644 Binary files a/Main/WebService/Bin/TraceLab.Core.pdb and b/Main/WebService/Bin/TraceLab.Core.pdb differ diff --git a/Main/WebService/Bin/TraceLab.dll b/Main/WebService/Bin/TraceLab.dll index 012b83d..2cfe442 100644 Binary files a/Main/WebService/Bin/TraceLab.dll and b/Main/WebService/Bin/TraceLab.dll differ diff --git a/Main/WebService/Bin/TraceLab.pdb b/Main/WebService/Bin/TraceLab.pdb index 46d4048..f2ee9ea 100644 Binary files a/Main/WebService/Bin/TraceLab.pdb and b/Main/WebService/Bin/TraceLab.pdb differ diff --git a/Main/WebService/Bin/TraceLabSDK.Types.dll b/Main/WebService/Bin/TraceLabSDK.Types.dll index 38f6585..c3c9048 100644 Binary files a/Main/WebService/Bin/TraceLabSDK.Types.dll and b/Main/WebService/Bin/TraceLabSDK.Types.dll differ diff --git a/Main/WebService/Bin/TraceLabSDK.Types.pdb b/Main/WebService/Bin/TraceLabSDK.Types.pdb index 98c68fb..13ab0f1 100644 Binary files a/Main/WebService/Bin/TraceLabSDK.Types.pdb and b/Main/WebService/Bin/TraceLabSDK.Types.pdb differ diff --git a/Main/WebService/Bin/TraceLabSDK.dll b/Main/WebService/Bin/TraceLabSDK.dll index f312ba2..9811bf3 100644 Binary files a/Main/WebService/Bin/TraceLabSDK.dll and b/Main/WebService/Bin/TraceLabSDK.dll differ diff --git a/Main/WebService/Bin/TraceLabSDK.pdb b/Main/WebService/Bin/TraceLabSDK.pdb index 16facfc..0db4bb7 100644 Binary files a/Main/WebService/Bin/TraceLabSDK.pdb and b/Main/WebService/Bin/TraceLabSDK.pdb differ diff --git a/Main/WebService/Bin/TraceLabWeb.dll b/Main/WebService/Bin/TraceLabWeb.dll index 995e12e..5d2c077 100644 Binary files a/Main/WebService/Bin/TraceLabWeb.dll and b/Main/WebService/Bin/TraceLabWeb.dll differ diff --git a/Main/WebService/Bin/TraceLabWeb.pdb b/Main/WebService/Bin/TraceLabWeb.pdb index 969aae5..9655c93 100644 Binary files a/Main/WebService/Bin/TraceLabWeb.pdb and b/Main/WebService/Bin/TraceLabWeb.pdb differ diff --git a/Main/WebService/TraceLab.Core/Components/ChallengeMetadata.cs b/Main/WebService/TraceLab.Core/Components/ChallengeMetadata.cs index cf24104..d5b11f7 100644 --- a/Main/WebService/TraceLab.Core/Components/ChallengeMetadata.cs +++ b/Main/WebService/TraceLab.Core/Components/ChallengeMetadata.cs @@ -51,7 +51,7 @@ protected ChallengeMetadata() /// The composite component graph. /// The label. /// The experiment location root. - internal ChallengeMetadata(CompositeComponentEditableGraph compositeComponentGraph, string label, string experimentLocationRoot) + public ChallengeMetadata(CompositeComponentEditableGraph compositeComponentGraph, string label, string experimentLocationRoot) : base(compositeComponentGraph, label, experimentLocationRoot) { } diff --git a/Main/WebService/TraceLab.Core/Components/ComponentMetadata.cs b/Main/WebService/TraceLab.Core/Components/ComponentMetadata.cs index 85e7b37..6a034be 100644 --- a/Main/WebService/TraceLab.Core/Components/ComponentMetadata.cs +++ b/Main/WebService/TraceLab.Core/Components/ComponentMetadata.cs @@ -54,7 +54,7 @@ protected ComponentMetadata() /// Initializes a new s_instance of the class. /// /// The component metadata definition. - internal ComponentMetadata(ComponentMetadataDefinition componentMetadataDefinition, string experimentLocationRoot) + public ComponentMetadata(ComponentMetadataDefinition componentMetadataDefinition, string experimentLocationRoot) { m_experimentLocationRoot = experimentLocationRoot; ComponentMetadataDefinition = componentMetadataDefinition; diff --git a/Main/WebService/TraceLab.Core/Components/LoopScopeMetadata.cs b/Main/WebService/TraceLab.Core/Components/LoopScopeMetadata.cs index 94828de..e211cdc 100644 --- a/Main/WebService/TraceLab.Core/Components/LoopScopeMetadata.cs +++ b/Main/WebService/TraceLab.Core/Components/LoopScopeMetadata.cs @@ -53,7 +53,7 @@ protected LoopScopeMetadata() /// The composite component graph. /// The label. /// The experiment location root. - internal LoopScopeMetadata(CompositeComponentEditableGraph compositeComponentGraph, string label, string experimentLocationRoot) + public LoopScopeMetadata(CompositeComponentEditableGraph compositeComponentGraph, string label, string experimentLocationRoot) : base(compositeComponentGraph, label, experimentLocationRoot) { UniqueDecisionID = Guid.NewGuid().ToString(); diff --git a/Main/WebService/TraceLab.Core/Components/ScopeMetadata.cs b/Main/WebService/TraceLab.Core/Components/ScopeMetadata.cs index d73c561..10017d4 100644 --- a/Main/WebService/TraceLab.Core/Components/ScopeMetadata.cs +++ b/Main/WebService/TraceLab.Core/Components/ScopeMetadata.cs @@ -48,7 +48,7 @@ protected ScopeMetadata() /// The composite component graph. /// The label. /// The experiment location root. - internal ScopeMetadata(CompositeComponentEditableGraph compositeComponentGraph, string label, string experimentLocationRoot) + public ScopeMetadata(CompositeComponentEditableGraph compositeComponentGraph, string label, string experimentLocationRoot) : base(compositeComponentGraph, label, experimentLocationRoot) { } diff --git a/Main/WebService/TraceLab.Core/ViewModels/ComponentLibraryViewModel.cs b/Main/WebService/TraceLab.Core/ViewModels/ComponentLibraryViewModel.cs index 3242df3..654baf9 100644 --- a/Main/WebService/TraceLab.Core/ViewModels/ComponentLibraryViewModel.cs +++ b/Main/WebService/TraceLab.Core/ViewModels/ComponentLibraryViewModel.cs @@ -113,6 +113,18 @@ public IEnumerable ComponentsCollection } } + public MetadataDefinition GetComponentByID(string ID) + { + foreach(MetadataDefinition definition in m_packageAwareComponentLibrary.Components ) + { + if (definition.ID.Equals(ID)) + { + return definition; + } + } + return null; + } + public IEnumerable PackageTypeDirectories { get { return this.m_componentsLibraryInstance.PackageTypeDirectories; } diff --git a/Main/WebService/TraceLab.Core/obj/Debug/TraceLab.Core.csprojResolveAssemblyReference.cache b/Main/WebService/TraceLab.Core/obj/Debug/TraceLab.Core.csprojResolveAssemblyReference.cache index 5024550..af17368 100644 Binary files a/Main/WebService/TraceLab.Core/obj/Debug/TraceLab.Core.csprojResolveAssemblyReference.cache and b/Main/WebService/TraceLab.Core/obj/Debug/TraceLab.Core.csprojResolveAssemblyReference.cache differ diff --git a/Main/WebService/TraceLab.Core/obj/Debug/TraceLab.Core.dll b/Main/WebService/TraceLab.Core/obj/Debug/TraceLab.Core.dll index e430637..be50dcc 100644 Binary files a/Main/WebService/TraceLab.Core/obj/Debug/TraceLab.Core.dll and b/Main/WebService/TraceLab.Core/obj/Debug/TraceLab.Core.dll differ diff --git a/Main/WebService/TraceLab.Core/obj/Debug/TraceLab.Core.pdb b/Main/WebService/TraceLab.Core/obj/Debug/TraceLab.Core.pdb index 357c292..31e38e5 100644 Binary files a/Main/WebService/TraceLab.Core/obj/Debug/TraceLab.Core.pdb and b/Main/WebService/TraceLab.Core/obj/Debug/TraceLab.Core.pdb differ diff --git a/Main/WebService/TraceLab/bin/Debug/TraceLab.Core.dll b/Main/WebService/TraceLab/bin/Debug/TraceLab.Core.dll index e430637..be50dcc 100644 Binary files a/Main/WebService/TraceLab/bin/Debug/TraceLab.Core.dll and b/Main/WebService/TraceLab/bin/Debug/TraceLab.Core.dll differ diff --git a/Main/WebService/TraceLab/bin/Debug/TraceLab.Core.dll.CodeAnalysisLog.xml b/Main/WebService/TraceLab/bin/Debug/TraceLab.Core.dll.CodeAnalysisLog.xml index 0973535..f74fc82 100644 --- a/Main/WebService/TraceLab/bin/Debug/TraceLab.Core.dll.CodeAnalysisLog.xml +++ b/Main/WebService/TraceLab/bin/Debug/TraceLab.Core.dll.CodeAnalysisLog.xml @@ -10,17 +10,17 @@ - + Add an implementation of GetObjectData to type 'BenchmarkInfo'. - + Add a constructor to BenchmarkInfo with the following signature: 'protected BenchmarkInfo(SerializationInfo info, StreamingContext context)'. - + Implement IDisposable on 'DefiningBenchmark' because it creates members of the following IDisposable types: 'ExperimentWorkspaceWrapper'. If 'DefiningBenchmark' has previously shipped, adding new members that implement IDisposable to this type is considered a breaking change to existing consumers. @@ -31,7 +31,7 @@ - + Add a constructor to ChallengeMetadata with the following signature: 'protected ChallengeMetadata(SerializationInfo info, StreamingContext context)'. @@ -40,14 +40,14 @@ - + 'ComponentMetadata.ComponentMetadata()' contains a call chain that results in a call to a virtual method defined by the class. Review the following call stack for unintended consequences: ComponentMetadata..ctor() Metadata.InitLoggingNodeSettings():Void - + - + 'ComponentMetadata.ComponentMetadata(ComponentMetadataDefinition, string)' contains a call chain that results in a call to a virtual method defined by the class. Review the following call stack for unintended consequences: ComponentMetadata..ctor(ComponentMetadataDefinition, String) ComponentMetadata.set_ComponentMetadataDefinition(ComponentMetadataDefinition):Void ComponentMetadata.set_ComponentMetadataDefinitionID(String) Metadata.InitLoggingNodeSettings():Void 'ComponentMetadata.ComponentMetadata(ComponentMetadataDefinition, string)' contains a call chain that results in a call to a virtual method defined by the class. Review the following call stack for unintended consequences: ComponentMetadata..ctor(ComponentMetadataDefinition, String) ComponentMetadata.set_ComponentMetadataDefinition(ComponentMetadataDefinition):Void ComponentMetadata.set_ComponentMetadataDefinitionID(String):Void Metadata.NotifyPropertyChanged(String):Void Metadata.set_IsModified(Boolean):Void @@ -57,14 +57,14 @@ - + Add an implementation of GetObjectData to type 'CompositeComponentBaseMetadata'. - + 'CompositeComponentBaseMetadata.CompositeComponentBaseMetadata()' contains a call chain that results in a call to a virtual method defined by the class. Review the following call stack for unintended consequences: CompositeComponentBaseMetadata..ctor() Metadata.InitLoggingNodeSettings():Void @@ -73,17 +73,17 @@ - + Add an implementation of GetObjectData to type 'CompositeComponentMetadata'. - + Add a constructor to CompositeComponentMetadata with the following signature: 'protected CompositeComponentMetadata(SerializationInfo info, StreamingContext context)'. - + 'CompositeComponentMetadata.CompositeComponentMetadata(CompositeComponentMetadataDefinition, string)' contains a call chain that results in a call to a virtual method defined by the class. Review the following call stack for unintended consequences: CompositeComponentMetadata..ctor(CompositeComponentMetadataDefinition, String) CompositeComponentMetadata.set_ComponentMetadataDefinition(CompositeComponentMetadataDefinition):Void CompositeComponentMetadata.set_ComponentMetadataDefinitionID(String):Void Metadata.NotifyPropertyChanged(String):Void Metadata.set_IsModified(Boolean):Void @@ -94,7 +94,7 @@ - + Make 'IOItem' sealed (a breaking change if this class has previously shipped), implement the method non-explicitly, or implement a new method that exposes the functionality of 'IXmlSerializable.GetSchema()' and is visible to derived classes. @@ -105,7 +105,7 @@ - + Make 'IOSpec' sealed (a breaking change if this class has previously shipped), implement the method non-explicitly, or implement a new method that exposes the functionality of 'IXmlSerializable.GetSchema()' and is visible to derived classes. @@ -116,7 +116,7 @@ - + Field 'LibraryHelper.PackageManagerSetup.m_manager' is a member of type 'LibraryHelper.PackageManagerSetup', which is serializable, but is of type 'PackageManager', which is not serializable. Add the NonSerializedAttribute to 'LibraryHelper.PackageManagerSetup.m_manager'. @@ -125,10 +125,10 @@ - + Add an implementation of GetObjectData to type 'LoopScopeMetadata'. - + Add a constructor to LoopScopeMetadata with the following signature: 'protected LoopScopeMetadata(SerializationInfo info, StreamingContext context)'. @@ -139,7 +139,7 @@ - + 'PackageAwareComponentLibrary.DecisionsDirectoryPath.get()' creates an exception of type 'NotImplementedException', an exception type that should not be raised in a property. If this exception instance might be raised, use a different exception type, convert this property into a method, or change this property's logic so that it no longer raises an exception. @@ -150,14 +150,14 @@ - + Add an implementation of GetObjectData to type 'ScopeBaseMetadata'. - + Add a constructor to ScopeMetadata with the following signature: 'protected ScopeMetadata(SerializationInfo info, StreamingContext context)'. @@ -168,21 +168,21 @@ - + Add [Serializable] to 'ExperimentLoadException' as this type implements ISerializable. - + Add [Serializable] to 'FilesCopyFailuresException' as this type implements ISerializable. - + Add [Serializable] to 'PackageCreationFailureException' as this type implements ISerializable. @@ -195,7 +195,7 @@ - + 'ExperimentRunner' implements a finalizer that only calls conditionally emitted methods or the base type finalizer. Remove the finalizer or ensure that it is only conditionally compiled into the assembly. If this violation occurs against a finalizer that is entirely wrapped in a conditionally-emitted block of code, suppress this message. @@ -204,21 +204,21 @@ - + Implement IDisposable on 'RunnableNode' because it creates members of the following IDisposable types: 'AutoResetEvent'. - + Field 'RunnableNode.m_nodeResetEvent' is a member of type 'RunnableNode', which is serializable, but is of type 'AutoResetEvent', which is not serializable. Add the NonSerializedAttribute to 'RunnableNode.m_nodeResetEvent'. - + Field 'RunnableNode.m_nodeThread' is a member of type 'RunnableNode', which is serializable, but is of type 'Thread', which is not serializable. Add the NonSerializedAttribute to 'RunnableNode.m_nodeThread'. @@ -233,7 +233,7 @@ - + 'CompositeComponentEditableGraph.CompositeComponentEditableGraph(BaseExperiment)' contains a call chain that results in a call to a virtual method defined by the class. Review the following call stack for unintended consequences: CompositeComponentEditableGraph..ctor(BaseExperiment) BaseExperiment.CopyFrom(BaseExperiment):Void 'CompositeComponentEditableGraph.CompositeComponentEditableGraph(BaseExperiment)' contains a call chain that results in a call to a virtual method defined by the class. Review the following call stack for unintended consequences: CompositeComponentEditableGraph..ctor(BaseExperiment) BaseExperiment.CopyFrom(BaseExperiment):Void CompositeComponentGraph.set_OwnerNode(CompositeComponentNode):Void @@ -241,7 +241,7 @@ - + 'CompositeComponentEditableGraph.CompositeComponentEditableGraph(CompositeComponentNode, CompositeComponentEditableGraph)' contains a call chain that results in a call to a virtual method defined by the class. Review the following call stack for unintended consequences: CompositeComponentEditableGraph..ctor(CompositeComponentNode, CompositeComponentEditableGraph) BaseExperiment.CopyFrom(BaseExperiment):Void 'CompositeComponentEditableGraph.CompositeComponentEditableGraph(CompositeComponentNode, CompositeComponentEditableGraph)' contains a call chain that results in a call to a virtual method defined by the class. Review the following call stack for unintended consequences: CompositeComponentEditableGraph..ctor(CompositeComponentNode, CompositeComponentEditableGraph) BaseExperiment.CopyFrom(BaseExperiment):Void CompositeComponentGraph.set_OwnerNode(CompositeComponentNode):Void @@ -253,7 +253,7 @@ - + 'CompositeComponentGraph.CompositeComponentGraph(BaseExperiment)' contains a call chain that results in a call to a virtual method defined by the class. Review the following call stack for unintended consequences: CompositeComponentGraph..ctor(BaseExperiment) BaseExperiment.CopyFrom(BaseExperiment):Void 'CompositeComponentGraph.CompositeComponentGraph(BaseExperiment)' contains a call chain that results in a call to a virtual method defined by the class. Review the following call stack for unintended consequences: CompositeComponentGraph..ctor(BaseExperiment) BaseExperiment.CopyFrom(BaseExperiment):Void CompositeComponentGraph.set_OwnerNode(CompositeComponentNode):Void @@ -261,7 +261,7 @@ - + 'CompositeComponentGraph.CompositeComponentGraph(CompositeComponentNode, CompositeComponentGraph)' contains a call chain that results in a call to a virtual method defined by the class. Review the following call stack for unintended consequences: CompositeComponentGraph..ctor(CompositeComponentNode, CompositeComponentGraph) BaseExperiment.CopyFrom(BaseExperiment):Void 'CompositeComponentGraph.CompositeComponentGraph(CompositeComponentNode, CompositeComponentGraph)' contains a call chain that results in a call to a virtual method defined by the class. Review the following call stack for unintended consequences: CompositeComponentGraph..ctor(CompositeComponentNode, CompositeComponentGraph) BaseExperiment.CopyFrom(BaseExperiment):Void CompositeComponentGraph.set_OwnerNode(CompositeComponentNode):Void @@ -273,7 +273,7 @@ - + 'CompositeComponentNode.CompositeComponentNode(string, SerializedVertexData)' contains a call chain that results in a call to a virtual method defined by the class. Review the following call stack for unintended consequences: CompositeComponentNode..ctor(String, SerializedVertexData) CompositeComponentNode.InitializeComponentGraph():Void 'CompositeComponentNode.CompositeComponentNode(string, SerializedVertexData)' contains a call chain that results in a call to a virtual method defined by the class. Review the following call stack for unintended consequences: CompositeComponentNode..ctor(String, SerializedVertexData) CompositeComponentNode.InitializeComponentGraph():Void CompositeComponentNode.InitializeComponentGraph(Settings):Void @@ -281,7 +281,7 @@ - + 'CompositeComponentNode.CompositeComponentNode(string, SerializedVertexData, Settings)' contains a call chain that results in a call to a virtual method defined by the class. Review the following call stack for unintended consequences: CompositeComponentNode..ctor(String, SerializedVertexData, Settings) CompositeComponentNode.InitializeComponentGraph(Settings):Void @@ -292,7 +292,7 @@ - + Object 'writer' can be disposed more than once in method 'DefiningCompositeComponentSetup.DefineComponent()'. To avoid generating a System.ObjectDisposedException you should not call Dispose more than one time on an object.: Lines: 413 @@ -303,7 +303,7 @@ - + Object 'fileStream' can be disposed more than once in method 'ExperimentManager.SerializeExperimentToStream(IExperiment, string)'. To avoid generating a System.ObjectDisposedException you should not call Dispose more than one time on an object.: Lines: 358 Object 'writer' can be disposed more than once in method 'ExperimentManager.SerializeExperimentToStream(IExperiment, string)'. To avoid generating a System.ObjectDisposedException you should not call Dispose more than one time on an object.: Lines: 358 @@ -315,7 +315,7 @@ - + Declare the first parameter of 'EdgeAction<ExperimentNode, ExperimentNodeConnection>' as an object named 'sender'. Declare the second parameter of 'EdgeAction<ExperimentNode, ExperimentNodeConnection>' as an EventArgs, or an instance of a type that extends EventArgs, named 'e'. @@ -323,7 +323,7 @@ - + Declare the first parameter of 'EdgeAction<ExperimentNode, ExperimentNodeConnection>' as an object named 'sender'. Declare the second parameter of 'EdgeAction<ExperimentNode, ExperimentNodeConnection>' as an EventArgs, or an instance of a type that extends EventArgs, named 'e'. @@ -331,7 +331,7 @@ - + Declare the first parameter of 'VertexAction<ExperimentNode>' as an object named 'sender'. Declare the second parameter of 'VertexAction<ExperimentNode>' as an EventArgs, or an instance of a type that extends EventArgs, named 'e'. @@ -339,7 +339,7 @@ - + Declare the first parameter of 'VertexAction<ExperimentNode>' as an object named 'sender'. Declare the second parameter of 'VertexAction<ExperimentNode>' as an EventArgs, or an instance of a type that extends EventArgs, named 'e'. @@ -349,7 +349,7 @@ - + Add [Serializable] to 'RecentExperimentList' as this type implements ISerializable. @@ -358,7 +358,7 @@ - + Object 'writer' can be disposed more than once in method 'RecentExperimentsHelper.SaveRecentExperimentListToXML(RecentExperimentList, string)'. To avoid generating a System.ObjectDisposedException you should not call Dispose more than one time on an object.: Lines: 106 @@ -367,17 +367,17 @@ - + Make 'SerializedVertexData'.GetObjectData virtual and overridable. - + Declare the serialization constructor of 'SerializedVertexData', an unsealed type, as protected. - + Add an implementation of GetObjectData to type 'SerializedVertexDataWithSize'. @@ -392,7 +392,7 @@ - + 'Package.this.get(string)' creates an exception of type 'NotImplementedException', an exception type that should not be raised in a property. If this exception instance might be raised, use a different exception type, convert this property into a method, or change this property's logic so that it no longer raises an exception. @@ -401,7 +401,7 @@ - + Object 'stream' can be disposed more than once in method 'Package.SaveManifest()'. To avoid generating a System.ObjectDisposedException you should not call Dispose more than one time on an object.: Lines: 511 @@ -410,7 +410,7 @@ - + Add [Serializable] to 'PackageException' as this type implements ISerializable. @@ -423,17 +423,17 @@ - + Object 'fsEncrypted' can be disposed more than once in method 'Crypto.EncryptFile(Stream, string)'. To avoid generating a System.ObjectDisposedException you should not call Dispose more than one time on an object.: Lines: 74 - + Because it is a P/Invoke method, 'Crypto.ZeroMemory(IntPtr, int)' should be defined in a class named NativeMethods, SafeNativeMethods, or UnsafeNativeMethods. - + Change the accessibility of P/Invoke 'Crypto.ZeroMemory(IntPtr, int)' so that it is no longer visible from outside its assembly. @@ -448,7 +448,7 @@ - + Object 'writer' can be disposed more than once in method 'WebsiteLink.SaveLinksToXML(string, List<WebsiteLink>, List<WebsiteLink>)'. To avoid generating a System.ObjectDisposedException you should not call Dispose more than one time on an object.: Lines: 165 @@ -463,7 +463,7 @@ - + Declare the second parameter of 'CallCompletedEventHandler<T>' as an EventArgs, or an instance of a type that extends EventArgs, named 'e'. @@ -474,7 +474,7 @@ - + Object 'memorystream' can be disposed more than once in method 'JsonSerializer.Deserialize<T>(string)'. To avoid generating a System.ObjectDisposedException you should not call Dispose more than one time on an object.: Lines: 79 @@ -489,7 +489,7 @@ - + 'Workspace.Store(string, object)' locks on a reference of type 'Workspace'. Replace this with a lock against an object with strong-identity. 'Workspace.Store(string, object)' locks on a reference of type 'Workspace'. Replace this with a lock against an object with strong-identity. @@ -497,7 +497,7 @@ - + 'Workspace.StoreBytes(string, Type, byte[])' locks on a reference of type 'Workspace'. Replace this with a lock against an object with strong-identity. 'Workspace.StoreBytes(string, Type, byte[])' locks on a reference of type 'Workspace'. Replace this with a lock against an object with strong-identity. @@ -509,7 +509,7 @@ - + Method 'WorkspaceWrapper.Store(string, object)' calls 'string.Format(IFormatProvider, string, params object[])' and does not provide a format item for argument "1". The provided format string is: '"Given object is null. It is not allowed to store null objects in the workspace."' diff --git a/Main/WebService/TraceLab/bin/Debug/TraceLab.Core.pdb b/Main/WebService/TraceLab/bin/Debug/TraceLab.Core.pdb index 357c292..31e38e5 100644 Binary files a/Main/WebService/TraceLab/bin/Debug/TraceLab.Core.pdb and b/Main/WebService/TraceLab/bin/Debug/TraceLab.Core.pdb differ diff --git a/Main/WebService/TraceLab/bin/Debug/TraceLab.dll b/Main/WebService/TraceLab/bin/Debug/TraceLab.dll index 012b83d..2cfe442 100644 Binary files a/Main/WebService/TraceLab/bin/Debug/TraceLab.dll and b/Main/WebService/TraceLab/bin/Debug/TraceLab.dll differ diff --git a/Main/WebService/TraceLab/bin/Debug/TraceLab.pdb b/Main/WebService/TraceLab/bin/Debug/TraceLab.pdb index 46d4048..f2ee9ea 100644 Binary files a/Main/WebService/TraceLab/bin/Debug/TraceLab.pdb and b/Main/WebService/TraceLab/bin/Debug/TraceLab.pdb differ diff --git a/Main/WebService/TraceLab/bin/Debug/TraceLabSDK.Types.dll b/Main/WebService/TraceLab/bin/Debug/TraceLabSDK.Types.dll index 38f6585..c3c9048 100644 Binary files a/Main/WebService/TraceLab/bin/Debug/TraceLabSDK.Types.dll and b/Main/WebService/TraceLab/bin/Debug/TraceLabSDK.Types.dll differ diff --git a/Main/WebService/TraceLab/bin/Debug/TraceLabSDK.Types.pdb b/Main/WebService/TraceLab/bin/Debug/TraceLabSDK.Types.pdb index 98c68fb..13ab0f1 100644 Binary files a/Main/WebService/TraceLab/bin/Debug/TraceLabSDK.Types.pdb and b/Main/WebService/TraceLab/bin/Debug/TraceLabSDK.Types.pdb differ diff --git a/Main/WebService/TraceLab/bin/Debug/TraceLabSDK.dll b/Main/WebService/TraceLab/bin/Debug/TraceLabSDK.dll index f312ba2..9811bf3 100644 Binary files a/Main/WebService/TraceLab/bin/Debug/TraceLabSDK.dll and b/Main/WebService/TraceLab/bin/Debug/TraceLabSDK.dll differ diff --git a/Main/WebService/TraceLab/bin/Debug/TraceLabSDK.pdb b/Main/WebService/TraceLab/bin/Debug/TraceLabSDK.pdb index 16facfc..0db4bb7 100644 Binary files a/Main/WebService/TraceLab/bin/Debug/TraceLabSDK.pdb and b/Main/WebService/TraceLab/bin/Debug/TraceLabSDK.pdb differ diff --git a/Main/WebService/TraceLab/lib/TraceLabSDK.dll b/Main/WebService/TraceLab/lib/TraceLabSDK.dll index f312ba2..9811bf3 100644 Binary files a/Main/WebService/TraceLab/lib/TraceLabSDK.dll and b/Main/WebService/TraceLab/lib/TraceLabSDK.dll differ diff --git a/Main/WebService/TraceLab/lib/TraceLabSDK.pdb b/Main/WebService/TraceLab/lib/TraceLabSDK.pdb index 16facfc..0db4bb7 100644 Binary files a/Main/WebService/TraceLab/lib/TraceLabSDK.pdb and b/Main/WebService/TraceLab/lib/TraceLabSDK.pdb differ diff --git a/Main/WebService/TraceLab/obj/Debug/TraceLab.csprojResolveAssemblyReference.cache b/Main/WebService/TraceLab/obj/Debug/TraceLab.csprojResolveAssemblyReference.cache index 137c4be..d58498c 100644 Binary files a/Main/WebService/TraceLab/obj/Debug/TraceLab.csprojResolveAssemblyReference.cache and b/Main/WebService/TraceLab/obj/Debug/TraceLab.csprojResolveAssemblyReference.cache differ diff --git a/Main/WebService/TraceLab/obj/Debug/TraceLab.dll b/Main/WebService/TraceLab/obj/Debug/TraceLab.dll index 012b83d..2cfe442 100644 Binary files a/Main/WebService/TraceLab/obj/Debug/TraceLab.dll and b/Main/WebService/TraceLab/obj/Debug/TraceLab.dll differ diff --git a/Main/WebService/TraceLab/obj/Debug/TraceLab.pdb b/Main/WebService/TraceLab/obj/Debug/TraceLab.pdb index 46d4048..f2ee9ea 100644 Binary files a/Main/WebService/TraceLab/obj/Debug/TraceLab.pdb and b/Main/WebService/TraceLab/obj/Debug/TraceLab.pdb differ diff --git a/Main/WebService/TraceLabSDK.Types/obj/Debug/TraceLabSDK.Types.csprojResolveAssemblyReference.cache b/Main/WebService/TraceLabSDK.Types/obj/Debug/TraceLabSDK.Types.csprojResolveAssemblyReference.cache index 35f8513..1181f5e 100644 Binary files a/Main/WebService/TraceLabSDK.Types/obj/Debug/TraceLabSDK.Types.csprojResolveAssemblyReference.cache and b/Main/WebService/TraceLabSDK.Types/obj/Debug/TraceLabSDK.Types.csprojResolveAssemblyReference.cache differ diff --git a/Main/WebService/TraceLabSDK.Types/obj/Debug/TraceLabSDK.Types.dll b/Main/WebService/TraceLabSDK.Types/obj/Debug/TraceLabSDK.Types.dll index 38f6585..d73dee0 100644 Binary files a/Main/WebService/TraceLabSDK.Types/obj/Debug/TraceLabSDK.Types.dll and b/Main/WebService/TraceLabSDK.Types/obj/Debug/TraceLabSDK.Types.dll differ diff --git a/Main/WebService/TraceLabSDK.Types/obj/Debug/TraceLabSDK.Types.pdb b/Main/WebService/TraceLabSDK.Types/obj/Debug/TraceLabSDK.Types.pdb index 98c68fb..77d17df 100644 Binary files a/Main/WebService/TraceLabSDK.Types/obj/Debug/TraceLabSDK.Types.pdb and b/Main/WebService/TraceLabSDK.Types/obj/Debug/TraceLabSDK.Types.pdb differ diff --git a/Main/WebService/TraceLabSDK/obj/Debug/TraceLabSDK.csproj.FileListAbsolute.txt b/Main/WebService/TraceLabSDK/obj/Debug/TraceLabSDK.csproj.FileListAbsolute.txt index 8aac308..a842ab7 100644 --- a/Main/WebService/TraceLabSDK/obj/Debug/TraceLabSDK.csproj.FileListAbsolute.txt +++ b/Main/WebService/TraceLabSDK/obj/Debug/TraceLabSDK.csproj.FileListAbsolute.txt @@ -30,3 +30,4 @@ C:\Users\Owner\Documents\W&M\cs635\TraceLab\Main\WebService\TraceLabSDK\obj\Debu C:\Users\Owner\Documents\W&M\cs635\TraceLab\Main\WebService\TraceLabSDK\obj\Debug\TraceLabSDK.csproj.CoreCompileInputs.cache C:\Users\Owner\Documents\W&M\cs635\TraceLab\Main\WebService\TraceLabSDK\obj\Debug\TraceLabSDK.dll C:\Users\Owner\Documents\W&M\cs635\TraceLab\Main\WebService\TraceLabSDK\obj\Debug\TraceLabSDK.pdb +C:\Users\Andrew\Documents\Git\TraceLab\Main\WebService\TraceLabSDK\obj\Debug\TraceLabSDK.csprojResolveAssemblyReference.cache diff --git a/Main/WebService/TraceLabSDK/obj/Debug/TraceLabSDK.dll b/Main/WebService/TraceLabSDK/obj/Debug/TraceLabSDK.dll index f312ba2..9811bf3 100644 Binary files a/Main/WebService/TraceLabSDK/obj/Debug/TraceLabSDK.dll and b/Main/WebService/TraceLabSDK/obj/Debug/TraceLabSDK.dll differ diff --git a/Main/WebService/TraceLabSDK/obj/Debug/TraceLabSDK.pdb b/Main/WebService/TraceLabSDK/obj/Debug/TraceLabSDK.pdb index 16facfc..0db4bb7 100644 Binary files a/Main/WebService/TraceLabSDK/obj/Debug/TraceLabSDK.pdb and b/Main/WebService/TraceLabSDK/obj/Debug/TraceLabSDK.pdb differ diff --git a/Main/WebService/TraceLabWeb/TraceLabApplicationWebConsole.cs b/Main/WebService/TraceLabWeb/TraceLabApplicationWebConsole.cs index d1301fd..004295e 100644 --- a/Main/WebService/TraceLabWeb/TraceLabApplicationWebConsole.cs +++ b/Main/WebService/TraceLabWeb/TraceLabApplicationWebConsole.cs @@ -5,6 +5,7 @@ using System.Threading.Tasks; using TraceLab; using System.Diagnostics; +using System.Data; namespace TraceLabWeb { @@ -40,6 +41,13 @@ public string GetComponents() return WebConsoleUI.GetComponents(); } + public DataTable GetComponentListForDropDown() + { + return WebConsoleUI.GetComponentsForDropDown (); + } + + + public string GetNodes() { return WebConsoleUI.GetNodes (); // TODO WebConsoleUI.GetNodes @@ -63,46 +71,11 @@ public void AddEdge(string edgeName,string sourceName,string targetName) WebConsoleUI.AddEdge(edgeName,sourceName,targetName ); } - public void AddNode(string nodeName, string nodeType) + public void AddNode(string componentType,int xloc,int yloc) { - switch(nodeType ) - { - case ("ExperimentStartNode"): - WebConsoleUI.AddStartNode (nodeName); - break; - case ("ExperimentEndNode"): - WebConsoleUI.AddEndNode(nodeName); - break; - case ("ComponentNode"): - WebConsoleUI.AddComponenetNode (nodeName); - break; - case ("CompositeComponentNode"): - WebConsoleUI.AddCompositeComponenetNode (nodeName); - break; - case ("DecisionNode"): - WebConsoleUI.AddDecisionNode (nodeName); - break; - case ("ExitDecisionNode"): - WebConsoleUI.AddExitDecisionNode (nodeName); - break; - case ("ScopeNode"): - WebConsoleUI.AddScopeNode (nodeName); - break; - case ("LoopScopeNode"): - WebConsoleUI.AddLoopScopeNode (nodeName); - break; - case ("ChallengeNode"): - WebConsoleUI.AddChallengeNode (nodeName); - break; - case ("CommentNode"): - WebConsoleUI.AddCommentNode (nodeName); - break; - default: - break; - - - } + WebConsoleUI.AddComponenetNode (componentType ,xloc,yloc); + } public void RunExperiment() diff --git a/Main/WebService/TraceLabWeb/WebConsoleUI.cs b/Main/WebService/TraceLabWeb/WebConsoleUI.cs index e97f4d9..9084178 100644 --- a/Main/WebService/TraceLabWeb/WebConsoleUI.cs +++ b/Main/WebService/TraceLabWeb/WebConsoleUI.cs @@ -7,6 +7,8 @@ using TraceLab.Core.Components; using TraceLab.Core.Workspaces; using TraceLab.Core.Experiments; +using TraceLab.Core.Utilities; +using System.Data; namespace TraceLabWeb { @@ -65,6 +67,23 @@ internal static string GetComponents() components += ""; return components; } + + internal static DataTable GetComponentsForDropDown() + { + DataTable dt = new DataTable (); + dt.Columns.Add("Label"); + dt.Columns.Add("ID"); + foreach (MetadataDefinition definition in ConsoleInstance.Application.ComponentLibraryViewModel.ComponentsCollection) + { + DataRow dr = dt.NewRow(); + dr["Label"] = definition.Label; + dr["ID"] = definition.ID; + dt.Rows.Add(dr); + } + + return dt; + } + public static string GetNodes() { string components = "
  • Nodes:
    • "; @@ -252,18 +271,17 @@ public static void AddEdge(string value, string sourceName,string targetName) } - public static void AddComponenetNode(string value) //TODO Implement for Node Type + public static void AddComponenetNode(string value, int xloc,int yloc) //TODO Implement for Node Type { try { var experiment = ConsoleInstance.Application.Experiment; - SerializedVertexData svd = new SerializedVertexData(); - svd.Metadata = new DecisionMetadata(value); - ExperimentDecisionNode nodeToAdd = new ExperimentDecisionNode(Guid.NewGuid().ToString(), svd); + MetadataDefinition metadataDefinition =ConsoleInstance.Application.ComponentLibraryViewModel.GetComponentByID (value) ; + + ExperimentNode nodeToAdd = experiment.AddComponentFromDefinition(metadataDefinition, xloc,yloc); + - nodeToAdd.Data.Metadata.Label = value; - experiment.AddVertex(nodeToAdd); } catch @@ -294,6 +312,10 @@ public static void AddEdge(string value, string sourceName,string targetName) } + /// + /// Add Decision Node to Experiment + /// + /// Label of Decision Node public static void AddDecisionNode(string value) { try @@ -337,15 +359,24 @@ public static void AddDecisionNode(string value) } - public static void AddScopeNode(string value) //TODO Implement for Node Type + /// + /// Add a scopeNode to the Experiment + /// + /// Name of the scope node + public static void AddScopeNode(string value) { try { var experiment = ConsoleInstance.Application.Experiment; + var componentGraph = new CompositeComponentEditableGraph(true); - SerializedVertexData svd = new SerializedVertexData(); - svd.Metadata = new DecisionMetadata(value); - ExperimentDecisionNode nodeToAdd = new ExperimentDecisionNode(Guid.NewGuid().ToString(), svd); + if (componentGraph.References != null) + { + componentGraph.References = experiment.References.CopyCollection(); + } + SerializedVertexDataWithSize svd = new SerializedVertexDataWithSize(); + svd.Metadata = new ScopeMetadata (componentGraph,value, System.IO.Path.GetDirectoryName(experiment.ExperimentInfo.FilePath)); + ScopeNode nodeToAdd = new ScopeNode(Guid.NewGuid().ToString(),svd); nodeToAdd.Data.Metadata.Label = value; experiment.AddVertex(nodeToAdd); @@ -358,15 +389,25 @@ public static void AddDecisionNode(string value) } - public static void AddLoopScopeNode(string value) //TODO Implement for Node Type + /// + /// Add a Loop Scope Node to the Experiment + /// + /// The name of the node + public static void AddLoopScopeNode(string value) { try { var experiment = ConsoleInstance.Application.Experiment; + var componentGraph = new CompositeComponentEditableGraph(true); - SerializedVertexData svd = new SerializedVertexData(); - svd.Metadata = new DecisionMetadata(value); - ExperimentDecisionNode nodeToAdd = new ExperimentDecisionNode(Guid.NewGuid().ToString(), svd); + if (componentGraph.References != null) + { + componentGraph.References = experiment.References.CopyCollection(); + } + + SerializedVertexDataWithSize svd = new SerializedVertexDataWithSize(); + svd.Metadata = new LoopScopeMetadata ( componentGraph, value, System.IO.Path.GetDirectoryName(experiment.ExperimentInfo.FilePath)); + LoopScopeNode nodeToAdd = new LoopScopeNode(Guid.NewGuid().ToString(), svd); nodeToAdd.Data.Metadata.Label = value; experiment.AddVertex(nodeToAdd); @@ -379,18 +420,23 @@ public static void AddDecisionNode(string value) } - - public static void AddChallengeNode(string value) //TODO Implement for Node Type + /// + /// Add a challenge node to the Experiment + /// + /// the name of the challenge + public static void AddChallengeNode(string value) { try { var experiment = ConsoleInstance.Application.Experiment; - SerializedVertexData svd = new SerializedVertexData(); - svd.Metadata = new DecisionMetadata(value); - ExperimentDecisionNode nodeToAdd = new ExperimentDecisionNode(Guid.NewGuid().ToString(), svd); + SerializedVertexDataWithSize svd = new SerializedVertexDataWithSize(); + CompositeComponentEditableGraph compositeComponentGraph = new CompositeComponentEditableGraph (true); - nodeToAdd.Data.Metadata.Label = value; + svd.Metadata = new ChallengeMetadata (compositeComponentGraph ,value, System.IO.Path.GetDirectoryName(experiment.ExperimentInfo.FilePath)); + ChallengeNode nodeToAdd = new ChallengeNode(Guid.NewGuid().ToString(), svd); + + nodeToAdd.Data.Metadata.Label = value; experiment.AddVertex(nodeToAdd); } diff --git a/Main/WebService/TraceLabWeb/bin/Debug/TraceLab.Core.dll b/Main/WebService/TraceLabWeb/bin/Debug/TraceLab.Core.dll index e430637..be50dcc 100644 Binary files a/Main/WebService/TraceLabWeb/bin/Debug/TraceLab.Core.dll and b/Main/WebService/TraceLabWeb/bin/Debug/TraceLab.Core.dll differ diff --git a/Main/WebService/TraceLabWeb/bin/Debug/TraceLab.Core.pdb b/Main/WebService/TraceLabWeb/bin/Debug/TraceLab.Core.pdb index 357c292..31e38e5 100644 Binary files a/Main/WebService/TraceLabWeb/bin/Debug/TraceLab.Core.pdb and b/Main/WebService/TraceLabWeb/bin/Debug/TraceLab.Core.pdb differ diff --git a/Main/WebService/TraceLabWeb/bin/Debug/TraceLab.dll b/Main/WebService/TraceLabWeb/bin/Debug/TraceLab.dll index 012b83d..2cfe442 100644 Binary files a/Main/WebService/TraceLabWeb/bin/Debug/TraceLab.dll and b/Main/WebService/TraceLabWeb/bin/Debug/TraceLab.dll differ diff --git a/Main/WebService/TraceLabWeb/bin/Debug/TraceLab.pdb b/Main/WebService/TraceLabWeb/bin/Debug/TraceLab.pdb index 46d4048..f2ee9ea 100644 Binary files a/Main/WebService/TraceLabWeb/bin/Debug/TraceLab.pdb and b/Main/WebService/TraceLabWeb/bin/Debug/TraceLab.pdb differ diff --git a/Main/WebService/TraceLabWeb/bin/Debug/TraceLabSDK.Types.dll b/Main/WebService/TraceLabWeb/bin/Debug/TraceLabSDK.Types.dll index 38f6585..c3c9048 100644 Binary files a/Main/WebService/TraceLabWeb/bin/Debug/TraceLabSDK.Types.dll and b/Main/WebService/TraceLabWeb/bin/Debug/TraceLabSDK.Types.dll differ diff --git a/Main/WebService/TraceLabWeb/bin/Debug/TraceLabSDK.Types.pdb b/Main/WebService/TraceLabWeb/bin/Debug/TraceLabSDK.Types.pdb index 98c68fb..13ab0f1 100644 Binary files a/Main/WebService/TraceLabWeb/bin/Debug/TraceLabSDK.Types.pdb and b/Main/WebService/TraceLabWeb/bin/Debug/TraceLabSDK.Types.pdb differ diff --git a/Main/WebService/TraceLabWeb/bin/Debug/TraceLabSDK.dll b/Main/WebService/TraceLabWeb/bin/Debug/TraceLabSDK.dll index f312ba2..9811bf3 100644 Binary files a/Main/WebService/TraceLabWeb/bin/Debug/TraceLabSDK.dll and b/Main/WebService/TraceLabWeb/bin/Debug/TraceLabSDK.dll differ diff --git a/Main/WebService/TraceLabWeb/bin/Debug/TraceLabSDK.pdb b/Main/WebService/TraceLabWeb/bin/Debug/TraceLabSDK.pdb index 16facfc..0db4bb7 100644 Binary files a/Main/WebService/TraceLabWeb/bin/Debug/TraceLabSDK.pdb and b/Main/WebService/TraceLabWeb/bin/Debug/TraceLabSDK.pdb differ diff --git a/Main/WebService/TraceLabWeb/bin/Debug/TraceLabWeb.dll b/Main/WebService/TraceLabWeb/bin/Debug/TraceLabWeb.dll index 995e12e..5d2c077 100644 Binary files a/Main/WebService/TraceLabWeb/bin/Debug/TraceLabWeb.dll and b/Main/WebService/TraceLabWeb/bin/Debug/TraceLabWeb.dll differ diff --git a/Main/WebService/TraceLabWeb/bin/Debug/TraceLabWeb.pdb b/Main/WebService/TraceLabWeb/bin/Debug/TraceLabWeb.pdb index 969aae5..9655c93 100644 Binary files a/Main/WebService/TraceLabWeb/bin/Debug/TraceLabWeb.pdb and b/Main/WebService/TraceLabWeb/bin/Debug/TraceLabWeb.pdb differ diff --git a/Main/WebService/TraceLabWeb/obj/Debug/TraceLabWeb.csprojResolveAssemblyReference.cache b/Main/WebService/TraceLabWeb/obj/Debug/TraceLabWeb.csprojResolveAssemblyReference.cache index 1125743..46e55f6 100644 Binary files a/Main/WebService/TraceLabWeb/obj/Debug/TraceLabWeb.csprojResolveAssemblyReference.cache and b/Main/WebService/TraceLabWeb/obj/Debug/TraceLabWeb.csprojResolveAssemblyReference.cache differ diff --git a/Main/WebService/TraceLabWeb/obj/Debug/TraceLabWeb.dll b/Main/WebService/TraceLabWeb/obj/Debug/TraceLabWeb.dll index 995e12e..5d2c077 100644 Binary files a/Main/WebService/TraceLabWeb/obj/Debug/TraceLabWeb.dll and b/Main/WebService/TraceLabWeb/obj/Debug/TraceLabWeb.dll differ diff --git a/Main/WebService/TraceLabWeb/obj/Debug/TraceLabWeb.pdb b/Main/WebService/TraceLabWeb/obj/Debug/TraceLabWeb.pdb index 969aae5..9655c93 100644 Binary files a/Main/WebService/TraceLabWeb/obj/Debug/TraceLabWeb.pdb and b/Main/WebService/TraceLabWeb/obj/Debug/TraceLabWeb.pdb differ diff --git a/Main/WebService/TraceLab_UI.aspx b/Main/WebService/TraceLab_UI.aspx index b83b201..8a64089 100644 --- a/Main/WebService/TraceLab_UI.aspx +++ b/Main/WebService/TraceLab_UI.aspx @@ -68,20 +68,11 @@
    - - - - - - - - - - - - - - + X: + Y: + + ComponentType: +
    diff --git a/Main/WebService/TraceLab_UI.aspx.cs b/Main/WebService/TraceLab_UI.aspx.cs index 81d2de2..24435bf 100644 --- a/Main/WebService/TraceLab_UI.aspx.cs +++ b/Main/WebService/TraceLab_UI.aspx.cs @@ -12,6 +12,10 @@ protected void Page_Load(object sender, EventArgs e) { var app = TraceLabApplicationWebConsole.Instance; Components.Text = app.GetComponents(); + ComponentDropDown.DataSource = app.GetComponentListForDropDown(); + ComponentDropDown.DataTextField = "Label"; + ComponentDropDown.DataValueField = "ID"; + ComponentDropDown.DataBind(); Workspace.Text = app.GetWorkspace(); } @@ -23,6 +27,10 @@ protected void OpenButton_Click(object sender, EventArgs e) Console.Text += app.GetLog(); Components.Text = app.GetComponents(); + ComponentDropDown.DataSource = app.GetComponentListForDropDown(); + ComponentDropDown.DataTextField = "Label"; + ComponentDropDown.DataValueField = "ID"; + ComponentDropDown.DataBind(); Workspace.Text = app.GetWorkspace(); } @@ -32,6 +40,10 @@ protected void Save_Click(object sender, EventArgs e) app.SaveExperiment (SaveText.Text); Console.Text = app.GetLog(); Components.Text = app.GetComponents(); + ComponentDropDown.DataSource = app.GetComponentListForDropDown(); + ComponentDropDown.DataTextField = "Label"; + ComponentDropDown.DataValueField = "ID"; + ComponentDropDown.DataBind(); Workspace.Text = app.GetWorkspace(); } @@ -42,6 +54,10 @@ protected void Log_Click(object sender, EventArgs e) Components.Text = app.GetComponents(); Workspace.Text = app.GetWorkspace(); ComponentList.Text = app.GetNodes(); + ComponentDropDown.DataSource = app.GetComponentListForDropDown(); + ComponentDropDown.DataTextField = "Label"; + ComponentDropDown.DataValueField = "ID"; + ComponentDropDown.DataBind(); } protected void Run_Click(object sender, EventArgs e) @@ -51,6 +67,10 @@ protected void Run_Click(object sender, EventArgs e) Console.Text = app.GetLog(); Components.Text = app.GetComponents(); Workspace.Text = app.GetWorkspace(); + ComponentDropDown.DataSource = app.GetComponentListForDropDown(); + ComponentDropDown.DataTextField = "Label"; + ComponentDropDown.DataValueField = "ID"; + ComponentDropDown.DataBind(); } protected void EdgeCommand(object sender, EventArgs e) @@ -62,7 +82,11 @@ protected void EdgeCommand(object sender, EventArgs e) protected void AddNode(object sender, EventArgs e) { var app = TraceLabApplicationWebConsole.Instance; - app.AddNode(NodeText.Text,NodeType.SelectedValue ); - + int x = 0; + int y = 0; + Int32.TryParse(txt_nodeX.Text,out x); + Int32.TryParse(txt_nodeY.Text, out y); + app.AddNode(ComponentDropDown.SelectedValue , x, y); + } } \ No newline at end of file