Skip to content
Snippets Groups Projects
Commit 5e397da6 authored by mariuskern's avatar mariuskern
Browse files

Rectangle and Triangle fact changed

parent f026e485
No related branches found
No related tags found
No related merge requests found
...@@ -53,13 +53,11 @@ public RectangleFact() : base(){ ...@@ -53,13 +53,11 @@ public RectangleFact() : base(){
[JsonConstructor] [JsonConstructor]
public RectangleFact( string PidA, string PidB, string PidC) : base() public RectangleFact( string PidA, string PidB, string PidC) : base()
{ {
this.PidA = PidA; this.PidA = PidA;
this.PidB = PidB; this.PidB = PidB;
this.PidC = PidC; this.PidC = PidC;
calculate_vectors(); calculate_vectors();
} }
/// <summary> /// <summary>
...@@ -74,6 +72,8 @@ public RectangleFact(string PidA, string PidB, string PidC, SOMDoc ServerDefinit ...@@ -74,6 +72,8 @@ public RectangleFact(string PidA, string PidB, string PidC, SOMDoc ServerDefinit
this.PidB = PidB; this.PidB = PidB;
this.PidC = PidC; this.PidC = PidC;
this.ServerDefinition = ServerDefinition;
calculate_vectors(); calculate_vectors();
} }
...@@ -95,7 +95,7 @@ public RectangleFact(string PidA, string PidB, string PidC, SOMDoc ServerDefinit ...@@ -95,7 +95,7 @@ public RectangleFact(string PidA, string PidB, string PidC, SOMDoc ServerDefinit
ret.Add(new RectangleFact(PidA, PidB, PidC, fact.@ref)); ret.Add(new RectangleFact(PidA, PidB, PidC));
//ParsingDictionary.parseTermsToId.TryAdd(defines.ToString(), fact.@ref.uri); //ParsingDictionary.parseTermsToId.TryAdd(defines.ToString(), fact.@ref.uri);
//ret.Add(new PointFact(SOMDoc.MakeVector3(defines), fact.@ref)); //ret.Add(new PointFact(SOMDoc.MakeVector3(defines), fact.@ref));
......
...@@ -76,13 +76,11 @@ public TriangleFact2() : base(){ ...@@ -76,13 +76,11 @@ public TriangleFact2() : base(){
[JsonConstructor] [JsonConstructor]
public TriangleFact2( string PidA, string PidB, string PidC) : base() public TriangleFact2( string PidA, string PidB, string PidC) : base()
{ {
this.PidA = PidA; this.PidA = PidA;
this.PidB = PidB; this.PidB = PidB;
this.PidC = PidC; this.PidC = PidC;
calculate_vectors(); calculate_vectors();
} }
/// <summary> /// <summary>
...@@ -93,8 +91,6 @@ public TriangleFact2( string PidA, string PidB, string PidC) : base() ...@@ -93,8 +91,6 @@ public TriangleFact2( string PidA, string PidB, string PidC) : base()
/// <param name="ServerDefinition">MMT URI as OMS</param> /// <param name="ServerDefinition">MMT URI as OMS</param>
public TriangleFact2(string PidA, string PidB, string PidC, SOMDoc ServerDefinition) : base() public TriangleFact2(string PidA, string PidB, string PidC, SOMDoc ServerDefinition) : base()
{ {
this.PidA = PidA; this.PidA = PidA;
this.PidB = PidB; this.PidB = PidB;
this.PidC = PidC; this.PidC = PidC;
...@@ -102,7 +98,6 @@ public TriangleFact2(string PidA, string PidB, string PidC, SOMDoc ServerDefinit ...@@ -102,7 +98,6 @@ public TriangleFact2(string PidA, string PidB, string PidC, SOMDoc ServerDefinit
this.ServerDefinition = ServerDefinition; this.ServerDefinition = ServerDefinition;
calculate_vectors(); calculate_vectors();
} }
/// \copydoc Fact.parseFact(ScrollFact) /// \copydoc Fact.parseFact(ScrollFact)
...@@ -123,7 +118,7 @@ public TriangleFact2(string PidA, string PidB, string PidC, SOMDoc ServerDefinit ...@@ -123,7 +118,7 @@ public TriangleFact2(string PidA, string PidB, string PidC, SOMDoc ServerDefinit
ret.Add(new TriangleFact2(PidA, PidB, PidC, fact.@ref)); ret.Add(new TriangleFact2(PidA, PidB, PidC));
//ParsingDictionary.parseTermsToId.TryAdd(defines.ToString(), fact.@ref.uri); //ParsingDictionary.parseTermsToId.TryAdd(defines.ToString(), fact.@ref.uri);
//ret.Add(new PointFact(SOMDoc.MakeVector3(defines), fact.@ref)); //ret.Add(new PointFact(SOMDoc.MakeVector3(defines), fact.@ref));
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment