Skip to content

Commit

Permalink
учтена водичка при смещении геотермы по глубине при построении
Browse files Browse the repository at this point in the history
добавлено копирование в буфер обмена построенных геотерм
  • Loading branch information
Serhantes91 committed Apr 17, 2018
1 parent ce98ac3 commit 6489889
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 12 deletions.
19 changes: 11 additions & 8 deletions I2VISTools/Windows/GeothermFileWindow.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,16 @@ private void DisplayButton_Click(object sender, RoutedEventArgs e)
{
if (selectedInds.Count == 0) return;

//todo сделать свой airNodes для каждого сечения
_airNodesNum = 1;
while ((arr[_airNodesNum, selectedInds[0]] == 0 || arr[_airNodesNum, selectedInds[0]] == 1) && _airNodesNum < arr.GetLength(0) - 1)
{
_airNodesNum++;
}

_airNodesNum = (_airNodesNum < 200) ? _airNodesNum - 1 : 0;


ThermSeries = new List<LineSeries>();

var oldArrZ = arr.GetLength(0);
Expand Down Expand Up @@ -88,14 +98,7 @@ private void GeothermFileWindow_OnLoaded(object sender, RoutedEventArgs e)
}

TxtImage.Source = new DrawingImage(visual.Drawing);

while (arr[_airNodesNum,10] == 0 && _airNodesNum < arr.GetLength(0)-1)
{
_airNodesNum++;
}

_airNodesNum = (_airNodesNum < 200) ? _airNodesNum - 1 : 0;


}


Expand Down
6 changes: 3 additions & 3 deletions I2VISTools/Windows/GeothermWindow.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -738,13 +738,13 @@ private void ClearApproxButton_Click(object sender, RoutedEventArgs e)

private void ImplyButton_Click(object sender, RoutedEventArgs e)
{

var Hocean = 4500;
//todo расхардкодить глубину океана и высоту воздуха (расчёт по маркерам или иниту или сделать опциональным)
var Hocean = 4500;
var Hair = 8000;

if (approxSerie == null || approxSerie.Points.Count == 0)
{
MessageBox.Show("Похоже, вы ещё не сделали аппрксимацию. Нечего выводить.");
MessageBox.Show("Похоже, вы ещё не сделали аппроксимацию. Нечего выводить.");
return;
}

Expand Down
2 changes: 1 addition & 1 deletion I2VISTools/Windows/TextWindow.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ public TextWindow( string text )

private void COpyButton_Click(object sender, RoutedEventArgs e)
{

Clipboard.SetText(TextContent);
}

private void TextWindow_OnLoaded(object sender, RoutedEventArgs e)
Expand Down

0 comments on commit 6489889

Please sign in to comment.