[ifcsoft] 5 new revisions pushed by kyle.tha...@gmail.com on 2011-06-08 16:31 GMT

0 views

Skip to first unread message

ifc...@googlecode.com

unread,

Jun 8, 2011, 12:32:49 PM6/8/11

to ifcsoft--a...@googlegroups.com

5 new revisions:

Revision: 9b886bc7adb5
Author: sjabba2@10D_BIOS036
Date: Fri Jun 3 08:41:42 2011
Log: Adding the Show Statistics to Data Set Viewer
http://code.google.com/p/ifcsoft/source/detail?r=9b886bc7adb5

Revision: 1e00a1869a1d
Author: sjabba2@10D_BIOS036
Date: Fri Jun 3 08:50:55 2011
Log: Merge
http://code.google.com/p/ifcsoft/source/detail?r=1e00a1869a1d

Revision: bf2452d2a21c
Author: sjabba2@10D_BIOS036
Date: Fri Jun 3 11:55:57 2011
Log: Change the SOM Progress dialog box so it uses ifcDialogBox
http://code.google.com/p/ifcsoft/source/detail?r=bf2452d2a21c

Revision: ab197b663d5f
Author: sjabba2@10D_BIOS036
Date: Wed Jun 8 07:33:36 2011
Log: Progress bar file got left out of last commit.
http://code.google.com/p/ifcsoft/source/detail?r=ab197b663d5f

Revision: 34ad38c68d1e
Author: kthayer@bioslab
Date: Wed Jun 8 09:31:05 2011
Log: Merge
http://code.google.com/p/ifcsoft/source/detail?r=34ad38c68d1e

==============================================================================
Revision: 9b886bc7adb5
Author: sjabba2@10D_BIOS036
Date: Fri Jun 3 08:41:42 2011
Log: Adding the Show Statistics to Data Set Viewer
http://code.google.com/p/ifcsoft/source/detail?r=9b886bc7adb5

Added:
/src/ifcSoft/view/ShowDataSetStatisticsDialog.fx
Modified:
/src/ifcSoft/view/DataSetViewer.fx

=======================================
--- /dev/null
+++ /src/ifcSoft/view/ShowDataSetStatisticsDialog.fx Fri Jun 3 08:41:42
2011
@@ -0,0 +1,94 @@
+/**
+ * Copyright (C) 2011 IFCSoft project
+ *
+ * This file is part of the IFCSoft project (http://ifcsoft.com)
+ *
+ * IFCSoft is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package ifcSoft.view;
+
+import ifcSoft.MainApp;
+import ifcSoft.view.dialogBox.ifcDialogBox;
+import ifcSoft.model.DataSetProxy;
+import ifcSoft.view.dialogBox.ifcDialogText;
+import ifcSoft.view.dialogBox.ifcDialogHBox;
+import ifcSoft.view.dialogBox.ifcDialogVBox;
+
+
+public class ShowDataSetStatisticsDialog {
+ public-init var mainApp:MainApp;
+ public-init var dsp:DataSetProxy = null;
+
+ var ShowStatisticsBoxDialog:ifcDialogBox;
+
+ function ShowStatisticsOK():Void{
+
+ mainApp.removeDialog(ShowStatisticsBoxDialog);
+ }
+
+ /**
+ * Create and display the Show Statistics dialog box.
+ */
+ public function ShowDataSetStatisticsDialog():Void{
+ if(dsp == null){
+ mainApp.alert("No Data Selected");
+ return;
+ }
+ ShowStatisticsBoxDialog =
+ ifcDialogBox{
+ name: "Data Statistics"
+ content:[
+ ifcDialogText{text: dsp.getDataSetName()}
+ ifcDialogHBox{
+ content:[
+ ifcDialogVBox{
+ content:[
+ ifcDialogText{text: " "}
+ ifcDialogText{text: "Min"}
+ ifcDialogText{text: "Max"}
+ ifcDialogText{text: "Mean"}
+ ifcDialogText{text: "StdDev"}
+
+ ]
+ }
+ for(i in [0..dsp.getDimensions()-1]){
+ ifcDialogVBox{
+ content:[
+ ifcDialogText{text:dsp.getColNames()[i]},
+ ifcDialogText{text:"{dsp.getData().getMin(i)}"}
+ ifcDialogText{text:"{dsp.getData().getMax(i)}"}
+ ifcDialogText{text:"{dsp.getData().getMean(i)as
Float}"}
+ ifcDialogText{text:"{dsp.getData().getStdDev(i)as
Float}"}
+
+
+ ]
+ }
+ }
+ ]
+ }
+ ]
+
+
+ okAction: ShowStatisticsOK
+ okName: "Close"
+
+ blocksMouse: true
+ };
+ mainApp.addDialog(ShowStatisticsBoxDialog);
+ }
+
+
+
+}
=======================================
--- /src/ifcSoft/view/DataSetViewer.fx Wed Apr 20 08:26:49 2011
+++ /src/ifcSoft/view/DataSetViewer.fx Fri Jun 3 08:41:42 2011
@@ -67,6 +67,16 @@
ifcDialogButton{
text:"Shrink\nData Set"

action:function(){mainApp.shrinkDatasetDialog(getCurrentDataSet());}
+ },
+ ifcDialogButton{
+ text:"Show\nStatistics"
+ action: function(){
+ var SSD=ShowDataSetStatisticsDialog{
+ mainApp:mainApp
+ dsp:getCurrentDataSet()
+ }
+ SSD.ShowDataSetStatisticsDialog();
+ }
},
]
},

==============================================================================
Revision: 1e00a1869a1d
Author: sjabba2@10D_BIOS036
Date: Fri Jun 3 08:50:55 2011
Log: Merge
http://code.google.com/p/ifcsoft/source/detail?r=1e00a1869a1d

Modified:
/nbproject/project.properties
/src/ifcSoft/view/DataSetViewer.fx
/src/ifcSoft/view/som/SOMTile.fx
/src/ifcSoft/view/som/SOMmaps.fx

=======================================
--- /nbproject/project.properties Mon May 16 15:28:39 2011
+++ /nbproject/project.properties Fri Jun 3 08:50:55 2011
@@ -43,10 +43,10 @@
javadoc.version=false
javafx.profile=desktop
jnlp.codebase.type=local
-jnlp.codebase.url=file:/Z:/KyleT/New%20program/netbeansworkspace/IFCSoft/dist/
+jnlp.codebase.url=file:/C:/Documents%20and%20Settings/sjabba2/My%20Documents/NetBeansProjects/shirinjab-rsph/dist/
jnlp.offline-allowed=true
jnlp.packEnabled=false
-jnlp.signed=true
+jnlp.signed=false
jnlp.update.model=always
main.class=ifcSoft.MainApp
pack200.jar.compress=true
=======================================
--- /src/ifcSoft/view/DataSetViewer.fx Fri Jun 3 08:41:42 2011
+++ /src/ifcSoft/view/DataSetViewer.fx Fri Jun 3 08:50:55 2011
@@ -112,7 +112,7 @@
return null;
}

- var finaldsp:DataSetProxy =
mainMediator.getDataSet(dataSetSelect.getDataSets());
+ var finaldsp:DataSetProxy =
mainMediator.getDataSet(dataSetSelect.getDataSets(),
dataSetSelect.getSynchColumns());
if(finaldsp == null){
println("Error in data set combination");
return null;
=======================================
--- /src/ifcSoft/view/som/SOMTile.fx Thu Feb 17 08:17:03 2011
+++ /src/ifcSoft/view/som/SOMTile.fx Fri Jun 3 08:50:55 2011
@@ -161,7 +161,7 @@
hpos: HPos.CENTER
translateY: bind - somMaps.tileWidth* somMaps.aspectratio / 2 +
10
text: bind name
- font: Font {name: "Arial" size: 16}
+ font: Font {name: "Arial" size: 12}
textFill: Color.WHITE
visible: bind not isEditingName
},
=======================================
--- /src/ifcSoft/view/som/SOMmaps.fx Tue Apr 19 14:14:33 2011
+++ /src/ifcSoft/view/som/SOMmaps.fx Fri Jun 3 08:50:55 2011
@@ -62,6 +62,7 @@
import ifcSoft.view.som.somtile.SOMTileBlank;
import ifcSoft.view.dialogBox.ifcDialogBox;
import ifcSoft.view.dialogBox.ifcDialogStringInput;
+import ifcSoft.view.som.somtile.SOMTileDenseMap;

/**
* @author Kyle Thayer <kth...@emory.edu>
@@ -196,13 +197,10 @@
mapTiles,
rightClickMenu = PopupMenu{
items: [
- //MenuItem { text: "Test File Against SOM", action:
function() { mediator.testFileAgainstSOM(); } }
+ MenuItem { text: "Export SOM and Hit Histograms", action:
function() { ExportSOMAndHit{app:app, mediator:mediator };} }
Separator { }
MenuItem { text: "Clustering Options", action: function() {
mediator.clustOpt(); } }
//MenuItem { text: "Save Cluster", action: function() {
SaveClusterDialog{app:app, mediator:mediator }; } //in order for the menu
not to be in the screenshot, must use the other button
- //MenuItem { text: "Save Cluster", action: function() {
mediator.saveCluster(); } }
- //MenuItem { text: "Save Cluster Stats", action:
saveClusterStats }
- //MenuItem { text: "Save Cluster to File", action:
function() {mediator.saveClusterToFile(); } }
Separator { }
removeTileMenuItem = MenuItem { text: "Remove Map Tile",
disable:true }
Menu{
@@ -497,11 +495,10 @@
max: somHolder.dimMaxes[i]
};
}
- denseMap = SOMTileSubsetDenseMap{
+ denseMap = SOMTileDenseMap{
somMaps:this
- densityMap: 0
img: somHolder.blankmap
- name: "Density Map"
+ name: "Hit Histogram"
min: 0
max: 1
};
@@ -548,7 +545,7 @@
if(denseMaps.size() == 0){
displayedTiles = [euMap, displaydDimTiles, anotherBlankTile,
denseMap];
}else{
- displayedTiles = [euMap, displaydDimTiles, anotherBlankTile,
denseMaps];
+ displayedTiles = [euMap, displaydDimTiles, anotherBlankTile,
denseMap, denseMaps];
insert denseMapsDelta into notDisplayedTiles;
}

==============================================================================
Revision: bf2452d2a21c
Author: sjabba2@10D_BIOS036
Date: Fri Jun 3 11:55:57 2011
Log: Change the SOM Progress dialog box so it uses ifcDialogBox
http://code.google.com/p/ifcsoft/source/detail?r=bf2452d2a21c

Added:
/src/ifcSoft/view/som/SOMProgressBox.fx
Deleted:
/src/ifcSoft/view/som/SOMInternDialogs.fx
Modified:
/src/ifcSoft/view/som/SOMMediator.java
/src/ifcSoft/view/som/SOMvc.fx
/src/ifcSoft/view/som/SOMvcI.java

=======================================
--- /dev/null
+++ /src/ifcSoft/view/som/SOMProgressBox.fx Fri Jun 3 11:55:57 2011
@@ -0,0 +1,81 @@
+/**
+ * Copyright (C) 2011 IFCSoft project
+ *
+ * This file is part of the IFCSoft project (http://ifcsoft.com)
+ *
+ * IFCSoft is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package ifcSoft.view.som;
+
+import ifcSoft.MainApp;
+import ifcSoft.view.dialogBox.ifcDialogBox;
+import ifcSoft.view.dialogBox.ifcDialogProgressBar;
+import javafx.animation.Timeline;
+import javafx.animation.KeyFrame;
+import javafx.util.Math;
+
+
+public class SOMProgressBox {
+
+ public-init var mainApp:MainApp;
+ public-init package var mediator:SOMMediator;
+
+ var SOMProgressDialogBox:ifcDialogBox;
+ var progress: Float = 0;
+
+
+
+ /**
+ * Create and display the SOM Progress Bar dialog box.
+ */
+ public function SOMProgressBox():Void{
+
+ SOMProgressDialogBox =
+ ifcDialogBox{
+ name: "SOM Progress"
+ content:[
+ ifcDialogProgressBar{progress: bind Math.min (progress,1) }
+ ]
+ cancelAction: CancelSOM
+ blocksMouse: true
+ };
+ mainApp.addDialog(SOMProgressDialogBox);
+ checkprogress();
+ }
+
+ function checkprogress():Void{
+ progress = mediator.getProgress();
+ if (progress<100){
+ var timeline = Timeline{
+ repeatCount: 1
+ keyFrames: KeyFrame{
+ time: 30ms
+ action: function():Void{checkprogress();}
+ }
+ };
+ timeline.play();
+ }else{
+ mainApp.removeDialog(SOMProgressDialogBox);
+ }
+ }
+
+
+
+ function CancelSOM(){
+ mediator.cancelSOM();
+
+ mainApp.removeDialog(SOMProgressDialogBox);
+ }
+}
=======================================
--- /src/ifcSoft/view/som/SOMInternDialogs.fx Fri Feb 11 10:49:36 2011
+++ /dev/null
@@ -1,115 +0,0 @@
-/**
- * Copyright (C) 2011 Kyle Thayer <kyle.thayer AT gmail.com>
- *
- * This file is part of the IFCSoft project (http://ifcsoft.com)
- *
- * IFCSoft is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package ifcSoft.view.som;
-
-import javafx.scene.paint.Color;
-import javafx.scene.shape.*;
-import javafx.scene.Group;
-import javafx.scene.text.*;
-import javafx.scene.control.Button;
-import javafx.scene.layout.VBox;
-import javafx.geometry.HPos;
-import javafx.animation.Timeline;
-import javafx.animation.KeyFrame;
-import javafx.scene.control.*;
-import javafx.scene.layout.*;
-
-import ifcSoft.MainApp;
-
-
-/**
- * These are functions for SOM dialog boxes that could be loaded when an
SOM is displayed
- * This consists currently of the:
- * SOM progress display
- * @author Kyle Thayer <kth...@emory.edu>
- */
-public class SOMInternDialogs {
- public-init var app:MainApp;
- public-init package var mediator:SOMMediator;
- postinit{
- if(app == null or mediator == null){
- println("SOMInternDialogs initializer: not initialized fully");
- }
- }
-
- package var statusdialog: Group;
-
- public var progress = 0;
-
- public function SOMstarted(): Void{
- progress=0;
- statusdialog =
- Group{
- blocksMouse: true
- layoutX: bind (app.contentWidth - 200) / 2
- layoutY: bind (app.contentHeight - 150) / 2
- content: [
- Rectangle {
- width: 200
- height: 100
- arcWidth: 20 arcHeight: 20
- stroke: Color.LIGHTGRAY;
- fill: Color.rgb(138,123,102);
- x: 0
- y: 0
- }
- VBox{
- hpos: HPos.CENTER
- translateX: 10
- translateY: 10
- spacing: 10
- content:[
- Text {content: bind "SOM Progress: {progress}%"}
- ProgressBar {progress: bind progress / 100.0 }
- Button{
- action: function():Void{CancelSOM();}
- text: "Cancel"
- }
- ]
- }
- ]
- };
-
- app.addDialog(statusdialog);
-
- checkprogress();
-
- }
-
- function CancelSOM(){
- mediator.cancelSOM();
-
- app.removeDialog(statusdialog);
- }
-
- public function checkprogress(){
- var t;
- var timeline = Timeline{
- repeatCount: 1
- keyFrames: KeyFrame{
- time: 30ms
- action: function():Void{mediator.checkProgress();}
-
- }
- };
- timeline.play();
- }
-};
-
-
=======================================
--- /src/ifcSoft/view/som/SOMMediator.java Mon May 30 20:41:15 2011
+++ /src/ifcSoft/view/som/SOMMediator.java Fri Jun 3 11:55:57 2011
@@ -391,23 +391,18 @@
}
}

- /**
- * Check the progress of the SOM calculation.
- */
- public void checkProgress(){
+
+ public float getProgress(){
float p = SOMp.getProgress();
if(p == 100){ //if it is done, get the SOMs
currentState = FINDINGDENSITIES;
if(isTabOpen){
somVC.dispSOM();
}
- }else{ //set the current progress
- int prog = (int) (p*100);
- somVC.setProgress(prog);
- }
+ }
+ return p;
}

/**
* Return the name of the set used for the SOM.
=======================================
--- /src/ifcSoft/view/som/SOMvc.fx Tue Apr 19 14:14:33 2011
+++ /src/ifcSoft/view/som/SOMvc.fx Fri Jun 3 11:55:57 2011
@@ -35,7 +35,6 @@
import javafx.scene.layout.Container;
import javafx.scene.layout.*;

-import ifcSoft.view.som.SOMInternDialogs;
import ifcSoft.view.som.SOMcluster;
import ifcSoft.view.som.SOMmaps;

@@ -58,7 +57,6 @@
package var app:MainApp;
package var mediator:SOMMediator;

- package var SOMdlgs:SOMInternDialogs;
package var SOMclstr:SOMcluster;
package var SOMmps:SOMmaps;

@@ -91,7 +89,6 @@
public function init(ap: MainApp, med:SOMMediator):Void{
app = ap;
mediator = med;
- SOMdlgs = SOMInternDialogs{app:app mediator:mediator};
SOMclstr = SOMcluster{app:app mediator:mediator somvc:this};
SOMmps = SOMmaps{app:app mediator:mediator SOMclstr:SOMclstr};
}
@@ -109,19 +106,14 @@
* Informs the SOMvc the the SOM has started calculating (so it can put
up the progress bar).
*/
override public function SOMstarted(): Void{
- SOMdlgs.SOMstarted();
+ var PRDB= SOMProgressBox{
+ mainApp:app
+ mediator:mediator
+ }
+ PRDB.SOMProgressBox()
}

- /**
- * Sets the progress of the calculating SOM.
- * @param p - progress % (0 - 1 if computing, 100 when done)
- */
- override public function setProgress(p: Integer): Void{
- SOMdlgs.progress = p;
- SOMdlgs.checkprogress();
- }
-
/**
* Initialize the SOM content box and set it as the main content box.
*/
=======================================
--- /src/ifcSoft/view/som/SOMvcI.java Fri Feb 11 10:49:36 2011
+++ /src/ifcSoft/view/som/SOMvcI.java Fri Jun 3 11:55:57 2011
@@ -33,11 +33,6 @@
*/
public void SOMstarted();

- /**
- * Sets the progress of the calculating SOM.
- * @param p - progress % (0 - 1 if computing, 100 when done)
- */
- public void setProgress(int p);

/**
* Tells the SOMvc to draw the SOM maps in the current tab.

==============================================================================
Revision: ab197b663d5f
Author: sjabba2@10D_BIOS036
Date: Wed Jun 8 07:33:36 2011
Log: Progress bar file got left out of last commit.
http://code.google.com/p/ifcsoft/source/detail?r=ab197b663d5f

Added:
/src/ifcSoft/view/dialogBox/ifcDialogProgressBar.fx

=======================================
--- /dev/null
+++ /src/ifcSoft/view/dialogBox/ifcDialogProgressBar.fx Wed Jun 8 07:33:36
2011
@@ -0,0 +1,42 @@
+/**
+ * Copyright (C) 2011 IFCSoft project
+ *
+ * This file is part of the IFCSoft project (http://ifcsoft.com)
+ *
+ * IFCSoft is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package ifcSoft.view.dialogBox;
+import javafx.scene.layout.HBox;
+import javafx.scene.control.ProgressBar;
+import javafx.scene.control.Label;
+
+
+public class ifcDialogProgressBar extends ifcDialogItem{
+ public var progress:Float;
+
+ init{
+ children = HBox {
+ content: [
+ ProgressBar {
+ progress: bind progress
+ }
+ Label {
+ text: bind "{progress*100 as Integer}%"
+ }
+
+ ]
+ }
+ }
+}

==============================================================================
Revision: 34ad38c68d1e
Author: kthayer@bioslab
Date: Wed Jun 8 09:31:05 2011
Log: Merge
http://code.google.com/p/ifcsoft/source/detail?r=34ad38c68d1e

Deleted:
/src/ifcSoft/view/som/SOMInternDialogs.fx
Modified:
/src/ifcSoft/view/som/SOMvc.fx

=======================================
--- /src/ifcSoft/view/som/SOMInternDialogs.fx Fri Feb 11 10:49:36 2011
+++ /dev/null
@@ -1,115 +0,0 @@
-/**
- * Copyright (C) 2011 Kyle Thayer <kyle.thayer AT gmail.com>
- *
- * This file is part of the IFCSoft project (http://ifcsoft.com)
- *
- * IFCSoft is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package ifcSoft.view.som;
-
-import javafx.scene.paint.Color;
-import javafx.scene.shape.*;
-import javafx.scene.Group;
-import javafx.scene.text.*;
-import javafx.scene.control.Button;
-import javafx.scene.layout.VBox;
-import javafx.geometry.HPos;
-import javafx.animation.Timeline;
-import javafx.animation.KeyFrame;
-import javafx.scene.control.*;
-import javafx.scene.layout.*;
-
-import ifcSoft.MainApp;
-
-
-/**
- * These are functions for SOM dialog boxes that could be loaded when an
SOM is displayed
- * This consists currently of the:
- * SOM progress display
- * @author Kyle Thayer <kth...@emory.edu>
- */
-public class SOMInternDialogs {
- public-init var app:MainApp;
- public-init package var mediator:SOMMediator;
- postinit{
- if(app == null or mediator == null){
- println("SOMInternDialogs initializer: not initialized fully");
- }
- }
-
- package var statusdialog: Group;
-
- public var progress = 0;
-
- public function SOMstarted(): Void{
- progress=0;
- statusdialog =
- Group{
- blocksMouse: true
- layoutX: bind (app.contentWidth - 200) / 2
- layoutY: bind (app.contentHeight - 150) / 2
- content: [
- Rectangle {
- width: 200
- height: 100
- arcWidth: 20 arcHeight: 20
- stroke: Color.LIGHTGRAY;
- fill: Color.rgb(138,123,102);
- x: 0
- y: 0
- }
- VBox{
- hpos: HPos.CENTER
- translateX: 10
- translateY: 10
- spacing: 10
- content:[
- Text {content: bind "SOM Progress: {progress}%"}
- ProgressBar {progress: bind progress / 100.0 }
- Button{
- action: function():Void{CancelSOM();}
- text: "Cancel"
- }
- ]
- }
- ]
- };
-
- app.addDialog(statusdialog);
-
- checkprogress();
-
- }
-
- function CancelSOM(){
- mediator.cancelSOM();
-
- app.removeDialog(statusdialog);
- }
-
- public function checkprogress(){
- var t;
- var timeline = Timeline{
- repeatCount: 1
- keyFrames: KeyFrame{
- time: 30ms
- action: function():Void{mediator.checkProgress();}
-
- }
- };
- timeline.play();
- }
-};
-
-
=======================================
--- /src/ifcSoft/view/som/SOMvc.fx Mon Jun 6 13:05:20 2011
+++ /src/ifcSoft/view/som/SOMvc.fx Wed Jun 8 09:31:05 2011
@@ -35,7 +35,6 @@
import javafx.scene.layout.Container;
import javafx.scene.layout.*;

-import ifcSoft.view.som.SOMInternDialogs;
import ifcSoft.view.som.SOMcluster;
import ifcSoft.view.som.SOMmaps;

@@ -58,7 +57,6 @@
package var app:MainApp;
package var mediator:SOMMediator;

- package var SOMdlgs:SOMInternDialogs;
package var SOMclstr:SOMcluster;
package var SOMmps:SOMmaps;

Reply all

Reply to author

Forward

0 new messages