• R/O
  • SSH
  • HTTPS

ea-addin-dsm: Commit


Commit MetaInfo

Revision50 (tree)
Time2010-07-19 00:11:59
Authorm-usami

Log Message

とりあえずtearingのバックグラウンド処理化に対応

Change Summary

Incremental Difference

--- dsm/branches/version-0.5.1.0/EAAddinDSM/DSMDialog.cs (revision 49)
+++ dsm/branches/version-0.5.1.0/EAAddinDSM/DSMDialog.cs (revision 50)
@@ -272,11 +272,14 @@
272272 if ((grid_.SelectedCells[0].ColumnIndex >= 1) && (grid_.SelectedCells[0].RowIndex >= 1) &&
273273 (grid_.SelectedCells[0].Value.ToString() == 1.ToString()))
274274 {
275- //if (controller_.tearing(grid_.SelectedCells[0].ColumnIndex - 1, grid_.SelectedCells[0].RowIndex - 1))
276- if (controller_.tearing(grid_.SelectedCells[0].RowIndex - 1, grid_.SelectedCells[0].ColumnIndex - 1))
277- {
278- return;
279- }
275+ ProgressDialog prog = new ProgressDialog(ref controller_, ref dsm_);
276+ prog.tearing(grid_.SelectedCells[0].RowIndex - 1, grid_.SelectedCells[0].ColumnIndex - 1);
277+ prog.ShowDialog();
278+ update();
279+ //if (controller_.tearing(grid_.SelectedCells[0].RowIndex - 1, grid_.SelectedCells[0].ColumnIndex - 1))
280+ //{
281+ // return;
282+ //}
280283 }
281284 }
282285
--- dsm/branches/version-0.5.1.0/EAAddinDSM/ProgressDialog.cs (revision 49)
+++ dsm/branches/version-0.5.1.0/EAAddinDSM/ProgressDialog.cs (revision 50)
@@ -64,6 +64,15 @@
6464 bgWorker_.RunWorkerAsync();
6565 }
6666
67+ public void tearing(int row, int columun)
68+ {
69+ if (controller_.tearing(row, columun))
70+ {
71+ this.bgWorker_.DoWork += new DoWorkEventHandler(bgWorker__DoWork3);
72+ bgWorker_.RunWorkerAsync();
73+ }
74+ }
75+
6776 private void bgWorker__DoWork(object sender, DoWorkEventArgs e)
6877 {
6978 BackgroundWorker bg = (BackgroundWorker)sender;
@@ -79,6 +88,12 @@
7988 controller_.partitioning(ref bg);
8089 }
8190
91+ private void bgWorker__DoWork3(object sender, DoWorkEventArgs e)
92+ {
93+ BackgroundWorker bg = (BackgroundWorker)sender;
94+ controller_.partitioning(ref bg);
95+ }
96+
8297 private void bgWorker__ProgressChanged(object sender, ProgressChangedEventArgs e)
8398 {
8499 pBar_.Value = e.ProgressPercentage;
--- dsm/branches/version-0.5.1.0/EAAddinDSM/DSMController.cs (revision 49)
+++ dsm/branches/version-0.5.1.0/EAAddinDSM/DSMController.cs (revision 50)
@@ -260,9 +260,9 @@
260260 // 指定されたセルを削除
261261 if (dsm_.removeDependency(x, y))
262262 {
263+ return true;
263264 // partitioningを実行
264265 //return partitioning(ref bg);
265- return true;
266266 }
267267 return false;
268268 }
Show on old repository browser