Skip to content

Commit 1a40880

Browse files
peterjamesnugentFraser Greenroyd
authored andcommitted
Change m_midasCivilVersion to be viewable from Adapter and modify initial setting of version for specific cases
1 parent 002f1c0 commit 1a40880

File tree

3 files changed

+3
-4
lines changed

3 files changed

+3
-4
lines changed

MidasCivil_Adapter/AdapterActions/Execute.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -165,9 +165,8 @@ public bool RunCommand(Open command)
165165
m_midasText = File.ReadAllLines(mctFile).ToList();
166166
SetSectionText();
167167
}
168-
string versionFile = m_directory + "\\TextFiles\\" + "VERSION" + ".txt";
169-
m_midasCivilVersion = "8.8.1";
170168

169+
string versionFile = m_directory + "\\TextFiles\\" + "VERSION" + ".txt";
171170
if (!(m_midasCivilVersion == ""))
172171
{
173172
m_midasCivilVersion = m_midasCivilVersion.Trim();
@@ -183,6 +182,7 @@ public bool RunCommand(Open command)
183182
}
184183
else
185184
{
185+
m_midasCivilVersion = "8.8.1";
186186
Engine.Reflection.Compute.RecordWarning("*VERSION file not found in directory and no version specified, MidasCivil version assumed default value = " + m_midasCivilVersion);
187187
}
188188

MidasCivil_Adapter/MidasCivilAdapter.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ public static bool IsApplicationRunning()
112112

113113
private List<string> m_midasText;
114114
private string m_directory;
115-
private string m_midasCivilVersion;
115+
public string m_midasCivilVersion { get; protected set; }
116116
private string m_forceUnit;
117117
private string m_lengthUnit;
118118
private string m_heatUnit;

MidasCivil_Engine/MidasCivil_Engine.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,6 @@
105105
</ItemGroup>
106106
<ItemGroup>
107107
<Folder Include="Modify\" />
108-
<Folder Include="Query\" />
109108
</ItemGroup>
110109
<ItemGroup>
111110
<None Include="packages.config" />

0 commit comments

Comments
 (0)