This is the main source code repository for Cassandra. It includes all needed components (Core, Pipeline Manager, Plugins...). It is based on the LibreSource Synchroniser. {resource:../beInvolved|noaction}
- bug fixe in the connectivity managment in the probing line plug-in - update of the launching script for .app execution under Apple OSX. - bug fixes
AddBlock(.ignore.so6,20,2) ++ .*:Packaging$ ++ DelBlock(build.xml,33,5) -- <echo message=" - build-depend : pre-build the component common to Cassandra and ArtenumPipeline" /> -- <echo message=" - clean-all : remove all builded documents. (class, jar, javadoc)" /> -- <echo message=" - build-all : compile CassandraCore/PipelineManager" /> -- <echo message=" - build-plugins: compile the plugins " /> -- <echo message=" - print-paths : print the configuration paths" /> AddBlock(build.xml,33,8) ++ <echo message=" - build-depend : pre-build the cross-dependent components beetween Cassandra and ArtenumPipeline" /> ++ <echo message=" - build-and-package-renderer : build and pack the Cassandra Renderer package" /> ++ <echo message=" - build-and-package-pipeline : build and pack the ArtenumPipeline package" /> ++ <echo message=" - clean-all : remove all builded documents. (class, jar, javadoc)" /> ++ <echo message=" - build-core : compile Cassandra Core and PipelineManager" /> ++ <echo message=" - build-all : compile core and plug-ins" /> ++ <echo message=" - build-plugins : compile the plugins " /> ++ <echo message=" - print-paths : print the configuration paths" /> DelBlock(build.xml,61,1) -- AddBlock(build.xml,61,1) ++ DelBlock(build.xml,75,1) -- <target name="build-all" depends="build-depend"> AddBlock(build.xml,76,1) ++ <target name="build-and-package-renderer" depends="build-depend"> AddBlock(build.xml,83,1) ++ </target> DelBlock(build.xml,85,2) -- <ant antfile="build.xml" dir="${cassandra.core.home}" target="make" inheritall="false" inheritrefs="false" /> -- AddBlock(build.xml,85,1) ++ <target name="build-and-package-pipeline" depends="build-depend"> DelBlock(build.xml,87,1) -- AddBlock(build.xml,92,1) ++ </target> AddBlock(build.xml,94,3) ++ ++ <target name="build-core" depends="build-depend, build-and-package-renderer, build-and-package-pipeline"> ++ <ant antfile="build.xml" dir="${cassandra.core.home}" target="make" inheritall="false" inheritrefs="false" /> AddBlock(build.xml,99,2) ++ <target name="build-all" depends="build-core, build-plugins"> ++ </target> DelBlock(build.xml,103,1) -- <target name="build-plugins" depends="build-all"> AddBlock(build.xml,103,1) ++ <target name="build-plugins" depends="build-core"> DelBlock(build.xml,143,2) -- -- AddBlock(build.xml,143,2) ++ ++ AddBinaryFile(Cassandra-2.4.03_OK_for_demo.tgz) DelBlock(cassandra.properties,15,1) -- python.path=../thirdpart/VTK/MacOSX/vtk5_4_2_OSX_64/lib/vtk-5.4/java/vtk/vtk.jar:${jython.home}:Cassandra.jar:plugin/IsoLevelPlugin.jar AddBlock(cassandra.properties,15,1) ++ python.path=../thirdpart/VTK/MacOSX/Java/vtk.jar:${jython.dir}:Cassandra.jar:plugin/IsoLevelPlugin.jar DelBlock(cassandra.properties,17,1) -- #python.path=../thirdpart/VTK/MacOSX/vtk5_4_2_OSX_64/lib/vtk-5.4/java/vtk/vtk.jar:${jython.home}:Cassandra.jar:plugin/IsoLevelPlugin.jar AddBlock(cassandra.properties,17,1) ++ #python.path=../thirdpart/VTK/MacOSX/vtk5_4_2_OSX_64/lib/vtk-5.4/java/vtk/vtk.jar:${jython.dir}:Cassandra.jar:plugin/IsoLevelPlugin.jar DelBlock(cassandra.properties,88,1) -- java.class.path=../thirdpart/VTK/MacOSX/vtk5_4_2_OSX_64/lib/vtk-5.4/java/vtk/vtk.jar:../thirdpart/CassandraRenderer-1.1.0-all-all-none-jvm1_6-stable/CassandraRenderer-1.1.0-all-all-none-jvm1_6-stable.jar:../thirdpart/CassandraPipelineManager-1.1/ArtenumPipeLineManager-1.1.jar:Cassandra.jar:../thirdpart/ArtTk/ArtTk.jar:../thirdpart/DedaleGraph/DedaleGraph.jar:../thirdpart/JyConsole/JyConsole.jar:{thirdpart.jar-file.jython}:../thirdpart/JFreeChart/jfreechart-1.0.13/lib/jfreechart-1.0.13.jar:../thirdpart/JFreeChart/jfreechart-1.0.13/lib/jcommon-1.0.16.jar:../thirdpart/JFreeChart/jfreechart-1.0.13/lib/jfreechart-1.0.13.jar:../thirdpart/JFreeChart/jfreechart-1.0.13/lib/jcommon-1.0.16.jar AddBlock(cassandra.properties,88,1) ++ java.class.path=../thirdpart/VTK/Java/vtk.jar:../thirdpart/CassandraRenderer-1.1.0-all-all-none-jvm1_6-stable/CassandraRenderer-1.1.0-all-all-none-jvm1_6-stable.jar:../thirdpart/CassandraPipelineManager-1.1/ArtenumPipeLineManager-1.1.jar:Cassandra.jar:../thirdpart/ArtTk/ArtTk.jar:../thirdpart/DedaleGraph/DedaleGraph.jar:../thirdpart/JyConsole/JyConsole.jar:{thirdpart.jar-file.jython}:../thirdpart/JFreeChart/jfreechart-1.0.13/lib/jfreechart-1.0.13.jar:../thirdpart/JFreeChart/jfreechart-1.0.13/lib/jcommon-1.0.16.jar:../thirdpart/JFreeChart/jfreechart-1.0.13/lib/jfreechart-1.0.13.jar:../thirdpart/JFreeChart/jfreechart-1.0.13/lib/jcommon-1.0.16.jar AddBinaryFile(cassandraIcon2.icns) AddBlock(config.properties,85,2) ++ tmp.jar-file.corePipeline=${tmp.dependance.dir}/CorePipeline.jar ++ DelBlock(config.properties,91,1) -- thirdpart.jar-file.jython=${jython.home}/jython.jar AddBlock(config.properties,91,1) ++ thirdpart.jar-file.jython=${jython.dir}/jython.jar DelBlock(config.properties,113,5) -- vtk.version=5.4 -- #vtk.root.dir=${thirdpart.dir}/VTK/MacOSX/vtk-${vtk.version}-osx-i686-JVM1.6-64b -- vtk.root.dir=${thirdpart.dir}/VTK/MacOSX/vtk5_4_2_OSX_64 -- thirdpart.jar-file.vtk=${vtk.root.dir}/lib/vtk-${vtk.version}/java/vtk/vtk.jar -- vtk.library.path=${vtk.root.dir}/lib/vtk-${vtk.version}/ AddBlock(config.properties,113,4) ++ vtk.version=5.6 ++ vtk.root.dir=${thirdpart.dir}/VTK/MacOSX/vtk-native-5.6.1-osx-x86_64 ++ thirdpart.jar-file.vtk=${thirdpart.dir}/VTK/Java/vtk-5.6.1.jar ++ vtk.library.path=${vtk.root.dir}:${vtk.root.dir}/lib/vtk-${vtk.version}/ AddBlock(config.properties,118,4) ++ ################################################################ ++ # Java memory stack # ++ ################################################################ ++ java.xmx=512m AddBlock(config.properties,123,1) ++ AddBlock(Core/build.xml,4,12) ++ ++ ++ ++ <!-- ++ <property file="config.properties" /> ++ <property name="cassandra.root.path" value="${basedir}/.." /> ++ --> ++ ++ <property name="cassandra.root" value=".." /> ++ <property file="../config.properties" /> ++ ++ DelBlock(Core/build.xml,17,1) -- <property file="config.properties" /> DelBlock(Core/build.xml,170,1) -- <property name="java-cmd" value=" -jar $CASSANDRA_HOME/${launcher.jar.name} $CASSANDRA_HOME/cassandra.properties $ARGUMENT_1" /> AddBlock(Core/build.xml,170,2) ++ <property name="memory-stack" value="-Xmx${java.xmx}"/> ++ <property name="java-cmd" value=" ${memory-stack} -jar $CASSANDRA_HOME/${launcher.jar.name} $CASSANDRA_HOME/cassandra.properties $ARGUMENT_1" /> DelBlock(Core/build.xml,229,1) -- <echo message="XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX File Separator: ${path.separator}" /> DelBlock(Core/build.xml,232,1) -- <filter token="CASSANDRA_CLASS_PATH" value="${thirdpart.jar-file.vtk}${path.separator}${thirdpart.jar-file.renderer}${path.separator}${thirdpart.jar-file.pipeline}${path.separator}${jar.name}${path.separator}${thirdpart.jar-file.arttk}${path.separator}${thirdpart.jar-file.dedalegraph}${path.separator}${thirdpart.jar-file.jyconsole}${path.separator}${thirdpart.jar-file.jython}${path.separator}${thirdpart.dir}/JFreeChart/jfreechart-1.0.13/lib/jfreechart-1.0.13.jar${path.separator}${thirdpart.dir}/JFreeChart/jfreechart-1.0.13/lib/jcommon-1.0.16.jar" /> AddBlock(Core/build.xml,232,1) ++ <filter token="CASSANDRA_CLASS_PATH" value="${thirdpart.jar-file.vtk}${path.separator}${thirdpart.jar-file.renderer}${path.separator}${thirdpart.jar-file.pipeline}${path.separator}${jar.name}${path.separator}${thirdpart.jar-file.arttk}${path.separator}${thirdpart.jar-file.dedalegraph}${path.separator}${thirdpart.jar-file.jyconsole}${path.separator}${thirdpart.jar-file.jython}${path.separator}${thirdpart.dir}/JFreeChart/jfreechart-1.0.13/lib/jfreechart-1.0.13.jar${path.separator}${thirdpart.dir}/JFreeChart/jfreechart-1.0.13/lib/jcommon-1.0.16.jar${path.separator}${penelop.core.jar}${path.separator}${penelope.vtk.jar}" /> AddBlock(Core/config.properties,138,11) ++ ++ ################################################################ ++ # Penelope Library settings # ++ ################################################################ ++ penelop.core.jar=${thirdpart.dir}/JFreeMesh/JFreeMesh-2.4.1/JFreeMesh.jar ++ penelope.vtk.jar=${thirdpart.dir}/JFreeMesh/JFreeMesh-2.4.1/JFreeMesh-VtkBuilder.jar ++ ++ ################################################################ ++ # Java memory stack # ++ ################################################################ ++ java.xmx=512m AddBlock(Core/Script/cameraDolly.py,2,1) ++ import time DelBlock(Core/Script/cameraDolly.py,4,2) -- def initTrajectoryAndOrientation(): -- traj = [] AddBlock(Core/Script/cameraDolly.py,4,13) ++ class CameraDolly: ++ ++ def __init__(self, cassandraRendererPanel): ++ self.renderePanel = cassandraRendererPanel ++ self.renderePanel.GetRenderer().SetLightFollowCamera(1) ++ self.camera = self.renderePanel.GetRenderer().GetActiveCamera() ++ ++ self.renderePanel.GetRenderer().GetActiveCamera().SetClippingRange(0.1, 1000) ++ ++ self.initTrajectoryAndOrientation() ++ ++ def initTrajectoryAndOrientation(self): ++ self.traj = [] DelBlock(Core/Script/cameraDolly.py,18,6) -- def addLine(xIn, yIn, zIn, xOut, yOut, zOut, nbSteps): -- for pos in xrange(nbSteps): -- x = (xOut - xIn)/nbSteps*pos; -- y = (yOut - yIn)/nbSteps*pos; -- z = (zOut - zIn)/nbSteps*pos; -- traj.append([x, y, z]); AddBlock(Core/Script/cameraDolly.py,18,6) ++ def addLine(self, xIn, yIn, zIn, xOut, yOut, zOut, nbSteps): ++ for pos in xrange(nbSteps): ++ x = (xOut - xIn)/nbSteps*pos + xIn; ++ y = (yOut - yIn)/nbSteps*pos + yIn; ++ z = (zOut - zIn)/nbSteps*pos + zIn; ++ self.traj.append([x, y, z]); DelBlock(Core/Script/cameraDolly.py,25,9) -- def moveCamera(period, lockOrientationOnCenter): -- for pos in traj: -- camera.SetPosition(pos) -- if (lockOrientationOnCenter == 1): -- camera.SetOrientation(0.0, 0.0, 0.0) -- elif ( len(orientationList) > 0): -- camera.SetOrientation( orientationList[traj.index(pos)] ) -- cassandra.getRendererPanel().validateViewAndGo() -- time.sleep(period) AddBlock(Core/Script/cameraDolly.py,25,10) ++ def moveCamera(self, period, lockOrientationOnCenter): ++ for pos in self.traj: ++ self.camera.SetPosition(pos) ++ #if (lockOrientationOnCenter == 1): ++ # self.camera.SetOrientation(0.0, 0.0, 0.0) ++ #elif ( len(orientationList) > 0): ++ # self.camera.SetOrientation( orientationList[traj.index(pos)] ) ++ self.renderePanel.UpdateLight() ++ self.renderePanel.validateViewAndGo() ++ time.sleep(period) AddTxtFile(Core/Script/demoDolly.py) AddBlock(Core/scriptTemplates/unixLaunchScriptHeader.txt,33,1) ++ cd $CASSANDRA_HOME DelBlock(Core/src/com/artenum/cassandra/action/menu/AddTxtActor.java,26,1) -- import com.artenum.cassandra.pipeline.VtkObject; AddBlock(Core/src/com/artenum/cassandra/action/menu/AddTxtActor.java,26,1) ++ import com.artenum.cassandra.pipeline.CassandraObject; DelBlock(Core/src/com/artenum/cassandra/action/menu/AddTxtActor.java,70,1) -- VtkObject obj = pipelineManager.addTxtActor(txtActor, "Txt"); AddBlock(Core/src/com/artenum/cassandra/action/menu/AddTxtActor.java,70,1) ++ CassandraObject obj = pipelineManager.addTxtActor(txtActor, "Txt"); DelBlock(Core/src/com/artenum/cassandra/action/menu/RenameVtkObject.java,25,1) -- import com.artenum.cassandra.pipeline.VtkObject; AddBlock(Core/src/com/artenum/cassandra/action/menu/RenameVtkObject.java,25,1) ++ import com.artenum.cassandra.pipeline.CassandraObject; DelBlock(Core/src/com/artenum/cassandra/action/menu/RenameVtkObject.java,57,1) -- private VtkObject currentVtkObject; AddBlock(Core/src/com/artenum/cassandra/action/menu/RenameVtkObject.java,57,1) ++ private CassandraObject currentVtkObject; DelBlock(Core/src/com/artenum/cassandra/action/menu/RenameVtkObject.java,60,1) -- public RenameVtkObject(String itemName, String title, VtkObject object) { AddBlock(Core/src/com/artenum/cassandra/action/menu/RenameVtkObject.java,60,1) ++ public RenameVtkObject(String itemName, String title, CassandraObject object) { DelBlock(Core/src/com/artenum/cassandra/action/menu/RenameVtkObject.java,68,1) -- public void setVtkObject(VtkObject obj) { AddBlock(Core/src/com/artenum/cassandra/action/menu/RenameVtkObject.java,68,1) ++ public void setVtkObject(CassandraObject obj) { DelBlock(Core/src/com/artenum/cassandra/action/menu/RenameVtkObject.java,80,1) -- ((VtkObjectUI) ((VtkObjectCellAdapter) currentVtkObject.getMetaData().get(VtkObject.CELL)).getUI()).setName(newName); AddBlock(Core/src/com/artenum/cassandra/action/menu/RenameVtkObject.java,80,1) ++ ((VtkObjectUI) ((VtkObjectCellAdapter) currentVtkObject.getMetaData().get(CassandraObject.CELL)).getUI()).setName(newName); AddTxtFile(Core/src/com/artenum/cassandra/pipeline/CassandraObject.java) DelBlock(Core/src/com/artenum/cassandra/pipeline/ConnectivityListener.java,48,1) -- public void connectivityChange(VtkObject vtkObject); AddBlock(Core/src/com/artenum/cassandra/pipeline/ConnectivityListener.java,48,1) ++ public void connectivityChange(CassandraObject vtkObject); DelBlock(Core/src/com/artenum/cassandra/pipeline/io/PipelineToJythonExporter.java,48,1) -- import com.artenum.cassandra.pipeline.VtkObject; AddBlock(Core/src/com/artenum/cassandra/pipeline/io/PipelineToJythonExporter.java,48,1) ++ import com.artenum.cassandra.pipeline.CassandraObject; DelBlock(Core/src/com/artenum/cassandra/pipeline/io/PipelineToJythonExporter.java,178,1) -- VtkObject obj; AddBlock(Core/src/com/artenum/cassandra/pipeline/io/PipelineToJythonExporter.java,178,1) ++ CassandraObject obj; DelBlock(Core/src/com/artenum/cassandra/pipeline/io/PipelineToJythonExporter.java,218,1) -- obj = (VtkObject) selectedVtkObjectList.get(key); AddBlock(Core/src/com/artenum/cassandra/pipeline/io/PipelineToJythonExporter.java,218,1) ++ obj = (CassandraObject) selectedVtkObjectList.get(key); DelBlock(Core/src/com/artenum/cassandra/pipeline/io/PipelineToJythonExporter.java,272,1) -- obj = (VtkObject) selectedVtkObjectList.get(key); AddBlock(Core/src/com/artenum/cassandra/pipeline/io/PipelineToJythonExporter.java,272,1) ++ obj = (CassandraObject) selectedVtkObjectList.get(key); DelBlock(Core/src/com/artenum/cassandra/pipeline/io/PipelineToJythonExporter.java,381,1) -- obj = (VtkObject) selectedVtkObjectList.get(key); AddBlock(Core/src/com/artenum/cassandra/pipeline/io/PipelineToJythonExporter.java,381,1) ++ obj = (CassandraObject) selectedVtkObjectList.get(key); DelBlock(Core/src/com/artenum/cassandra/pipeline/io/PipelineToJythonExporter.java,391,1) -- Point cellPosition = ((VtkObjectCellAdapter) obj.getMetaData().get(VtkObject.CELL)).getPosition(); AddBlock(Core/src/com/artenum/cassandra/pipeline/io/PipelineToJythonExporter.java,391,1) ++ Point cellPosition = ((VtkObjectCellAdapter) obj.getMetaData().get(CassandraObject.CELL)).getPosition(); DelBlock(Core/src/com/artenum/cassandra/pipeline/PipeLineManager.java,61,1) -- public void setActorVisible(VtkObject vtkObjectActor, boolean viewActor); AddBlock(Core/src/com/artenum/cassandra/pipeline/PipeLineManager.java,61,1) ++ public void setActorVisible(CassandraObject vtkObjectActor, boolean viewActor); DelBlock(Core/src/com/artenum/cassandra/pipeline/PipeLineManager.java,63,1) -- public VtkObject getVtkObject(Integer vtkObjectId); AddBlock(Core/src/com/artenum/cassandra/pipeline/PipeLineManager.java,63,1) ++ public CassandraObject getVtkObject(Integer vtkObjectId); DelBlock(Core/src/com/artenum/cassandra/pipeline/PipeLineManager.java,79,1) -- public VtkObject addActor(Object actor, String name); AddBlock(Core/src/com/artenum/cassandra/pipeline/PipeLineManager.java,79,1) ++ public CassandraObject addActor(Object actor, String name); DelBlock(Core/src/com/artenum/cassandra/pipeline/PipeLineManager.java,81,1) -- public VtkObject addMapper(Object mapper, String name); AddBlock(Core/src/com/artenum/cassandra/pipeline/PipeLineManager.java,81,1) ++ public CassandraObject addMapper(Object mapper, String name); DelBlock(Core/src/com/artenum/cassandra/pipeline/PipeLineManager.java,83,1) -- public VtkObject addDataSet(Object dataset, String name); AddBlock(Core/src/com/artenum/cassandra/pipeline/PipeLineManager.java,83,1) ++ public CassandraObject addDataSet(Object dataset, String name); DelBlock(Core/src/com/artenum/cassandra/pipeline/PipeLineManager.java,85,1) -- public VtkObject addFilter(Filter filter, String name); AddBlock(Core/src/com/artenum/cassandra/pipeline/PipeLineManager.java,85,1) ++ public CassandraObject addFilter(Filter filter, String name); DelBlock(Core/src/com/artenum/cassandra/pipeline/PipeLineManager.java,87,1) -- public VtkObject addScalarBar(vtkScalarBarActor scalarBar, String name); AddBlock(Core/src/com/artenum/cassandra/pipeline/PipeLineManager.java,87,1) ++ public CassandraObject addScalarBar(vtkScalarBarActor scalarBar, String name); DelBlock(Core/src/com/artenum/cassandra/pipeline/PipeLineManager.java,89,1) -- public VtkObject addLookupTable(vtkLookupTable lookupTable, String name); AddBlock(Core/src/com/artenum/cassandra/pipeline/PipeLineManager.java,89,1) ++ public CassandraObject addLookupTable(vtkLookupTable lookupTable, String name); DelBlock(Core/src/com/artenum/cassandra/pipeline/PipeLineManager.java,91,1) -- public VtkObject addTxtActor(vtkTextActor txtActor, String name); AddBlock(Core/src/com/artenum/cassandra/pipeline/PipeLineManager.java,91,1) ++ public CassandraObject addTxtActor(vtkTextActor txtActor, String name); DelBlock(Core/src/com/artenum/cassandra/pipeline/PipeLineManager.java,95,1) -- public void removeVtkObject(VtkObject vtkObject); AddBlock(Core/src/com/artenum/cassandra/pipeline/PipeLineManager.java,95,1) ++ public void removeVtkObject(CassandraObject vtkObject); DelBlock(Core/src/com/artenum/cassandra/pipeline/PipeLineManager.java,107,1) -- public void notifyConnectivityChange(VtkObject obj); AddBlock(Core/src/com/artenum/cassandra/pipeline/PipeLineManager.java,107,1) ++ public void notifyConnectivityChange(CassandraObject obj); DelBlock(Core/src/com/artenum/cassandra/pipeline/PipeLineManager.java,113,1) -- public void hideInputActor(VtkObject actor, vtkDataSet vtkDataSet); AddBlock(Core/src/com/artenum/cassandra/pipeline/PipeLineManager.java,113,1) ++ public void hideInputActor(CassandraObject actor, vtkDataSet vtkDataSet); DelBlock(Core/src/com/artenum/cassandra/pipeline/PipeLineManager.java,119,1) -- VtkObject getCassandraVtkObjectByTrueVtkObject(vtkObject obj); AddBlock(Core/src/com/artenum/cassandra/pipeline/PipeLineManager.java,119,1) ++ CassandraObject getCassandraVtkObjectByTrueVtkObject(vtkObject obj); DelBlock(Core/src/com/artenum/cassandra/pipeline/VtkObjectListModel.java,53,1) -- * @author Sebastien Jourdain AddBlock(Core/src/com/artenum/cassandra/pipeline/VtkObjectListModel.java,53,2) ++ * @author Sebastien Jourdain, Artenum SARL ++ * @author julien Forest, Artenum sARL AddBlock(Core/src/com/artenum/cassandra/pipeline/VtkObjectListModel.java,86,3) ++ /** ++ * returns the size of the Cassandra objects model list. ++ */ AddBlock(Core/src/com/artenum/cassandra/pipeline/VtkObjectListModel.java,93,3) ++ /** ++ * return the Cassandra object stored in the pipeline manager at the given index. ++ */ DelBlock(Core/src/com/artenum/cassandra/pipeline/VtkObjectListModel.java,100,3) -- public void addVtkObject(VtkObject vtkObject) { -- if (vtkObject.getType() == modelType) { -- vtkObjectList.add(vtkObject); AddBlock(Core/src/com/artenum/cassandra/pipeline/VtkObjectListModel.java,100,8) ++ /** ++ * Add a Cassandra object into the pipeline manager. ++ * ++ * @param cassObject ++ */ ++ public void addVtkObject(CassandraObject cassObject) { ++ if (cassObject.getType() == modelType) { ++ vtkObjectList.add(cassObject); DelBlock(Core/src/com/artenum/cassandra/pipeline/VtkObjectListModel.java,110,1) -- System.err.println("Try to ADD invalide type in the VtkObjectListModel. (Expected: " + modelType + " / Got: " + vtkObject.getType() + ")"); AddBlock(Core/src/com/artenum/cassandra/pipeline/VtkObjectListModel.java,110,1) ++ System.err.println("Try to ADD invalide type in the VtkObjectListModel. (Expected: " + modelType + " / Got: " + cassObject.getType() + ")"); DelBlock(Core/src/com/artenum/cassandra/pipeline/VtkObjectListModel.java,114,1) -- public void removeVtkObject(VtkObject vtkObject) { AddBlock(Core/src/com/artenum/cassandra/pipeline/VtkObjectListModel.java,114,1) ++ public void removeVtkObject(CassandraObject vtkObject) { DelBlock(Core/src/com/artenum/cassandra/pipeline/VtkObjectListModel.java,127,2) -- public VtkObject getVtkObject(int index) { -- return ((VtkObject) getElementAt(index)); AddBlock(Core/src/com/artenum/cassandra/pipeline/VtkObjectListModel.java,127,2) ++ public CassandraObject getVtkObject(int index) { ++ return ((CassandraObject) getElementAt(index)); DelBlock(Core/src/com/artenum/cassandra/pipeline/VtkObjectListModel.java,131,2) -- public VtkObject getVtkObject(Object encapsulateObject) { -- VtkObject currentObject; AddBlock(Core/src/com/artenum/cassandra/pipeline/VtkObjectListModel.java,131,2) ++ public CassandraObject getVtkObject(Object encapsulateObject) { ++ CassandraObject currentObject; DelBlock(Core/src/com/artenum/cassandra/pipeline/VtkObjectListModel.java,134,1) -- currentObject = ((VtkObject) i.next()); AddBlock(Core/src/com/artenum/cassandra/pipeline/VtkObjectListModel.java,134,1) ++ currentObject = ((CassandraObject) i.next()); DelBlock(Core/src/com/artenum/cassandra/pipeline/VtkObjectListModel.java,143,1) -- public int getVtkObjectIndex(VtkObject vtkObject) { AddBlock(Core/src/com/artenum/cassandra/pipeline/VtkObjectListModel.java,143,1) ++ public int getVtkObjectIndex(CassandraObject vtkObject) { DelBlock(Core/src/com/artenum/cassandra/pipeline/VtkObjectListModel.java,147,1) -- public VtkObject getLastVtkObject() { AddBlock(Core/src/com/artenum/cassandra/pipeline/VtkObjectListModel.java,147,1) ++ public CassandraObject getLastVtkObject() { DelBlock(Core/src/com/artenum/cassandra/pipeline/VtkObjectListModel.java,153,1) -- VtkObject vtkObject = (VtkObject) value; AddBlock(Core/src/com/artenum/cassandra/pipeline/VtkObjectListModel.java,153,1) ++ CassandraObject vtkObject = (CassandraObject) value; DelBlock(Core/src/com/artenum/cassandra/ui/ActorList.java,26,1) -- import com.artenum.cassandra.pipeline.VtkObject; AddBlock(Core/src/com/artenum/cassandra/ui/ActorList.java,26,1) ++ import com.artenum.cassandra.pipeline.CassandraObject; DelBlock(Core/src/com/artenum/cassandra/ui/ActorList.java,106,1) -- VtkObject vtkObject = model.getVtkObject(rowIndex); AddBlock(Core/src/com/artenum/cassandra/ui/ActorList.java,106,1) ++ CassandraObject vtkObject = model.getVtkObject(rowIndex); DelBlock(Core/src/com/artenum/cassandra/ui/ActorList.java,109,1) -- return Boolean.valueOf((String) vtkObject.getMetaData().get(VtkObject.ACTOR_VISIBLE)); AddBlock(Core/src/com/artenum/cassandra/ui/ActorList.java,109,1) ++ return Boolean.valueOf((String) vtkObject.getMetaData().get(CassandraObject.ACTOR_VISIBLE)); DelBlock(Core/src/com/artenum/cassandra/ui/ActorList.java,143,1) -- VtkObject vtkObject = model.getVtkObject(row); AddBlock(Core/src/com/artenum/cassandra/ui/ActorList.java,143,1) ++ CassandraObject vtkObject = model.getVtkObject(row); DelBlock(Core/src/com/artenum/cassandra/ui/CassandraTree.java,27,1) -- import com.artenum.cassandra.pipeline.VtkObject; AddBlock(Core/src/com/artenum/cassandra/ui/CassandraTree.java,27,1) ++ import com.artenum.cassandra.pipeline.CassandraObject; DelBlock(Core/src/com/artenum/cassandra/ui/CassandraTree.java,85,2) -- if (node instanceof VtkObject) { -- vtkPopupMenu.showPopupMenu(e.getComponent(), e.getX(), e.getY(), (VtkObject) node); AddBlock(Core/src/com/artenum/cassandra/ui/CassandraTree.java,85,2) ++ if (node instanceof CassandraObject) { ++ vtkPopupMenu.showPopupMenu(e.getComponent(), e.getX(), e.getY(), (CassandraObject) node); DelBlock(Core/src/com/artenum/cassandra/ui/dialog/LookUpTableControlDialog.java,26,1) -- import com.artenum.cassandra.pipeline.VtkObject; AddBlock(Core/src/com/artenum/cassandra/ui/dialog/LookUpTableControlDialog.java,26,1) ++ import com.artenum.cassandra.pipeline.CassandraObject; DelBlock(Core/src/com/artenum/cassandra/ui/dialog/LookUpTableControlDialog.java,77,1) -- private VtkObject lookupTable; AddBlock(Core/src/com/artenum/cassandra/ui/dialog/LookUpTableControlDialog.java,77,1) ++ private CassandraObject lookupTable; DelBlock(Core/src/com/artenum/cassandra/ui/dialog/LookUpTableControlDialog.java,203,1) -- public void setLookupTable(VtkObject lookupTable) { AddBlock(Core/src/com/artenum/cassandra/ui/dialog/LookUpTableControlDialog.java,203,1) ++ public void setLookupTable(CassandraObject lookupTable) { DelBlock(Core/src/com/artenum/cassandra/ui/dialog/LookUpTableControlDialog.java,282,1) -- double[] range = ((vtkDataSet) ((VtkObject) obj).getVtkObject()).GetScalarRange(); AddBlock(Core/src/com/artenum/cassandra/ui/dialog/LookUpTableControlDialog.java,282,1) ++ double[] range = ((vtkDataSet) ((CassandraObject) obj).getVtkObject()).GetScalarRange(); DelBlock(Core/src/com/artenum/cassandra/ui/dialog/LookUpTableControlDialog.java,294,1) -- range = ((vtkDataSet) ((VtkObject) selectedObjects[i]).getVtkObject()).GetScalarRange(); AddBlock(Core/src/com/artenum/cassandra/ui/dialog/LookUpTableControlDialog.java,294,1) ++ range = ((vtkDataSet) ((CassandraObject) selectedObjects[i]).getVtkObject()).GetScalarRange(); DelBlock(Core/src/com/artenum/cassandra/ui/dialog/ScalarBarControlDialog.java,26,1) -- import com.artenum.cassandra.pipeline.VtkObject; AddBlock(Core/src/com/artenum/cassandra/ui/dialog/ScalarBarControlDialog.java,26,1) ++ import com.artenum.cassandra.pipeline.CassandraObject; DelBlock(Core/src/com/artenum/cassandra/ui/dialog/ScalarBarControlDialog.java,73,1) -- private VtkObject scalarBar; AddBlock(Core/src/com/artenum/cassandra/ui/dialog/ScalarBarControlDialog.java,73,1) ++ private CassandraObject scalarBar; DelBlock(Core/src/com/artenum/cassandra/ui/dialog/ScalarBarControlDialog.java,179,1) -- public void setScalarBar(VtkObject scalarBar) { AddBlock(Core/src/com/artenum/cassandra/ui/dialog/ScalarBarControlDialog.java,179,1) ++ public void setScalarBar(CassandraObject scalarBar) { DelBlock(Core/src/com/artenum/cassandra/ui/dialog/ScalarBarControlDialog.java,204,1) -- getVtkScalarBar().SetLookupTable((vtkLookupTable) ((VtkObject) lookupTableModel.getSelectedItem()).getVtkObject()); AddBlock(Core/src/com/artenum/cassandra/ui/dialog/ScalarBarControlDialog.java,204,1) ++ getVtkScalarBar().SetLookupTable((vtkLookupTable) ((CassandraObject) lookupTableModel.getSelectedItem()).getVtkObject()); DelBlock(Core/src/com/artenum/cassandra/ui/dialog/TxtActorControlDialog.java,26,1) -- import com.artenum.cassandra.pipeline.VtkObject; AddBlock(Core/src/com/artenum/cassandra/ui/dialog/TxtActorControlDialog.java,26,1) ++ import com.artenum.cassandra.pipeline.CassandraObject; DelBlock(Core/src/com/artenum/cassandra/ui/dialog/TxtActorControlDialog.java,72,1) -- private VtkObject currentVtkObject; AddBlock(Core/src/com/artenum/cassandra/ui/dialog/TxtActorControlDialog.java,72,1) ++ private CassandraObject currentVtkObject; DelBlock(Core/src/com/artenum/cassandra/ui/dialog/TxtActorControlDialog.java,170,1) -- public void setTxtActor(VtkObject currentTxtActor) { AddBlock(Core/src/com/artenum/cassandra/ui/dialog/TxtActorControlDialog.java,170,1) ++ public void setTxtActor(CassandraObject currentTxtActor) { DelBlock(Core/src/com/artenum/cassandra/ui/popup/ActorPopupMenu.java,28,1) -- import com.artenum.cassandra.pipeline.VtkObject; AddBlock(Core/src/com/artenum/cassandra/ui/popup/ActorPopupMenu.java,28,1) ++ import com.artenum.cassandra.pipeline.CassandraObject; DelBlock(Core/src/com/artenum/cassandra/ui/popup/ActorPopupMenu.java,46,1) -- import javax.swing.JComboBox; DelBlock(Core/src/com/artenum/cassandra/ui/popup/ActorPopupMenu.java,48,1) -- import javax.swing.JPanel; DelBlock(Core/src/com/artenum/cassandra/ui/popup/ActorPopupMenu.java,77,1) -- * @author Sebastien Jourdain AddBlock(Core/src/com/artenum/cassandra/ui/popup/ActorPopupMenu.java,77,1) ++ * @author Sebastien Jourdain, Artenum SARL DelBlock(Core/src/com/artenum/cassandra/ui/popup/ActorPopupMenu.java,96,1) -- private VtkObject currentVtkObject; AddBlock(Core/src/com/artenum/cassandra/ui/popup/ActorPopupMenu.java,96,1) ++ private CassandraObject currentVtkObject; DelBlock(Core/src/com/artenum/cassandra/ui/popup/ActorPopupMenu.java,208,1) -- public void setCurrentVtkOject(VtkObject currentVtkObject) { AddBlock(Core/src/com/artenum/cassandra/ui/popup/ActorPopupMenu.java,208,1) ++ public void setCurrentVtkOject(CassandraObject currentVtkObject) { DelBlock(Core/src/com/artenum/cassandra/ui/popup/ActorPopupMenu.java,221,1) -- if (currentVtkObject.getMetaData().get(VtkObject.ACTOR_VISIBLE) == null) { AddBlock(Core/src/com/artenum/cassandra/ui/popup/ActorPopupMenu.java,221,1) ++ if (currentVtkObject.getMetaData().get(CassandraObject.ACTOR_VISIBLE) == null) { DelBlock(Core/src/com/artenum/cassandra/ui/popup/ActorPopupMenu.java,224,1) -- viewActor.setSelected(((String) currentVtkObject.getMetaData().get(VtkObject.ACTOR_VISIBLE)).equals("true")); AddBlock(Core/src/com/artenum/cassandra/ui/popup/ActorPopupMenu.java,224,1) ++ viewActor.setSelected(((String) currentVtkObject.getMetaData().get(CassandraObject.ACTOR_VISIBLE)).equals("true")); DelBlock(Core/src/com/artenum/cassandra/ui/popup/DataSetPopupMenu.java,28,1) -- import com.artenum.cassandra.pipeline.VtkObject; AddBlock(Core/src/com/artenum/cassandra/ui/popup/DataSetPopupMenu.java,28,1) ++ import com.artenum.cassandra.pipeline.CassandraObject; DelBlock(Core/src/com/artenum/cassandra/ui/popup/DataSetPopupMenu.java,73,1) -- private VtkObject currentVtkObject; AddBlock(Core/src/com/artenum/cassandra/ui/popup/DataSetPopupMenu.java,73,1) ++ private CassandraObject currentVtkObject; DelBlock(Core/src/com/artenum/cassandra/ui/popup/DataSetPopupMenu.java,123,1) -- public void setCurrentVtkOject(VtkObject currentVtkObject) { AddBlock(Core/src/com/artenum/cassandra/ui/popup/DataSetPopupMenu.java,123,1) ++ public void setCurrentVtkOject(CassandraObject currentVtkObject) { DelBlock(Core/src/com/artenum/cassandra/ui/popup/LookupTablePopupMenu.java,28,1) -- import com.artenum.cassandra.pipeline.VtkObject; AddBlock(Core/src/com/artenum/cassandra/ui/popup/LookupTablePopupMenu.java,28,1) ++ import com.artenum.cassandra.pipeline.CassandraObject; DelBlock(Core/src/com/artenum/cassandra/ui/popup/LookupTablePopupMenu.java,73,1) -- private VtkObject currentVtkObject; AddBlock(Core/src/com/artenum/cassandra/ui/popup/LookupTablePopupMenu.java,73,1) ++ private CassandraObject currentVtkObject; DelBlock(Core/src/com/artenum/cassandra/ui/popup/LookupTablePopupMenu.java,118,1) -- VtkObject mapper = null; AddBlock(Core/src/com/artenum/cassandra/ui/popup/LookupTablePopupMenu.java,118,1) ++ CassandraObject mapper = null; DelBlock(Core/src/com/artenum/cassandra/ui/popup/LookupTablePopupMenu.java,122,1) -- mapper = (VtkObject) i.next(); AddBlock(Core/src/com/artenum/cassandra/ui/popup/LookupTablePopupMenu.java,122,1) ++ mapper = (CassandraObject) i.next(); DelBlock(Core/src/com/artenum/cassandra/ui/popup/LookupTablePopupMenu.java,129,1) -- public void setCurrentVtkOject(VtkObject currentVtkObject) { AddBlock(Core/src/com/artenum/cassandra/ui/popup/LookupTablePopupMenu.java,129,1) ++ public void setCurrentVtkOject(CassandraObject currentVtkObject) { DelBlock(Core/src/com/artenum/cassandra/ui/popup/MapperPopupMenu.java,28,1) -- import com.artenum.cassandra.pipeline.VtkObject; AddBlock(Core/src/com/artenum/cassandra/ui/popup/MapperPopupMenu.java,28,1) ++ import com.artenum.cassandra.pipeline.CassandraObject; DelBlock(Core/src/com/artenum/cassandra/ui/popup/MapperPopupMenu.java,78,1) -- private VtkObject currentVtkObject; AddBlock(Core/src/com/artenum/cassandra/ui/popup/MapperPopupMenu.java,78,1) ++ private CassandraObject currentVtkObject; DelBlock(Core/src/com/artenum/cassandra/ui/popup/MapperPopupMenu.java,127,1) -- VtkObject lookupTable = null; AddBlock(Core/src/com/artenum/cassandra/ui/popup/MapperPopupMenu.java,127,1) ++ CassandraObject lookupTable = null; DelBlock(Core/src/com/artenum/cassandra/ui/popup/MapperPopupMenu.java,131,1) -- lookupTable = (VtkObject) i.next(); AddBlock(Core/src/com/artenum/cassandra/ui/popup/MapperPopupMenu.java,131,1) ++ lookupTable = (CassandraObject) i.next(); DelBlock(Core/src/com/artenum/cassandra/ui/popup/MapperPopupMenu.java,138,1) -- public void setCurrentVtkOject(VtkObject currentVtkObject) { AddBlock(Core/src/com/artenum/cassandra/ui/popup/MapperPopupMenu.java,138,1) ++ public void setCurrentVtkOject(CassandraObject currentVtkObject) { DelBlock(Core/src/com/artenum/cassandra/ui/popup/SaveDataSetToVtkFilePopupMenu.java,12,1) -- import com.artenum.cassandra.pipeline.VtkObject; AddBlock(Core/src/com/artenum/cassandra/ui/popup/SaveDataSetToVtkFilePopupMenu.java,12,1) ++ import com.artenum.cassandra.pipeline.CassandraObject; DelBlock(Core/src/com/artenum/cassandra/ui/popup/SaveDataSetToVtkFilePopupMenu.java,103,1) -- writeVtkDataSetToFile((vtkDataSet) ((VtkObject) input.getSelectedItem()).getVtkObject(), vtkFile.getAbsolutePath()); AddBlock(Core/src/com/artenum/cassandra/ui/popup/SaveDataSetToVtkFilePopupMenu.java,103,1) ++ writeVtkDataSetToFile((vtkDataSet) ((CassandraObject) input.getSelectedItem()).getVtkObject(), vtkFile.getAbsolutePath()); DelBlock(Core/src/com/artenum/cassandra/ui/popup/ScalarBarPopupMenu.java,28,1) -- import com.artenum.cassandra.pipeline.VtkObject; AddBlock(Core/src/com/artenum/cassandra/ui/popup/ScalarBarPopupMenu.java,28,1) ++ import com.artenum.cassandra.pipeline.CassandraObject; DelBlock(Core/src/com/artenum/cassandra/ui/popup/ScalarBarPopupMenu.java,71,1) -- private VtkObject currentVtkObject; AddBlock(Core/src/com/artenum/cassandra/ui/popup/ScalarBarPopupMenu.java,71,1) ++ private CassandraObject currentVtkObject; DelBlock(Core/src/com/artenum/cassandra/ui/popup/ScalarBarPopupMenu.java,108,1) -- public void setCurrentVtkOject(VtkObject currentVtkObject) { AddBlock(Core/src/com/artenum/cassandra/ui/popup/ScalarBarPopupMenu.java,108,1) ++ public void setCurrentVtkOject(CassandraObject currentVtkObject) { DelBlock(Core/src/com/artenum/cassandra/ui/popup/ScalarBarPopupMenu.java,120,1) -- VtkObject lookupTable = null; AddBlock(Core/src/com/artenum/cassandra/ui/popup/ScalarBarPopupMenu.java,120,1) ++ CassandraObject lookupTable = null; DelBlock(Core/src/com/artenum/cassandra/ui/popup/ScalarBarPopupMenu.java,124,1) -- lookupTable = (VtkObject) i.next(); AddBlock(Core/src/com/artenum/cassandra/ui/popup/ScalarBarPopupMenu.java,124,1) ++ lookupTable = (CassandraObject) i.next(); DelBlock(Core/src/com/artenum/cassandra/ui/popup/TxtActorPopupMenu.java,28,1) -- import com.artenum.cassandra.pipeline.VtkObject; AddBlock(Core/src/com/artenum/cassandra/ui/popup/TxtActorPopupMenu.java,28,1) ++ import com.artenum.cassandra.pipeline.CassandraObject; DelBlock(Core/src/com/artenum/cassandra/ui/popup/TxtActorPopupMenu.java,65,1) -- private VtkObject currentVtkObject; AddBlock(Core/src/com/artenum/cassandra/ui/popup/TxtActorPopupMenu.java,65,1) ++ private CassandraObject currentVtkObject; DelBlock(Core/src/com/artenum/cassandra/ui/popup/TxtActorPopupMenu.java,90,1) -- public void setCurrentVtkOject(VtkObject currentVtkObject) { AddBlock(Core/src/com/artenum/cassandra/ui/popup/TxtActorPopupMenu.java,90,1) ++ public void setCurrentVtkOject(CassandraObject currentVtkObject) { DelBlock(Core/src/com/artenum/cassandra/ui/popup/VtkObjectPopupMenu.java,25,1) -- import com.artenum.cassandra.pipeline.VtkObject; AddBlock(Core/src/com/artenum/cassandra/ui/popup/VtkObjectPopupMenu.java,25,1) ++ import com.artenum.cassandra.pipeline.CassandraObject; DelBlock(Core/src/com/artenum/cassandra/ui/popup/VtkObjectPopupMenu.java,49,1) -- public void setCurrentVtkOject(VtkObject currentVtkObject); AddBlock(Core/src/com/artenum/cassandra/ui/popup/VtkObjectPopupMenu.java,49,1) ++ public void setCurrentVtkOject(CassandraObject currentVtkObject); DelBlock(Core/src/com/artenum/cassandra/ui/VtkObjectPopupMenuDipatcher.java,27,1) -- import com.artenum.cassandra.pipeline.VtkObject; AddBlock(Core/src/com/artenum/cassandra/ui/VtkObjectPopupMenuDipatcher.java,27,1) ++ import com.artenum.cassandra.pipeline.CassandraObject; DelBlock(Core/src/com/artenum/cassandra/ui/VtkObjectPopupMenuDipatcher.java,63,1) -- private VtkObject vtkObject; AddBlock(Core/src/com/artenum/cassandra/ui/VtkObjectPopupMenuDipatcher.java,63,1) ++ private CassandraObject vtkObject; DelBlock(Core/src/com/artenum/cassandra/ui/VtkObjectPopupMenuDipatcher.java,89,1) -- JPopupMenu result = (JPopupMenu) vtkObject.getMetaData().get(VtkObject.POPUP_MENU); AddBlock(Core/src/com/artenum/cassandra/ui/VtkObjectPopupMenuDipatcher.java,89,1) ++ JPopupMenu result = (JPopupMenu) vtkObject.getMetaData().get(CassandraObject.POPUP_MENU); DelBlock(Core/src/com/artenum/cassandra/ui/VtkObjectPopupMenuDipatcher.java,95,1) -- case VtkObject.ACTOR: AddBlock(Core/src/com/artenum/cassandra/ui/VtkObjectPopupMenuDipatcher.java,95,1) ++ case CassandraObject.ACTOR: DelBlock(Core/src/com/artenum/cassandra/ui/VtkObjectPopupMenuDipatcher.java,97,1) -- case VtkObject.SCALAR_BAR: AddBlock(Core/src/com/artenum/cassandra/ui/VtkObjectPopupMenuDipatcher.java,97,1) ++ case CassandraObject.SCALAR_BAR: DelBlock(Core/src/com/artenum/cassandra/ui/VtkObjectPopupMenuDipatcher.java,99,1) -- case VtkObject.TXT_ACTOR: AddBlock(Core/src/com/artenum/cassandra/ui/VtkObjectPopupMenuDipatcher.java,99,1) ++ case CassandraObject.TXT_ACTOR: DelBlock(Core/src/com/artenum/cassandra/ui/VtkObjectPopupMenuDipatcher.java,101,1) -- case VtkObject.MAPPER: AddBlock(Core/src/com/artenum/cassandra/ui/VtkObjectPopupMenuDipatcher.java,101,1) ++ case CassandraObject.MAPPER: DelBlock(Core/src/com/artenum/cassandra/ui/VtkObjectPopupMenuDipatcher.java,103,1) -- case VtkObject.DATASET: AddBlock(Core/src/com/artenum/cassandra/ui/VtkObjectPopupMenuDipatcher.java,103,1) ++ case CassandraObject.DATASET: DelBlock(Core/src/com/artenum/cassandra/ui/VtkObjectPopupMenuDipatcher.java,105,1) -- case VtkObject.LOOKUP_TABLE: AddBlock(Core/src/com/artenum/cassandra/ui/VtkObjectPopupMenuDipatcher.java,105,1) ++ case CassandraObject.LOOKUP_TABLE: DelBlock(Core/src/com/artenum/cassandra/ui/VtkObjectPopupMenuDipatcher.java,112,1) -- public void showPopupMenu(Component invoker, int x, int y, VtkObject vtkObject) { AddBlock(Core/src/com/artenum/cassandra/ui/VtkObjectPopupMenuDipatcher.java,112,1) ++ public void showPopupMenu(Component invoker, int x, int y, CassandraObject vtkObject) { DelBlock(Core/src/com/artenum/cassandra/util/CassandraToolBox.java,26,1) -- import com.artenum.cassandra.pipeline.VtkObject; AddBlock(Core/src/com/artenum/cassandra/util/CassandraToolBox.java,26,1) ++ import com.artenum.cassandra.pipeline.CassandraObject; DelBlock(Core/src/com/artenum/cassandra/util/CassandraToolBox.java,106,1) -- vtkMapper mapper = (vtkMapper) ((VtkObject) i.next()).getVtkObject(); AddBlock(Core/src/com/artenum/cassandra/util/CassandraToolBox.java,106,1) ++ vtkMapper mapper = (vtkMapper) ((CassandraObject) i.next()).getVtkObject(); DelBlock(Core/src/com/artenum/cassandra/util/VtkObjectComboBoxModel.java,25,1) -- import com.artenum.cassandra.pipeline.VtkObject; AddBlock(Core/src/com/artenum/cassandra/util/VtkObjectComboBoxModel.java,25,1) ++ import com.artenum.cassandra.pipeline.CassandraObject; DelBlock(Core/src/com/artenum/cassandra/util/VtkObjectComboBoxModel.java,52,2) -- private VtkObject filteredItem; -- private VtkObject selectedItem; AddBlock(Core/src/com/artenum/cassandra/util/VtkObjectComboBoxModel.java,52,2) ++ private CassandraObject filteredItem; ++ private CassandraObject selectedItem; DelBlock(Core/src/com/artenum/cassandra/util/VtkObjectComboBoxModel.java,57,1) -- public VtkObjectComboBoxModel(VtkObjectListModel listModel, VtkObject filteredItem) { AddBlock(Core/src/com/artenum/cassandra/util/VtkObjectComboBoxModel.java,57,1) ++ public VtkObjectComboBoxModel(VtkObjectListModel listModel, CassandraObject filteredItem) { DelBlock(Core/src/com/artenum/cassandra/util/VtkObjectComboBoxModel.java,69,1) -- this.selectedItem = (VtkObject) anItem; AddBlock(Core/src/com/artenum/cassandra/util/VtkObjectComboBoxModel.java,69,1) ++ this.selectedItem = (CassandraObject) anItem; DelBlock(Core/src/com/artenum/cassandra/util/VtkObjectInformationPane.java,12,1) -- import com.artenum.cassandra.pipeline.VtkObject; AddBlock(Core/src/com/artenum/cassandra/util/VtkObjectInformationPane.java,12,1) ++ import com.artenum.cassandra.pipeline.CassandraObject; DelBlock(Core/src/com/artenum/cassandra/util/VtkObjectInformationPane.java,21,1) -- public VtkObjectInformationPane(VtkObject currentVtkObject) { AddBlock(Core/src/com/artenum/cassandra/util/VtkObjectInformationPane.java,21,1) ++ public VtkObjectInformationPane(CassandraObject currentVtkObject) { DelBlock(CrossDepSrc/build.xml,26,1) -- AddBinaryFile(Nlogo_cassandra-notext-crop.tif) AddBinaryFile(Nlogo_cassandra-notext.tif) AddBlock(Pipeline/build.xml,4,2) ++ <property name="cassandra.root" value=".." /> ++ DelBlock(Pipeline/build.xml,7,1) -- <property file="config.properties" /> AddBlock(Pipeline/build.xml,7,6) ++ ++ ++ <!-- <property file="config.properties" /> --> ++ ++ <property file="../config.properties" /> ++ DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/CascadeRemoveManager.java,30,1) -- public void removeScalarBar(VtkObject objToRemove) { AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/CascadeRemoveManager.java,30,1) ++ public void removeScalarBar(CassandraObject objToRemove) { DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/CascadeRemoveManager.java,36,1) -- public void removeActor(VtkObject objToRemove) { AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/CascadeRemoveManager.java,36,1) ++ public void removeActor(CassandraObject objToRemove) { DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/CascadeRemoveManager.java,42,1) -- public void removeLookupTable(VtkObject objToRemove) { AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/CascadeRemoveManager.java,42,1) ++ public void removeLookupTable(CassandraObject objToRemove) { DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/CascadeRemoveManager.java,48,1) -- public void removeFilter(VtkObject objToRemove) { AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/CascadeRemoveManager.java,48,1) ++ public void removeFilter(CassandraObject objToRemove) { DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/CascadeRemoveManager.java,54,1) -- public void removeMapper(VtkObject objToRemove) { AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/CascadeRemoveManager.java,54,1) ++ public void removeMapper(CassandraObject objToRemove) { DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/CascadeRemoveManager.java,60,1) -- public void removeDataSet(VtkObject objToRemove) { AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/CascadeRemoveManager.java,60,1) ++ public void removeDataSet(CassandraObject objToRemove) { DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/CascadeRemoveManager.java,67,1) -- private void removeScalarBarWithOutQuestion(VtkObject objToRemove) { AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/CascadeRemoveManager.java,67,1) ++ private void removeScalarBarWithOutQuestion(CassandraObject objToRemove) { DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/CascadeRemoveManager.java,71,1) -- private void removeActorWithOutQuestion(VtkObject objToRemove) { AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/CascadeRemoveManager.java,71,1) ++ private void removeActorWithOutQuestion(CassandraObject objToRemove) { DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/CascadeRemoveManager.java,75,1) -- private void removeLookupTableWithOutQuestion(VtkObject objToRemove) { AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/CascadeRemoveManager.java,75,1) ++ private void removeLookupTableWithOutQuestion(CassandraObject objToRemove) { DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/CascadeRemoveManager.java,77,1) -- VtkObject vtkObject = null; AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/CascadeRemoveManager.java,77,1) ++ CassandraObject vtkObject = null; DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/CascadeRemoveManager.java,79,1) -- vtkObject = (VtkObject) objList[i]; AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/CascadeRemoveManager.java,79,1) ++ vtkObject = (CassandraObject) objList[i]; DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/CascadeRemoveManager.java,89,1) -- private void removeFilterWithOutQuestion(VtkObject objToRemove) { AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/CascadeRemoveManager.java,89,1) ++ private void removeFilterWithOutQuestion(CassandraObject objToRemove) { DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/CascadeRemoveManager.java,91,1) -- VtkObject vtkObject = null; AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/CascadeRemoveManager.java,91,1) ++ CassandraObject vtkObject = null; DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/CascadeRemoveManager.java,114,1) -- private void removeMapperWithOutQuestion(VtkObject objToRemove) { AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/CascadeRemoveManager.java,114,1) ++ private void removeMapperWithOutQuestion(CassandraObject objToRemove) { DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/CascadeRemoveManager.java,117,1) -- VtkObject vtkObject = null; AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/CascadeRemoveManager.java,117,1) ++ CassandraObject vtkObject = null; DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/CascadeRemoveManager.java,119,1) -- vtkObject = (VtkObject) objList[i]; AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/CascadeRemoveManager.java,119,1) ++ vtkObject = (CassandraObject) objList[i]; DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/CascadeRemoveManager.java,128,1) -- vtkObject = (VtkObject) objList[i]; AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/CascadeRemoveManager.java,128,1) ++ vtkObject = (CassandraObject) objList[i]; DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/CascadeRemoveManager.java,146,1) -- private void removeDataSetWithOutQuestion(VtkObject objToRemove) { AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/CascadeRemoveManager.java,146,1) ++ private void removeDataSetWithOutQuestion(CassandraObject objToRemove) { DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/CascadeRemoveManager.java,149,1) -- VtkObject vtkObject = null; AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/CascadeRemoveManager.java,149,1) ++ CassandraObject vtkObject = null; DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/CascadeRemoveManager.java,151,1) -- vtkObject = (VtkObject) objList[i]; AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/CascadeRemoveManager.java,151,1) ++ vtkObject = (CassandraObject) objList[i]; DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/CascadeRemoveManager.java,160,1) -- vtkObject = (VtkObject) objList[i]; AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/CascadeRemoveManager.java,160,1) ++ vtkObject = (CassandraObject) objList[i]; DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkObjectCellAdapter.java,11,1) -- import com.artenum.cassandra.pipeline.VtkObject; AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkObjectCellAdapter.java,11,1) ++ import com.artenum.cassandra.pipeline.CassandraObject; DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkObjectCellAdapter.java,32,1) -- * @author Sebastien AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkObjectCellAdapter.java,32,7) ++ * Implementation of the Cell interface for the graphical representation of the ++ * pipeline manager. ++ * ++ * @author Sebastien Jourdain, Artenum SARL ++ * @julien Forest, Artenum SARL ++ * ++ * @version 0.2 DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkObjectCellAdapter.java,41,1) -- private VtkObject object; AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkObjectCellAdapter.java,41,1) ++ private CassandraObject object; AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkObjectCellAdapter.java,43,1) ++ /** define the renderer of the cell and its position */ DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkObjectCellAdapter.java,51,1) -- public VtkObjectCellAdapter(VtkObject object) { AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkObjectCellAdapter.java,51,1) ++ public VtkObjectCellAdapter(CassandraObject object) { DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkObjectCellAdapter.java,130,1) -- public VtkObject getVtkObject() { AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkObjectCellAdapter.java,130,4) ++ /** ++ * @return the Cassandra object linked to the current Cell. ++ */ ++ public CassandraObject getVtkObject() { AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkObjectCellAdapter.java,141,4) ++ /** ++ * ++ * @return return the position of the current cell in the Pipeline panel. ++ */ AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkObjectCellAdapter.java,149,4) ++ /** ++ * Set the position of the current cell in the Pipeline panel. ++ * @param point ++ */ DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkObjectUI.java,14,1) -- * @author Sebastien AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkObjectUI.java,14,1) ++ * @author Sebastien Jourdain, Artenum SARL DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkObjectUI1.java,11,1) -- import com.artenum.cassandra.pipeline.VtkObject; AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkObjectUI1.java,11,1) ++ import com.artenum.cassandra.pipeline.CassandraObject; DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkObjectUI1.java,25,1) -- private VtkObject object; AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkObjectUI1.java,25,1) ++ private CassandraObject object; DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkObjectUI1.java,31,1) -- public VtkObjectUI1(VtkObject object) { AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkObjectUI1.java,31,1) ++ public VtkObjectUI1(CassandraObject object) { DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkObjectUI1.java,46,1) -- case VtkObject.ACTOR: AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkObjectUI1.java,46,1) ++ case CassandraObject.ACTOR: DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkObjectUI1.java,59,1) -- case VtkObject.MAPPER: AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkObjectUI1.java,59,1) ++ case CassandraObject.MAPPER: DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkObjectUI1.java,69,1) -- case VtkObject.DATASET: AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkObjectUI1.java,69,1) ++ case CassandraObject.DATASET: DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkObjectUI1.java,78,1) -- case VtkObject.FILTER: AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkObjectUI1.java,78,1) ++ case CassandraObject.FILTER: DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkObjectUI1.java,87,1) -- case VtkObject.LOOKUP_TABLE: AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkObjectUI1.java,87,1) ++ case CassandraObject.LOOKUP_TABLE: DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkObjectUI1.java,96,1) -- case VtkObject.SCALAR_BAR: AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkObjectUI1.java,96,1) ++ case CassandraObject.SCALAR_BAR: DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkObjectUI1.java,108,1) -- case VtkObject.TXT_ACTOR: AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkObjectUI1.java,108,1) ++ case CassandraObject.TXT_ACTOR: DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkObjectUI1.java,169,3) -- if (((object.getType() == VtkObject.ACTOR) || (object.getType() == VtkObject.SCALAR_BAR) || (object.getType() == VtkObject.TXT_ACTOR)) && -- (object.getMetaData().get(VtkObject.ACTOR_VISIBLE) != null)) { -- if (((String) object.getMetaData().get(VtkObject.ACTOR_VISIBLE)).equals("true")) { AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkObjectUI1.java,169,3) ++ if (((object.getType() == CassandraObject.ACTOR) || (object.getType() == CassandraObject.SCALAR_BAR) || (object.getType() == CassandraObject.TXT_ACTOR)) && ++ (object.getMetaData().get(CassandraObject.ACTOR_VISIBLE) != null)) { ++ if (((String) object.getMetaData().get(CassandraObject.ACTOR_VISIBLE)).equals("true")) { DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkObjectUI2.java,11,1) -- import com.artenum.cassandra.pipeline.VtkObject; AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkObjectUI2.java,11,1) ++ import com.artenum.cassandra.pipeline.CassandraObject; DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkObjectUI2.java,28,1) -- * @author Sebastien ant Juju AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkObjectUI2.java,28,2) ++ * @author Sebastien Jourdain, Artenum SARL ++ * @author Julien Forest, Artenum SARL DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkObjectUI2.java,32,1) -- private VtkObject object; AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkObjectUI2.java,32,1) ++ private CassandraObject object; AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkObjectUI2.java,37,1) ++ /** Position of the Icon corresponding to the Cell. */ DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkObjectUI2.java,53,1) -- * @return the deltaX AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkObjectUI2.java,53,1) ++ * @return deltaX, the horizontal cell padding. DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkObjectUI2.java,60,1) -- * @return the deltaY AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkObjectUI2.java,60,1) ++ * @return deltaY, the vertical cell padding. DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkObjectUI2.java,66,1) -- public VtkObjectUI2(VtkObject object) { AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkObjectUI2.java,66,15) ++ /** ++ * Build a cell rendering for the Cassandra object given in argument and set its ++ * automatically its default position for a later rendering. ++ * ++ * By default, the cells are disposed in 7 columns, one for each type of cell ++ * (i.e Actor, Mapper, DataSet, Filter, LookupTable, ScalarBar, TextActor). ++ * By default the vertical position of the cell is defined column by column on the ++ * basis of the LocalTypeId of the given Cassandra object multiplied by the ++ * vertical padding. ++ * ++ * NB: For this reason, we recommend that each CassandraObject has a unique LocalTypeId ++ * in order to avoid to be positioned on the same place than another cell by default. ++ * @param object ++ */ ++ public VtkObjectUI2(CassandraObject object) { AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkObjectUI2.java,95,4) ++ //System.out.println("DEBUG - In VtkObjectUI2, object type: " + object.getType()); ++ //System.out.println("DEBUG - In VtkObjectUI2, object LocalTypeId().intValue(): " + object.getLocalTypeId().intValue() ) ; ++ //System.out.println("DEBUG - Position before: " + position.x + ", " + position.y); ++ DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkObjectUI2.java,100,1) -- case VtkObject.ACTOR: AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkObjectUI2.java,100,1) ++ case CassandraObject.ACTOR: DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkObjectUI2.java,106,1) -- case VtkObject.MAPPER: AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkObjectUI2.java,106,1) ++ case CassandraObject.MAPPER: DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkObjectUI2.java,112,1) -- case VtkObject.DATASET: AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkObjectUI2.java,112,1) ++ case CassandraObject.DATASET: DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkObjectUI2.java,117,1) -- case VtkObject.FILTER: AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkObjectUI2.java,117,1) ++ case CassandraObject.FILTER: DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkObjectUI2.java,122,1) -- case VtkObject.LOOKUP_TABLE: AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkObjectUI2.java,122,1) ++ case CassandraObject.LOOKUP_TABLE: DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkObjectUI2.java,129,1) -- case VtkObject.SCALAR_BAR: AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkObjectUI2.java,129,1) ++ case CassandraObject.SCALAR_BAR: DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkObjectUI2.java,135,1) -- case VtkObject.TXT_ACTOR: AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkObjectUI2.java,135,1) ++ case CassandraObject.TXT_ACTOR: AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkObjectUI2.java,143,1) ++ //System.out.println("DEBUG - Position after: " + position.x + ", " + position.y); AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkObjectUI2.java,147,3) ++ /** ++ * Set the name (and displayed label) of the current cell. ++ */ AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkObjectUI2.java,165,3) ++ /** ++ * save the position of the current cell. ++ */ DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkObjectUI2.java,205,3) -- if (((object.getType() == VtkObject.ACTOR) || (object.getType() == VtkObject.SCALAR_BAR) || (object.getType() == VtkObject.TXT_ACTOR)) && -- (object.getMetaData().get(VtkObject.ACTOR_VISIBLE) != null)) { -- if (((String) object.getMetaData().get(VtkObject.ACTOR_VISIBLE)).equals("true")) { AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkObjectUI2.java,205,3) ++ if (((object.getType() == CassandraObject.ACTOR) || (object.getType() == CassandraObject.SCALAR_BAR) || (object.getType() == CassandraObject.TXT_ACTOR)) && ++ (object.getMetaData().get(CassandraObject.ACTOR_VISIBLE) != null)) { ++ if (((String) object.getMetaData().get(CassandraObject.ACTOR_VISIBLE)).equals("true")) { DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkObjectUI2.java,210,1) -- } else if (object.getType() == VtkObject.LOOKUP_TABLE) { AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkObjectUI2.java,210,1) ++ } else if (object.getType() == CassandraObject.LOOKUP_TABLE) { DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkPipeLineGraphModel.java,14,1) -- import com.artenum.cassandra.pipeline.VtkObject; AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkPipeLineGraphModel.java,14,1) ++ import com.artenum.cassandra.pipeline.CassandraObject; AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkPipeLineGraphModel.java,73,15) ++ /** ++ * Align the CassandraObjectUI (i.e cell renderer) on the lowest component. ++ * @param cellUI ++ */ ++ public void alignVerticalPosition(VtkObjectUI cellUI){ ++ //System.out.println("DEBUG - XXXXXXXXXXXXXXXXXXXXXXXXXXXXX In alignVerticalPosition XXXXXXXXXXXXXXXXXXX"); ++ //System.out.println("DEBUG - Initial cell position:" + cellUI.getPosition().x +", " + cellUI.getPosition().y); ++ if (cellUI.getPosition().y < lastYPos) { ++ cellUI.getPosition().y = lastYPos; ++ } else { ++ lastYPos = cellUI.getPosition().y; ++ } ++ //System.out.println("DEBUG - Final cell position:" + cellUI.getPosition().x +", " + cellUI.getPosition().y); ++ } ++ DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkPipeLineGraphModel.java,89,1) -- VtkObject tmp = null; AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkPipeLineGraphModel.java,89,1) ++ CassandraObject tmp = null; AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkPipeLineGraphModel.java,91,2) ++ ++ // The actors list DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkPipeLineGraphModel.java,94,2) -- tmp = (VtkObject) i.next(); -- if (tmp.getMetaData().get(VtkObject.CELL) == null) { AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkPipeLineGraphModel.java,94,2) ++ tmp = (CassandraObject) i.next(); ++ if (tmp.getMetaData().get(CassandraObject.CELL) == null) { DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkPipeLineGraphModel.java,97,1) -- tmp.getMetaData().put(VtkObject.CELL, tmpCell); AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkPipeLineGraphModel.java,97,1) ++ tmp.getMetaData().put(CassandraObject.CELL, tmpCell); DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkPipeLineGraphModel.java,99,1) -- tmpCell = (VtkObjectCellAdapter) tmp.getMetaData().get(VtkObject.CELL); AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkPipeLineGraphModel.java,99,1) ++ tmpCell = (VtkObjectCellAdapter) tmp.getMetaData().get(CassandraObject.CELL); AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkPipeLineGraphModel.java,107,1) ++ // the mappers list DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkPipeLineGraphModel.java,109,2) -- tmp = (VtkObject) i.next(); -- if (tmp.getMetaData().get(VtkObject.CELL) == null) { AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkPipeLineGraphModel.java,109,2) ++ tmp = (CassandraObject) i.next(); ++ if (tmp.getMetaData().get(CassandraObject.CELL) == null) { DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkPipeLineGraphModel.java,112,1) -- tmp.getMetaData().put(VtkObject.CELL, tmpCell); AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkPipeLineGraphModel.java,112,1) ++ tmp.getMetaData().put(CassandraObject.CELL, tmpCell); DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkPipeLineGraphModel.java,114,1) -- tmpCell = (VtkObjectCellAdapter) tmp.getMetaData().get(VtkObject.CELL); AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkPipeLineGraphModel.java,114,1) ++ tmpCell = (VtkObjectCellAdapter) tmp.getMetaData().get(CassandraObject.CELL); AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkPipeLineGraphModel.java,122,1) ++ // the data set list DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkPipeLineGraphModel.java,124,2) -- tmp = (VtkObject) i.next(); -- if (tmp.getMetaData().get(VtkObject.CELL) == null) { AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkPipeLineGraphModel.java,124,2) ++ tmp = (CassandraObject) i.next(); ++ if (tmp.getMetaData().get(CassandraObject.CELL) == null) { DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkPipeLineGraphModel.java,127,5) -- tmp.getMetaData().put(VtkObject.CELL, tmpCell); -- VtkObjectUI cellUI = (VtkObjectUI) tmpCell.getUI(); -- if (cellUI.getPosition().y > lastYPos) { -- lastYPos = cellUI.getPosition().y; -- } AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkPipeLineGraphModel.java,127,2) ++ tmp.getMetaData().put(CassandraObject.CELL, tmpCell); ++ alignVerticalPosition((VtkObjectUI) tmpCell.getUI()); DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkPipeLineGraphModel.java,130,1) -- tmpCell = (VtkObjectCellAdapter) tmp.getMetaData().get(VtkObject.CELL); AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkPipeLineGraphModel.java,130,1) ++ tmpCell = (VtkObjectCellAdapter) tmp.getMetaData().get(CassandraObject.CELL); AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkPipeLineGraphModel.java,138,1) ++ //the filters list DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkPipeLineGraphModel.java,140,2) -- tmp = (VtkObject) i.next(); -- if (tmp.getMetaData().get(VtkObject.CELL) == null) { AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkPipeLineGraphModel.java,140,2) ++ tmp = (CassandraObject) i.next(); ++ if (tmp.getMetaData().get(CassandraObject.CELL) == null) { DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkPipeLineGraphModel.java,143,5) -- tmp.getMetaData().put(VtkObject.CELL, tmpCell); -- VtkObjectUI cellUI = (VtkObjectUI) tmpCell.getUI(); -- if (cellUI.getPosition().y < lastYPos) { -- cellUI.getPosition().y = lastYPos; -- } AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkPipeLineGraphModel.java,143,2) ++ tmp.getMetaData().put(CassandraObject.CELL, tmpCell); ++ alignVerticalPosition((VtkObjectUI) tmpCell.getUI()); DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkPipeLineGraphModel.java,146,1) -- tmpCell = (VtkObjectCellAdapter) tmp.getMetaData().get(VtkObject.CELL); AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkPipeLineGraphModel.java,146,1) ++ tmpCell = (VtkObjectCellAdapter) tmp.getMetaData().get(CassandraObject.CELL); AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkPipeLineGraphModel.java,154,1) ++ // the lookup table list DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkPipeLineGraphModel.java,156,2) -- tmp = (VtkObject) i.next(); -- if (tmp.getMetaData().get(VtkObject.CELL) == null) { AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkPipeLineGraphModel.java,156,2) ++ tmp = (CassandraObject) i.next(); ++ if (tmp.getMetaData().get(CassandraObject.CELL) == null) { DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkPipeLineGraphModel.java,159,1) -- tmp.getMetaData().put(VtkObject.CELL, tmpCell); AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkPipeLineGraphModel.java,159,1) ++ tmp.getMetaData().put(CassandraObject.CELL, tmpCell); DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkPipeLineGraphModel.java,161,1) -- tmpCell = (VtkObjectCellAdapter) tmp.getMetaData().get(VtkObject.CELL); AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkPipeLineGraphModel.java,161,1) ++ tmpCell = (VtkObjectCellAdapter) tmp.getMetaData().get(CassandraObject.CELL); DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkPipeLineGraphModel.java,170,2) -- tmp = (VtkObject) i.next(); -- if (tmp.getMetaData().get(VtkObject.CELL) == null) { AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkPipeLineGraphModel.java,170,2) ++ tmp = (CassandraObject) i.next(); ++ if (tmp.getMetaData().get(CassandraObject.CELL) == null) { DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkPipeLineGraphModel.java,173,1) -- tmp.getMetaData().put(VtkObject.CELL, tmpCell); AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkPipeLineGraphModel.java,173,1) ++ tmp.getMetaData().put(CassandraObject.CELL, tmpCell); DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkPipeLineGraphModel.java,175,1) -- tmpCell = (VtkObjectCellAdapter) tmp.getMetaData().get(VtkObject.CELL); AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkPipeLineGraphModel.java,175,1) ++ tmpCell = (VtkObjectCellAdapter) tmp.getMetaData().get(CassandraObject.CELL); DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkPipeLineGraphModel.java,184,2) -- tmp = (VtkObject) i.next(); -- if (tmp.getMetaData().get(VtkObject.CELL) == null) { AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkPipeLineGraphModel.java,184,2) ++ tmp = (CassandraObject) i.next(); ++ if (tmp.getMetaData().get(CassandraObject.CELL) == null) { DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkPipeLineGraphModel.java,187,1) -- tmp.getMetaData().put(VtkObject.CELL, tmpCell); AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkPipeLineGraphModel.java,187,1) ++ tmp.getMetaData().put(CassandraObject.CELL, tmpCell); DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkPipeLineGraphModel.java,189,1) -- tmpCell = (VtkObjectCellAdapter) tmp.getMetaData().get(VtkObject.CELL); AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkPipeLineGraphModel.java,189,1) ++ tmpCell = (VtkObjectCellAdapter) tmp.getMetaData().get(CassandraObject.CELL); AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkPipeLineGraphModel.java,203,2) ++ ++ // clear the connectivity DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkPipeLineGraphModel.java,212,1) -- VtkObject actor = ((VtkObject) i.next()); AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkPipeLineGraphModel.java,212,1) ++ CassandraObject actor = ((CassandraObject) i.next()); DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkPipeLineGraphModel.java,218,1) -- VtkObject dataset = ((VtkObject) i.next()); AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkPipeLineGraphModel.java,218,1) ++ CassandraObject dataset = ((CassandraObject) i.next()); DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkPipeLineGraphModel.java,224,1) -- VtkObject mapper = ((VtkObject) iMap.next()); AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkPipeLineGraphModel.java,224,1) ++ CassandraObject mapper = ((CassandraObject) iMap.next()); DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkPipeLineGraphModel.java,230,1) -- VtkObject lookupTable = ((VtkObject) i.next()); AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkPipeLineGraphModel.java,230,1) ++ CassandraObject lookupTable = ((CassandraObject) i.next()); DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkPipeLineGraphModel.java,236,1) -- VtkObject filter = ((VtkObject) i.next()); AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkPipeLineGraphModel.java,236,1) ++ CassandraObject filter = ((CassandraObject) i.next()); DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkPipeLineGraphModel.java,242,1) -- VtkObject scalarBar = ((VtkObject) iScalar.next()); AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkPipeLineGraphModel.java,242,1) ++ CassandraObject scalarBar = ((CassandraObject) iScalar.next()); DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkPipeLineGraphModel.java,250,1) -- VtkObject actor = ((VtkObject) i.next()); AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkPipeLineGraphModel.java,250,1) ++ CassandraObject actor = ((CassandraObject) i.next()); DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkPipeLineGraphModel.java,257,1) -- VtkObject mapper = ((VtkObject) iMap.next()); AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkPipeLineGraphModel.java,257,1) ++ CassandraObject mapper = ((CassandraObject) iMap.next()); DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkPipeLineGraphModel.java,262,1) -- connect((Cell) actor.getMetaData().get(VtkObject.CELL), (Cell) mapper.getMetaData().get(VtkObject.CELL)); AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkPipeLineGraphModel.java,262,1) ++ connect((Cell) actor.getMetaData().get(CassandraObject.CELL), (Cell) mapper.getMetaData().get(CassandraObject.CELL)); DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkPipeLineGraphModel.java,274,1) -- VtkObject dataset = ((VtkObject) i.next()); AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkPipeLineGraphModel.java,274,1) ++ CassandraObject dataset = ((CassandraObject) i.next()); DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkPipeLineGraphModel.java,277,1) -- VtkObject mapper = ((VtkObject) iMap.next()); AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkPipeLineGraphModel.java,277,1) ++ CassandraObject mapper = ((CassandraObject) iMap.next()); DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkPipeLineGraphModel.java,286,1) -- connect((Cell) dataset.getMetaData().get(VtkObject.CELL), (Cell) mapper.getMetaData().get(VtkObject.CELL)); AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkPipeLineGraphModel.java,286,1) ++ connect((Cell) dataset.getMetaData().get(CassandraObject.CELL), (Cell) mapper.getMetaData().get(CassandraObject.CELL)); DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkPipeLineGraphModel.java,297,1) -- VtkObject lookupTable = ((VtkObject) i.next()); AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkPipeLineGraphModel.java,297,1) ++ CassandraObject lookupTable = ((CassandraObject) i.next()); DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkPipeLineGraphModel.java,301,1) -- VtkObject mapper = ((VtkObject) iMap.next()); AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkPipeLineGraphModel.java,301,1) ++ CassandraObject mapper = ((CassandraObject) iMap.next()); DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkPipeLineGraphModel.java,310,1) -- connect((Cell) lookupTable.getMetaData().get(VtkObject.CELL), (Cell) mapper.getMetaData().get(VtkObject.CELL)); AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkPipeLineGraphModel.java,310,1) ++ connect((Cell) lookupTable.getMetaData().get(CassandraObject.CELL), (Cell) mapper.getMetaData().get(CassandraObject.CELL)); DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkPipeLineGraphModel.java,318,1) -- VtkObject scalarBar = ((VtkObject) iScalar.next()); AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkPipeLineGraphModel.java,318,1) ++ CassandraObject scalarBar = ((CassandraObject) iScalar.next()); DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkPipeLineGraphModel.java,324,1) -- connect((Cell) lookupTable.getMetaData().get(VtkObject.CELL), (Cell) scalarBar.getMetaData().get(VtkObject.CELL)); AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkPipeLineGraphModel.java,324,1) ++ connect((Cell) lookupTable.getMetaData().get(CassandraObject.CELL), (Cell) scalarBar.getMetaData().get(CassandraObject.CELL)); DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkPipeLineGraphModel.java,334,1) -- VtkObject filter = ((VtkObject) i.next()); AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkPipeLineGraphModel.java,334,1) ++ CassandraObject filter = ((CassandraObject) i.next()); DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkPipeLineGraphModel.java,340,1) -- VtkObject mapper = ((VtkObject) iMap.next()); AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkPipeLineGraphModel.java,340,1) ++ CassandraObject mapper = ((CassandraObject) iMap.next()); DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkPipeLineGraphModel.java,346,1) -- connect((Cell) filter.getMetaData().get(VtkObject.CELL), (Cell) mapper.getMetaData().get(VtkObject.CELL)); AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkPipeLineGraphModel.java,346,1) ++ connect((Cell) filter.getMetaData().get(CassandraObject.CELL), (Cell) mapper.getMetaData().get(CassandraObject.CELL)); DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkPipeLineGraphModel.java,359,1) -- connect((Cell) filter.getMetaData().get(VtkObject.CELL), (Cell) mapper.getMetaData().get(VtkObject.CELL)); AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkPipeLineGraphModel.java,359,1) ++ connect((Cell) filter.getMetaData().get(CassandraObject.CELL), (Cell) mapper.getMetaData().get(CassandraObject.CELL)); DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkPipeLineGraphModel.java,370,1) -- VtkObject actor = ((VtkObject) iActor.next()); AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkPipeLineGraphModel.java,370,1) ++ CassandraObject actor = ((CassandraObject) iActor.next()); DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkPipeLineGraphModel.java,376,1) -- connect((Cell) filter.getMetaData().get(VtkObject.CELL), (Cell) actor.getMetaData().get(VtkObject.CELL)); AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkPipeLineGraphModel.java,376,1) ++ connect((Cell) filter.getMetaData().get(CassandraObject.CELL), (Cell) actor.getMetaData().get(CassandraObject.CELL)); DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkPipeLineGraphModel.java,388,1) -- connect((Cell) filter.getMetaData().get(VtkObject.CELL), (Cell) actor.getMetaData().get(VtkObject.CELL)); AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkPipeLineGraphModel.java,388,1) ++ connect((Cell) filter.getMetaData().get(CassandraObject.CELL), (Cell) actor.getMetaData().get(CassandraObject.CELL)); DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkPipeLineGraphModel.java,399,1) -- VtkObject dataset = ((VtkObject) iDataSet.next()); AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkPipeLineGraphModel.java,399,1) ++ CassandraObject dataset = ((CassandraObject) iDataSet.next()); DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkPipeLineGraphModel.java,405,1) -- connect((Cell) filter.getMetaData().get(VtkObject.CELL), (Cell) dataset.getMetaData().get(VtkObject.CELL)); AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkPipeLineGraphModel.java,405,1) ++ connect((Cell) filter.getMetaData().get(CassandraObject.CELL), (Cell) dataset.getMetaData().get(CassandraObject.CELL)); DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkPipeLineGraphModel.java,417,1) -- connect((Cell) filter.getMetaData().get(VtkObject.CELL), (Cell) dataset.getMetaData().get(VtkObject.CELL)); AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkPipeLineGraphModel.java,417,1) ++ connect((Cell) filter.getMetaData().get(CassandraObject.CELL), (Cell) dataset.getMetaData().get(CassandraObject.CELL)); DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkPipeLineGraphModel.java,453,1) -- public void connectivityChange(VtkObject vtkObject) { AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkPipeLineGraphModel.java,453,1) ++ public void connectivityChange(CassandraObject vtkObject) { DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkPipeLinePanel.java,11,1) -- import com.artenum.cassandra.pipeline.VtkObject; AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkPipeLinePanel.java,11,1) ++ import com.artenum.cassandra.pipeline.CassandraObject; DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkPipeLinePanel.java,34,1) -- * Graphical representation of the pipelien manager panel. AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkPipeLinePanel.java,34,1) ++ * Graphical representation of the pipeline manager panel. AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkPipeLinePanel.java,63,4) ++ /** ++ * Add a cell into the graphical representation of the pipeline. ++ * The position of the cell is defined in the cell it-self. ++ */ DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkPipeLinePanel.java,70,1) -- //System.out.println("----> "+c.getSize()); AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkPipeLinePanel.java,70,1) ++ //System.out.println("DEBUG - ----> "+c.getSize()); DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkPipeLinePanel.java,108,1) -- VtkObject obj = ((VtkObjectCellAdapter) cellIndex.get(e.getSource())).getVtkObject(); AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkPipeLinePanel.java,108,1) ++ CassandraObject obj = ((VtkObjectCellAdapter) cellIndex.get(e.getSource())).getVtkObject(); DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,102,7) -- actorList = new VtkObjectListModel(VtkObject.ACTOR); -- mapperList = new VtkObjectListModel(VtkObject.MAPPER); -- datasetList = new VtkObjectListModel(VtkObject.DATASET); -- filterList = new VtkObjectListModel(VtkObject.FILTER); -- lookupTableList = new VtkObjectListModel(VtkObject.LOOKUP_TABLE); -- scalarBarList = new VtkObjectListModel(VtkObject.SCALAR_BAR); -- txtActorList = new VtkObjectListModel(VtkObject.TXT_ACTOR); AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,102,7) ++ actorList = new VtkObjectListModel(CassandraObject.ACTOR); ++ mapperList = new VtkObjectListModel(CassandraObject.MAPPER); ++ datasetList = new VtkObjectListModel(CassandraObject.DATASET); ++ filterList = new VtkObjectListModel(CassandraObject.FILTER); ++ lookupTableList = new VtkObjectListModel(CassandraObject.LOOKUP_TABLE); ++ scalarBarList = new VtkObjectListModel(CassandraObject.SCALAR_BAR); ++ txtActorList = new VtkObjectListModel(CassandraObject.TXT_ACTOR); DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,205,1) -- setActorVisible((VtkObject) vtkObjectHashtable.get(vtkObjectId), viewActor); AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,205,1) ++ setActorVisible((CassandraObject) vtkObjectHashtable.get(vtkObjectId), viewActor); DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,211,2) -- public void setActorVisible(VtkObject vtkObject, boolean viewActor) { -- if ((vtkObject.getType() == VtkObject.ACTOR) || (vtkObject.getType() == VtkObject.TXT_ACTOR) || (vtkObject.getType() == VtkObject.SCALAR_BAR)) { AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,211,2) ++ public void setActorVisible(CassandraObject vtkObject, boolean viewActor) { ++ if ((vtkObject.getType() == CassandraObject.ACTOR) || (vtkObject.getType() == CassandraObject.TXT_ACTOR) || (vtkObject.getType() == CassandraObject.SCALAR_BAR)) { DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,217,1) -- vtkObject.getMetaData().put(VtkObject.ACTOR_VISIBLE, Boolean.toString(viewActor)); AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,217,1) ++ vtkObject.getMetaData().put(CassandraObject.ACTOR_VISIBLE, Boolean.toString(viewActor)); DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,242,2) -- public VtkObject getVtkObject(Integer vtkObjectId) { -- return (VtkObject) vtkObjectHashtable.get(vtkObjectId); AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,242,2) ++ public CassandraObject getVtkObject(Integer vtkObjectId) { ++ return (CassandraObject) vtkObjectHashtable.get(vtkObjectId); DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,294,1) -- synchronized public VtkObject addActor(Object actor, String name) { AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,294,2) ++ synchronized public CassandraObject addActor(Object actor, String name) { ++ DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,298,1) -- VtkObjectAdapter vtkObject = new VtkObjectAdapter(actor, VtkObject.ACTOR, actorId, getNextVtkObjectId()); AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,298,1) ++ VtkObjectAdapter vtkObject = new VtkObjectAdapter(actor, CassandraObject.ACTOR, actorId, getNextVtkObjectId()); DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,315,3) -- synchronized public VtkObject addActor(Object actor, String name, int cellPosX, int cellPosY) { -- VtkObject casActor = addActor( actor, name); -- ((VtkObjectCellAdapter) casActor.getMetaData().get(VtkObject.CELL)).setPosition(new Point(cellPosX, cellPosY)); AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,315,3) ++ synchronized public CassandraObject addActor(Object actor, String name, int cellPosX, int cellPosY) { ++ CassandraObject casActor = addActor( actor, name); ++ ((VtkObjectCellAdapter) casActor.getMetaData().get(CassandraObject.CELL)).setPosition(new Point(cellPosX, cellPosY)); DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,328,1) -- synchronized public VtkObject addMapper(Object mapper, String name) { AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,328,2) ++ synchronized public CassandraObject addMapper(Object mapper, String name) { ++ DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,336,1) -- VtkObjectAdapter casObject = new VtkObjectAdapter(mapper, VtkObject.MAPPER, mapperId, getNextVtkObjectId()); AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,336,1) ++ VtkObjectAdapter casObject = new VtkObjectAdapter(mapper, CassandraObject.MAPPER, mapperId, getNextVtkObjectId()); DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,346,1) -- * Add a mapper at eh x, y position in the pipelione editor. AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,346,1) ++ * Add a mapper at the x, y position in the pipeline editor. DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,353,3) -- synchronized public VtkObject addMapper(Object mapper, String name, int cellPosX, int cellPosY) { -- VtkObject casMapper = addMapper( mapper, name); -- ((VtkObjectCellAdapter) casMapper.getMetaData().get(VtkObject.CELL)).setPosition(new Point(cellPosX, cellPosY)); AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,353,3) ++ synchronized public CassandraObject addMapper(Object mapper, String name, int cellPosX, int cellPosY) { ++ CassandraObject casMapper = addMapper( mapper, name); ++ ((VtkObjectCellAdapter) casMapper.getMetaData().get(CassandraObject.CELL)).setPosition(new Point(cellPosX, cellPosY)); DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,359,1) -- synchronized public VtkObject addDataSet(Object dataset, String name) { AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,359,1) ++ synchronized public CassandraObject addDataSet(Object dataset, String name) { DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,362,1) -- VtkObjectAdapter vtkObject = new VtkObjectAdapter(dataset, VtkObject.DATASET, datasetId, getNextVtkObjectId()); AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,362,1) ++ VtkObjectAdapter vtkObject = new VtkObjectAdapter(dataset, CassandraObject.DATASET, datasetId, getNextVtkObjectId()); DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,371,3) -- synchronized public VtkObject addDataSet(Object dataset, String name, int cellPosX, int cellPosY) { -- VtkObject casDataset = addDataSet( dataset, name); -- ((VtkObjectCellAdapter) casDataset.getMetaData().get(VtkObject.CELL)).setPosition(new Point(cellPosX, cellPosY)); AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,371,3) ++ synchronized public CassandraObject addDataSet(Object dataset, String name, int cellPosX, int cellPosY) { ++ CassandraObject casDataset = addDataSet( dataset, name); ++ ((VtkObjectCellAdapter) casDataset.getMetaData().get(CassandraObject.CELL)).setPosition(new Point(cellPosX, cellPosY)); DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,387,1) -- VtkObject tmpDataSet = this.addDataSet(dataset, name); AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,387,1) ++ CassandraObject tmpDataSet = this.addDataSet(dataset, name); DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,402,2) -- VtkObject tmpMapper = this.addMapper(mapper, name + " mapper"); -- VtkObject tmpActor = this.addActor(actor, name + " actor"); AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,402,2) ++ CassandraObject tmpMapper = this.addMapper(mapper, name + " mapper"); ++ CassandraObject tmpActor = this.addActor(actor, name + " actor"); DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,405,1) -- VtkObject tmpLookUpTable = this.addLookupTable(lookupTable, name + " lookup table"); AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,405,1) ++ CassandraObject tmpLookUpTable = this.addLookupTable(lookupTable, name + " lookup table"); DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,417,1) -- synchronized public VtkObject addFilter(Filter filter, String name) { AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,417,6) ++ synchronized public CassandraObject addFilter(Filter filter, String name) { ++ ++ ++ //System.out.println("DEBUG - ADDING FILTER" + filter.toString()); ++ //System.out.println("filterNumber = " + filterNumber); ++ DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,425,4) -- VtkObjectAdapter vtkObject = new VtkObjectAdapter(filter, VtkObject.FILTER, filterId, getNextVtkObjectId()); -- vtkObject.setLocalTypeId(id); -- vtkObjectHashtable.put(vtkObject.getId(), vtkObject); -- filterList.addVtkObject(vtkObject); AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,425,13) ++ VtkObjectAdapter cassAdapter = new VtkObjectAdapter(filter, CassandraObject.FILTER, filterId, getNextVtkObjectId()); ++ ++ //System.out.println("DEBUG - " + cassAdapter.toString()); ++ ++ // set the id of the filter (in the filters list), used to defined the cell rendering position ++ cassAdapter.setLocalTypeId(id); ++ ++ vtkObjectHashtable.put(cassAdapter.getId(), cassAdapter); ++ filterList.addVtkObject(cassAdapter); ++ ++ Point tmpPos = ((VtkObjectCellAdapter)cassAdapter.getMetaData().get(CassandraObject.CELL)).getPosition(); ++ //System.out.println("DEBUG - cell position after addVtkObject:" + tmpPos.x + ", " + tmpPos.y); ++ DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,440,1) -- return vtkObject; AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,440,4) ++ tmpPos = ((VtkObjectCellAdapter)cassAdapter.getMetaData().get(CassandraObject.CELL)).getPosition(); ++ //System.out.println("DEBUG - cell position after notification:" + tmpPos.x + ", " + tmpPos.y); ++ ++ return cassAdapter; DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,446,3) -- synchronized public VtkObject addFilter(Filter filter, String name, int cellPosX, int cellPosY) { -- VtkObject cassFilter = addFilter( filter, name); -- ((VtkObjectCellAdapter) cassFilter.getMetaData().get(VtkObject.CELL)).setPosition(new Point(cellPosX, cellPosY)); AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,446,3) ++ synchronized public CassandraObject addFilter(Filter filter, String name, int cellPosX, int cellPosY) { ++ CassandraObject cassFilter = addFilter( filter, name); ++ ((VtkObjectCellAdapter) cassFilter.getMetaData().get(CassandraObject.CELL)).setPosition(new Point(cellPosX, cellPosY)); DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,459,1) -- synchronized public VtkObject addLookupTable(vtkLookupTable lookupTable, String name) { AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,459,1) ++ synchronized public CassandraObject addLookupTable(vtkLookupTable lookupTable, String name) { DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,462,4) -- VtkObjectAdapter vtkObject = new VtkObjectAdapter(lookupTable, VtkObject.LOOKUP_TABLE, lookupTableId, getNextVtkObjectId()); -- vtkObject.setLocalTypeId(id); -- vtkObjectHashtable.put(vtkObject.getId(), vtkObject); -- lookupTableList.addVtkObject(vtkObject); AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,462,4) ++ VtkObjectAdapter adapter = new VtkObjectAdapter(lookupTable, CassandraObject.LOOKUP_TABLE, lookupTableId, getNextVtkObjectId()); ++ adapter.setLocalTypeId(id); ++ vtkObjectHashtable.put(adapter.getId(), adapter); ++ lookupTableList.addVtkObject(adapter); DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,468,1) -- return vtkObject; AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,468,1) ++ return adapter; DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,471,3) -- synchronized public VtkObject addLookupTable(vtkLookupTable lookupTable, String name, int cellPosX, int cellPosY) { -- VtkObject cassLookupTable = addLookupTable( lookupTable, name); -- ((VtkObjectCellAdapter) cassLookupTable.getMetaData().get(VtkObject.CELL)).setPosition(new Point(cellPosX, cellPosY)); AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,471,3) ++ synchronized public CassandraObject addLookupTable(vtkLookupTable lookupTable, String name, int cellPosX, int cellPosY) { ++ CassandraObject cassLookupTable = addLookupTable( lookupTable, name); ++ ((VtkObjectCellAdapter) cassLookupTable.getMetaData().get(CassandraObject.CELL)).setPosition(new Point(cellPosX, cellPosY)); DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,477,1) -- synchronized public VtkObject addScalarBar(vtkScalarBarActor scalarBar, String name) { AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,477,1) ++ synchronized public CassandraObject addScalarBar(vtkScalarBarActor scalarBar, String name) { DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,480,1) -- VtkObjectAdapter vtkObject = new VtkObjectAdapter(scalarBar, VtkObject.SCALAR_BAR, scalarBarId, getNextVtkObjectId()); AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,480,1) ++ VtkObjectAdapter vtkObject = new VtkObjectAdapter(scalarBar, CassandraObject.SCALAR_BAR, scalarBarId, getNextVtkObjectId()); DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,489,3) -- synchronized public VtkObject addScalarBar(vtkScalarBarActor scalarBar, String name, int cellPosX, int cellPosY) { -- VtkObject cassScalarBar = addScalarBar( scalarBar, name); -- ((VtkObjectCellAdapter) cassScalarBar.getMetaData().get(VtkObject.CELL)).setPosition(new Point(cellPosX, cellPosY)); AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,489,3) ++ synchronized public CassandraObject addScalarBar(vtkScalarBarActor scalarBar, String name, int cellPosX, int cellPosY) { ++ CassandraObject cassScalarBar = addScalarBar( scalarBar, name); ++ ((VtkObjectCellAdapter) cassScalarBar.getMetaData().get(CassandraObject.CELL)).setPosition(new Point(cellPosX, cellPosY)); DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,496,1) -- * add text (i.e 2D) actor into the pipeline manager. AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,496,1) ++ * add text (i.e 2D actor) into the pipeline manager. DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,498,1) -- synchronized public VtkObject addTxtActor(vtkTextActor txtActor, String name) { AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,498,1) ++ synchronized public CassandraObject addTxtActor(vtkTextActor txtActor, String name) { DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,501,1) -- VtkObjectAdapter vtkObject = new VtkObjectAdapter(txtActor, VtkObject.TXT_ACTOR, txtActorId, getNextVtkObjectId()); AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,501,1) ++ VtkObjectAdapter vtkObject = new VtkObjectAdapter(txtActor, CassandraObject.TXT_ACTOR, txtActorId, getNextVtkObjectId()); DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,510,3) -- synchronized public VtkObject addTxtActor(vtkTextActor txtActor, String name, int cellPosX, int cellPosY) { -- VtkObject cassTextActor = addTxtActor( txtActor, name); -- ((VtkObjectCellAdapter) cassTextActor.getMetaData().get(VtkObject.CELL)).setPosition(new Point(cellPosX, cellPosY)); AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,510,3) ++ synchronized public CassandraObject addTxtActor(vtkTextActor txtActor, String name, int cellPosX, int cellPosY) { ++ CassandraObject cassTextActor = addTxtActor( txtActor, name); ++ ((VtkObjectCellAdapter) cassTextActor.getMetaData().get(CassandraObject.CELL)).setPosition(new Point(cellPosX, cellPosY)); DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,520,1) -- VtkObject vtkObject = (VtkObject) vtkObjectHashtable.remove(vtkObjectId); AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,520,1) ++ CassandraObject vtkObject = (CassandraObject) vtkObjectHashtable.remove(vtkObjectId); DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,523,1) -- case VtkObject.ACTOR: AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,523,1) ++ case CassandraObject.ACTOR: DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,527,1) -- case VtkObject.MAPPER: AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,527,1) ++ case CassandraObject.MAPPER: DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,530,1) -- case VtkObject.DATASET: AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,530,1) ++ case CassandraObject.DATASET: DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,533,1) -- case VtkObject.FILTER: AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,533,1) ++ case CassandraObject.FILTER: DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,536,1) -- case VtkObject.LOOKUP_TABLE: AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,536,1) ++ case CassandraObject.LOOKUP_TABLE: DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,539,1) -- case VtkObject.SCALAR_BAR: AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,539,1) ++ case CassandraObject.SCALAR_BAR: DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,543,1) -- case VtkObject.TXT_ACTOR: AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,543,1) ++ case CassandraObject.TXT_ACTOR: DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,558,1) -- synchronized public void hideInputActor(VtkObject actor, vtkDataSet vtkDataSet) { AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,558,1) ++ synchronized public void hideInputActor(CassandraObject actor, vtkDataSet vtkDataSet) { DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,562,1) -- VtkObject inputPipelineActor = null; AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,562,1) ++ CassandraObject inputPipelineActor = null; DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,569,1) -- inputPipelineActor = (VtkObject) this.getActorList().getElementAt(i); AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,569,1) ++ inputPipelineActor = (CassandraObject) this.getActorList().getElementAt(i); DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,592,1) -- synchronized public void removeVtkObject(VtkObject vtkObject) { AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,592,1) ++ synchronized public void removeVtkObject(CassandraObject vtkObject) { DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,645,1) -- public void notifyConnectivityChange(VtkObject obj) { AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,645,1) ++ public void notifyConnectivityChange(CassandraObject obj) { DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,663,1) -- public VtkObject getCassandraVtkObjectByTrueVtkObject(vtkObject obj) { AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,663,1) ++ public CassandraObject getCassandraVtkObjectByTrueVtkObject(vtkObject obj) { DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,670,1) -- VtkObject pipelineObj = (VtkObject) tmpIterator.next(); AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,670,1) ++ CassandraObject pipelineObj = (CassandraObject) tmpIterator.next(); DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,681,1) -- VtkObject pipelineObj = (VtkObject) tmpIterator.next(); AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,681,1) ++ CassandraObject pipelineObj = (CassandraObject) tmpIterator.next(); DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,692,1) -- VtkObject pipelineObj = (VtkObject) tmpIterator.next(); AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,692,1) ++ CassandraObject pipelineObj = (CassandraObject) tmpIterator.next(); DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,703,1) -- VtkObject pipelineObj = (VtkObject) tmpIterator.next(); AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,703,1) ++ CassandraObject pipelineObj = (CassandraObject) tmpIterator.next(); DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,714,1) -- VtkObject pipelineObj = (VtkObject) tmpIterator.next(); AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,714,1) ++ CassandraObject pipelineObj = (CassandraObject) tmpIterator.next(); DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,725,1) -- VtkObject pipelineObj = (VtkObject) tmpIterator.next(); AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,725,1) ++ CassandraObject pipelineObj = (CassandraObject) tmpIterator.next(); DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,736,1) -- VtkObject pipelineObj = (VtkObject) tmpIterator.next(); AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,736,1) ++ CassandraObject pipelineObj = (CassandraObject) tmpIterator.next(); DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/VtkObjectAdapter.java,21,1) -- * wich is a generic overload of vtkObject for a better adaptation to the AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/VtkObjectAdapter.java,21,1) ++ * which is a generic overload of vtkObject for a better adaptation to the DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/VtkObjectAdapter.java,25,1) -- * managment and the pipeline connectivity. AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/VtkObjectAdapter.java,25,1) ++ * management and the pipeline connectivity. DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/VtkObjectAdapter.java,32,1) -- public class VtkObjectAdapter extends DefaultCell implements VtkObject { AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/VtkObjectAdapter.java,32,1) ++ public class VtkObjectAdapter extends DefaultCell implements CassandraObject { DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/VtkObjectAdapter.java,44,1) -- * Main constructor. AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/VtkObjectAdapter.java,44,3) ++ * Build a VtkObjectAdapter, i.e an adapter to the Cassandra's pipeline ++ * object, for the given vtkObject. This also instantiates the connectivity tables ++ * for this CassandraObject. DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/VtkObjectAdapter.java,152,1) -- public void addInputConnectivtiy(VtkObject vtkObjectIn) { AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/VtkObjectAdapter.java,152,1) ++ public void addInputConnectivtiy(CassandraObject vtkObjectIn) { DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/VtkObjectAdapter.java,171,1) -- public boolean isInInputConnectivityInputList(VtkObject vtkObjectIn) { AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/VtkObjectAdapter.java,171,1) ++ public boolean isInInputConnectivityInputList(CassandraObject vtkObjectIn) { DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/VtkObjectAdapter.java,200,1) -- public void addOutputConnectivity(VtkObject vtkObjectIn) { AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/VtkObjectAdapter.java,200,1) ++ public void addOutputConnectivity(CassandraObject vtkObjectIn) { DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/VtkObjectAdapter.java,216,1) -- public boolean inOutputConnectivityList(VtkObject vtkObjectIn) { AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/VtkObjectAdapter.java,216,1) ++ public boolean inOutputConnectivityList(CassandraObject vtkObjectIn) { DelBlock(Plugins/CellCenter/src/com/artenum/cassandra/plugin/cellcenter/CellCenterControlUI.java,26,1) -- import com.artenum.cassandra.pipeline.VtkObject; AddBlock(Plugins/CellCenter/src/com/artenum/cassandra/plugin/cellcenter/CellCenterControlUI.java,26,1) ++ import com.artenum.cassandra.pipeline.CassandraObject; DelBlock(Plugins/CellCenter/src/com/artenum/cassandra/plugin/cellcenter/CellCenterControlUI.java,34,1) -- import java.awt.GridLayout; DelBlock(Plugins/CellCenter/src/com/artenum/cassandra/plugin/cellcenter/CellCenterControlUI.java,35,1) -- import java.awt.event.ActionListener; DelBlock(Plugins/CellCenter/src/com/artenum/cassandra/plugin/cellcenter/CellCenterControlUI.java,37,2) -- import java.util.Hashtable; -- DelBlock(Plugins/CellCenter/src/com/artenum/cassandra/plugin/cellcenter/CellCenterControlUI.java,43,1) -- import javax.swing.JDialog; DelBlock(Plugins/CellCenter/src/com/artenum/cassandra/plugin/cellcenter/CellCenterControlUI.java,48,1) -- import javax.swing.JSlider; DelBlock(Plugins/CellCenter/src/com/artenum/cassandra/plugin/cellcenter/CellCenterControlUI.java,49,1) -- import javax.swing.event.ChangeListener; DelBlock(Plugins/CellCenter/src/com/artenum/cassandra/plugin/cellcenter/CellCenterControlUI.java,156,1) -- plugin.updateCellCenter(cellVertexFlag, (vtkDataSet) ((VtkObject) input.getSelectedItem()).getVtkObject()); AddBlock(Plugins/CellCenter/src/com/artenum/cassandra/plugin/cellcenter/CellCenterControlUI.java,156,1) ++ plugin.updateCellCenter(cellVertexFlag, (vtkDataSet) ((CassandraObject) input.getSelectedItem()).getVtkObject()); DelBlock(Plugins/CellCenter/src/com/artenum/cassandra/plugin/cellcenter/CellCenterPlugin.java,43,1) -- import com.artenum.cassandra.pipeline.VtkObject; AddBlock(Plugins/CellCenter/src/com/artenum/cassandra/plugin/cellcenter/CellCenterPlugin.java,43,1) ++ import com.artenum.cassandra.pipeline.CassandraObject; DelBlock(Plugins/CellCenter/src/com/artenum/cassandra/plugin/cellcenter/CellCenterPlugin.java,86,4) -- private VtkObject actor; -- private VtkObject mapper; -- private VtkObject dataset; -- private VtkObject filter; AddBlock(Plugins/CellCenter/src/com/artenum/cassandra/plugin/cellcenter/CellCenterPlugin.java,86,4) ++ private CassandraObject actor; ++ private CassandraObject mapper; ++ private CassandraObject dataset; ++ private CassandraObject filter; DelBlock(Plugins/CellCenter/src/com/artenum/cassandra/plugin/cellcenter/CellCenterPlugin.java,161,1) -- filter.getMetaData().put(VtkObject.POPUP_MENU, getContextualMenu()); AddBlock(Plugins/CellCenter/src/com/artenum/cassandra/plugin/cellcenter/CellCenterPlugin.java,161,1) ++ filter.getMetaData().put(CassandraObject.POPUP_MENU, getContextualMenu()); DelBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlaneControlUI.java,12,1) -- import com.artenum.cassandra.pipeline.VtkObject; AddBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlaneControlUI.java,12,1) ++ import com.artenum.cassandra.pipeline.CassandraObject; DelBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlaneControlUI.java,125,2) -- //define the "Update" buton. The corresponding action name -- //is "UPDATE". The action istself is performed in the AddBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlaneControlUI.java,125,2) ++ //define the "Update" button. The corresponding action name ++ //is "UPDATE". The action itself is performed in the DelBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlaneControlUI.java,210,1) -- public void setSelectedInput(VtkObject selectedInput){ AddBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlaneControlUI.java,210,1) ++ public void setSelectedInput(CassandraObject selectedInput){ DelBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlaneControlUI.java,245,1) -- plugin.updateClippingPlane(cx, cy, cz, nx, ny, nz, (vtkDataSet) ((VtkObject) input.getSelectedItem()).getVtkObject(), insideOut.isSelected()); AddBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlaneControlUI.java,245,1) ++ plugin.updateClippingPlane(cx, cy, cz, nx, ny, nz, (vtkDataSet) ((CassandraObject) input.getSelectedItem()).getVtkObject(), insideOut.isSelected()); DelBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlaneControlUI.java,269,1) -- (vtkDataSet) ((VtkObject) input.getSelectedItem()).getVtkObject(), insideOut.isSelected()); AddBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlaneControlUI.java,269,1) ++ (vtkDataSet) ((CassandraObject) input.getSelectedItem()).getVtkObject(), insideOut.isSelected()); DelBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,16,1) -- import com.artenum.cassandra.pipeline.VtkObject; AddBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,16,1) ++ import com.artenum.cassandra.pipeline.CassandraObject; DelBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,99,6) -- private VtkObject outputCassActor; -- private VtkObject outputCassMapper; -- private VtkObject outputCassDataset; -- private VtkObject outputCassLookupTable; -- private VtkObject outputCassScalarBar; -- private VtkObject cassfilter; AddBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,99,6) ++ private CassandraObject outputCassActor; ++ private CassandraObject outputCassMapper; ++ private CassandraObject outputCassDataset; ++ private CassandraObject outputCassLookupTable; ++ private CassandraObject outputCassScalarBar; ++ private CassandraObject cassfilter; DelBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,177,1) -- this.filterImpl = new FilterImpl(); AddBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,177,1) ++ filterImpl = new FilterImpl(); DelBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,259,1) -- // Load the result data in the Cassandra pipeline AddBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,259,1) ++ // Load the filter in the Cassandra pipeline DelBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,261,1) -- cassfilter.getMetaData().put(VtkObject.POPUP_MENU, getContextualMenu()); AddBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,261,1) ++ cassfilter.getMetaData().put(CassandraObject.POPUP_MENU, getContextualMenu()); DelBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,513,1) -- if (cellPosX > 0 && cellPosY > 0) ((VtkObjectCellAdapter) cassfilter.getMetaData().get(VtkObject.CELL)).setPosition(new Point(cellPosX, cellPosY)); AddBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,513,1) ++ if (cellPosX > 0 && cellPosY > 0) ((VtkObjectCellAdapter) cassfilter.getMetaData().get(CassandraObject.CELL)).setPosition(new Point(cellPosX, cellPosY)); DelBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,548,1) -- Point cellPosition = ((VtkObjectCellAdapter) cassfilter.getMetaData().get(VtkObject.CELL)).getPosition(); AddBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,548,1) ++ Point cellPosition = ((VtkObjectCellAdapter) cassfilter.getMetaData().get(CassandraObject.CELL)).getPosition(); DelBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPluginIntegrator.java,23,1) -- * @author seb AddBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPluginIntegrator.java,23,2) ++ * ++ * @author Sebastien Jourdain, Artenum SARL DelBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlaneControlUI.java,26,1) -- import com.artenum.cassandra.pipeline.VtkObject; AddBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlaneControlUI.java,28,1) ++ import com.artenum.cassandra.pipeline.CassandraObject; AddBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlaneControlUI.java,30,1) ++ DelBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlaneControlUI.java,227,1) -- public void setSelectedInput(VtkObject selectedInput){ AddBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlaneControlUI.java,227,1) ++ public void setSelectedInput(CassandraObject selectedInput){ DelBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlaneControlUI.java,260,1) -- plugin.updateCuttingPlane(cx, cy, cz, nx, ny, nz, (vtkDataSet) ((VtkObject) input.getSelectedItem()).getVtkObject()); AddBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlaneControlUI.java,260,1) ++ plugin.updateCuttingPlane(cx, cy, cz, nx, ny, nz, (vtkDataSet) ((CassandraObject) input.getSelectedItem()).getVtkObject()); DelBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlaneControlUI.java,283,1) -- plugin.updateCuttingPlane(cx + (nx * value), cy + (ny * value), cz + (nz * value), nx, ny, nz, (vtkDataSet) ((VtkObject) input.getSelectedItem()) AddBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlaneControlUI.java,283,1) ++ plugin.updateCuttingPlane(cx + (nx * value), cy + (ny * value), cz + (nz * value), nx, ny, nz, (vtkDataSet) ((CassandraObject) input.getSelectedItem()) DelBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlanePlugin.java,29,1) -- import com.artenum.cassandra.pipeline.VtkObject; AddBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlanePlugin.java,29,1) ++ import com.artenum.cassandra.pipeline.CassandraObject; DelBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlanePlugin.java,111,6) -- private VtkObject outputCassActor; -- private VtkObject outputCassMapper; -- private VtkObject outputCassDataset; -- private VtkObject outputCassLookupTable; -- private VtkObject outputCassScalarBar; -- private VtkObject cassFilter; AddBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlanePlugin.java,111,6) ++ private CassandraObject outputCassActor; ++ private CassandraObject outputCassMapper; ++ private CassandraObject outputCassDataset; ++ private CassandraObject outputCassLookupTable; ++ private CassandraObject outputCassScalarBar; ++ private CassandraObject cassFilter; DelBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlanePlugin.java,276,1) -- cassFilter.getMetaData().put(VtkObject.POPUP_MENU, getContextualMenu()); AddBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlanePlugin.java,276,1) ++ cassFilter.getMetaData().put(CassandraObject.POPUP_MENU, getContextualMenu()); DelBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlanePlugin.java,499,1) -- Point cellPosition = ((VtkObjectCellAdapter) cassFilter.getMetaData().get(VtkObject.CELL)).getPosition(); AddBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlanePlugin.java,499,1) ++ Point cellPosition = ((VtkObjectCellAdapter) cassFilter.getMetaData().get(CassandraObject.CELL)).getPosition(); DelBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlanePlugin.java,555,1) -- if (cellPosX > 0 && cellPosY > 0) ((VtkObjectCellAdapter) cassFilter.getMetaData().get(VtkObject.CELL)).setPosition(new Point(cellPosX, cellPosY)); AddBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlanePlugin.java,555,1) ++ if (cellPosX > 0 && cellPosY > 0) ((VtkObjectCellAdapter) cassFilter.getMetaData().get(CassandraObject.CELL)).setPosition(new Point(cellPosX, cellPosY)); DelBlock(Plugins/Default/src/com/artenum/cassandra/plugin/defaults/BuildEndOfPipeline.java,26,1) -- import com.artenum.cassandra.pipeline.VtkObject; AddBlock(Plugins/Default/src/com/artenum/cassandra/plugin/defaults/BuildEndOfPipeline.java,26,1) ++ import com.artenum.cassandra.pipeline.CassandraObject; AddBlock(Plugins/Default/src/com/artenum/cassandra/plugin/defaults/BuildEndOfPipeline.java,38,9) ++ /** ++ * Generate and load into the pipeline manager the ++ * end part (i.e mapper to actor) pipeline for a given ++ * data set. ++ * ++ * @author Sebastion Jourdain, Artenum SARL ++ * @author Julien Forest, Artenum SARL ++ * ++ */ DelBlock(Plugins/Default/src/com/artenum/cassandra/plugin/defaults/BuildEndOfPipeline.java,61,1) -- vtkDataSet datasetVTK = (vtkDataSet) ((VtkObject) JOptionPane.showInputDialog(owner, "Input dataset", "Build default pipeline for a dataset", AddBlock(Plugins/Default/src/com/artenum/cassandra/plugin/defaults/BuildEndOfPipeline.java,61,1) ++ vtkDataSet datasetVTK = (vtkDataSet) ((CassandraObject) JOptionPane.showInputDialog(owner, "Input dataset", "Build default pipeline for a dataset", DelBlock(Plugins/Default/src/com/artenum/cassandra/plugin/defaults/CubeAxis.java,15,1) -- import com.artenum.cassandra.pipeline.VtkObject; AddBlock(Plugins/Default/src/com/artenum/cassandra/plugin/defaults/CubeAxis.java,15,1) ++ import com.artenum.cassandra.pipeline.CassandraObject; DelBlock(Plugins/Default/src/com/artenum/cassandra/plugin/defaults/CubeAxis.java,59,3) -- private VtkObject axisObject; -- private VtkObject outlineObject; -- private VtkObject filter; AddBlock(Plugins/Default/src/com/artenum/cassandra/plugin/defaults/CubeAxis.java,59,3) ++ private CassandraObject axisObject; ++ private CassandraObject outlineObject; ++ private CassandraObject filter; DelBlock(Plugins/Default/src/com/artenum/cassandra/plugin/defaults/CubeAxis.java,157,1) -- filter.getMetaData().put(VtkObject.POPUP_MENU, getContextualMenu()); AddBlock(Plugins/Default/src/com/artenum/cassandra/plugin/defaults/CubeAxis.java,157,1) ++ filter.getMetaData().put(CassandraObject.POPUP_MENU, getContextualMenu()); DelBlock(Plugins/Default/src/com/artenum/cassandra/plugin/defaults/CubeAxis.java,160,1) -- public void setInput(VtkObject dataset) { AddBlock(Plugins/Default/src/com/artenum/cassandra/plugin/defaults/CubeAxis.java,160,1) ++ public void setInput(CassandraObject dataset) { DelBlock(Plugins/Default/src/com/artenum/cassandra/plugin/defaults/CubeAxis.java,176,1) -- setInput(((VtkObject) inputDataset.getSelectedItem())); AddBlock(Plugins/Default/src/com/artenum/cassandra/plugin/defaults/CubeAxis.java,176,1) ++ setInput(((CassandraObject) inputDataset.getSelectedItem())); AddBlock(Plugins/Default/src/com/artenum/cassandra/plugin/defaults/ExportToVRML.java,34,1) ++ DelBlock(Plugins/Default/src/com/artenum/cassandra/plugin/defaults/ExportToVRML.java,46,1) -- return "WRL files (VRML)"; AddBlock(Plugins/Default/src/com/artenum/cassandra/plugin/defaults/ExportToVRML.java,46,1) ++ return "VRML files (VRML)"; DelBlock(Plugins/Default/src/com/artenum/cassandra/plugin/defaults/PluginIntegrator.java,33,1) -- JMenuItem open3dLine = new JMenuItem("Import 3d line (txt file)"); AddBlock(Plugins/Default/src/com/artenum/cassandra/plugin/defaults/PluginIntegrator.java,33,1) ++ JMenuItem open3dLine = new JMenuItem("Import 3D line (txt file)"); DelBlock(Plugins/Default/src/com/artenum/cassandra/plugin/defaults/SaveDataSetToVtkFile.java,12,1) -- import com.artenum.cassandra.pipeline.VtkObject; AddBlock(Plugins/Default/src/com/artenum/cassandra/plugin/defaults/SaveDataSetToVtkFile.java,12,1) ++ import com.artenum.cassandra.pipeline.CassandraObject; DelBlock(Plugins/Default/src/com/artenum/cassandra/plugin/defaults/SaveDataSetToVtkFile.java,36,1) -- * @author Sebastien AddBlock(Plugins/Default/src/com/artenum/cassandra/plugin/defaults/SaveDataSetToVtkFile.java,36,4) ++ * Save the selected data to the disk. ++ * ++ * @author Sebastien Jourdain, Artenum SARL ++ * @author Julien Forest, Artenum SARL DelBlock(Plugins/Default/src/com/artenum/cassandra/plugin/defaults/SaveDataSetToVtkFile.java,105,1) -- VtkToolBox.writeVtkDataSetToFile((vtkDataSet) ((VtkObject) input.getSelectedItem()).getVtkObject(), vtkFile.getAbsolutePath()); AddBlock(Plugins/Default/src/com/artenum/cassandra/plugin/defaults/SaveDataSetToVtkFile.java,105,1) ++ VtkToolBox.writeVtkDataSetToFile((vtkDataSet) ((CassandraObject) input.getSelectedItem()).getVtkObject(), vtkFile.getAbsolutePath()); DelBlock(Plugins/Default/src/com/artenum/cassandra/plugin/defaults/ShowPickingInformation.java,26,1) -- import com.artenum.cassandra.pipeline.VtkObject; AddBlock(Plugins/Default/src/com/artenum/cassandra/plugin/defaults/ShowPickingInformation.java,26,1) ++ import com.artenum.cassandra.pipeline.CassandraObject; DelBlock(Plugins/Default/src/com/artenum/cassandra/plugin/defaults/ShowPickingInformation.java,44,7) -- private vtkTextActor textActor; -- private StringBuffer txtBuffer; -- private PipeLineManager pipelineManager; -- private VtkObject txtActor; -- private String[] coord = new String[3]; -- private String padding = " "; -- private String[] label = new String[] { "X: ", "Y: ", "Z: " }; AddBlock(Plugins/Default/src/com/artenum/cassandra/plugin/defaults/ShowPickingInformation.java,44,7) ++ private vtkTextActor textActor; ++ private StringBuffer txtBuffer; ++ private PipeLineManager pipelineManager; ++ private CassandraObject txtActor; ++ private String[] coord = new String[3]; ++ private String padding = " "; ++ private String[] label = new String[] { "X: ", "Y: ", "Z: " }; DelBlock(Plugins/Default/src/com/artenum/cassandra/plugin/defaults/ShowPickingInformation.java,52,9) -- /** -- * main contructor -- * -- * @param pipelineManager -- */ -- public ShowPickingInformation(PipeLineManager pipelineManager) { -- this.pipelineManager = pipelineManager; -- txtBuffer = new StringBuffer(); -- } AddBlock(Plugins/Default/src/com/artenum/cassandra/plugin/defaults/ShowPickingInformation.java,52,9) ++ /** ++ * main constructor ++ * ++ * @param pipelineManager ++ */ ++ public ShowPickingInformation(PipeLineManager pipelineManager) { ++ this.pipelineManager = pipelineManager; ++ txtBuffer = new StringBuffer(); ++ } DelBlock(Plugins/Default/src/com/artenum/cassandra/plugin/defaults/ShowPickingInformation.java,62,6) -- public void actionPerformed(ActionEvent e) { -- if (textActor == null) { -- textActor = new vtkTextActor(); -- textActor.SetInput(""); -- textActor.SetDisplayPosition(10, 10); -- textActor.GetTextProperty().SetColor(1, 1, 1); AddBlock(Plugins/Default/src/com/artenum/cassandra/plugin/defaults/ShowPickingInformation.java,62,6) ++ public void actionPerformed(ActionEvent e) { ++ if (textActor == null) { ++ textActor = new vtkTextActor(); ++ textActor.SetInput(""); ++ textActor.SetDisplayPosition(10, 10); ++ textActor.GetTextProperty().SetColor(1, 1, 1); DelBlock(Plugins/Default/src/com/artenum/cassandra/plugin/defaults/ShowPickingInformation.java,69,11) -- txtActor = pipelineManager.addTxtActor(textActor, "Pick"); -- // -- pipelineManager.getCassandraView().addPickingObserver(this); -- pipelineManager.setActorVisible(txtActor, true); -- -- // pipelineManager.validateViewAndGo(); // Not enough -- pipelineManager.getCassandraView().deepValidateView(); // Don t ask me why, -- // apparently needed, -- // at least -- // under MacOSX and default swing LAF, to activate -- // the widget interactor. AddBlock(Plugins/Default/src/com/artenum/cassandra/plugin/defaults/ShowPickingInformation.java,69,4) ++ txtActor = pipelineManager.addTxtActor(textActor, "Pick"); ++ // ++ pipelineManager.getCassandraView().addPickingObserver(this); ++ pipelineManager.setActorVisible(txtActor, true); DelBlock(Plugins/Default/src/com/artenum/cassandra/plugin/defaults/ShowPickingInformation.java,74,5) -- } else { -- if (pipelineManager.getTextActorList().getVtkObjectIndex(txtActor) == -1) { -- txtActor = pipelineManager.addTxtActor(textActor, "Pick"); -- // -- pipelineManager.setActorVisible(txtActor, true); AddBlock(Plugins/Default/src/com/artenum/cassandra/plugin/defaults/ShowPickingInformation.java,74,7) ++ // pipelineManager.validateViewAndGo(); // Not enough ++ pipelineManager.getCassandraView().deepValidateView(); // Don t ask ++ // me why, ++ // apparently needed, ++ // at least ++ // under MacOSX and default swing LAF, to activate ++ // the widget interactor. DelBlock(Plugins/Default/src/com/artenum/cassandra/plugin/defaults/ShowPickingInformation.java,82,4) -- pipelineManager.validateViewAndGo(); -- } -- } -- } AddBlock(Plugins/Default/src/com/artenum/cassandra/plugin/defaults/ShowPickingInformation.java,82,5) ++ } else { ++ if (pipelineManager.getTextActorList().getVtkObjectIndex(txtActor) == -1) { ++ txtActor = pipelineManager.addTxtActor(textActor, "Pick"); ++ // ++ pipelineManager.setActorVisible(txtActor, true); DelBlock(Plugins/Default/src/com/artenum/cassandra/plugin/defaults/ShowPickingInformation.java,88,7) -- -- public void pick(vtkPointPicker picker) { -- if (textActor != null) { -- double[] xyz = picker.GetDataSet().GetPoint(picker.GetPointId()); -- coord[0] = Float.toString((float) xyz[0]); -- coord[1] = Float.toString((float) xyz[1]); -- coord[2] = Float.toString((float) xyz[2]); AddBlock(Plugins/Default/src/com/artenum/cassandra/plugin/defaults/ShowPickingInformation.java,88,4) ++ pipelineManager.validateViewAndGo(); ++ } ++ } ++ } DelBlock(Plugins/Default/src/com/artenum/cassandra/plugin/defaults/ShowPickingInformation.java,93,2) -- // Clear buffer -- txtBuffer.delete(0, txtBuffer.length()); AddBlock(Plugins/Default/src/com/artenum/cassandra/plugin/defaults/ShowPickingInformation.java,93,10) ++ /** ++ * performs the picking action and display in 3D view the information of the ++ * picked element. ++ */ ++ public void pick(vtkPointPicker picker) { ++ if (textActor != null) { ++ double[] xyz = picker.GetDataSet().GetPoint(picker.GetPointId()); ++ coord[0] = Float.toString((float) xyz[0]); ++ coord[1] = Float.toString((float) xyz[1]); ++ coord[2] = Float.toString((float) xyz[2]); DelBlock(Plugins/Default/src/com/artenum/cassandra/plugin/defaults/ShowPickingInformation.java,104,4) -- // point ID -- txtBuffer.append("Point ID: "); -- txtBuffer.append(Integer.toString(picker.GetPointId())); -- txtBuffer.append("\n"); AddBlock(Plugins/Default/src/com/artenum/cassandra/plugin/defaults/ShowPickingInformation.java,104,2) ++ // Clear buffer ++ txtBuffer.delete(0, txtBuffer.length()); DelBlock(Plugins/Default/src/com/artenum/cassandra/plugin/defaults/ShowPickingInformation.java,107,6) -- // Coord -- for (int i = 0; i < coord.length; i++) { -- txtBuffer.append(label[i % 3]); -- txtBuffer.append(coord[i]); -- txtBuffer.append(fill(coord[i])); -- } AddBlock(Plugins/Default/src/com/artenum/cassandra/plugin/defaults/ShowPickingInformation.java,107,4) ++ // point ID ++ txtBuffer.append("Point ID: "); ++ txtBuffer.append(Integer.toString(picker.GetPointId())); ++ txtBuffer.append("\n"); DelBlock(Plugins/Default/src/com/artenum/cassandra/plugin/defaults/ShowPickingInformation.java,112,3) -- // data -- txtBuffer.append("\nValue: "); -- txtBuffer.append(Double.toString(picker.GetDataSet().GetPointData().GetArray(0).GetTuple1(picker.GetPointId()))); AddBlock(Plugins/Default/src/com/artenum/cassandra/plugin/defaults/ShowPickingInformation.java,112,6) ++ // Coord ++ for (int i = 0; i < coord.length; i++) { ++ txtBuffer.append(label[i % 3]); ++ txtBuffer.append(coord[i]); ++ txtBuffer.append(fill(coord[i])); ++ } DelBlock(Plugins/Default/src/com/artenum/cassandra/plugin/defaults/ShowPickingInformation.java,119,4) -- // set text to VTK -- textActor.SetInput(txtBuffer.toString()); -- } -- } AddBlock(Plugins/Default/src/com/artenum/cassandra/plugin/defaults/ShowPickingInformation.java,119,7) ++ // data ++ txtBuffer.append("\nValue: "); ++ if (picker.GetDataSet().GetPointData().GetArray(0) != null) { ++ txtBuffer.append(Double.toString(picker.GetDataSet().GetPointData().GetArray(0).GetTuple1(picker.GetPointId()))); ++ } else { ++ txtBuffer.append(" not defined"); ++ } DelBlock(Plugins/Default/src/com/artenum/cassandra/plugin/defaults/ShowPickingInformation.java,127,3) -- public String fill(String number) { -- return padding.substring(number.length()); -- } AddBlock(Plugins/Default/src/com/artenum/cassandra/plugin/defaults/ShowPickingInformation.java,127,8) ++ // set text to VTK ++ textActor.SetInput(txtBuffer.toString()); ++ } ++ } ++ ++ public String fill(String number) { ++ return padding.substring(number.length()); ++ } DelBlock(Plugins/DynamicDataset/src/com/artenum/cassandra/plugin/dynamic/dataset/DynamicDatasetPlugin.java,29,1) -- import com.artenum.cassandra.pipeline.VtkObject; AddBlock(Plugins/DynamicDataset/src/com/artenum/cassandra/plugin/dynamic/dataset/DynamicDatasetPlugin.java,29,1) ++ import com.artenum.cassandra.pipeline.CassandraObject; DelBlock(Plugins/DynamicDataset/src/com/artenum/cassandra/plugin/dynamic/dataset/DynamicDatasetPlugin.java,97,4) -- private VtkObject actor; -- private VtkObject mapper; -- private VtkObject dataset; -- private VtkObject filter; AddBlock(Plugins/DynamicDataset/src/com/artenum/cassandra/plugin/dynamic/dataset/DynamicDatasetPlugin.java,97,4) ++ private CassandraObject actor; ++ private CassandraObject mapper; ++ private CassandraObject dataset; ++ private CassandraObject filter; DelBlock(Plugins/DynamicDataset/src/com/artenum/cassandra/plugin/dynamic/dataset/DynamicDatasetPlugin.java,204,1) -- filter.getMetaData().put(VtkObject.POPUP_MENU, getContextualMenu()); AddBlock(Plugins/DynamicDataset/src/com/artenum/cassandra/plugin/dynamic/dataset/DynamicDatasetPlugin.java,204,1) ++ filter.getMetaData().put(CassandraObject.POPUP_MENU, getContextualMenu()); DelBlock(Plugins/GenericCutter/src/com/artenum/cassandra/plugin/cutter/CutterControlUI.java,12,1) -- import com.artenum.cassandra.pipeline.VtkObject; AddBlock(Plugins/GenericCutter/src/com/artenum/cassandra/plugin/cutter/CutterControlUI.java,12,1) ++ import com.artenum.cassandra.pipeline.CassandraObject; DelBlock(Plugins/GenericCutter/src/com/artenum/cassandra/plugin/cutter/CutterControlUI.java,22,1) -- import java.awt.event.ActionListener; DelBlock(Plugins/GenericCutter/src/com/artenum/cassandra/plugin/cutter/CutterControlUI.java,31,1) -- import javax.swing.JDialog; DelBlock(Plugins/GenericCutter/src/com/artenum/cassandra/plugin/cutter/CutterControlUI.java,37,1) -- import javax.swing.event.ChangeListener; DelBlock(Plugins/GenericCutter/src/com/artenum/cassandra/plugin/cutter/CutterControlUI.java,55,1) -- * @author Sebastien Jourdain AddBlock(Plugins/GenericCutter/src/com/artenum/cassandra/plugin/cutter/CutterControlUI.java,55,1) ++ * @author Sebastien Jourdain, Artenum sarl DelBlock(Plugins/GenericCutter/src/com/artenum/cassandra/plugin/cutter/CutterControlUI.java,267,1) -- * Performe the actions requested by the components (buttons, etc...) AddBlock(Plugins/GenericCutter/src/com/artenum/cassandra/plugin/cutter/CutterControlUI.java,267,1) ++ * Perform the actions requested by the components (buttons, etc...) DelBlock(Plugins/GenericCutter/src/com/artenum/cassandra/plugin/cutter/CutterControlUI.java,287,1) -- (vtkDataSet) ((VtkObject) input.getSelectedItem()).getVtkObject()); AddBlock(Plugins/GenericCutter/src/com/artenum/cassandra/plugin/cutter/CutterControlUI.java,287,1) ++ (vtkDataSet) ((CassandraObject) input.getSelectedItem()).getVtkObject()); DelBlock(Plugins/GenericCutter/src/com/artenum/cassandra/plugin/cutter/CutterControlUI.java,292,1) -- (vtkDataSet) ((VtkObject) input.getSelectedItem()).getVtkObject()); AddBlock(Plugins/GenericCutter/src/com/artenum/cassandra/plugin/cutter/CutterControlUI.java,292,1) ++ (vtkDataSet) ((CassandraObject) input.getSelectedItem()).getVtkObject()); DelBlock(Plugins/GenericCutter/src/com/artenum/cassandra/plugin/cutter/CutterControlUI.java,298,1) -- ((Number) cylinderRadius.getValue()).doubleValue(), (vtkDataSet) ((VtkObject) input.getSelectedItem()).getVtkObject()); AddBlock(Plugins/GenericCutter/src/com/artenum/cassandra/plugin/cutter/CutterControlUI.java,298,1) ++ ((Number) cylinderRadius.getValue()).doubleValue(), (vtkDataSet) ((CassandraObject) input.getSelectedItem()).getVtkObject()); DelBlock(Plugins/GenericCutter/src/com/artenum/cassandra/plugin/cutter/CutterControlUI.java,326,1) -- (vtkDataSet) ((VtkObject) input.getSelectedItem()).getVtkObject()); AddBlock(Plugins/GenericCutter/src/com/artenum/cassandra/plugin/cutter/CutterControlUI.java,326,1) ++ (vtkDataSet) ((CassandraObject) input.getSelectedItem()).getVtkObject()); DelBlock(Plugins/GenericCutter/src/com/artenum/cassandra/plugin/cutter/CutterPlugin.java,15,1) -- import com.artenum.cassandra.pipeline.VtkObject; AddBlock(Plugins/GenericCutter/src/com/artenum/cassandra/plugin/cutter/CutterPlugin.java,15,1) ++ import com.artenum.cassandra.pipeline.CassandraObject; DelBlock(Plugins/GenericCutter/src/com/artenum/cassandra/plugin/cutter/CutterPlugin.java,95,4) -- private VtkObject actor; -- private VtkObject mapper; -- private VtkObject dataset; -- private VtkObject filter; AddBlock(Plugins/GenericCutter/src/com/artenum/cassandra/plugin/cutter/CutterPlugin.java,95,4) ++ private CassandraObject actor; ++ private CassandraObject mapper; ++ private CassandraObject dataset; ++ private CassandraObject filter; DelBlock(Plugins/GenericCutter/src/com/artenum/cassandra/plugin/cutter/CutterPlugin.java,228,1) -- filter.getMetaData().put(VtkObject.POPUP_MENU, getContextualMenu()); AddBlock(Plugins/GenericCutter/src/com/artenum/cassandra/plugin/cutter/CutterPlugin.java,228,1) ++ filter.getMetaData().put(CassandraObject.POPUP_MENU, getContextualMenu()); AddBlock(Plugins/GenericCutter/src/com/artenum/cassandra/plugin/cutter/CutterPlugin.java,281,9) ++ /** ++ * update the status of the cutting sphere. ++ * ++ * @param cx ++ * @param cy ++ * @param cz ++ * @param radius ++ * @param vtkDataSet ++ */ DelBlock(Plugins/Glyph/src/com/artenum/cassandra/plugin/glyph/GlyphControlUI.java,41,1) -- import javax.swing.JTextField; DelBlock(Plugins/Glyph/src/com/artenum/cassandra/plugin/glyph/GlyphControlUI.java,47,1) -- import com.artenum.cassandra.pipeline.VtkObject; AddBlock(Plugins/Glyph/src/com/artenum/cassandra/plugin/glyph/GlyphControlUI.java,47,1) ++ import com.artenum.cassandra.pipeline.CassandraObject; DelBlock(Plugins/Glyph/src/com/artenum/cassandra/plugin/glyph/GlyphControlUI.java,182,1) -- public void setSelectedInput(VtkObject selectedInput){ AddBlock(Plugins/Glyph/src/com/artenum/cassandra/plugin/glyph/GlyphControlUI.java,182,1) ++ public void setSelectedInput(CassandraObject selectedInput){ DelBlock(Plugins/Glyph/src/com/artenum/cassandra/plugin/glyph/GlyphControlUI.java,212,1) -- plugin.updateGlyph(cellVertexFlag, (vtkDataSet) ((VtkObject) input.getSelectedItem()).getVtkObject(), plugin.ARROW_SOURCE); AddBlock(Plugins/Glyph/src/com/artenum/cassandra/plugin/glyph/GlyphControlUI.java,212,1) ++ plugin.updateGlyph(cellVertexFlag, (vtkDataSet) ((CassandraObject) input.getSelectedItem()).getVtkObject(), plugin.ARROW_SOURCE); DelBlock(Plugins/Glyph/src/com/artenum/cassandra/plugin/glyph/GlyphPlugin.java,35,1) -- import vtk.vtkCellCenters; DelBlock(Plugins/Glyph/src/com/artenum/cassandra/plugin/glyph/GlyphPlugin.java,39,1) -- import vtk.vtkDataSetMapper; DelBlock(Plugins/Glyph/src/com/artenum/cassandra/plugin/glyph/GlyphPlugin.java,44,1) -- import vtk.vtkUnstructuredGrid; DelBlock(Plugins/Glyph/src/com/artenum/cassandra/plugin/glyph/GlyphPlugin.java,49,1) -- import com.artenum.cassandra.pipeline.VtkObject; AddBlock(Plugins/Glyph/src/com/artenum/cassandra/plugin/glyph/GlyphPlugin.java,49,1) ++ import com.artenum.cassandra.pipeline.CassandraObject; DelBlock(Plugins/Glyph/src/com/artenum/cassandra/plugin/glyph/GlyphPlugin.java,93,6) -- private VtkObject outputCassActor; -- private VtkObject outputCassMapper; -- private VtkObject outputCassDataset; -- private VtkObject outputCassLookupTable; -- private VtkObject outputCassScalarBar; -- private VtkObject cassFilter; AddBlock(Plugins/Glyph/src/com/artenum/cassandra/plugin/glyph/GlyphPlugin.java,93,6) ++ private CassandraObject outputCassActor; ++ private CassandraObject outputCassMapper; ++ private CassandraObject outputCassDataset; ++ private CassandraObject outputCassLookupTable; ++ private CassandraObject outputCassScalarBar; ++ private CassandraObject cassFilter; DelBlock(Plugins/Glyph/src/com/artenum/cassandra/plugin/glyph/GlyphPlugin.java,275,1) -- cassFilter.getMetaData().put(VtkObject.POPUP_MENU, getContextualMenu()); AddBlock(Plugins/Glyph/src/com/artenum/cassandra/plugin/glyph/GlyphPlugin.java,275,1) ++ cassFilter.getMetaData().put(CassandraObject.POPUP_MENU, getContextualMenu()); DelBlock(Plugins/Glyph/src/com/artenum/cassandra/plugin/glyph/GlyphPlugin.java,389,1) -- Point cellPosition = ((VtkObjectCellAdapter) cassFilter.getMetaData().get(VtkObject.CELL)).getPosition(); AddBlock(Plugins/Glyph/src/com/artenum/cassandra/plugin/glyph/GlyphPlugin.java,389,1) ++ Point cellPosition = ((VtkObjectCellAdapter) cassFilter.getMetaData().get(CassandraObject.CELL)).getPosition(); DelBlock(Plugins/Info2D/src/com/artenum/cassandra/plugin/info2d/Info2DControlUI.java,12,1) -- import com.artenum.cassandra.pipeline.VtkObject; AddBlock(Plugins/Info2D/src/com/artenum/cassandra/plugin/info2d/Info2DControlUI.java,12,1) ++ import com.artenum.cassandra.pipeline.CassandraObject; DelBlock(Plugins/Info2D/src/com/artenum/cassandra/plugin/info2d/Info2DControlUI.java,136,1) -- plugin.updateInfo2D((vtkDataSet) ((VtkObject) datasetModel.getSelectedItem()).getVtkObject(), dataToShow.getSelectedIndex()); AddBlock(Plugins/Info2D/src/com/artenum/cassandra/plugin/info2d/Info2DControlUI.java,136,1) ++ plugin.updateInfo2D((vtkDataSet) ((CassandraObject) datasetModel.getSelectedItem()).getVtkObject(), dataToShow.getSelectedIndex()); DelBlock(Plugins/Info2D/src/com/artenum/cassandra/plugin/info2d/Infos2DPlugin.java,15,1) -- import com.artenum.cassandra.pipeline.VtkObject; AddBlock(Plugins/Info2D/src/com/artenum/cassandra/plugin/info2d/Infos2DPlugin.java,15,1) ++ import com.artenum.cassandra.pipeline.CassandraObject; DelBlock(Plugins/Info2D/src/com/artenum/cassandra/plugin/info2d/Infos2DPlugin.java,78,3) -- private VtkObject actor; -- private VtkObject mapper; -- private VtkObject filter; AddBlock(Plugins/Info2D/src/com/artenum/cassandra/plugin/info2d/Infos2DPlugin.java,78,3) ++ private CassandraObject actor; ++ private CassandraObject mapper; ++ private CassandraObject filter; DelBlock(Plugins/Info2D/src/com/artenum/cassandra/plugin/info2d/Infos2DPlugin.java,128,1) -- filter.getMetaData().put(VtkObject.POPUP_MENU, getContextualMenu()); AddBlock(Plugins/Info2D/src/com/artenum/cassandra/plugin/info2d/Infos2DPlugin.java,128,1) ++ filter.getMetaData().put(CassandraObject.POPUP_MENU, getContextualMenu()); DelBlock(Plugins/IsoLevel/src/com/artenum/cassandra/plugin/isolevel/IsoLevelControlUI.java,26,1) -- import com.artenum.cassandra.pipeline.VtkObject; AddBlock(Plugins/IsoLevel/src/com/artenum/cassandra/plugin/isolevel/IsoLevelControlUI.java,26,1) ++ import com.artenum.cassandra.pipeline.CassandraObject; DelBlock(Plugins/IsoLevel/src/com/artenum/cassandra/plugin/isolevel/IsoLevelControlUI.java,221,1) -- plugin.updateIsoLevel((vtkDataSet) ((VtkObject) datasetModel.getSelectedItem()).getVtkObject(), updateLevelValue(), nbLevelValue, levelFlag, AddBlock(Plugins/IsoLevel/src/com/artenum/cassandra/plugin/isolevel/IsoLevelControlUI.java,221,1) ++ plugin.updateIsoLevel((vtkDataSet) ((CassandraObject) datasetModel.getSelectedItem()).getVtkObject(), updateLevelValue(), nbLevelValue, levelFlag, DelBlock(Plugins/IsoLevel/src/com/artenum/cassandra/plugin/isolevel/IsoLevelControlUI.java,235,1) -- double[] range = ((vtkDataSet) ((VtkObject) datasetModel.getSelectedItem()).getVtkObject()).GetScalarRange(); AddBlock(Plugins/IsoLevel/src/com/artenum/cassandra/plugin/isolevel/IsoLevelControlUI.java,235,1) ++ double[] range = ((vtkDataSet) ((CassandraObject) datasetModel.getSelectedItem()).getVtkObject()).GetScalarRange(); DelBlock(Plugins/IsoLevel/src/com/artenum/cassandra/plugin/isolevel/IsoLevelControlUI.java,250,1) -- plugin.updateIsoLevel((vtkDataSet) ((VtkObject) inputDataset.getSelectedItem()).getVtkObject(), level, 1, 0, minValue, maxValue); AddBlock(Plugins/IsoLevel/src/com/artenum/cassandra/plugin/isolevel/IsoLevelControlUI.java,250,1) ++ plugin.updateIsoLevel((vtkDataSet) ((CassandraObject) inputDataset.getSelectedItem()).getVtkObject(), level, 1, 0, minValue, maxValue); DelBlock(Plugins/IsoLevel/src/com/artenum/cassandra/plugin/isolevel/IsoLevelControlUI.java,288,1) -- public void setSelectedInput(VtkObject selectedInput){ AddBlock(Plugins/IsoLevel/src/com/artenum/cassandra/plugin/isolevel/IsoLevelControlUI.java,288,1) ++ public void setSelectedInput(CassandraObject selectedInput){ DelBlock(Plugins/IsoLevel/src/com/artenum/cassandra/plugin/isolevel/IsoLevelPlugin.java,29,1) -- import com.artenum.cassandra.pipeline.VtkObject; AddBlock(Plugins/IsoLevel/src/com/artenum/cassandra/plugin/isolevel/IsoLevelPlugin.java,29,1) ++ import com.artenum.cassandra.pipeline.CassandraObject; DelBlock(Plugins/IsoLevel/src/com/artenum/cassandra/plugin/isolevel/IsoLevelPlugin.java,111,7) -- private VtkObject outputCassActor; -- private VtkObject outputCassMapper; -- private VtkObject outputCassDataset; -- private VtkObject outputCassDatasetN; -- private VtkObject outputCassLookupTable; -- private VtkObject outputCassScalarBar; -- private VtkObject cassFilter; AddBlock(Plugins/IsoLevel/src/com/artenum/cassandra/plugin/isolevel/IsoLevelPlugin.java,111,7) ++ private CassandraObject outputCassActor; ++ private CassandraObject outputCassMapper; ++ private CassandraObject outputCassDataset; ++ private CassandraObject outputCassDatasetN; ++ private CassandraObject outputCassLookupTable; ++ private CassandraObject outputCassScalarBar; ++ private CassandraObject cassFilter; DelBlock(Plugins/IsoLevel/src/com/artenum/cassandra/plugin/isolevel/IsoLevelPlugin.java,270,1) -- cassFilter.getMetaData().put(VtkObject.POPUP_MENU, getContextualMenu()); AddBlock(Plugins/IsoLevel/src/com/artenum/cassandra/plugin/isolevel/IsoLevelPlugin.java,270,1) ++ cassFilter.getMetaData().put(CassandraObject.POPUP_MENU, getContextualMenu()); DelBlock(Plugins/IsoLevel/src/com/artenum/cassandra/plugin/isolevel/IsoLevelPlugin.java,317,1) -- this.cellPosition = ((VtkObjectCellAdapter) cassFilter.getMetaData().get(VtkObject.CELL)).getPosition(); AddBlock(Plugins/IsoLevel/src/com/artenum/cassandra/plugin/isolevel/IsoLevelPlugin.java,317,1) ++ this.cellPosition = ((VtkObjectCellAdapter) cassFilter.getMetaData().get(CassandraObject.CELL)).getPosition(); DelBlock(Plugins/IsoLevel/src/com/artenum/cassandra/plugin/isolevel/IsoLevelPlugin.java,390,1) -- public VtkObject getOutputDataSet() { AddBlock(Plugins/IsoLevel/src/com/artenum/cassandra/plugin/isolevel/IsoLevelPlugin.java,390,1) ++ public CassandraObject getOutputDataSet() { DelBlock(Plugins/IsoLevel/src/com/artenum/cassandra/plugin/isolevel/IsoLevelPlugin.java,394,1) -- public VtkObject getActor() { AddBlock(Plugins/IsoLevel/src/com/artenum/cassandra/plugin/isolevel/IsoLevelPlugin.java,394,1) ++ public CassandraObject getActor() { DelBlock(Plugins/IsoLevel/src/com/artenum/cassandra/plugin/isolevel/IsoLevelPlugin.java,429,1) -- this.cellPosition = ((VtkObjectCellAdapter) cassFilter.getMetaData().get(VtkObject.CELL)).getPosition(); AddBlock(Plugins/IsoLevel/src/com/artenum/cassandra/plugin/isolevel/IsoLevelPlugin.java,429,1) ++ this.cellPosition = ((VtkObjectCellAdapter) cassFilter.getMetaData().get(CassandraObject.CELL)).getPosition(); DelBlock(Plugins/IsoLevel/src/com/artenum/cassandra/plugin/isolevel/IsoLevelPlugin.java,486,1) -- ((VtkObjectCellAdapter) cassFilter.getMetaData().get(VtkObject.CELL)).setPosition(new Point(cellPosX, cellPosY)); AddBlock(Plugins/IsoLevel/src/com/artenum/cassandra/plugin/isolevel/IsoLevelPlugin.java,486,1) ++ ((VtkObjectCellAdapter) cassFilter.getMetaData().get(CassandraObject.CELL)).setPosition(new Point(cellPosX, cellPosY)); DelBlock(Plugins/ProbingLine/build.xml,47,1) -- <javac srcdir="${src.dir}" destdir="${classes.build.dir}" optimize="yes"> AddBlock(Plugins/ProbingLine/build.xml,47,1) ++ <javac srcdir="${src.dir}" destdir="${classes.build.dir}" debug="true" optimize="yes"> DelBlock(Plugins/ProbingLine/build.xml,110,1) -- <echo message="Â and place it in the Cassandra plugin directory" /> AddBlock(Plugins/ProbingLine/build.xml,110,1) ++ <echo message=" and place it in the Cassandra plugin directory" /> DelBlock(Plugins/ProbingLine/build.xml,112,1) -- <echo message="Â the Doc-API directory" /> AddBlock(Plugins/ProbingLine/build.xml,112,1) ++ <echo message=" the Doc-API directory" /> DelBlock(Plugins/ProbingLine/config.properties,68,2) -- thirdpart.jar-file.jfreechart=${cassandra.root}/thirdpart/jfreechart-1.0.13/lib/jfreechart-1.0.13.jar -- thirdpart.jar-file.jcommon=${cassandra.root}/thirdpart/jfreechart-1.0.13/lib/jcommon-1.0.16.jar AddBlock(Plugins/ProbingLine/config.properties,68,2) ++ thirdpart.jar-file.jfreechart=${cassandra.root}/thirdpart/JFreeChart/jfreechart-1.0.13/lib/jfreechart-1.0.13.jar ++ thirdpart.jar-file.jcommon=${cassandra.root}/thirdpart/JFreeChart/jfreechart-1.0.13/lib/jcommon-1.0.16.jar DelBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLineControlUI.java,12,1) -- import com.artenum.cassandra.pipeline.VtkObject; AddBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLineControlUI.java,12,1) ++ import com.artenum.cassandra.pipeline.CassandraObject; DelBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLineControlUI.java,271,1) -- public void setSelectedInput(VtkObject selectedInput){ AddBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLineControlUI.java,271,1) ++ public void setSelectedInput(CassandraObject selectedInput){ DelBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLineControlUI.java,307,1) -- plugin.updateProbe((vtkDataSet) ((VtkObject) datasetModel.getSelectedItem()).getVtkObject(), startPt, endPt, res, viewPlot2D.isSelected(), AddBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLineControlUI.java,307,1) ++ plugin.updateProbe((vtkDataSet) ((CassandraObject) datasetModel.getSelectedItem()).getVtkObject(), startPt, endPt, res, viewPlot2D.isSelected(), DelBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLinePlugin.java,22,1) -- import javax.swing.JFrame; DelBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLinePlugin.java,40,1) -- import com.artenum.cassandra.pipeline.VtkObject; AddBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLinePlugin.java,40,1) ++ import com.artenum.cassandra.pipeline.CassandraObject; DelBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLinePlugin.java,47,1) -- import com.sun.org.apache.xml.internal.serialize.LineSeparator; DelBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLinePlugin.java,98,1) -- private vtkTransformPolyDataFilter tf; AddBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLinePlugin.java,98,1) ++ //private vtkTransformPolyDataFilter tf; DelBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLinePlugin.java,105,6) -- private VtkObject outputCassDataset; -- private VtkObject cassFilter; -- private VtkObject outputCassMapper; -- private VtkObject outputCassActor; -- private VtkObject outputCassLookupTable; -- private VtkObject outputCassScalarBar; AddBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLinePlugin.java,105,6) ++ private CassandraObject outputCassDataset; ++ private CassandraObject cassFilter; ++ private CassandraObject outputCassMapper; ++ private CassandraObject outputCassActor; ++ private CassandraObject outputCassLookupTable; ++ private CassandraObject outputCassScalarBar; DelBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLinePlugin.java,152,1) -- * Contructor used in the pipeline importer AddBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLinePlugin.java,152,1) ++ * Constructor used in the pipeline importer DelBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLinePlugin.java,243,1) -- AddBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLinePlugin.java,243,2) ++ ++ ///////////////////////////////////// DelBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLinePlugin.java,247,2) -- this.outputCassDataset = pipelineManager.addDataSet(probe.GetOutput(), "Probe"); -- System.out.println("filter: new component"); AddBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLinePlugin.java,247,2) ++ probe.SetInput(line.GetOutput()); ++ this.outputCassDataset = pipelineManager.addDataSet(probe.GetOutput(), "Probe Output"); DelBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLinePlugin.java,250,1) -- probe.SetInput(line.GetOutput()); AddBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLinePlugin.java,250,1) ++ ///////////////////////////////////// DelBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLinePlugin.java,254,2) -- outputCassMapper = pipelineManager.addMapper(lineMapper, "Probe"); -- System.out.println("mapper: new component"); AddBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLinePlugin.java,254,1) ++ this.outputCassMapper = pipelineManager.addMapper(lineMapper, "Probe Mapper"); AddBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLinePlugin.java,256,1) ++ DelBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLinePlugin.java,258,1) -- AddBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLinePlugin.java,258,1) ++ DelBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLinePlugin.java,265,1) -- AddBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLinePlugin.java,265,18) ++ ++ ++ // Build lookupTable ++ if (outputLookupTable == null) { ++ outputLookupTable = new vtkLookupTable(); ++ outputCassLookupTable = pipelineManager.addLookupTable(outputLookupTable, "Clipping plane"); ++ } else outputCassLookupTable = pipelineManager.getCassandraVtkObjectByTrueVtkObject(outputLookupTable); ++ outputLookupTable.SetHueRange(0.66667, 0); ++ outputLookupTable.Build(); ++ lineMapper.SetLookupTable(outputLookupTable); ++ ++ // Scalar bar ++ if (outputScalarBar == null) { ++ outputScalarBar = new vtkScalarBarActor(); ++ outputCassScalarBar = pipelineManager.addScalarBar(outputScalarBar, "Clipping plane"); ++ } else outputCassScalarBar = pipelineManager.getCassandraVtkObjectByTrueVtkObject(outputScalarBar); ++ outputScalarBar.SetLookupTable(outputLookupTable); ++ DelBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLinePlugin.java,284,2) -- filterImpl.getOutputDataSet().add(probe.GetOutput()); -- filterImpl.addRemoveListener(this); AddBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLinePlugin.java,284,2) ++ //filterImpl.getOutputDataSet().add(probe.GetOutput()); ++ //filterImpl.addRemoveListener(this); AddBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLinePlugin.java,287,4) ++ // define the filter (i.e the yellow triangle) and load it in the Cassandra pipeline ++ cassFilter = pipelineManager.addFilter(filterImpl, "Prober"); ++ cassFilter.getMetaData().put(CassandraObject.POPUP_MENU, getContextualMenu()); ++ DelBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLinePlugin.java,300,4) -- // -- cassFilter = pipelineManager.addFilter(filterImpl, "Prober"); -- cassFilter.getMetaData().put(VtkObject.POPUP_MENU, getContextualMenu()); -- DelBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLinePlugin.java,334,2) -- filterImpl.getInputDataSet().clear(); -- filterImpl.getInputDataSet().add(inputDataSet); AddBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLinePlugin.java,334,2) ++ //filterImpl.getInputDataSet().clear(); ++ //filterImpl.getInputDataSet().add(inputDataSet); AddBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLinePlugin.java,378,12) ++ ++ // registration of internal elements of the filter ++ // useful for export of the detailed pipeline if needed ++ filterImpl.getInputDataSet().clear(); ++ filterImpl.getInputDataSet().add(inputDataSet); ++ filterImpl.getOutputDataSet().clear(); ++ filterImpl.getOutputDataSet().add(probe.GetOutput()); ++ filterImpl.getAlgorithm().add(probe); ++ filterImpl.getVtkImplicitFunction().clear(); ++ filterImpl.getVtkImplicitFunction().add(line); ++ pipelineManager.notifyConnectivityChange(cassFilter); ++ AddBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLinePlugin.java,480,1) ++ pipelineManager.removeVtkObject(outputCassActor); AddBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLinePlugin.java,482,1) ++ pipelineManager.removeVtkObject(outputCassMapper); DelBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLinePlugin.java,494,1) -- public VtkObject getOutputDataSet() { AddBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLinePlugin.java,494,1) ++ public CassandraObject getOutputDataSet() { AddBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLinePlugin.java,513,1) ++ if(lineWidget != null){ AddBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLinePlugin.java,515,1) ++ } DelBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLinePlugin.java,624,1) -- Point cellPosition = ((VtkObjectCellAdapter) cassFilter.getMetaData().get(VtkObject.CELL)).getPosition(); AddBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLinePlugin.java,624,1) ++ Point cellPosition = ((VtkObjectCellAdapter) cassFilter.getMetaData().get(CassandraObject.CELL)).getPosition(); DelBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLinePlugin.java,666,1) -- if (cellPosX > 0 && cellPosY > 0) ((VtkObjectCellAdapter) cassFilter.getMetaData().get(VtkObject.CELL)).setPosition(new Point(cellPosX, cellPosY)); AddBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLinePlugin.java,666,1) ++ if (cellPosX > 0 && cellPosY > 0) ((VtkObjectCellAdapter) cassFilter.getMetaData().get(CassandraObject.CELL)).setPosition(new Point(cellPosX, cellPosY)); DelBlock(Plugins/Threshold/src/com/artenum/cassandra/plugin/threshold/ThresholdControlUI.java,26,1) -- import com.artenum.cassandra.pipeline.VtkObject; AddBlock(Plugins/Threshold/src/com/artenum/cassandra/plugin/threshold/ThresholdControlUI.java,26,1) ++ import com.artenum.cassandra.pipeline.CassandraObject; DelBlock(Plugins/Threshold/src/com/artenum/cassandra/plugin/threshold/ThresholdControlUI.java,38,1) -- import java.awt.event.ActionListener; DelBlock(Plugins/Threshold/src/com/artenum/cassandra/plugin/threshold/ThresholdControlUI.java,46,1) -- import javax.swing.JDialog; DelBlock(Plugins/Threshold/src/com/artenum/cassandra/plugin/threshold/ThresholdControlUI.java,188,1) -- plugin.updateThreshold((vtkDataSet) ((VtkObject) datasetModel.getSelectedItem()).getVtkObject(), thresholdType, AddBlock(Plugins/Threshold/src/com/artenum/cassandra/plugin/threshold/ThresholdControlUI.java,188,1) ++ plugin.updateThreshold((vtkDataSet) ((CassandraObject) datasetModel.getSelectedItem()).getVtkObject(), thresholdType, DelBlock(Plugins/Threshold/src/com/artenum/cassandra/plugin/threshold/ThresholdControlUI.java,202,1) -- double[] range = ((vtkDataSet) ((VtkObject) datasetModel.getSelectedItem()).getVtkObject()).GetScalarRange(); AddBlock(Plugins/Threshold/src/com/artenum/cassandra/plugin/threshold/ThresholdControlUI.java,202,1) ++ double[] range = ((vtkDataSet) ((CassandraObject) datasetModel.getSelectedItem()).getVtkObject()).GetScalarRange(); DelBlock(Plugins/Threshold/src/com/artenum/cassandra/plugin/threshold/ThresholdPlugin.java,29,1) -- import com.artenum.cassandra.pipeline.VtkObject; AddBlock(Plugins/Threshold/src/com/artenum/cassandra/plugin/threshold/ThresholdPlugin.java,29,1) ++ import com.artenum.cassandra.pipeline.CassandraObject; DelBlock(Plugins/Threshold/src/com/artenum/cassandra/plugin/threshold/ThresholdPlugin.java,96,4) -- private VtkObject actor; -- private VtkObject mapper; -- private VtkObject dataset; -- private VtkObject filter; AddBlock(Plugins/Threshold/src/com/artenum/cassandra/plugin/threshold/ThresholdPlugin.java,96,4) ++ private CassandraObject actor; ++ private CassandraObject mapper; ++ private CassandraObject dataset; ++ private CassandraObject filter; DelBlock(Plugins/Threshold/src/com/artenum/cassandra/plugin/threshold/ThresholdPlugin.java,168,1) -- filter.getMetaData().put(VtkObject.POPUP_MENU, getContextualMenu()); AddBlock(Plugins/Threshold/src/com/artenum/cassandra/plugin/threshold/ThresholdPlugin.java,168,1) ++ filter.getMetaData().put(CassandraObject.POPUP_MENU, getContextualMenu()); DelBlock(Plugins/Threshold/src/com/artenum/cassandra/plugin/threshold/ThresholdPlugin.java,238,1) -- public VtkObject getOutputDataSet() { AddBlock(Plugins/Threshold/src/com/artenum/cassandra/plugin/threshold/ThresholdPlugin.java,238,1) ++ public CassandraObject getOutputDataSet() { DelBlock(Plugins/WarpScalar/src/com/artenum/cassandra/plugin/warp/scalar/WarpScalarControlUI.java,26,1) -- import com.artenum.cassandra.pipeline.VtkObject; AddBlock(Plugins/WarpScalar/src/com/artenum/cassandra/plugin/warp/scalar/WarpScalarControlUI.java,26,1) ++ import com.artenum.cassandra.pipeline.CassandraObject; DelBlock(Plugins/WarpScalar/src/com/artenum/cassandra/plugin/warp/scalar/WarpScalarControlUI.java,36,1) -- import java.awt.event.ActionListener; DelBlock(Plugins/WarpScalar/src/com/artenum/cassandra/plugin/warp/scalar/WarpScalarControlUI.java,38,2) -- import java.util.Hashtable; -- DelBlock(Plugins/WarpScalar/src/com/artenum/cassandra/plugin/warp/scalar/WarpScalarControlUI.java,43,1) -- import javax.swing.JDialog; DelBlock(Plugins/WarpScalar/src/com/artenum/cassandra/plugin/warp/scalar/WarpScalarControlUI.java,48,1) -- import javax.swing.event.ChangeListener; DelBlock(Plugins/WarpScalar/src/com/artenum/cassandra/plugin/warp/scalar/WarpScalarControlUI.java,199,1) -- plugin.updateWarpScalar(scale_, nx, ny, nz, (vtkDataSet) ((VtkObject) input.getSelectedItem()).getVtkObject()); AddBlock(Plugins/WarpScalar/src/com/artenum/cassandra/plugin/warp/scalar/WarpScalarControlUI.java,199,1) ++ plugin.updateWarpScalar(scale_, nx, ny, nz, (vtkDataSet) ((CassandraObject) input.getSelectedItem()).getVtkObject()); DelBlock(Plugins/WarpScalar/src/com/artenum/cassandra/plugin/warp/scalar/WarpScalarControlUI.java,210,1) -- * the sldie bar is changed. AddBlock(Plugins/WarpScalar/src/com/artenum/cassandra/plugin/warp/scalar/WarpScalarControlUI.java,210,1) ++ * the slide bar is changed. DelBlock(Plugins/WarpScalar/src/com/artenum/cassandra/plugin/warp/scalar/WarpScalarControlUI.java,218,1) -- plugin.updateWarpScalar(value, nx, ny, nz, (vtkDataSet) ((VtkObject) input.getSelectedItem()).getVtkObject()); AddBlock(Plugins/WarpScalar/src/com/artenum/cassandra/plugin/warp/scalar/WarpScalarControlUI.java,218,1) ++ plugin.updateWarpScalar(value, nx, ny, nz, (vtkDataSet) ((CassandraObject) input.getSelectedItem()).getVtkObject()); DelBlock(Plugins/WarpScalar/src/com/artenum/cassandra/plugin/warp/scalar/WarpScalarPlugin.java,29,1) -- import com.artenum.cassandra.pipeline.VtkObject; AddBlock(Plugins/WarpScalar/src/com/artenum/cassandra/plugin/warp/scalar/WarpScalarPlugin.java,29,1) ++ import com.artenum.cassandra.pipeline.CassandraObject; DelBlock(Plugins/WarpScalar/src/com/artenum/cassandra/plugin/warp/scalar/WarpScalarPlugin.java,39,1) -- import vtk.vtkPointSetAlgorithm; DelBlock(Plugins/WarpScalar/src/com/artenum/cassandra/plugin/warp/scalar/WarpScalarPlugin.java,99,4) -- private VtkObject actor; -- private VtkObject mapper; -- private VtkObject dataset; -- private VtkObject filter; AddBlock(Plugins/WarpScalar/src/com/artenum/cassandra/plugin/warp/scalar/WarpScalarPlugin.java,99,4) ++ private CassandraObject actor; ++ private CassandraObject mapper; ++ private CassandraObject dataset; ++ private CassandraObject filter; DelBlock(Plugins/WarpScalar/src/com/artenum/cassandra/plugin/warp/scalar/WarpScalarPlugin.java,162,1) -- filter.getMetaData().put(VtkObject.POPUP_MENU, getContextualMenu()); AddBlock(Plugins/WarpScalar/src/com/artenum/cassandra/plugin/warp/scalar/WarpScalarPlugin.java,162,1) ++ filter.getMetaData().put(CassandraObject.POPUP_MENU, getContextualMenu()); AddBlock(Plugins/X3DExporter/src/com/artenum/cassandra/plugin/X3DExporter/X3DExporterPlugin.java,106,1) ++ DelBlock(Renderer/build.xml,5,1) -- <property file="config.properties" /> AddBlock(Renderer/build.xml,5,8) ++ ++ <!-- ++ <property file="config.properties" /> ++ <property name="cassandra.root.path" value="${basedir}/.." /> ++ --> ++ ++ <property name="cassandra.root" value=".." /> ++ <property file="../config.properties" /> DelBlock(Renderer/build.xml,18,3) -- -- <property name="cassandra.root.path" value="${basedir}/.." /> -- UpdateBinaryFile(Renderer/CassandraRenderer-1.1.0-all-all-none-jvm1_6-stable/CassandraRenderer-1.1.0-all-all-none-jvm1_6-stable.jar) DelBlock(Renderer/CassandraRenderer-1.1.0-all-all-none-jvm1_6-stable/version.txt,9,2) -- Date of build: 20110616 -- Hour of build: 2229 AddBlock(Renderer/CassandraRenderer-1.1.0-all-all-none-jvm1_6-stable/version.txt,9,2) ++ Date of build: 20110630 ++ Hour of build: 0314 DelBlock(Renderer/CassandraRenderer-1.1.0-all-all-none-jvm1_6-stable/version.txt,12,1) -- Cassandra CORE branch development ticket: 6249 AddBlock(Renderer/CassandraRenderer-1.1.0-all-all-none-jvm1_6-stable/version.txt,12,1) ++ Cassandra CORE branch development ticket: ${cassandra.so6.last.ticket.before.corruption} AddBlock(test.sh,6,1) ++ cp thirdpart/JFreeMesh/JFreeMesh-2.4.1/JFreeMesh-CassandraPlugin.jar Cassandra-2.4.03/plugin/ UpdateBinaryFile(tmpCrossDepDir/CorePipeline.jar) Remove(tmpCrossDepDir/tmp/build.xml) Remove(Plugins/X3DExporter/DefaultPlugin.jar) Remove(Plugins/Threshold/ThresholdPlugin.jar) Remove(Plugins/ProbingLine/ProbingLinePlugin.jar) Remove(Plugins/Glyph/thirdpart/vtk50/vtk.jar) Remove(Plugins/Glyph/thirdpart/jalopy-ant-0.1-1.5rc3/log4j.jar) Remove(Plugins/Glyph/thirdpart/jalopy-ant-0.1-1.5rc3/jalopy.jar) Remove(Plugins/Glyph/thirdpart/jalopy-ant-0.1-1.5rc3/jalopy-ant.jar) Remove(Plugins/Glyph/thirdpart/DedaleGraph/DedaleGraph.jar) Remove(Plugins/Glyph/thirdpart/Cassandra/CassandraLauncher.jar) Remove(Plugins/Glyph/thirdpart/Cassandra/Cassandra.jar) Remove(Plugins/Glyph/binary-plugin/CellCenterPlugin.jar) Remove(Plugins/GenericCutter/CutterPlugin.jar) Remove(Plugins/DynamicDataset/DynamicLoaderPlugin.jar) Remove(Plugins/Default/DefaultPlugin.jar) Remove(Plugins/CuttingPlaneTemplate/thirdpart/vtk50/vtk.jar) Remove(Plugins/CuttingPlaneTemplate/thirdpart/jalopy-ant-0.1-1.5rc3/log4j.jar) Remove(Plugins/CuttingPlaneTemplate/thirdpart/jalopy-ant-0.1-1.5rc3/jalopy.jar) Remove(Plugins/CuttingPlaneTemplate/thirdpart/jalopy-ant-0.1-1.5rc3/jalopy-ant.jar) Remove(Plugins/CuttingPlaneTemplate/thirdpart/DedaleGraph/DedaleGraph.jar) Remove(Plugins/CuttingPlaneTemplate/thirdpart/Cassandra/CassandraLauncher.jar) Remove(Plugins/CuttingPlaneTemplate/thirdpart/Cassandra/Cassandra.jar) Remove(Plugins/CellCenter/thirdpart/vtk50/vtk.jar) Remove(Plugins/CellCenter/thirdpart/jalopy-ant-0.1-1.5rc3/log4j.jar) Remove(Plugins/CellCenter/thirdpart/jalopy-ant-0.1-1.5rc3/jalopy.jar) Remove(Plugins/CellCenter/thirdpart/jalopy-ant-0.1-1.5rc3/jalopy-ant.jar) Remove(Plugins/CellCenter/thirdpart/DedaleGraph/DedaleGraph.jar) Remove(Plugins/CellCenter/thirdpart/Cassandra/CassandraLauncher.jar) Remove(Plugins/CellCenter/thirdpart/Cassandra/Cassandra.jar) Remove(Plugins/CellCenter/binary-plugin/CellCenterPlugin.jar) Remove(Core/src/com/artenum/cassandra/pipeline/VtkObject.java) Remove(Core/plugin/X3DExporterPlugin.jar) Remove(Core/plugin/WarpScalarPlugin.jar) Remove(Core/plugin/ThresholdPlugin.jar) Remove(Core/plugin/ProbingLinePlugin.jar) Remove(Core/plugin/IsoLevelPlugin.jar) Remove(Core/plugin/Glyph.jar) Remove(Core/plugin/DynamicDatasetPlugin.jar) Remove(Core/plugin/DefaultPlugin.jar) Remove(Core/plugin/CuttingPlanePlugin.jar) Remove(Core/plugin/CutterPlugin.jar) Remove(Core/plugin/ClippingPlugin.jar) Remove(Core/plugin/CellCenterPlugin.jar) Remove(Core/plugin/2DInfosPlugin.jar)
- correction of build.xml and properties files
AddTxtFile(cassandra.properties) AddTxtFile(cassandra.properties.SAV) DelBlock(config.properties,85,2) -- -- jython.home=${thirdpart.dir}/Jython/jython2.5.1 AddBlock(config.properties,85,4) ++ ################################################################ ++ # Jython interpreter # ++ ################################################################ ++ jython.dir=${thirdpart.dir}/Jython/jython2.5.1 AddBlock(Core/build.xml,217,1) ++ <echo message="XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX File Separator: ${path.separator}" /> DelBlock(Core/build.xml,221,3) -- <filter token="CASSANDRA_CLASS_PATH" value="${thirdpart.jar-file.vtk};${thirdpart.jar-file.renderer};${thirdpart.jar-file.pipeline};${jar.name};${thirdpart.jar-file.arttk};${thirdpart.jar-file.dedalegraph};${thirdpart.jar-file.jyconsole};${thirdpart.jar-file.jython}" /> -- <filter token="CASSANDRA_PYHTON_PATH_WIN" value="${thirdpart.jar-file.vtk};${jython.home};${jar.name};plugin/IsoLevelPlugin.jar" /> -- <filter token="CASSANDRA_PYHTON_PATH_LINUX" value="${thirdpart.jar-file.vtk}:${jython.home}:${jar.name}:plugin/IsoLevelPlugin.jar" /> AddBlock(Core/build.xml,221,3) ++ <filter token="CASSANDRA_CLASS_PATH" value="${thirdpart.jar-file.vtk}${path.separator}${thirdpart.jar-file.renderer}${path.separator}${thirdpart.jar-file.pipeline}${path.separator}${jar.name}${path.separator}${thirdpart.jar-file.arttk}${path.separator}${thirdpart.jar-file.dedalegraph}${path.separator}${thirdpart.jar-file.jyconsole}${path.separator}${thirdpart.jar-file.jython}${path.separator}${thirdpart.dir}/JFreeChart/jfreechart-1.0.13/lib/jfreechart-1.0.13.jar${path.separator}${thirdpart.dir}/JFreeChart/jfreechart-1.0.13/lib/jcommon-1.0.16.jar" /> ++ <filter token="CASSANDRA_PYHTON_PATH_WIN" value="${thirdpart.jar-file.vtk}${path.separator}${jython.home}${path.separator}${jar.name}${path.separator}plugin/IsoLevelPlugin.jar" /> ++ <filter token="CASSANDRA_PYHTON_PATH_LINUX" value="${thirdpart.jar-file.vtk}${path.separator}${jython.home}${path.separator}${jar.name}${path.separator}plugin/IsoLevelPlugin.jar" /> DelBlock(Core/cassandra.properties,88,1) -- java.class.path=@CASSANDRA_CLASS_PATH@;../thirdpart/JFreeChart/jfreechart-1.0.13/lib/jfreechart-1.0.13.jar;../thirdpart/JFreeChart/jfreechart-1.0.13/lib/jcommon-1.0.16.jar AddBlock(Core/cassandra.properties,88,1) ++ java.class.path=@CASSANDRA_CLASS_PATH@ UpdateBinaryFile(Core/plugin/2DInfosPlugin.jar) UpdateBinaryFile(Core/plugin/CellCenterPlugin.jar) UpdateBinaryFile(Core/plugin/ClippingPlugin.jar) UpdateBinaryFile(Core/plugin/CutterPlugin.jar) UpdateBinaryFile(Core/plugin/CuttingPlanePlugin.jar) UpdateBinaryFile(Core/plugin/DefaultPlugin.jar) UpdateBinaryFile(Core/plugin/DynamicDatasetPlugin.jar) UpdateBinaryFile(Core/plugin/Glyph.jar) UpdateBinaryFile(Core/plugin/IsoLevelPlugin.jar) UpdateBinaryFile(Core/plugin/ProbingLinePlugin.jar) UpdateBinaryFile(Core/plugin/ThresholdPlugin.jar) UpdateBinaryFile(Core/plugin/WarpScalarPlugin.jar) UpdateBinaryFile(Core/plugin/X3DExporterPlugin.jar) DelBlock(Core/src/com/artenum/cassandra/action/CassandraActionListener.java,229,1) -- ThreadeFileLoader loader = new ThreadeFileLoader(pipeLineManager, recentFile); AddBlock(Core/src/com/artenum/cassandra/action/CassandraActionListener.java,229,1) ++ ThreadedFileLoader loader = new ThreadedFileLoader(pipeLineManager, recentFile); DelBlock(Core/src/com/artenum/cassandra/action/CassandraActionListener.java,242,1) -- ThreadeFileLoader loader = new ThreadeFileLoader(pipeLineManager, bookmarkedFile); AddBlock(Core/src/com/artenum/cassandra/action/CassandraActionListener.java,242,1) ++ ThreadedFileLoader loader = new ThreadedFileLoader(pipeLineManager, bookmarkedFile); DelBlock(Core/src/com/artenum/cassandra/action/CassandraActionListener.java,432,1) -- ThreadeFileLoader loader = new ThreadeFileLoader(pipeLineManager); AddBlock(Core/src/com/artenum/cassandra/action/CassandraActionListener.java,432,1) ++ ThreadedFileLoader loader = new ThreadedFileLoader(pipeLineManager); AddTxtFile(Core/src/com/artenum/cassandra/action/ThreadedFileLoader.java) AddBlock(Core/src-launch/com/artenum/cassandra/launcher/Run.java,116,1) ++ String pathSep = System.getProperty("path.separator"); DelBlock(Core/src-launch/com/artenum/cassandra/launcher/Run.java,118,1) -- String[] classPath = System.getProperty("java.class.path").split(";"); AddBlock(Core/src-launch/com/artenum/cassandra/launcher/Run.java,118,1) ++ String[] classPath = System.getProperty("java.class.path").split(pathSep); DelBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,141,1) -- * Contructor used in the pipeline importer AddBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,141,1) ++ * Constructor used in the pipeline importer DelBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,205,1) -- * intialise the processing pipeline it-self. Should be called after the AddBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,205,1) ++ * Initialises the processing pipeline it-self. Should be called after the DelBlock(Plugins/IsoLevel/src/com/artenum/cassandra/plugin/isolevel/IsoLevelControlUI.java,204,1) -- setSize(300, d.height); AddBlock(Plugins/IsoLevel/src/com/artenum/cassandra/plugin/isolevel/IsoLevelControlUI.java,204,1) ++ setSize(d.width, d.height); DelBlock(Plugins/IsoLevel/src/com/artenum/cassandra/plugin/isolevel/IsoLevelPluginIntegrator.java,72,1) -- // Instantiate the graphical component to add in the defaul cassandra AddBlock(Plugins/IsoLevel/src/com/artenum/cassandra/plugin/isolevel/IsoLevelPluginIntegrator.java,72,1) ++ // Instantiate the graphical component to add in the default cassandra AddBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLinePlugin.java,240,1) ++ System.out.println("line: new component"); DelBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLinePlugin.java,249,2) -- } else -- outputCassDataset = pipelineManager.getCassandraVtkObjectByTrueVtkObject(probe); AddBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLinePlugin.java,249,2) ++ System.out.println("filter: new component"); ++ } else outputCassDataset = pipelineManager.getCassandraVtkObjectByTrueVtkObject(probe); DelBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLinePlugin.java,256,2) -- } else -- outputCassMapper = pipelineManager.getCassandraVtkObjectByTrueVtkObject(lineMapper); AddBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLinePlugin.java,256,2) ++ System.out.println("mapper: new component"); ++ } else outputCassMapper = pipelineManager.getCassandraVtkObjectByTrueVtkObject(lineMapper); DelBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLinePlugin.java,263,2) -- } else -- outputCassActor = pipelineManager.getCassandraVtkObjectByTrueVtkObject(lineActor); AddBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLinePlugin.java,263,2) ++ System.out.println("actor: new component"); ++ } else outputCassActor = pipelineManager.getCassandraVtkObjectByTrueVtkObject(lineActor); UpdateBinaryFile(Renderer/CassandraRenderer-1.1.0-all-all-none-jvm1_6-stable/CassandraRenderer-1.1.0-all-all-none-jvm1_6-stable.jar) DelBlock(Renderer/CassandraRenderer-1.1.0-all-all-none-jvm1_6-stable/version.txt,9,2) -- Date of build: 20110510 -- Hour of build: 1501 AddBlock(Renderer/CassandraRenderer-1.1.0-all-all-none-jvm1_6-stable/version.txt,9,2) ++ Date of build: 20110616 ++ Hour of build: 2229 DelBlock(Renderer/CassandraRenderer-1.1.0-all-all-none-jvm1_6-stable/version.txt,12,1) -- Cassandra CORE branch development ticket: 6003 AddBlock(Renderer/CassandraRenderer-1.1.0-all-all-none-jvm1_6-stable/version.txt,12,1) ++ Cassandra CORE branch development ticket: 6249 DelBlock(Renderer/src/main/java/com/artenum/cassandra/renderer/vtk/VtkContextLoader.java,57,1) -- + "MS/Windows systems. \n" + " Please check this. \n" AddBlock(Renderer/src/main/java/com/artenum/cassandra/renderer/vtk/VtkContextLoader.java,57,2) ++ + "MS/Windows systems; or we could nt able to load the native layer. \n" ++ + "Please check this. \n" DelBlock(Renderer/src/main/java/com/artenum/cassandra/renderer/vtk/VtkContextLoader.java,60,2) -- + "layers (e.g vtk.jar). \n" -- + "Theses path should be defined/set BEFORE launch the JVM. \n" AddBlock(Renderer/src/main/java/com/artenum/cassandra/renderer/vtk/VtkContextLoader.java,60,2) ++ + "layers (e.g vtk.jar). Theses paths should be defined/set BEFORE \n" ++ + "launching the JVM.\n" DelBlock(Renderer/src/main/java/com/artenum/cassandra/renderer/vtk/VtkContextLoader.java,63,1) -- + "informationi, supports and/or advices: \n" AddBlock(Renderer/src/main/java/com/artenum/cassandra/renderer/vtk/VtkContextLoader.java,63,1) ++ + "information, supports and/or advices: \n" DelBlock(Renderer/src/main/java/com/artenum/cassandra/renderer/vtk/VtkContextLoader.java,65,1) -- + " http://www.artenum.com/kerdiwen"; AddBlock(Renderer/src/main/java/com/artenum/cassandra/renderer/vtk/VtkContextLoader.java,65,1) ++ + " http://www.artenum.com/keridwen"; DelBlock(test.sh,5,1) -- cp cassandra.properties.OK ./Cassandra-2.4.03/cassandra.properties AddBlock(test.sh,5,1) ++ #cp cassandra.properties.OK ./Cassandra-2.4.03/cassandra.properties UpdateBinaryFile(tmpCrossDepDir/CorePipeline.jar) Remove(Core/src/com/artenum/cassandra/action/ThreadeFileLoader.java)
AddBinaryFile(Core/plugin/2DInfosPlugin.jar) AddBinaryFile(Core/plugin/CellCenterPlugin.jar) AddBinaryFile(Core/plugin/ClippingPlugin.jar) AddBinaryFile(Core/plugin/CutterPlugin.jar) AddBinaryFile(Core/plugin/CuttingPlanePlugin.jar) AddBinaryFile(Core/plugin/DefaultPlugin.jar) AddBinaryFile(Core/plugin/DynamicDatasetPlugin.jar) AddBinaryFile(Core/plugin/Glyph.jar) AddBinaryFile(Core/plugin/IsoLevelPlugin.jar) AddBinaryFile(Core/plugin/ProbingLinePlugin.jar) AddBinaryFile(Core/plugin/ThresholdPlugin.jar) AddBinaryFile(Core/plugin/WarpScalarPlugin.jar) AddBinaryFile(Core/plugin/X3DExporterPlugin.jar) DelBlock(Core/src/com/artenum/cassandra/action/CassandraActionListener.java,25,16) -- import com.artenum.cassandra.PreferenceListener; -- import com.artenum.cassandra.launcher.DynamicClassLoader; -- import com.artenum.cassandra.pipeline.PipeLineManager; -- import com.artenum.cassandra.pipeline.io.PipelineToJythonExporter; -- import com.artenum.cassandra.plugin.CassandraPluginIntegrator; -- import com.artenum.cassandra.plugin.DynamicPluginMenu; -- import com.artenum.cassandra.plugin.PluginManager; -- import com.artenum.cassandra.ui.CassandraGUI; -- import com.artenum.cassandra.ui.CassandraHelp; -- import com.artenum.cassandra.ui.dialog.ExportPipelineDialog; -- import com.artenum.cassandra.ui.popup.SaveDataSetToVtkFilePopupMenu; -- import com.artenum.cassandra.util.BookmarkManager; -- import com.artenum.cassandra.util.CassandraToolBox; -- import com.artenum.cassandra.util.FileItem; -- import com.artenum.cassandra.util.RecentFilesManager; -- DelBlock(Core/src/com/artenum/cassandra/action/CassandraActionListener.java,29,1) -- DelBlock(Core/src/com/artenum/cassandra/action/CassandraActionListener.java,30,1) -- AddBlock(Core/src/com/artenum/cassandra/action/CassandraActionListener.java,42,17) ++ import com.artenum.cassandra.PreferenceListener; ++ import com.artenum.cassandra.launcher.DynamicClassLoader; ++ import com.artenum.cassandra.pipeline.PipeLineManager; ++ import com.artenum.cassandra.pipeline.io.PipelineToJythonExporter; ++ import com.artenum.cassandra.plugin.CassandraPluginIntegrator; ++ import com.artenum.cassandra.plugin.DynamicPluginMenu; ++ import com.artenum.cassandra.plugin.PluginManager; ++ import com.artenum.cassandra.ui.CassandraGUI; ++ import com.artenum.cassandra.ui.CassandraHelp; ++ import com.artenum.cassandra.ui.dialog.ExportPipelineDialog; ++ import com.artenum.cassandra.ui.dialog.ThreadedProgressBarDialog; ++ import com.artenum.cassandra.ui.popup.SaveDataSetToVtkFilePopupMenu; ++ import com.artenum.cassandra.util.BookmarkManager; ++ import com.artenum.cassandra.util.CassandraToolBox; ++ import com.artenum.cassandra.util.FileItem; ++ import com.artenum.cassandra.util.RecentFilesManager; ++ DelBlock(Core/src/com/artenum/cassandra/action/CassandraActionListener.java,228,4) -- if (recentFile.isFile()){ -- if (isVtkFile(recentFile)) { -- pipeLineManager.addVtkFile(recentFile); -- pipeLineManager.validateViewAndGo(); AddBlock(Core/src/com/artenum/cassandra/action/CassandraActionListener.java,228,4) ++ if ( recentFile.isFile() && isVtkFile(recentFile)) { ++ ThreadeFileLoader loader = new ThreadeFileLoader(pipeLineManager, recentFile); ++ loader.setProgressMonitor(new ThreadedProgressBarDialog()); ++ loader.start(); DelBlock(Core/src/com/artenum/cassandra/action/CassandraActionListener.java,233,1) -- JOptionPane.showMessageDialog(new JFrame(), "File format not supported. Please select another file.", "File not supported.", AddBlock(Core/src/com/artenum/cassandra/action/CassandraActionListener.java,233,1) ++ JOptionPane.showMessageDialog(new JFrame(), "File not found or not format supported. Please select another file.", "File not supported.", DelBlock(Core/src/com/artenum/cassandra/action/CassandraActionListener.java,237,2) -- } -- DelBlock(Core/src/com/artenum/cassandra/action/CassandraActionListener.java,241,4) -- if (bookmarkedFile.isFile()) { -- if (isVtkFile(bookmarkedFile)) { -- pipeLineManager.addVtkFile(bookmarkedFile); -- pipeLineManager.validateViewAndGo(); AddBlock(Core/src/com/artenum/cassandra/action/CassandraActionListener.java,241,4) ++ if (bookmarkedFile.isFile() && isVtkFile(bookmarkedFile)) { ++ ThreadeFileLoader loader = new ThreadeFileLoader(pipeLineManager, bookmarkedFile); ++ loader.setProgressMonitor(new ThreadedProgressBarDialog()); ++ loader.start(); DelBlock(Core/src/com/artenum/cassandra/action/CassandraActionListener.java,246,1) -- JOptionPane.showMessageDialog(new JFrame(), "File format not supported. Please select another file.", "File not supported.", AddBlock(Core/src/com/artenum/cassandra/action/CassandraActionListener.java,246,1) ++ JOptionPane.showMessageDialog(new JFrame(), "File not found or not format supported. Please select another file.", "File not supported.", DelBlock(Core/src/com/artenum/cassandra/action/CassandraActionListener.java,250,1) -- } AddBlock(Core/src/com/artenum/cassandra/action/CassandraActionListener.java,322,1) ++ imageSaveDir = fileToSave.getParentFile(); AddBlock(Core/src/com/artenum/cassandra/action/CassandraActionListener.java,431,8) ++ ++ ThreadeFileLoader loader = new ThreadeFileLoader(pipeLineManager); ++ loader.setProgressMonitor(new ThreadedProgressBarDialog()); ++ for (int i = 0; i < vtkFiles.length; i++) { ++ loader.addFileToLoad(vtkFiles[i]); ++ } ++ loader.start(); ++ DelBlock(Core/src/com/artenum/cassandra/action/CassandraActionListener.java,440,1) -- pipeLineManager.addVtkFile(vtkFiles[i]); DelBlock(Core/src/com/artenum/cassandra/action/CassandraActionListener.java,448,1) -- pipeLineManager.validateViewAndGo(); AddBlock(Core/src/com/artenum/cassandra/action/CassandraActionListener.java,521,3) ++ /** ++ * @return the manager of recently loaded files. ++ */ AddBlock(Core/src/com/artenum/cassandra/action/CassandraActionListener.java,528,4) ++ /** ++ * Set the manager of recently loaded files. ++ * @param recentFileManager ++ */ AddTxtFile(Core/src/com/artenum/cassandra/action/ThreadeFileLoader.java) DelBlock(Core/src/com/artenum/cassandra/Cassandra.java,121,1) -- //menu.addSourceMenuComponent(new AddPlaque("Add a plaque", pipeLineManager)); AddBlock(Core/src/com/artenum/cassandra/Cassandra.java,121,1) ++ //menu.addSourceMenuComponent(new AddPlaque("Add a plane", pipeLineManager)); DelBlock(Core/src/com/artenum/cassandra/Cassandra.java,155,4) -- } -- -- -- AddBlock(Core/src/com/artenum/cassandra/Cassandra.java,155,1) ++ } DelBlock(Core/src/com/artenum/cassandra/Cassandra.java,245,1) -- // System.out.println(key + " : " + System.getProperty(key)); AddBlock(Core/src/com/artenum/cassandra/plugin/CassandraPlugInProperty.java,14,1) ++ AddBlock(Core/src/com/artenum/cassandra/plugin/SimplePlugInProperty.java,1,24) ++ /* ++ * Project: Cassandra ++ * ++ * (c) Copyright: Artenum SARL, 24 rue Louis Blanc, ++ * 75010, Paris, France 2005. ++ * http://www.artenum.com ++ * ++ * License: ++ * ++ * This program is free software; you can redistribute it ++ * and/or modify it under the terms of the Q Public License; ++ * either version 1 of the License. ++ * ++ * 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 Q Public License for more details. ++ * ++ * You should have received a copy of the Q Public License ++ * License along with this program; ++ * if not, write to: ++ * Artenum SARL, 24 rue Louis Blanc, ++ * 75010, PARIS, FRANCE, e-mail: contact@artenum.com ++ */ DelBlock(Core/src/com/artenum/cassandra/plugin/SimplePlugInProperty.java,29,3) -- import vtk.vtkObject; -- -- AddBlock(Core/src/com/artenum/cassandra/plugin/SimplePlugInProperty.java,29,9) ++ /** ++ * Basic implementation of the plug-in properties interfaces. Such list can store all type ++ * of object using all type of object as key. It also provides the getSafely methods to ++ * return a safely casted object. ++ * ++ * ++ * @author Julien Forest, Artenum SARL ++ * ++ */ AddBlock(Core/src/com/artenum/cassandra/plugin/SimplePlugInProperty.java,43,3) ++ /** ++ * main constructor ++ */ AddBlock(Core/src/com/artenum/cassandra/plugin/SimplePlugInProperty.java,51,3) ++ /** ++ * Add the object prop into the list with the key. ++ */ AddBlock(Core/src/com/artenum/cassandra/plugin/SimplePlugInProperty.java,59,5) ++ /** ++ * get the object for the given key. This returns the stored ++ * object without any cast. Useful for a fast and simple access ++ * (equivalent to the get method on hashmaps). ++ */ AddBlock(Core/src/com/artenum/cassandra/plugin/SimplePlugInProperty.java,69,5) ++ /** ++ * This first checks if the properties list contains the object and, ++ * if yes, returns it without any cast, otherwise returns the default ++ * value given with the defaultValue parameter. ++ */ DelBlock(Core/src/com/artenum/cassandra/plugin/SimplePlugInProperty.java,76,1) -- AddBlock(Core/src/com/artenum/cassandra/plugin/SimplePlugInProperty.java,76,5) ++ return getObjectSafely(key, defaultValue); ++ } ++ ++ ++ private Object getObjectSafely(Object key, Object defaultValue) { DelBlock(Core/src/com/artenum/cassandra/plugin/SimplePlugInProperty.java,82,1) -- return(this.get(key)); AddBlock(Core/src/com/artenum/cassandra/plugin/SimplePlugInProperty.java,82,1) ++ return (this.get(key)); DelBlock(Core/src/com/artenum/cassandra/plugin/SimplePlugInProperty.java,85,1) -- return(defaultValue); AddBlock(Core/src/com/artenum/cassandra/plugin/SimplePlugInProperty.java,85,1) ++ return (defaultValue); AddBlock(Core/src/com/artenum/cassandra/plugin/SimplePlugInProperty.java,89,5) ++ /** ++ * This first checks if the properties list contains the object and, ++ * if yes, returns it cast with the type of the defaultValue parameter, ++ * otherwise returns the defaultValue ++ */ DelBlock(Core/src/com/artenum/cassandra/plugin/SimplePlugInProperty.java,95,4) -- public double getSafely(Object key, double defaultValue){ -- try{ -- return( ((Double) getSafely(key, new Double(defaultValue))).doubleValue()); -- }catch (Exception e) { AddBlock(Core/src/com/artenum/cassandra/plugin/SimplePlugInProperty.java,95,4) ++ public double getSafely(Object key, double defaultValue) { ++ try { ++ return (Double) getObjectSafely(key, defaultValue); ++ } catch (Exception e) { DelBlock(Core/src/com/artenum/cassandra/plugin/SimplePlugInProperty.java,100,1) -- return(defaultValue); AddBlock(Core/src/com/artenum/cassandra/plugin/SimplePlugInProperty.java,100,1) ++ return (defaultValue); AddBlock(Core/src/com/artenum/cassandra/plugin/SimplePlugInProperty.java,104,5) ++ /** ++ * This first checks if the properties list contains the object and, ++ * if yes, returns it cast with the type of the defaultValue parameter, ++ * otherwise returns the defaultValue ++ */ DelBlock(Core/src/com/artenum/cassandra/plugin/SimplePlugInProperty.java,110,4) -- public int getSafely(Object key, int defaultValue){ -- try{ -- return( ((Integer) getSafely(key, new Integer(defaultValue))).intValue()); -- }catch (Exception e) { AddBlock(Core/src/com/artenum/cassandra/plugin/SimplePlugInProperty.java,110,4) ++ public int getSafely(Object key, int defaultValue) { ++ try { ++ return (Integer) getObjectSafely(key, defaultValue); ++ } catch (Exception e) { DelBlock(Core/src/com/artenum/cassandra/plugin/SimplePlugInProperty.java,115,1) -- return(defaultValue); AddBlock(Core/src/com/artenum/cassandra/plugin/SimplePlugInProperty.java,115,1) ++ return (defaultValue); DelBlock(Core/src/com/artenum/cassandra/plugin/SimplePlugInProperty.java,118,1) -- AddBlock(Core/src/com/artenum/cassandra/plugin/SimplePlugInProperty.java,118,6) ++ ++ /** ++ * This first checks if the properties list contains the object and, ++ * if yes, returns it cast with the type of the defaultValue parameter, ++ * otherwise returns the defaultValue ++ */ DelBlock(Core/src/com/artenum/cassandra/plugin/SimplePlugInProperty.java,125,4) -- public float getSafely(Object key, float defaultValue){ -- try{ -- return( ((Float) getSafely(key, new Float(defaultValue))).floatValue()); -- }catch (Exception e) { AddBlock(Core/src/com/artenum/cassandra/plugin/SimplePlugInProperty.java,125,4) ++ public float getSafely(Object key, float defaultValue) { ++ try { ++ return (Float) getObjectSafely(key, defaultValue ); ++ } catch (Exception e) { DelBlock(Core/src/com/artenum/cassandra/plugin/SimplePlugInProperty.java,130,1) -- return(defaultValue); AddBlock(Core/src/com/artenum/cassandra/plugin/SimplePlugInProperty.java,130,1) ++ return (defaultValue); DelBlock(Core/src/com/artenum/cassandra/plugin/SimplePlugInProperty.java,134,1) -- AddBlock(Core/src/com/artenum/cassandra/plugin/SimplePlugInProperty.java,135,3) ++ /** ++ * returns the hashmap of the propertyList. ++ */ AddBlock(Core/src/com/artenum/cassandra/plugin/SimplePlugInProperty.java,143,3) ++ /** ++ * checks if the PropertyList contains the given key. ++ */ AddBlock(Core/src/com/artenum/cassandra/plugin/SimplePlugInProperty.java,150,1) ++ AddBlock(Core/src/com/artenum/cassandra/ui/dialog/ExportPipelineDialog.java,36,1) ++ private File scriptSavedDir; AddBlock(Core/src/com/artenum/cassandra/ui/dialog/ExportPipelineDialog.java,82,3) ++ if (scriptSavedDir != null) { ++ chooser.setCurrentDirectory(scriptSavedDir); ++ } AddBlock(Core/src/com/artenum/cassandra/ui/dialog/ExportPipelineDialog.java,87,1) ++ scriptSavedDir = selectedFile.getParentFile(); AddTxtFile(Core/src/com/artenum/cassandra/ui/dialog/ThreadedProgressBarDialog.java) DelBlock(Core/src/com/artenum/cassandra/util/RecentFilesManager.java,44,1) -- * Add a file to the lsit of recent files in the limit of nbMaxRecentFiles. AddBlock(Core/src/com/artenum/cassandra/util/RecentFilesManager.java,44,1) ++ * Add a file to the list of recent files in the limit of nbMaxRecentFiles. AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,15,1) ++ import com.artenum.cassandra.ui.dialog.ThreadedProgressBarDialog; AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,39,2) ++ import javax.swing.JDialog; ++ import javax.swing.JOptionPane; DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,142,1) -- vtkDataSetReader dataSetReader = new vtkDataSetReader(); AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,142,2) ++ System.out.print("Vtk file loading... "); ++ vtkDataSetReader dataSetReader = new vtkDataSetReader(); AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,147,1) ++ System.out.println("DONE"); DelBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,472,1) -- public void initAndUpdate(CassandraPlugInProperty prop) { AddBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,472,1) ++ public void initAndUpdate(CassandraPlugInProperty prop) { DelBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,487,1) -- AddBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,487,1) ++ DelBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,495,1) -- AddBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,495,1) ++ DelBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,498,1) -- inOut = ((Integer) prop.getSafely(PERSISTENCE_KEY_INOUT, ((Integer) planeClip.GetInsideOut() == 1)) == 1); AddBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,498,1) ++ inOut = (prop.getSafely(PERSISTENCE_KEY_INOUT, 1) == 1); DelBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,511,1) -- DelBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,522,1) -- //FIXME : should be moved / handle by the evente lsitener of the pipeline. Not very clean. AddBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,522,1) ++ //FIXME : should be moved / handle by the event lsitener of the pipeline. Not very clean. DelBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlanePlugin.java,526,2) -- -- boolean inOut = false; AddBlock(Plugins/Glyph/src/com/artenum/cassandra/plugin/glyph/GlyphControlUI.java,29,2) ++ import java.awt.event.MouseWheelEvent; ++ import java.awt.event.MouseWheelListener; AddBlock(Plugins/Glyph/src/com/artenum/cassandra/plugin/glyph/GlyphControlUI.java,41,1) ++ import javax.swing.JTextField; DelBlock(Plugins/Glyph/src/com/artenum/cassandra/plugin/glyph/GlyphControlUI.java,71,1) -- AddBlock(Plugins/Glyph/src/com/artenum/cassandra/plugin/glyph/GlyphControlUI.java,71,3) ++ JFormattedTextField maskOnRatioTF; ++ JFormattedTextField scalingFactorTF; ++ AddBlock(Plugins/Glyph/src/com/artenum/cassandra/plugin/glyph/GlyphControlUI.java,113,13) ++ ++ // ++ JPanel line2 = new JPanel(); ++ line2.setLayout(new BoxLayout(line2, BoxLayout.LINE_AXIS)); ++ line2.add(new JLabel("Mask-on ratio")); ++ maskOnRatioTF = new JFormattedTextField("0"); ++ maskOnRatioTF.setValue(plugin.maskOnRatio); ++ maskOnRatioTF.addMouseWheelListener(new MouseWheelListener() { ++ public void mouseWheelMoved(java.awt.event.MouseWheelEvent evt) { ++ maskOnRationTFMouseWheelMoved(evt); ++ } ++ }); ++ line2.add(maskOnRatioTF); AddBlock(Plugins/Glyph/src/com/artenum/cassandra/plugin/glyph/GlyphControlUI.java,128,13) ++ JPanel line3 = new JPanel(); ++ line3.setLayout(new BoxLayout(line3, BoxLayout.LINE_AXIS)); ++ line3.add(new JLabel("Scaling ratio ")); ++ scalingFactorTF = new JFormattedTextField("1.0"); ++ scalingFactorTF.setValue(plugin.scalFactor); ++ scalingFactorTF.addMouseWheelListener(new MouseWheelListener() { ++ public void mouseWheelMoved(java.awt.event.MouseWheelEvent evt) { ++ scalingFactorTFMouseWheelMoved(evt); ++ } ++ }); ++ line3.add(scalingFactorTF); ++ ++ // AddBlock(Plugins/Glyph/src/com/artenum/cassandra/plugin/glyph/GlyphControlUI.java,150,2) ++ getContentPane().add(line2); ++ getContentPane().add(line3); AddBlock(Plugins/Glyph/src/com/artenum/cassandra/plugin/glyph/GlyphControlUI.java,163,16) ++ private void maskOnRationTFMouseWheelMoved(MouseWheelEvent evt){ ++ int tmpLevel; ++ tmpLevel = ((Number) maskOnRatioTF.getValue()).intValue() - evt.getWheelRotation(); ++ if (tmpLevel < 1) tmpLevel = 1; ++ maskOnRatioTF.setValue(tmpLevel); ++ plugin.maskOnRatio = ((Number) maskOnRatioTF.getValue()).intValue(); ++ } ++ ++ private void scalingFactorTFMouseWheelMoved(MouseWheelEvent evt){ ++ double tmpScaling; ++ tmpScaling = ((Number) scalingFactorTF.getValue()).doubleValue() - evt.getWheelRotation()*0.1; ++ if (tmpScaling < 0) tmpScaling = 0; ++ scalingFactorTF.setValue(tmpScaling); ++ plugin.scalFactor = ((Number) scalingFactorTF.getValue()).doubleValue(); ++ } ++ AddBlock(Plugins/Glyph/src/com/artenum/cassandra/plugin/glyph/GlyphControlUI.java,180,12) ++ * set the selected input data set. ++ * @param selectedInput ++ */ ++ public void setSelectedInput(VtkObject selectedInput){ ++ if (selectedInput != null){ ++ input.getModel().setSelectedItem(selectedInput); ++ } else { ++ System.out.println("Selection is null"); ++ } ++ } ++ ++ /** DelBlock(Plugins/Glyph/src/com/artenum/cassandra/plugin/glyph/GlyphControlUI.java,205,1) -- //here update the cutting plan input data of the cutting plane plugin AddBlock(Plugins/Glyph/src/com/artenum/cassandra/plugin/glyph/GlyphControlUI.java,210,3) ++ plugin.maskOnRatio = ((Number) maskOnRatioTF.getValue()).intValue(); ++ plugin.scalFactor = ((Number) scalingFactorTF.getValue()).doubleValue(); ++ AddBlock(Plugins/Glyph/src/com/artenum/cassandra/plugin/glyph/GlyphPlugin.java,26,1) ++ import java.awt.Point; AddBlock(Plugins/Glyph/src/com/artenum/cassandra/plugin/glyph/GlyphPlugin.java,38,1) ++ import vtk.vtkDataObject; AddBlock(Plugins/Glyph/src/com/artenum/cassandra/plugin/glyph/GlyphPlugin.java,53,1) ++ import com.artenum.cassandra.pipeline.graph.VtkObjectCellAdapter; AddBlock(Plugins/Glyph/src/com/artenum/cassandra/plugin/glyph/GlyphPlugin.java,58,1) ++ import com.artenum.cassandra.plugin.SimplePlugInProperty; DelBlock(Plugins/Glyph/src/com/artenum/cassandra/plugin/glyph/GlyphPlugin.java,67,1) -- * DelBlock(Plugins/Glyph/src/com/artenum/cassandra/plugin/glyph/GlyphPlugin.java,70,1) -- * DelBlock(Plugins/Glyph/src/com/artenum/cassandra/plugin/glyph/GlyphPlugin.java,71,1) -- * @version 0.2 AddBlock(Plugins/Glyph/src/com/artenum/cassandra/plugin/glyph/GlyphPlugin.java,71,1) ++ * @version 0.4 DelBlock(Plugins/Glyph/src/com/artenum/cassandra/plugin/glyph/GlyphPlugin.java,79,1) -- //private int nbUpdate = 0; AddBlock(Plugins/Glyph/src/com/artenum/cassandra/plugin/glyph/GlyphPlugin.java,79,1) ++ // private int nbUpdate = 0; AddBlock(Plugins/Glyph/src/com/artenum/cassandra/plugin/glyph/GlyphPlugin.java,91,2) ++ private vtkMaskPoints ptMask; ++ DelBlock(Plugins/Glyph/src/com/artenum/cassandra/plugin/glyph/GlyphPlugin.java,96,5) -- private VtkObject actor; -- private VtkObject mapper; -- private VtkObject dataset; -- private VtkObject filter; -- private vtkMaskPoints ptMask; AddBlock(Plugins/Glyph/src/com/artenum/cassandra/plugin/glyph/GlyphPlugin.java,96,9) ++ private VtkObject outputCassActor; ++ private VtkObject outputCassMapper; ++ private VtkObject outputCassDataset; ++ private VtkObject outputCassLookupTable; ++ private VtkObject outputCassScalarBar; ++ private VtkObject cassFilter; ++ ++ public int maskOnRatio = 10; ++ public double scalFactor = 1.0; AddBlock(Plugins/Glyph/src/com/artenum/cassandra/plugin/glyph/GlyphPlugin.java,106,3) ++ public int scalingMode = 1; //FIXME faire des constantes. ++ ++ AddBlock(Plugins/Glyph/src/com/artenum/cassandra/plugin/glyph/GlyphPlugin.java,112,2) ++ ++ private String sourceType = ARROW_SOURCE; AddBlock(Plugins/Glyph/src/com/artenum/cassandra/plugin/glyph/GlyphPlugin.java,115,14) ++ public static final String PERSISTENCE_KEY_SOURCE_TYPE = "peristence.key.source.type"; ++ ++ /** ++ * Property key for the persistence scheme. ++ */ ++ public static final String PERSISTENCE_KEY_INPUT_DATASET = "persistence.key.inputVtkDataSet"; ++ public static final String PERSISTENCE_KEY_INOUT = "persistence.key.insideOut"; ++ public static final String PERSISTENCE_KEY_OUPUT_DATASET = "persistence.key.outputDataSet"; ++ public static final String PERSISTENCE_KEY_OUPUT_MAPPER = "persistence.key.outputMapper"; ++ public static final String PERSISTENCE_KEY_OUPUT_LOOKUP_TABLE = "persistence.key.outputlookUpTable"; ++ public static final String PERSISTENCE_KEY_OUTPUT_ACTOR = "persistence.key.outputActor"; ++ public static final String PERSISTENCE_KEY_OUTPUT_SCALAR_BAR = "persistence.key.ouputScalarBar"; ++ public static final String PERSISTENCE_KEY_CELL_POS_X = "persistence.key.cell.PosX"; ++ public static final String PERSISTENCE_KEY_CELL_POS_Y = "persistence.key.cell.PosY"; DelBlock(Plugins/Glyph/src/com/artenum/cassandra/plugin/glyph/GlyphPlugin.java,132,2) -- * @param pipelineManager is the central pipeline manager of Cassandra. -- * @param pluginManager is the central list of plugin instance, where a contextual menu access is given. AddBlock(Plugins/Glyph/src/com/artenum/cassandra/plugin/glyph/GlyphPlugin.java,132,6) ++ * ++ * @param pipelineManager ++ * is the central pipeline manager of Cassandra. ++ * @param pluginManager ++ * is the central list of plugin instance, where a contextual ++ * menu access is given. AddBlock(Plugins/Glyph/src/com/artenum/cassandra/plugin/glyph/GlyphPlugin.java,140,35) ++ initPlugIn(pipelineManager, pluginManager, owner); ++ initPipeline(); ++ } ++ ++ /** ++ * Constructor used in the pipeline importer ++ * ++ * @param pipelineManager ++ * @param pluginManager ++ * @param owner ++ * @param initPipeline ++ */ ++ public GlyphPlugin(PipeLineManager pipelineManager, PluginManager pluginManager, Frame owner, boolean initPipeline) { ++ initPlugIn(pipelineManager, pluginManager, owner); ++ if (initPipeline) { ++ initPipeline(); ++ } ++ } ++ ++ /** ++ * Default constructor as used during the instantiation in Cassandra. ++ * ++ * @param pipelineManager ++ * @param pluginManager ++ * @param owner ++ * @param initPipeline ++ */ ++ public GlyphPlugin(PipeLineManager pipelineManager, PluginManager pluginManager, Frame owner, int initPipeline) { ++ initPlugIn(pipelineManager, pluginManager, owner); ++ if (initPipeline == 1) { ++ initPipeline(); ++ } ++ } ++ ++ public void initPlugIn(PipeLineManager pipelineManager, PluginManager pluginManager, Frame owner) { DelBlock(Plugins/Glyph/src/com/artenum/cassandra/plugin/glyph/GlyphPlugin.java,185,2) -- // Init contextual menu -- contextualMenu = new JPopupMenu("Cell Center filter menu"); AddBlock(Plugins/Glyph/src/com/artenum/cassandra/plugin/glyph/GlyphPlugin.java,185,2) ++ // Init contextual menu ++ contextualMenu = new JPopupMenu("Glyph filter menu"); DelBlock(Plugins/Glyph/src/com/artenum/cassandra/plugin/glyph/GlyphPlugin.java,189,4) -- public void actionPerformed(ActionEvent e) { -- controlUI.setVisible(true); -- } -- }); AddBlock(Plugins/Glyph/src/com/artenum/cassandra/plugin/glyph/GlyphPlugin.java,189,4) ++ public void actionPerformed(ActionEvent e) { ++ controlUI.setVisible(true); ++ } ++ }); DelBlock(Plugins/Glyph/src/com/artenum/cassandra/plugin/glyph/GlyphPlugin.java,197,4) -- public void actionPerformed(ActionEvent e) { -- remove(); -- } -- }); AddBlock(Plugins/Glyph/src/com/artenum/cassandra/plugin/glyph/GlyphPlugin.java,197,4) ++ public void actionPerformed(ActionEvent e) { ++ remove(); ++ } ++ }); AddBlock(Plugins/Glyph/src/com/artenum/cassandra/plugin/glyph/GlyphPlugin.java,202,1) ++ } DelBlock(Plugins/Glyph/src/com/artenum/cassandra/plugin/glyph/GlyphPlugin.java,204,2) -- // Define and initialise the VTK pipeline -- AddBlock(Plugins/Glyph/src/com/artenum/cassandra/plugin/glyph/GlyphPlugin.java,204,7) ++ /** ++ * intialise the processing pipeline it-self. Should be called after the ++ * initPlugIn. If its elements (i.e internal vtk components and the ++ * post-filter pipeline) are not set before, their are built as new ++ * instances and registered into the pipeline. ++ */ ++ public void initPipeline() { DelBlock(Plugins/Glyph/src/com/artenum/cassandra/plugin/glyph/GlyphPlugin.java,212,1) -- DelBlock(Plugins/Glyph/src/com/artenum/cassandra/plugin/glyph/GlyphPlugin.java,213,3) -- ptMask = new vtkMaskPoints(); -- //ptMask.SetInputConnection(normals.GetOutputPort()) -- ptMask.SetOnRatio(10); AddBlock(Plugins/Glyph/src/com/artenum/cassandra/plugin/glyph/GlyphPlugin.java,213,5) ++ if (ptMask == null) { ++ ptMask = new vtkMaskPoints(); ++ } ++ // ptMask.SetInputConnection(normals.GetOutputPort()) ++ ptMask.SetOnRatio(maskOnRatio); DelBlock(Plugins/Glyph/src/com/artenum/cassandra/plugin/glyph/GlyphPlugin.java,223,3) -- -- glyph = new vtkGlyph3D(); -- // re connect to the ouput of ptMask AddBlock(Plugins/Glyph/src/com/artenum/cassandra/plugin/glyph/GlyphPlugin.java,223,8) ++ ++ // the filter itself ++ if (glyph == null) { ++ glyph = new vtkGlyph3D(); ++ this.outputCassDataset = pipelineManager.addDataSet(glyph.GetOutput(), "Glyph output"); ++ } else ++ outputCassDataset = pipelineManager.getCassandraVtkObjectByTrueVtkObject(glyph); ++ // re connect to the output of ptMask DelBlock(Plugins/Glyph/src/com/artenum/cassandra/plugin/glyph/GlyphPlugin.java,233,1) -- //glyph.SetOrient(-1); AddBlock(Plugins/Glyph/src/com/artenum/cassandra/plugin/glyph/GlyphPlugin.java,233,1) ++ // glyph.SetOrient(-1); AddBlock(Plugins/Glyph/src/com/artenum/cassandra/plugin/glyph/GlyphPlugin.java,235,1) ++ //glyph.SetScaleMode(scalingMode); DelBlock(Plugins/Glyph/src/com/artenum/cassandra/plugin/glyph/GlyphPlugin.java,237,3) -- glyph.SetScaleFactor(1.5); -- -- AddBlock(Plugins/Glyph/src/com/artenum/cassandra/plugin/glyph/GlyphPlugin.java,237,1) ++ glyph.SetScaleFactor(scalFactor); DelBlock(Plugins/Glyph/src/com/artenum/cassandra/plugin/glyph/GlyphPlugin.java,239,1) -- glyphMapper = new vtkPolyDataMapper(); AddBlock(Plugins/Glyph/src/com/artenum/cassandra/plugin/glyph/GlyphPlugin.java,239,7) ++ ++ // the mapper ++ if (glyphMapper == null) { ++ glyphMapper = new vtkPolyDataMapper(); ++ outputCassMapper = pipelineManager.addMapper(glyphMapper, "Glyph"); ++ } else ++ outputCassMapper = pipelineManager.getCassandraVtkObjectByTrueVtkObject(glyphMapper); DelBlock(Plugins/Glyph/src/com/artenum/cassandra/plugin/glyph/GlyphPlugin.java,248,8) -- //we recover the common lookup table -- /* -- LookupTable Table = new LookupTable(); -- Table.Build(); -- cutMapper.SetLookupTable(Table.GetLookupTable()); -- System.out.println("Color map =" + cutMapper.GetLookupTable().Print()); -- */ -- glyphActor = new vtkActor(); AddBlock(Plugins/Glyph/src/com/artenum/cassandra/plugin/glyph/GlyphPlugin.java,248,6) ++ // the actor ++ if (glyphActor == null) { ++ glyphActor = new vtkActor(); ++ outputCassActor = pipelineManager.addActor(glyphActor, "Glyph"); ++ } else ++ outputCassActor = pipelineManager.getCassandraVtkObjectByTrueVtkObject(glyphActor); DelBlock(Plugins/Glyph/src/com/artenum/cassandra/plugin/glyph/GlyphPlugin.java,257,1) -- lookupTable = new vtkLookupTable(); AddBlock(Plugins/Glyph/src/com/artenum/cassandra/plugin/glyph/GlyphPlugin.java,257,5) ++ if (lookupTable == null) { ++ lookupTable = new vtkLookupTable(); ++ outputCassLookupTable = pipelineManager.addLookupTable(lookupTable, "Glyph"); ++ } else ++ outputCassLookupTable = pipelineManager.getCassandraVtkObjectByTrueVtkObject(lookupTable); DelBlock(Plugins/Glyph/src/com/artenum/cassandra/plugin/glyph/GlyphPlugin.java,263,1) -- DelBlock(Plugins/Glyph/src/com/artenum/cassandra/plugin/glyph/GlyphPlugin.java,266,2) -- // Scalar bar -- scalarBar = new vtkScalarBarActor(); AddBlock(Plugins/Glyph/src/com/artenum/cassandra/plugin/glyph/GlyphPlugin.java,266,5) ++ // Scalar bar ++ if (scalarBar == null) { ++ scalarBar = new vtkScalarBarActor(); ++ outputCassScalarBar = pipelineManager.addScalarBar(scalarBar, "Glyph"); ++ } else outputCassScalarBar = pipelineManager.getCassandraVtkObjectByTrueVtkObject(scalarBar); DelBlock(Plugins/Glyph/src/com/artenum/cassandra/plugin/glyph/GlyphPlugin.java,274,6) -- actor = pipelineManager.addActor(glyphActor, "Glyph"); -- mapper = pipelineManager.addMapper(glyphMapper, "Glyph"); -- dataset = pipelineManager.addDataSet(glyph.GetOutput(), "Glyph"); -- filter = pipelineManager.addFilter(filterImpl, "Glyph"); -- pipelineManager.addLookupTable(lookupTable, "Glyph"); -- pipelineManager.setActorVisible(pipelineManager.addScalarBar(scalarBar, "Glyph"), true); AddBlock(Plugins/Glyph/src/com/artenum/cassandra/plugin/glyph/GlyphPlugin.java,274,2) ++ cassFilter = pipelineManager.addFilter(filterImpl, "Glyph"); ++ //pipelineManager.setActorVisible(pipelineManager.addScalarBar(scalarBar, "Glyph"), true); DelBlock(Plugins/Glyph/src/com/artenum/cassandra/plugin/glyph/GlyphPlugin.java,278,1) -- filter.getMetaData().put(VtkObject.POPUP_MENU, getContextualMenu()); AddBlock(Plugins/Glyph/src/com/artenum/cassandra/plugin/glyph/GlyphPlugin.java,278,1) ++ cassFilter.getMetaData().put(VtkObject.POPUP_MENU, getContextualMenu()); DelBlock(Plugins/Glyph/src/com/artenum/cassandra/plugin/glyph/GlyphPlugin.java,281,4) -- actor.setValide(false); -- -- // to see directly the control panel when we intanciate the plugin -- controlUI.setVisible(true); AddBlock(Plugins/Glyph/src/com/artenum/cassandra/plugin/glyph/GlyphPlugin.java,281,1) ++ outputCassActor.setValide(false); DelBlock(Plugins/Glyph/src/com/artenum/cassandra/plugin/glyph/GlyphPlugin.java,292,3) -- -- actor.setValide(true); -- AddBlock(Plugins/Glyph/src/com/artenum/cassandra/plugin/glyph/GlyphPlugin.java,292,2) ++ outputCassActor.setValide(true); ++ DelBlock(Plugins/Glyph/src/com/artenum/cassandra/plugin/glyph/GlyphPlugin.java,296,8) -- -- if ( sourceType == CONE_SOURCE){ -- vtkConeSource coneSource = new vtkConeSource(); -- glyph.SetSource(coneSource.GetOutput()); -- } else if (sourceType == ARROW_SOURCE){ -- vtkArrowSource arrowSource = new vtkArrowSource(); -- glyph.SetSource(arrowSource.GetOutput()); -- } else if (sourceType == CYLINDER_SOURCE){ AddBlock(Plugins/Glyph/src/com/artenum/cassandra/plugin/glyph/GlyphPlugin.java,296,10) ++ ptMask.SetOnRatio(maskOnRatio); ++ ++ this.sourceType = sourceType; ++ if (sourceType == CONE_SOURCE) { ++ vtkConeSource coneSource = new vtkConeSource(); ++ glyph.SetSource(coneSource.GetOutput()); ++ } else if (sourceType == ARROW_SOURCE) { ++ vtkArrowSource arrowSource = new vtkArrowSource(); ++ glyph.SetSource(arrowSource.GetOutput()); ++ } else if (sourceType == CYLINDER_SOURCE) { AddBlock(Plugins/Glyph/src/com/artenum/cassandra/plugin/glyph/GlyphPlugin.java,309,2) ++ ++ glyph.SetScaleFactor(scalFactor); DelBlock(Plugins/Glyph/src/com/artenum/cassandra/plugin/glyph/GlyphPlugin.java,312,1) -- DelBlock(Plugins/Glyph/src/com/artenum/cassandra/plugin/glyph/GlyphPlugin.java,319,1) -- AddBlock(Plugins/Glyph/src/com/artenum/cassandra/plugin/glyph/GlyphPlugin.java,319,1) ++ DelBlock(Plugins/Glyph/src/com/artenum/cassandra/plugin/glyph/GlyphPlugin.java,321,3) -- //if ((nbUpdate++ == 0) && pipelineManager.getActorList().getData().contains(actor)) { -- if (pipelineManager.getActorList().getData().contains(actor)) { -- pipelineManager.setActorVisible(actor, true); AddBlock(Plugins/Glyph/src/com/artenum/cassandra/plugin/glyph/GlyphPlugin.java,321,2) ++ if (pipelineManager.getActorList().getData().contains(outputCassActor)) { ++ pipelineManager.setActorVisible(outputCassActor, true); DelBlock(Plugins/Glyph/src/com/artenum/cassandra/plugin/glyph/GlyphPlugin.java,325,1) -- pipelineManager.hideInputActor(actor, vtkDataSet); AddBlock(Plugins/Glyph/src/com/artenum/cassandra/plugin/glyph/GlyphPlugin.java,325,1) ++ pipelineManager.hideInputActor(outputCassActor, vtkDataSet); DelBlock(Plugins/Glyph/src/com/artenum/cassandra/plugin/glyph/GlyphPlugin.java,332,1) -- pipelineManager.notifyConnectivityChange(filter); AddBlock(Plugins/Glyph/src/com/artenum/cassandra/plugin/glyph/GlyphPlugin.java,332,1) ++ pipelineManager.notifyConnectivityChange(cassFilter); DelBlock(Plugins/Glyph/src/com/artenum/cassandra/plugin/glyph/GlyphPlugin.java,348,4) -- pipelineManager.removeVtkObject(actor); -- pipelineManager.removeVtkObject(mapper); -- pipelineManager.removeVtkObject(dataset); -- pipelineManager.removeVtkObject(filter); AddBlock(Plugins/Glyph/src/com/artenum/cassandra/plugin/glyph/GlyphPlugin.java,348,4) ++ pipelineManager.removeVtkObject(outputCassActor); ++ pipelineManager.removeVtkObject(outputCassMapper); ++ pipelineManager.removeVtkObject(outputCassDataset); ++ pipelineManager.removeVtkObject(cassFilter); DelBlock(Plugins/Glyph/src/com/artenum/cassandra/plugin/glyph/GlyphPlugin.java,360,1) -- AddBlock(Plugins/Glyph/src/com/artenum/cassandra/plugin/glyph/GlyphPlugin.java,360,1) ++ DelBlock(Plugins/Glyph/src/com/artenum/cassandra/plugin/glyph/GlyphPlugin.java,371,2) -- // TODO Auto-generated method stub -- return null; AddBlock(Plugins/Glyph/src/com/artenum/cassandra/plugin/glyph/GlyphPlugin.java,371,26) ++ ++ //FIXME : should be moved / handle by the event lsitener of the pipeline. Not very clean. ++ outputCassLookupTable = pipelineManager.getCassandraVtkObjectByTrueVtkObject((vtkLookupTable) glyphMapper.GetLookupTable()); ++ lookupTable = (vtkLookupTable) outputCassLookupTable.getVtkObject(); ++ outputCassScalarBar = pipelineManager.getVtkObject(outputCassLookupTable.getOutputConnectivityList().get(0)); ++ scalarBar = (vtkScalarBarActor) outputCassScalarBar.getVtkObject(); ++ // ++ ++ SimplePlugInProperty prop = new SimplePlugInProperty(); ++ ++ // specific plugin settings ++ prop.put(PERSISTENCE_KEY_SOURCE_TYPE, sourceType); ++ ++ // general connectivity stuff ++ prop.put(PERSISTENCE_KEY_INPUT_DATASET, glyph.GetInput()); ++ prop.put(PERSISTENCE_KEY_OUPUT_DATASET, glyph.GetOutput()); ++ prop.put(PERSISTENCE_KEY_OUPUT_MAPPER, glyphMapper); ++ prop.put(PERSISTENCE_KEY_OUPUT_LOOKUP_TABLE, outputCassLookupTable.getVtkObject()); ++ prop.put(PERSISTENCE_KEY_OUTPUT_ACTOR, outputCassActor.getVtkObject()); ++ prop.put(PERSISTENCE_KEY_OUTPUT_SCALAR_BAR, outputCassScalarBar.getVtkObject()); ++ ++ Point cellPosition = ((VtkObjectCellAdapter) cassFilter.getMetaData().get(VtkObject.CELL)).getPosition(); ++ prop.put(PERSISTENCE_KEY_CELL_POS_X, cellPosition.x); ++ prop.put(PERSISTENCE_KEY_CELL_POS_Y, cellPosition.y); ++ ++ return prop; DelBlock(Plugins/Glyph/src/com/artenum/cassandra/plugin/glyph/GlyphPlugin.java,401,1) -- // TODO Auto-generated method stub AddBlock(Plugins/Glyph/src/com/artenum/cassandra/plugin/glyph/GlyphPlugin.java,401,1) ++ vtkDataSet tmpInputDataSet; AddBlock(Plugins/Glyph/src/com/artenum/cassandra/plugin/glyph/GlyphPlugin.java,403,15) ++ this.glyph = new vtkGlyph3D(); ++ ++ // connectivity stuff ++ this.glyph.SetOutput((vtkDataObject) prop.getSafely(PERSISTENCE_KEY_OUPUT_DATASET, null)); // FIXME ++ tmpInputDataSet = (vtkDataSet) prop.getSafely(PERSISTENCE_KEY_INPUT_DATASET, (vtkDataSet) (glyph.GetInput())); ++ ++ lookupTable = (vtkLookupTable) prop.getSafely(PERSISTENCE_KEY_OUPUT_LOOKUP_TABLE, null); // FIXME ++ glyphMapper = (vtkPolyDataMapper) prop.getSafely(PERSISTENCE_KEY_OUPUT_MAPPER, null); // FIXME ++ glyphActor = (vtkActor) prop.getSafely(PERSISTENCE_KEY_OUTPUT_ACTOR, null); // FIXME ++ scalarBar = (vtkScalarBarActor) prop.getSafely(PERSISTENCE_KEY_OUTPUT_SCALAR_BAR, null); // FIXME ++ ++ this.initPipeline(); ++ controlUI.setSelectedInput(pipelineManager.getCassandraVtkObjectByTrueVtkObject(tmpInputDataSet)); //FIXME: nasty ++ this.updateGlyph(0, tmpInputDataSet, sourceType); //FIXME ++ DelBlock(Plugins/IsoLevel/src/com/artenum/cassandra/plugin/isolevel/IsoLevelPlugin.java,482,1) -- AddBlock(Plugins/IsoLevel/src/com/artenum/cassandra/plugin/isolevel/IsoLevelPlugin.java,482,1) ++ AddBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLineControlUI.java,266,12) ++ ++ /** ++ * set the selected input data set. ++ * @param selectedInput ++ */ ++ public void setSelectedInput(VtkObject selectedInput){ ++ if (selectedInput != null){ ++ inputDataset.getModel().setSelectedItem(selectedInput); ++ } else { ++ System.out.println("Selection is null"); ++ } ++ } AddBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLineControlUI.java,349,6) ++ ++ public void setPoint1(double x, double y, double z) { ++ aX.setValue(x); ++ aY.setValue(y); ++ aZ.setValue(z); ++ } AddBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLineControlUI.java,368,7) ++ public void setPoint2(double x, double y , double z) { ++ bX.setValue(x); ++ bY.setValue(y); ++ bZ.setValue(z); ++ } ++ ++ AddBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLinePlugin.java,12,1) ++ import java.awt.Point; AddBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLinePlugin.java,22,1) ++ import javax.swing.JFrame; AddBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLinePlugin.java,32,1) ++ import vtk.vtkLookupTable; AddBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLinePlugin.java,34,1) ++ import vtk.vtkScalarBarActor; AddBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLinePlugin.java,42,1) ++ import com.artenum.cassandra.pipeline.graph.VtkObjectCellAdapter; AddBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLinePlugin.java,47,2) ++ import com.artenum.cassandra.plugin.SimplePlugInProperty; ++ import com.sun.org.apache.xml.internal.serialize.LineSeparator; DelBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLinePlugin.java,94,1) -- // front AddBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLinePlugin.java,94,1) ++ // front DelBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLinePlugin.java,102,2) -- -- // Pipeline VtkObjects DelBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLinePlugin.java,103,4) -- private VtkObject dataset; -- private VtkObject filter; -- private VtkObject mapper; -- private VtkObject actor; AddBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLinePlugin.java,103,10) ++ private vtkLookupTable outputLookupTable; ++ private vtkScalarBarActor outputScalarBar; ++ ++ // Cassandra objects ++ private VtkObject outputCassDataset; ++ private VtkObject cassFilter; ++ private VtkObject outputCassMapper; ++ private VtkObject outputCassActor; ++ private VtkObject outputCassLookupTable; ++ private VtkObject outputCassScalarBar; AddBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLinePlugin.java,116,2) ++ ++ Frame owner; DelBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLinePlugin.java,119,1) -- public ProbingLinePlugin() { AddBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLinePlugin.java,119,68) ++ public static final String PERSISTENCE_KEY_INPUT_DATASET = "persistence.key.inputVtkDataSet"; ++ public static final String PERSISTENCE_KEY_INOUT = "persistence.key.insideOut"; ++ public static final String PERSISTENCE_KEY_OUPUT_DATASET = "persistence.key.outputDataSet"; ++ public static final String PERSISTENCE_KEY_OUPUT_MAPPER = "persistence.key.outputMapper"; ++ public static final String PERSISTENCE_KEY_OUPUT_LOOKUP_TABLE = "persistence.key.outputlookUpTable"; ++ public static final String PERSISTENCE_KEY_OUTPUT_ACTOR = "persistence.key.outputActor"; ++ public static final String PERSISTENCE_KEY_OUTPUT_SCALAR_BAR = "persistence.key.ouputScalarBar"; ++ public static final String PERSISTENCE_KEY_CELL_POS_X = "persistence.key.cell.PosX"; ++ public static final String PERSISTENCE_KEY_CELL_POS_Y = "persistence.key.cell.PosY"; ++ ++ public static final String PERSISTENCE_KEY_START_POINT_X = "persistence.key.start.point.x"; ++ public static final String PERSISTENCE_KEY_START_POINT_Y = "persistence.key.start.point.y"; ++ public static final String PERSISTENCE_KEY_START_POINT_Z = "persistence.key.start.point.z"; ++ ++ public static final String PERSISTENCE_KEY_END_POINT_X = "persistence.key.end.point.x"; ++ public static final String PERSISTENCE_KEY_END_POINT_Y = "persistence.key.end.point.y"; ++ public static final String PERSISTENCE_KEY_END_POINT_Z = "persistence.key.end.point.z"; ++ ++ public static final String PERSISTENCE_KEY_PROBE_RESOLUTION = "persistence.key.probe.resolution"; ++ ++ /** ++ * Main constructor and VTK pipeline definition. ++ * ++ * @param pipelineManager ++ * is the central pipeline manager of Cassandra. ++ * @param pluginManager ++ * is the central list of plugin instance, where a contextual ++ * menu access is given. ++ */ ++ public ProbingLinePlugin(PipeLineManager pipelineManager, PluginManager pluginManager, Frame owner) { ++ initPlugIn(pipelineManager, pluginManager, owner); ++ initPipeline(); ++ } ++ ++ /** ++ * Contructor used in the pipeline importer ++ * ++ * @param pipelineManager ++ * @param pluginManager ++ * @param owner ++ * @param initPipeline ++ */ ++ public ProbingLinePlugin(PipeLineManager pipelineManager, PluginManager pluginManager, Frame owner, boolean initPipeline) { ++ initPlugIn(pipelineManager, pluginManager, owner); ++ if (initPipeline) { ++ initPipeline(); ++ } ++ } ++ ++ /** ++ * Default constructor as used during the instantiation in Cassandra. ++ * ++ * @param pipelineManager ++ * @param pluginManager ++ * @param owner ++ * @param initPipeline ++ */ ++ public ProbingLinePlugin(PipeLineManager pipelineManager, PluginManager pluginManager, Frame owner, int initPipeline) { ++ initPlugIn(pipelineManager, pluginManager, owner); ++ if (initPipeline == 1) { ++ initPipeline(); ++ } ++ } ++ ++ public void initPlugIn(PipeLineManager pipelineManager, PluginManager pluginManager, Frame owner) { ++ ++ this.owner = owner; ++ DelBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLinePlugin.java,189,1) -- } AddBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLinePlugin.java,189,2) ++ filterImpl.addRemoveListener(this); ++ filterImpl.setParentPlugin(this); DelBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLinePlugin.java,192,2) -- public ProbingLinePlugin(PipeLineManager pipelineManager, PluginManager pluginManager, Frame owner) { -- this(); AddBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLinePlugin.java,216,1) ++ } AddBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLinePlugin.java,218,8) ++ /** ++ * initialises the processing pipeline it-self. Should be called after the ++ * initPlugIn. If its elements (i.e internal vtk components and the ++ * post-filter pipeline) are not set before, their are built as new ++ * instances and registered into the pipeline. ++ */ ++ public void initPipeline() { ++ DelBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLinePlugin.java,227,1) -- // Here write your processing pipeline DelBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLinePlugin.java,238,1) -- line = new vtkLineSource(); AddBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLinePlugin.java,238,3) ++ if (line == null) { ++ line = new vtkLineSource(); ++ } DelBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLinePlugin.java,245,1) -- probe = new vtkProbeFilter(); AddBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLinePlugin.java,245,5) ++ if (probe == null) { ++ probe = new vtkProbeFilter(); ++ this.outputCassDataset = pipelineManager.addDataSet(probe.GetOutput(), "Probe"); ++ } else ++ outputCassDataset = pipelineManager.getCassandraVtkObjectByTrueVtkObject(probe); DelBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLinePlugin.java,252,1) -- lineMapper = new vtkDataSetMapper(); AddBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLinePlugin.java,252,5) ++ if (lineMapper == null) { ++ lineMapper = new vtkDataSetMapper(); ++ outputCassMapper = pipelineManager.addMapper(lineMapper, "Probe"); ++ } else ++ outputCassMapper = pipelineManager.getCassandraVtkObjectByTrueVtkObject(lineMapper); DelBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLinePlugin.java,258,1) -- lineActor = new vtkActor(); AddBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLinePlugin.java,258,6) ++ ++ if (lineActor == null) { ++ lineActor = new vtkActor(); ++ outputCassActor = pipelineManager.addActor(lineActor, "Probe"); ++ } else ++ outputCassActor = pipelineManager.getCassandraVtkObjectByTrueVtkObject(lineActor); DelBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLinePlugin.java,271,1) -- plotDialog = new JDialog(owner, "Probed data"); AddBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLinePlugin.java,271,1) ++ plotDialog = new JDialog(this.owner, "Probed data"); DelBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLinePlugin.java,279,5) -- // -- actor = pipelineManager.addActor(lineActor, "Probe"); -- mapper = pipelineManager.addMapper(lineMapper, "Probe"); -- dataset = pipelineManager.addDataSet(probe.GetOutput(), "Probe"); -- filter = pipelineManager.addFilter(filterImpl, "Prober"); AddBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLinePlugin.java,279,3) ++ // ++ cassFilter = pipelineManager.addFilter(filterImpl, "Prober"); ++ cassFilter.getMetaData().put(VtkObject.POPUP_MENU, getContextualMenu()); DelBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLinePlugin.java,284,3) -- filter.getMetaData().put(VtkObject.POPUP_MENU, getContextualMenu()); -- -- // AddBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLinePlugin.java,286,6) ++ // set the 3D widget. ++ if (lineWidget != null) { ++ lineWidget.SetPoint1(line.GetPoint1()); ++ lineWidget.SetPoint2(line.GetPoint2()); ++ } ++ DelBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLinePlugin.java,339,2) -- // System.out.println(abscisse[0] + " " + abscisse[1] + " " + -- // abscisse[2] + " " + abscisse[3] + " " + abscisse[4]); DelBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLinePlugin.java,343,1) -- pipelineManager.notifyConnectivityChange(filter); AddBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLinePlugin.java,343,1) ++ pipelineManager.notifyConnectivityChange(cassFilter); DelBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLinePlugin.java,349,2) -- if ((nbUpdate++ == 0) && pipelineManager.getActorList().getData().contains(actor)) { -- pipelineManager.setActorVisible(actor, true); AddBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLinePlugin.java,349,2) ++ if ((nbUpdate++ == 0) && pipelineManager.getActorList().getData().contains(outputCassActor)) { ++ pipelineManager.setActorVisible(outputCassActor, true); DelBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLinePlugin.java,451,2) -- pipelineManager.removeVtkObject(dataset); -- pipelineManager.removeVtkObject(filter); AddBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLinePlugin.java,451,2) ++ pipelineManager.removeVtkObject(outputCassDataset); ++ pipelineManager.removeVtkObject(cassFilter); DelBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLinePlugin.java,464,1) -- return dataset; AddBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLinePlugin.java,464,1) ++ return outputCassDataset; DelBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLinePlugin.java,498,5) -- // why, -- // apparently -- // needed, at -- // least under -- // MacOSX and AddBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLinePlugin.java,498,1) ++ // why, apparently needed, at least under MacOSX and the DelBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLinePlugin.java,519,1) -- DelBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLinePlugin.java,546,1) -- AddBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLinePlugin.java,556,2) ++ ++ DelBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLinePlugin.java,561,2) -- // TODO Auto-generated method stub -- return null; AddBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLinePlugin.java,561,35) ++ ++ //FIXME : should be moved / handle by the event lsitener of the pipeline. Not very clean. ++ outputCassLookupTable = pipelineManager.getCassandraVtkObjectByTrueVtkObject((vtkLookupTable) lineMapper.GetLookupTable()); ++ outputLookupTable = (vtkLookupTable) outputCassLookupTable.getVtkObject(); ++ outputCassScalarBar = pipelineManager.getVtkObject(outputCassLookupTable.getOutputConnectivityList().get(0)); ++ outputScalarBar = (vtkScalarBarActor) outputCassScalarBar.getVtkObject(); ++ // ++ ++ SimplePlugInProperty prop = new SimplePlugInProperty(); ++ ++ prop.put(PERSISTENCE_KEY_INPUT_DATASET, probe.GetInput()); ++ ++ prop.put(PERSISTENCE_KEY_OUPUT_DATASET, probe.GetOutput()); ++ prop.put(PERSISTENCE_KEY_OUPUT_MAPPER, lineMapper); ++ prop.put(PERSISTENCE_KEY_OUPUT_LOOKUP_TABLE, outputCassLookupTable.getVtkObject()); ++ prop.put(PERSISTENCE_KEY_OUTPUT_ACTOR, outputCassActor.getVtkObject()); ++ prop.put(PERSISTENCE_KEY_OUTPUT_SCALAR_BAR, outputCassScalarBar.getVtkObject()); ++ ++ prop.put(PERSISTENCE_KEY_START_POINT_X, line.GetPoint1()[0]); ++ prop.put(PERSISTENCE_KEY_START_POINT_Y, line.GetPoint1()[1]); ++ prop.put(PERSISTENCE_KEY_START_POINT_Z, line.GetPoint1()[2]); ++ ++ prop.put(PERSISTENCE_KEY_END_POINT_X, line.GetPoint2()[0]); ++ prop.put(PERSISTENCE_KEY_END_POINT_Y, line.GetPoint2()[1]); ++ prop.put(PERSISTENCE_KEY_END_POINT_Z, line.GetPoint2()[3]); ++ ++ prop.put(PERSISTENCE_KEY_PROBE_RESOLUTION, line.GetResolution()); ++ ++ //FIXME : not handled ytet: boolean viewPlot2D, int plotType ++ ++ Point cellPosition = ((VtkObjectCellAdapter) cassFilter.getMetaData().get(VtkObject.CELL)).getPosition(); ++ prop.put(PERSISTENCE_KEY_CELL_POS_X, cellPosition.x); ++ prop.put(PERSISTENCE_KEY_CELL_POS_Y, cellPosition.y); ++ ++ return prop; DelBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLinePlugin.java,600,1) -- // TODO Auto-generated method stub AddBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLinePlugin.java,601,33) ++ vtkDataSet tmpInputDataSet; ++ ++ int cellPosX; ++ int cellPosY; ++ ++ this.probe = new vtkProbeFilter(); ++ //this.probe.setOuput //FIXME ++ tmpInputDataSet = (vtkDataSet) prop.getSafely(PERSISTENCE_KEY_INPUT_DATASET, (vtkDataSet) (probe.GetInput())); ++ ++ lineMapper = (vtkDataSetMapper) prop.getSafely(PERSISTENCE_KEY_OUPUT_MAPPER, null); // FIXME ++ outputLookupTable = (vtkLookupTable) prop.getSafely(PERSISTENCE_KEY_OUPUT_LOOKUP_TABLE, null); // FIXME ++ lineActor = (vtkActor) prop.getSafely(PERSISTENCE_KEY_OUTPUT_ACTOR, null); // FIXME ++ outputScalarBar = (vtkScalarBarActor) prop.getSafely(PERSISTENCE_KEY_OUTPUT_SCALAR_BAR, null); // FIXME ++ ++ line.SetPoint1(prop.getSafely(PERSISTENCE_KEY_START_POINT_X, 0.0), ++ prop.getSafely(PERSISTENCE_KEY_START_POINT_Y, 0.0), ++ prop.getSafely(PERSISTENCE_KEY_START_POINT_Z, 0.0)); ++ ++ line.SetPoint2(prop.getSafely(PERSISTENCE_KEY_END_POINT_X, 0.0), ++ prop.getSafely(PERSISTENCE_KEY_END_POINT_Y, 0.0), ++ prop.getSafely(PERSISTENCE_KEY_END_POINT_Z, 0.0)); ++ ++ line.SetResolution(prop.getSafely(PERSISTENCE_KEY_PROBE_RESOLUTION, 256)); ++ ++ this.initPipeline(); ++ controlUI.setPoint1(line.GetPoint1()); ++ controlUI.setPoint2(line.GetPoint2()); ++ controlUI.setSelectedInput(pipelineManager.getCassandraVtkObjectByTrueVtkObject(tmpInputDataSet)); //FIXME: nasty ++ this.updateProbe(tmpInputDataSet, line.GetPoint1(), line.GetPoint2(), line.GetResolution(), false, 1);//FIXME PLOTTYPE and view2DPlot ++ ++ cellPosX = prop.getSafely(PERSISTENCE_KEY_CELL_POS_X, -1); ++ cellPosY = prop.getSafely(PERSISTENCE_KEY_CELL_POS_Y, -1); ++ if (cellPosX > 0 && cellPosY > 0) ((VtkObjectCellAdapter) cassFilter.getMetaData().get(VtkObject.CELL)).setPosition(new Point(cellPosX, cellPosY)); UpdateBinaryFile(Renderer/CassandraRenderer-1.1.0-all-all-none-jvm1_6-stable/CassandraRenderer-1.1.0-all-all-none-jvm1_6-stable.jar) DelBlock(Renderer/CassandraRenderer-1.1.0-all-all-none-jvm1_6-stable/version.txt,9,2) -- Date of build: 20110418 -- Hour of build: 1232 AddBlock(Renderer/CassandraRenderer-1.1.0-all-all-none-jvm1_6-stable/version.txt,9,2) ++ Date of build: 20110510 ++ Hour of build: 1501 DelBlock(Renderer/CassandraRenderer-1.1.0-all-all-none-jvm1_6-stable/version.txt,12,1) -- Cassandra CORE branch development ticket: 5723 AddBlock(Renderer/CassandraRenderer-1.1.0-all-all-none-jvm1_6-stable/version.txt,12,1) ++ Cassandra CORE branch development ticket: 6003 UpdateBinaryFile(tmpCrossDepDir/CorePipeline.jar)
- bug fix if the post-pipeline saving in case of lookUp change - persistence scheme for cutting plane.
AddBlock(Core/src/com/artenum/cassandra/action/CassandraActionListener.java,367,1) ++ exporter.setPipeline(pipeLineManager); DelBlock(Core/src/com/artenum/cassandra/pipeline/io/PipelineToJythonExporter.java,31,1) -- import java.security.AccessControlException; DelBlock(Core/src/com/artenum/cassandra/pipeline/io/PipelineToJythonExporter.java,37,1) -- import java.util.Set; DelBlock(Core/src/com/artenum/cassandra/pipeline/io/PipelineToJythonExporter.java,46,1) -- import com.artenum.cassandra.pipeline.Filter; AddBlock(Core/src/com/artenum/cassandra/pipeline/io/PipelineToJythonExporter.java,47,1) ++ import com.artenum.cassandra.pipeline.PipeLineManager; AddBlock(Core/src/com/artenum/cassandra/pipeline/io/PipelineToJythonExporter.java,97,2) ++ private PipeLineManager pipeline; ++ AddBlock(Core/src/com/artenum/cassandra/pipeline/io/PipelineToJythonExporter.java,162,4) ++ public void setPipeline(PipeLineManager pipeline){ ++ this.pipeline = pipeline; ++ } ++ AddBlock(Core/src/com/artenum/cassandra/pipeline/io/PipelineToJythonExporter.java,223,2) ++ ++ //FIXME mettre un control d'erreur ici. AddBlock(Core/src/com/artenum/cassandra/pipeline/io/PipelineToJythonExporter.java,227,1) ++ AddBlock(Core/src/com/artenum/cassandra/pipeline/io/PipelineToJythonExporter.java,254,1) ++ System.out.println(pipeline.getCassandraVtkObjectByTrueVtkObject(vtkObj) + " expoterd as " + tmpObjectName); DelBlock(Core/src/com/artenum/cassandra/pipeline/io/PipelineToJythonExporter.java,278,1) -- // recover the parent plug-in of the current Cassnadra filter AddBlock(Core/src/com/artenum/cassandra/pipeline/io/PipelineToJythonExporter.java,278,1) ++ // recover the parent plug-in of the current Cassandra filter DelBlock(Core/src/com/artenum/cassandra/pipeline/io/PipelineToJythonExporter.java,298,1) -- for ( Map.Entry<Object, Object> currentEntry : propertyMap.entrySet() ) { AddBlock(Core/src/com/artenum/cassandra/pipeline/io/PipelineToJythonExporter.java,298,1) ++ for ( Map.Entry<Object, Object> currentEntry : propertyMap.entrySet() ) { AddBlock(Core/src/com/artenum/cassandra/pipeline/io/PipelineToJythonExporter.java,304,6) ++ if( exportedVtkObjCanonicalNameArray.containsValue(tmpVtkObject) ){ ++ System.out.println("found in exported list"); ++ } else { ++ System.out.println("not found in exported list"); ++ } ++ DelBlock(Core/src/com/artenum/cassandra/pipeline/io/PipelineToJythonExporter.java,311,1) -- if (tmpVtkObject == tmpEntry.getValue()){ AddBlock(Core/src/com/artenum/cassandra/pipeline/io/PipelineToJythonExporter.java,311,1) ++ if (tmpVtkObject.equals(tmpEntry.getValue()) ){ AddBlock(Core/src/com/artenum/cassandra/pipeline/io/PipelineToJythonExporter.java,317,1) ++ break; DelBlock(Core/src/com/artenum/cassandra/pipeline/io/PipelineToJythonExporter.java,424,1) -- public boolean getCassandraReloadable() { AddBlock(Core/src/com/artenum/cassandra/pipeline/io/PipelineToJythonExporter.java,424,4) ++ /** ++ * @return the Cassandra context, i.e if the generated Python script are generated to be reloadable into Cassandra or not. ++ */ ++ public boolean getCassandraContext() { DelBlock(Core/src/com/artenum/cassandra/ui/popup/LookupTablePopupMenu.java,55,1) -- * Description : Lookup table popup menu. AddBlock(Core/src/com/artenum/cassandra/ui/popup/LookupTablePopupMenu.java,55,1) ++ * Description : Lookup table's popup menu. DelBlock(Core/src/com/artenum/cassandra/ui/popup/LookupTablePopupMenu.java,174,1) -- DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkPipeLineGraphModel.java,70,1) -- AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,75,3) ++ /** ++ * main constructor. ++ */ AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,147,1) ++ DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,163,3) -- // Register vtkObject in pipeline -- addDataSet(inputDataSet, vtkFile.getName()); -- addMapper(mapper, vtkFile.getName()); AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,163,3) ++ // Register vtkObject into the pipeline ++ this.addDataSet(inputDataSet, vtkFile.getName()); ++ this.addMapper(mapper, vtkFile.getName()); DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,235,2) -- * return the vtkObject corresponding to the current object in the pipeline -- * manager. AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,235,1) ++ * return the Cassandra VtkObject of Id vtkObjectId. DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,301,1) -- AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,301,8) ++ /** ++ * Add an actor at the x, y position in the pipeline editor. ++ * @param actor ++ * @param name ++ * @param cellPosX ++ * @param cellPosY ++ * @return ++ */ DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,316,1) -- * Add a new mapper into the pipeline manager. AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,316,1) ++ * Add a new mapper into the pipeline manager and register it. DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,325,2) -- -- // for a better color mapping FIX ME: should be linked with the GUI AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,325,2) ++ ++ // for a better color mapping FIXME: should be linked with the GUI DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,329,4) -- VtkObjectAdapter vtkObject = new VtkObjectAdapter(mapper, VtkObject.MAPPER, mapperId, getNextVtkObjectId()); -- vtkObject.setLocalTypeId(id); -- vtkObjectHashtable.put(vtkObject.getId(), vtkObject); -- mapperList.addVtkObject(vtkObject); AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,329,4) ++ VtkObjectAdapter casObject = new VtkObjectAdapter(mapper, VtkObject.MAPPER, mapperId, getNextVtkObjectId()); ++ casObject.setLocalTypeId(id); ++ vtkObjectHashtable.put(casObject.getId(), casObject); ++ mapperList.addVtkObject(casObject); DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,335,1) -- return vtkObject; AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,335,1) ++ return casObject; AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,338,8) ++ /** ++ * Add a mapper at eh x, y position in the pipelione editor. ++ * @param mapper ++ * @param name ++ * @param cellPosX ++ * @param cellPosY ++ * @return ++ */ DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,433,1) -- * @return AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,433,1) ++ * @return the Cassandra's VtkObject DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,493,1) -- * remove the VtkObject defined by Id for the pipeline manager. AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,493,1) ++ * remove the VtkObject defined by vtkObjectId from the pipeline manager. DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,573,1) -- * returns the viewer of Cassandra (i.e panel and renderer). AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,573,1) ++ * returns the Cassandra Viewer (i.e panel and renderer) linked to the current pipeline. AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/VtkObjectAdapter.java,87,4) ++ /** ++ * Set the VTK type of the linked vtkObjec see interface. ++ * @param i ++ */ DelBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlaneControlUI.java,219,2) -- * Perform the actions requested by the components (buttons, etc...) -- * of the control GUI of the plugin. AddBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlaneControlUI.java,219,2) ++ * Perform the actions requested by the components ++ * of the plugin's control. DelBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,103,1) -- private VtkObject outputCassScalarBar; AddBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,103,1) ++ private VtkObject outputCassScalarBar; DelBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,222,1) -- DelBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,228,1) -- DelBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,241,1) -- DelBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,249,1) -- DelBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,251,1) -- AddBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,251,1) ++ DelBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,256,1) -- outputScalarBar.SetLookupTable(outputLookupTable); AddBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,257,1) ++ outputScalarBar.SetLookupTable(outputLookupTable); DelBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,261,2) -- -- // AddBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,311,6) ++ ++ //FIXME : should be moved / handle by the evente lsitener of the pipeline. ++ outputCassLookupTable = pipelineManager.getCassandraVtkObjectByTrueVtkObject((vtkLookupTable) outputMapper.GetLookupTable()); ++ outputCassScalarBar = pipelineManager.getVtkObject(outputCassLookupTable.getOutputConnectivityList().get(0)); ++ // ++ DelBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,467,1) -- * generic method of update of the current clipping using a AddBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,467,1) ++ * update of the current clipping using a DelBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,506,3) -- // because their are already loaded now -- //loadOutputPipelineComponents = false; -- DelBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,514,3) -- if (cellPosX > 0 && cellPosY > 0){ -- ((VtkObjectCellAdapter) cassfilter.getMetaData().get(VtkObject.CELL)).setPosition(new Point(cellPosX, cellPosY)); -- } AddBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,514,1) ++ if (cellPosX > 0 && cellPosY > 0) ((VtkObjectCellAdapter) cassfilter.getMetaData().get(VtkObject.CELL)).setPosition(new Point(cellPosX, cellPosY)); AddBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,522,7) ++ ++ //FIXME : should be moved / handle by the evente lsitener of the pipeline. Not very clean. ++ outputCassLookupTable = pipelineManager.getCassandraVtkObjectByTrueVtkObject((vtkLookupTable) outputMapper.GetLookupTable()); ++ outputLookupTable = (vtkLookupTable) outputCassLookupTable.getVtkObject(); ++ outputCassScalarBar = pipelineManager.getVtkObject(outputCassLookupTable.getOutputConnectivityList().get(0)); ++ outputScalarBar = (vtkScalarBarActor) outputCassScalarBar.getVtkObject(); ++ // AddBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,541,1) ++ DelBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,544,4) -- prop.put(PERSISTENCE_KEY_OUPUT_MAPPER, outputMapper); -- prop.put(PERSISTENCE_KEY_OUPUT_LOOKUP_TABLE, outputLookupTable); -- prop.put(PERSISTENCE_KEY_OUTPUT_ACTOR, outputActor); -- prop.put(PERSISTENCE_KEY_OUTPUT_SCALAR_BAR, outputScalarBar); AddBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,544,4) ++ prop.put(PERSISTENCE_KEY_OUPUT_MAPPER, outputMapper); ++ prop.put(PERSISTENCE_KEY_OUPUT_LOOKUP_TABLE, outputCassLookupTable.getVtkObject()); ++ prop.put(PERSISTENCE_KEY_OUTPUT_ACTOR, outputCassActor.getVtkObject()); ++ prop.put(PERSISTENCE_KEY_OUTPUT_SCALAR_BAR, outputCassScalarBar.getVtkObject()); DelBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlaneControlUI.java,73,2) -- * @author Sebastien Jourdain, ARTENUM SARL -- * @author Julien Forest, ARTENUM SARL AddBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlaneControlUI.java,73,2) ++ * @author Sebastien Jourdain, ARTENUM SARL ++ * @author Julien Forest, ARTENUM SARL DelBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlaneControlUI.java,79,10) -- private PipeLineManager pipeLineManager; -- private JFormattedTextField centerX; -- private JFormattedTextField centerY; -- private JFormattedTextField centerZ; -- private JFormattedTextField normalX; -- private JFormattedTextField normalY; -- private JFormattedTextField normalZ; -- private JComboBox input; -- private JSlider slider; -- private JCheckBox widgetCheckBox; AddBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlaneControlUI.java,79,10) ++ private PipeLineManager pipeLineManager; ++ private JFormattedTextField centerX; ++ private JFormattedTextField centerY; ++ private JFormattedTextField centerZ; ++ private JFormattedTextField normalX; ++ private JFormattedTextField normalY; ++ private JFormattedTextField normalZ; ++ private JComboBox input; ++ private JSlider slider; ++ private JCheckBox widgetCheckBox; DelBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlaneControlUI.java,90,2) -- // -- private CuttingPlanePlugin plugin; AddBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlaneControlUI.java,90,2) ++ // ++ private CuttingPlanePlugin plugin; DelBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlaneControlUI.java,93,10) -- /** -- * Defines the graphical interface of the control panel for the cutting -- * plane plugin. This method just defines the components and attach the -- * action listener. -- * -- * @param pipeLineManager -- * @param plugin -- */ -- public CuttingPlaneControlUI(PipeLineManager pipeLineManager, CuttingPlanePlugin plugin, Frame owner) { -- super(owner, "Cutting plane configuration panel"); AddBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlaneControlUI.java,93,10) ++ /** ++ * Defines the graphical interface of the control panel for the cutting ++ * plane plugin. This method just defines the components and attach the ++ * action listener. ++ * ++ * @param pipeLineManager ++ * @param plugin ++ */ ++ public CuttingPlaneControlUI(PipeLineManager pipeLineManager, CuttingPlanePlugin plugin, Frame owner) { ++ super(owner, "Cutting plane configuration panel"); DelBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlaneControlUI.java,104,3) -- // -- this.pipeLineManager = pipeLineManager; -- this.plugin = plugin; AddBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlaneControlUI.java,104,3) ++ // ++ this.pipeLineManager = pipeLineManager; ++ this.plugin = plugin; DelBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlaneControlUI.java,108,2) -- // -- input = new JComboBox(new DataSetListModel(pipeLineManager.getDataSetList())); AddBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlaneControlUI.java,108,2) ++ // ++ input = new JComboBox(new DataSetListModel(pipeLineManager.getDataSetList())); DelBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlaneControlUI.java,111,14) -- // -- NumberFormat format = new DecimalFormat("#.###"); -- centerX = new JFormattedTextField(format); -- centerX.setValue(new Double(0)); -- centerY = new JFormattedTextField(format); -- centerY.setValue(new Double(0)); -- centerZ = new JFormattedTextField(format); -- centerZ.setValue(new Double(0)); -- normalX = new JFormattedTextField(format); -- normalX.setValue(new Double(0)); -- normalY = new JFormattedTextField(format); -- normalY.setValue(new Double(0)); -- normalZ = new JFormattedTextField(format); -- normalZ.setValue(new Double(1)); AddBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlaneControlUI.java,111,14) ++ // ++ NumberFormat format = new DecimalFormat("#.###"); ++ centerX = new JFormattedTextField(format); ++ centerX.setValue(new Double(0)); ++ centerY = new JFormattedTextField(format); ++ centerY.setValue(new Double(0)); ++ centerZ = new JFormattedTextField(format); ++ centerZ.setValue(new Double(0)); ++ normalX = new JFormattedTextField(format); ++ normalX.setValue(new Double(0)); ++ normalY = new JFormattedTextField(format); ++ normalY.setValue(new Double(0)); ++ normalZ = new JFormattedTextField(format); ++ normalZ.setValue(new Double(1)); DelBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlaneControlUI.java,126,13) -- JPanel grid = new JPanel(new GridLayout(3, 4)); -- grid.add(new JLabel()); -- grid.add(new JLabel("X")); -- grid.add(new JLabel("Y")); -- grid.add(new JLabel("Z")); -- grid.add(new JLabel("Center")); -- grid.add(centerX); -- grid.add(centerY); -- grid.add(centerZ); -- grid.add(new JLabel("Normal")); -- grid.add(normalX); -- grid.add(normalY); -- grid.add(normalZ); AddBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlaneControlUI.java,126,13) ++ JPanel grid = new JPanel(new GridLayout(3, 4)); ++ grid.add(new JLabel()); ++ grid.add(new JLabel("X")); ++ grid.add(new JLabel("Y")); ++ grid.add(new JLabel("Z")); ++ grid.add(new JLabel("Center")); ++ grid.add(centerX); ++ grid.add(centerY); ++ grid.add(centerZ); ++ grid.add(new JLabel("Normal")); ++ grid.add(normalX); ++ grid.add(normalY); ++ grid.add(normalZ); DelBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlaneControlUI.java,140,7) -- // define the "Update" buton. The corresponding action name -- // is "UPDATE". The action istself is performed in the -- // actionPerformed method. -- JButton exec = new JButton("Update"); -- exec.setActionCommand("UPDATE"); -- exec.addActionListener(this); -- AddBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlaneControlUI.java,140,6) ++ // define the "Update" buton. The corresponding action name ++ // is "UPDATE". The action istself is performed in the ++ // actionPerformed method. ++ JButton exec = new JButton("Update"); ++ exec.setActionCommand("UPDATE"); ++ exec.addActionListener(this); DelBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlaneControlUI.java,147,3) -- JButton cancel = new JButton("Cancel"); -- cancel.setActionCommand("CANCEL"); -- cancel.addActionListener(this); AddBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlaneControlUI.java,147,3) ++ JButton cancel = new JButton("Cancel"); ++ cancel.setActionCommand("CANCEL"); ++ cancel.addActionListener(this); DelBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlaneControlUI.java,151,5) -- // -- JPanel line1 = new JPanel(); -- line1.setLayout(new BoxLayout(line1, BoxLayout.LINE_AXIS)); -- line1.add(new JLabel("Input Dataset")); -- line1.add(input); AddBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlaneControlUI.java,151,5) ++ // ++ JPanel line1 = new JPanel(); ++ line1.setLayout(new BoxLayout(line1, BoxLayout.LINE_AXIS)); ++ line1.add(new JLabel("Input Dataset")); ++ line1.add(input); DelBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlaneControlUI.java,157,6) -- // -- JPanel cmdLine = new JPanel(); -- cmdLine.setLayout(new BoxLayout(cmdLine, BoxLayout.LINE_AXIS)); -- cmdLine.add(Box.createHorizontalGlue()); -- cmdLine.add(exec); -- cmdLine.add(cancel); AddBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlaneControlUI.java,157,6) ++ // ++ JPanel cmdLine = new JPanel(); ++ cmdLine.setLayout(new BoxLayout(cmdLine, BoxLayout.LINE_AXIS)); ++ cmdLine.add(Box.createHorizontalGlue()); ++ cmdLine.add(exec); ++ cmdLine.add(cancel); DelBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlaneControlUI.java,164,13) -- // -- Hashtable label = new Hashtable(); -- label.put(new Integer(-10), new JLabel("-1")); -- label.put(new Integer(10), new JLabel("1")); -- label.put(new Integer(0), new JLabel("0")); -- slider = new JSlider(-10, 10, 0); -- slider.setMinorTickSpacing(1); -- slider.setMajorTickSpacing(10); -- slider.setLabelTable(label); -- slider.setPaintLabels(true); -- slider.setPaintLabels(true); -- slider.addChangeListener(this); -- slider.setToolTipText("Translation based on center point with the normal vector has unit"); AddBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlaneControlUI.java,164,13) ++ // ++ Hashtable label = new Hashtable(); ++ label.put(new Integer(-10), new JLabel("-1")); ++ label.put(new Integer(10), new JLabel("1")); ++ label.put(new Integer(0), new JLabel("0")); ++ slider = new JSlider(-10, 10, 0); ++ slider.setMinorTickSpacing(1); ++ slider.setMajorTickSpacing(10); ++ slider.setLabelTable(label); ++ slider.setPaintLabels(true); ++ slider.setPaintLabels(true); ++ slider.addChangeListener(this); ++ slider.setToolTipText("Translation based on center point with the normal vector has unit"); DelBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlaneControlUI.java,178,7) -- // -- JPanel widgetLine = new JPanel(); -- widgetLine.setLayout(new BoxLayout(widgetLine, BoxLayout.LINE_AXIS)); -- widgetLine.add(Box.createHorizontalGlue()); -- widgetCheckBox = new JCheckBox("Active 3D widget"); -- widgetCheckBox.addItemListener(this); -- widgetLine.add(widgetCheckBox); AddBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlaneControlUI.java,178,7) ++ // ++ JPanel widgetLine = new JPanel(); ++ widgetLine.setLayout(new BoxLayout(widgetLine, BoxLayout.LINE_AXIS)); ++ widgetLine.add(Box.createHorizontalGlue()); ++ widgetCheckBox = new JCheckBox("Active 3D widget"); ++ widgetCheckBox.addItemListener(this); ++ widgetLine.add(widgetCheckBox); DelBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlaneControlUI.java,186,6) -- // -- getContentPane().setLayout(new BoxLayout(getContentPane(), BoxLayout.PAGE_AXIS)); -- getContentPane().add(line1); -- getContentPane().add(grid); -- getContentPane().add(slider); -- getContentPane().add(widgetLine); AddBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlaneControlUI.java,186,6) ++ // ++ getContentPane().setLayout(new BoxLayout(getContentPane(), BoxLayout.PAGE_AXIS)); ++ getContentPane().add(line1); ++ getContentPane().add(grid); ++ getContentPane().add(slider); ++ getContentPane().add(widgetLine); DelBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlaneControlUI.java,193,1) -- getContentPane().add(cmdLine); AddBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlaneControlUI.java,193,1) ++ getContentPane().add(cmdLine); DelBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlaneControlUI.java,195,8) -- // getContentPane().setBorder(BorderFactory.createEmptyBorder(5, 5, 5, -- // 5)); -- pack(); -- Dimension size = getSize(); -- size.setSize(size.getWidth() + 100, size.getHeight()); -- setSize(size); -- setLocationRelativeTo(null); -- } AddBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlaneControlUI.java,195,8) ++ // getContentPane().setBorder(BorderFactory.createEmptyBorder(5, 5, 5, ++ // 5)); ++ pack(); ++ Dimension size = getSize(); ++ size.setSize(size.getWidth() + 100, size.getHeight()); ++ setSize(size); ++ setLocationRelativeTo(null); ++ } DelBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlaneControlUI.java,204,2) -- -- public void update3DWidgetStatus(){ AddBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlaneControlUI.java,204,1) ++ public void update3DWidgetStatus() { DelBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlaneControlUI.java,207,3) -- -- /** Listens to the check boxes. */ -- public void itemStateChanged(ItemEvent e) { DelBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlaneControlUI.java,208,1) -- Object source = e.getItemSelectable(); AddBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlaneControlUI.java,208,2) ++ /** Listens to the check boxes. */ ++ public void itemStateChanged(ItemEvent e) { DelBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlaneControlUI.java,211,8) -- if (source == widgetCheckBox) { -- // System.out.println( -- // "3D widgetBox is: "+widgetCheckBox.isSelected()); -- plugin.show3DWidget(widgetCheckBox.isSelected()); -- } else { -- System.out.println("Item not found"); -- } -- } AddBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlaneControlUI.java,211,1) ++ Object source = e.getItemSelectable(); DelBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlaneControlUI.java,213,13) -- /** -- * Perform the actions requested by the components (buttons, etc...) of the -- * control GUI of the plugin. The actions are filtered on the keywords -- * previously defined. If needed and depending on the action, this method -- * the relevant update method of the plugin. -- */ -- public void actionPerformed(ActionEvent e) { -- String command = e.getActionCommand(); -- if (command.equals("UPDATE")) { -- if (input.getSelectedItem() == null) { -- JOptionPane.showMessageDialog(new JFrame(), "Please select a valid input dataset.", "Input Filter Selection Error", JOptionPane.ERROR_MESSAGE); -- return; -- } AddBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlaneControlUI.java,213,21) ++ if (source == widgetCheckBox) { ++ // System.out.println( ++ // "3D widgetBox is: "+widgetCheckBox.isSelected()); ++ plugin.show3DWidget(widgetCheckBox.isSelected()); ++ } else { ++ System.out.println("Item not found"); ++ } ++ } ++ ++ /** ++ * set the selected input data set. ++ * @param selectedInput ++ */ ++ public void setSelectedInput(VtkObject selectedInput){ ++ if (selectedInput != null){ ++ input.getModel().setSelectedItem(selectedInput); ++ } else { ++ System.out.println("Selection is null"); ++ } ++ } ++ DelBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlaneControlUI.java,235,7) -- slider.setValue(0); -- double cx = ((Number) centerX.getValue()).doubleValue(); -- double cy = ((Number) centerY.getValue()).doubleValue(); -- double cz = ((Number) centerZ.getValue()).doubleValue(); -- double nx = ((Number) normalX.getValue()).doubleValue(); -- double ny = ((Number) normalY.getValue()).doubleValue(); -- double nz = ((Number) normalZ.getValue()).doubleValue(); AddBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlaneControlUI.java,235,13) ++ /** ++ * Perform the actions requested by the components (buttons, etc...) of the ++ * control GUI of the plugin. The actions are filtered on the keywords ++ * previously defined. If needed and depending on the action, this method ++ * the relevant update method of the plugin. ++ */ ++ public void actionPerformed(ActionEvent e) { ++ String command = e.getActionCommand(); ++ if (command.equals("UPDATE")) { ++ if (input.getSelectedItem() == null) { ++ JOptionPane.showMessageDialog(new JFrame(), "Please select a valid input dataset.", "Input Filter Selection Error", JOptionPane.ERROR_MESSAGE); ++ return; ++ } DelBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlaneControlUI.java,249,5) -- // here update the cutting plan input data of the cutting plane -- // plugin -- plugin.updateCuttingPlane(cx, cy, cz, nx, ny, nz, (vtkDataSet) ((VtkObject) input.getSelectedItem()).getVtkObject()); -- pipeLineManager.validateViewAndGo(); -- } AddBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlaneControlUI.java,249,7) ++ slider.setValue(0); ++ double cx = ((Number) centerX.getValue()).doubleValue(); ++ double cy = ((Number) centerY.getValue()).doubleValue(); ++ double cz = ((Number) centerZ.getValue()).doubleValue(); ++ double nx = ((Number) normalX.getValue()).doubleValue(); ++ double ny = ((Number) normalY.getValue()).doubleValue(); ++ double nz = ((Number) normalZ.getValue()).doubleValue(); DelBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlaneControlUI.java,257,6) -- if (command.equals("CANCEL")) { -- plugin.show3DWidget(false); -- widgetCheckBox.isSelected(); -- this.dispose(); -- } -- } AddBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlaneControlUI.java,257,5) ++ // here update the cutting plan input data of the cutting plane ++ // plugin ++ plugin.updateCuttingPlane(cx, cy, cz, nx, ny, nz, (vtkDataSet) ((VtkObject) input.getSelectedItem()).getVtkObject()); ++ pipeLineManager.validateViewAndGo(); ++ } DelBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlaneControlUI.java,263,17) -- /** -- * slide bar listener. The update of the pipeline is directly performed when -- * the sldie bar is changed. -- */ -- public void stateChanged(ChangeEvent e) { -- double value = ((double) slider.getValue()) / 10; -- double cx = ((Number) centerX.getValue()).doubleValue(); -- double cy = ((Number) centerY.getValue()).doubleValue(); -- double cz = ((Number) centerZ.getValue()).doubleValue(); -- double nx = ((Number) normalX.getValue()).doubleValue(); -- double ny = ((Number) normalY.getValue()).doubleValue(); -- double nz = ((Number) normalZ.getValue()).doubleValue(); -- if (input.getSelectedItem() != null) { -- plugin.updateCuttingPlane(cx + (nx * value), cy + (ny * value), cz + (nz * value), nx, ny, nz, (vtkDataSet) ((VtkObject) input.getSelectedItem()) -- .getVtkObject()); -- pipeLineManager.validateViewAndGo(); -- } AddBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlaneControlUI.java,263,5) ++ if (command.equals("CANCEL")) { ++ plugin.show3DWidget(false); ++ this.dispose(); ++ } ++ } DelBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlaneControlUI.java,269,1) -- } AddBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlaneControlUI.java,269,17) ++ /** ++ * slide bar listener. The update of the pipeline is directly performed when ++ * the slide bar is changed. ++ */ ++ public void stateChanged(ChangeEvent e) { ++ double value = ((double) slider.getValue()) / 10; ++ double cx = ((Number) centerX.getValue()).doubleValue(); ++ double cy = ((Number) centerY.getValue()).doubleValue(); ++ double cz = ((Number) centerZ.getValue()).doubleValue(); ++ double nx = ((Number) normalX.getValue()).doubleValue(); ++ double ny = ((Number) normalY.getValue()).doubleValue(); ++ double nz = ((Number) normalZ.getValue()).doubleValue(); ++ if (input.getSelectedItem() != null) { ++ plugin.updateCuttingPlane(cx + (nx * value), cy + (ny * value), cz + (nz * value), nx, ny, nz, (vtkDataSet) ((VtkObject) input.getSelectedItem()) ++ .getVtkObject()); ++ pipeLineManager.validateViewAndGo(); ++ } DelBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlaneControlUI.java,287,10) -- /** -- * Set the fields of the normal definition. -- * -- * @param normal -- */ -- public void setNormalFieldsValues(double[] normal) { -- normalX.setValue(new Double(normal[0])); -- normalY.setValue(new Double(normal[1])); -- normalZ.setValue(new Double(normal[2])); -- } AddBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlaneControlUI.java,287,1) ++ } DelBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlaneControlUI.java,289,9) -- /** -- * Set the fields of the plane origin definition. -- * @param origine -- */ -- public void setOrigineFieldsValues(double[] origine) { -- centerX.setValue(new Double(origine[0])); -- centerY.setValue(new Double(origine[1])); -- centerZ.setValue(new Double(origine[2])); -- } AddBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlaneControlUI.java,289,10) ++ /** ++ * Set the fields of the normal definition. ++ * ++ * @param normal ++ */ ++ public void setNormalFieldsValues(double[] normal) { ++ normalX.setValue(new Double(normal[0])); ++ normalY.setValue(new Double(normal[1])); ++ normalZ.setValue(new Double(normal[2])); ++ } DelBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlaneControlUI.java,300,6) -- /** -- * Define the data model for the input combobox. -- */ -- class DataSetListModel implements ComboBoxModel { -- private VtkObjectListModel datasetModel; -- private Object selectedItem; AddBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlaneControlUI.java,300,5) ++ public void setNormalFieldsValues(double nx, double ny, double nz) { ++ normalX.setValue(nx); ++ normalY.setValue(ny); ++ normalZ.setValue(nz); ++ } DelBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlaneControlUI.java,306,3) -- public DataSetListModel(VtkObjectListModel datasetModel) { -- this.datasetModel = datasetModel; -- } AddBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlaneControlUI.java,306,16) ++ /** ++ * Set the fields of the plane origin definition. ++ * ++ * @param origine ++ */ ++ public void setOrigineFieldsValues(double[] origine) { ++ centerX.setValue(new Double(origine[0])); ++ centerY.setValue(new Double(origine[1])); ++ centerZ.setValue(new Double(origine[2])); ++ } ++ ++ public void setOrigineFieldsValues(double cx, double cy, double cz) { ++ centerX.setValue(cx); ++ centerY.setValue(cy); ++ centerZ.setValue(cz); ++ } DelBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlaneControlUI.java,323,3) -- public Object getElementAt(int index) { -- return datasetModel.getElementAt(index); -- } AddBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlaneControlUI.java,323,6) ++ /** ++ * Define the data model for the input combobox. ++ */ ++ class DataSetListModel implements ComboBoxModel { ++ private VtkObjectListModel datasetModel; ++ private Object selectedItem; DelBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlaneControlUI.java,330,3) -- public Object getSelectedItem() { -- return selectedItem; -- } AddBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlaneControlUI.java,330,3) ++ public DataSetListModel(VtkObjectListModel datasetModel) { ++ this.datasetModel = datasetModel; ++ } DelBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlaneControlUI.java,334,3) -- public int getSize() { -- return datasetModel.getSize(); -- } AddBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlaneControlUI.java,334,3) ++ public Object getElementAt(int index) { ++ return datasetModel.getElementAt(index); ++ } DelBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlaneControlUI.java,338,3) -- public void setSelectedItem(Object anItem) { -- selectedItem = anItem; -- } AddBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlaneControlUI.java,338,3) ++ public Object getSelectedItem() { ++ return selectedItem; ++ } DelBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlaneControlUI.java,342,3) -- public void addListDataListener(ListDataListener l) { -- datasetModel.addListDataListener(l); -- } AddBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlaneControlUI.java,342,3) ++ public int getSize() { ++ return datasetModel.getSize(); ++ } DelBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlaneControlUI.java,346,4) -- public void removeListDataListener(ListDataListener l) { -- datasetModel.removeListDataListener(l); -- } -- } AddBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlaneControlUI.java,346,12) ++ public void setSelectedItem(Object anItem) { ++ selectedItem = anItem; ++ } ++ ++ public void addListDataListener(ListDataListener l) { ++ datasetModel.addListDataListener(l); ++ } ++ ++ public void removeListDataListener(ListDataListener l) { ++ datasetModel.removeListDataListener(l); ++ } ++ } AddBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlanePlugin.java,30,1) ++ import com.artenum.cassandra.pipeline.graph.VtkObjectCellAdapter; AddBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlanePlugin.java,35,1) ++ import com.artenum.cassandra.plugin.SimplePlugInProperty; AddBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlanePlugin.java,39,1) ++ import vtk.vtkClipDataSet; AddBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlanePlugin.java,41,1) ++ import vtk.vtkDataObject; AddBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlanePlugin.java,43,1) ++ import vtk.vtkDataSetMapper; AddBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlanePlugin.java,53,1) ++ import java.awt.Point; DelBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlanePlugin.java,62,7) -- * Project ref : CASSANDRA project -- * Copyright and license : See relevant sections -- * Status : under development -- * Creation : 04/03/2005 -- * Modification : -- * -- * Description : AddBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlanePlugin.java,62,6) ++ * Project ref : CASSANDRA project ++ * Copyright and license : See relevant sections ++ * Status : under development ++ * Creation : 04/03/2005 ++ * Modification : ++ * Description : DelBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlanePlugin.java,70,1) -- * AddBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlanePlugin.java,70,1) ++ * DelBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlanePlugin.java,73,2) -- * Version number Author (name, e-mail) Corrections/Modifications -- * 0.1 Sebastien Jourdain, jourdain@artenum.com Creation AddBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlanePlugin.java,73,10) ++ * ++ * Version number ++ * Author (name, e-mail) ++ * Corrections/Modifications ++ * ++ * ++ * 0.1 ++ * Sebastien Jourdain, jourdain@artenum.com ++ * Creation ++ * DelBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlanePlugin.java,84,3) -- * -- * @author Sebastien Jourdain, Julien Forest, Benoit Thiebault, Jeremie Turbet -- * @version 2.0 AddBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlanePlugin.java,84,3) ++ * ++ * @author Sebastien Jourdain, Julien Forest, Benoit Thiebault, Jeremie Turbet ++ * @version 2.0 DelBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlanePlugin.java,103,1) -- private vtkPlane plane; AddBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlanePlugin.java,103,1) ++ private vtkPlane sourcePlane; AddBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlanePlugin.java,107,1) ++ private vtkScalarBarActor scalBar; DelBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlanePlugin.java,111,5) -- private VtkObject actor; -- private VtkObject mapper; -- private VtkObject dataset; -- private VtkObject filter; -- AddBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlanePlugin.java,111,7) ++ private VtkObject outputCassActor; ++ private VtkObject outputCassMapper; ++ private VtkObject outputCassDataset; ++ private VtkObject outputCassLookupTable; ++ private VtkObject outputCassScalarBar; ++ private VtkObject cassFilter; ++ AddBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlanePlugin.java,120,27) ++ private Point cellPosition; ++ ++ // Persistence keys ++ ++ /** key of the input data set in the property map */ ++ public static final String PERSISTENCE_KEY_INPUT_DATASET = "persistence.key.inputVtkDataSet"; ++ public static final String PERSISTENCE_KEY_CX = "persistence.key.cx"; ++ public static final String PERSISTENCE_KEY_CY = "persistence.key.cy"; ++ public static final String PERSISTENCE_KEY_CZ = "persistence.key.cz"; ++ public static final String PERSISTENCE_KEY_NX = "persistence.key.nx"; ++ public static final String PERSISTENCE_KEY_NY = "persistence.key.ny"; ++ public static final String PERSISTENCE_KEY_NZ = "persistence.key.nz"; ++ /** key of the output data set in the property map */ ++ public static final String PERSISTENCE_KEY_OUPUT_DATASET = "persistence.key.outputDataSet"; ++ /** key of the output mapper in the property map */ ++ public static final String PERSISTENCE_KEY_OUPUT_MAPPER = "persistence.key.outputMapper"; ++ /** key of the output lookupt table in the property map */ ++ public static final String PERSISTENCE_KEY_OUPUT_LOOKUP_TABLE = "persistence.key.outputlookUpTable"; ++ /** key of the output actor in the property map */ ++ public static final String PERSISTENCE_KEY_OUTPUT_ACTOR = "persistence.key.outputActor"; ++ /** key of the output scalar bar set in the property map */ ++ public static final String PERSISTENCE_KEY_OUTPUT_SCALAR_BAR = "persistence.key.ouputScalarBar"; ++ /** key of the cell x-position in the pipeline editor in the property map */ ++ public static final String PERSISTENCE_KEY_CELL_POS_X = "persistence.key.cell.PosX"; ++ /** key of the cell y-position in the pipeline editor in the property map */ ++ public static final String PERSISTENCE_KEY_CELL_POS_Y = "persistence.key.cell.PosY"; ++ DelBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlanePlugin.java,149,2) -- * @param pipelineManager is the central pipeline manager of Cassandra. -- * @param pluginManager is the central list of plugin instance, where a contextual menu access is given. AddBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlanePlugin.java,149,6) ++ * ++ * @param pipelineManager ++ * is the central pipeline manager of Cassandra. ++ * @param pluginManager ++ * is the central list of plugin instance, where a contextual ++ * menu access is given. AddBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlanePlugin.java,157,20) ++ initPlugIn(pipelineManager, pluginManager, owner); ++ initPipeline(); ++ } ++ ++ /** ++ * Constructor used in the pipeline importer ++ * ++ * @param pipelineManager ++ * @param pluginManager ++ * @param owner ++ * @param initPipeline ++ */ ++ public CuttingPlanePlugin(PipeLineManager pipelineManager, PluginManager pluginManager, Frame owner, boolean initPipeline) { ++ initPlugIn(pipelineManager, pluginManager, owner); ++ if (initPipeline) { ++ initPipeline(); ++ } ++ } ++ ++ public void initPlugIn(PipeLineManager pipelineManager, PluginManager pluginManager, Frame owner) { AddBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlanePlugin.java,181,2) ++ ++ // Cassandra filter AddBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlanePlugin.java,185,1) ++ filterImpl.setParentPlugin(this); DelBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlanePlugin.java,190,1) -- // Init contextual menu AddBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlanePlugin.java,190,1) ++ // Init contextual menu DelBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlanePlugin.java,194,5) -- public void actionPerformed(ActionEvent e) { -- controlUI.setVisible(true); -- controlUI.update3DWidgetStatus(); -- } -- }); AddBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlanePlugin.java,194,5) ++ public void actionPerformed(ActionEvent e) { ++ controlUI.setVisible(true); ++ controlUI.update3DWidgetStatus(); ++ } ++ }); DelBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlanePlugin.java,203,4) -- public void actionPerformed(ActionEvent e) { -- remove(); -- } -- }); AddBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlanePlugin.java,203,4) ++ public void actionPerformed(ActionEvent e) { ++ remove(); ++ } ++ }); AddBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlanePlugin.java,209,10) ++ } ++ ++ /** ++ * Initialises the processing pipeline it-self. Should be called after the ++ * initPlugIn. If its elements (i.e internal vtk components and the ++ * post-filter pipeline) are not set before, their are built as new ++ * instances and registered into the pipeline. ++ */ ++ public void initPipeline() { ++ DelBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlanePlugin.java,220,3) -- plane = new vtkPlane(); -- plane.SetOrigin(0.0, 0.0, 0.0); -- plane.SetNormal(0, 0, 1.0); AddBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlanePlugin.java,220,5) ++ if (sourcePlane == null) { ++ sourcePlane = new vtkPlane(); ++ } ++ sourcePlane.SetOrigin(0.0, 0.0, 0.0); ++ sourcePlane.SetNormal(0, 0, 1.0); DelBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlanePlugin.java,226,2) -- planeCut = new vtkCutter(); -- planeCut.SetCutFunction(plane); AddBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlanePlugin.java,226,6) ++ if (planeCut == null) { ++ planeCut = new vtkCutter(); ++ this.outputCassDataset = pipelineManager.addDataSet(planeCut.GetOutput(), "Cutting plane"); ++ } else ++ outputCassDataset = pipelineManager.getCassandraVtkObjectByTrueVtkObject(planeCut); ++ planeCut.SetCutFunction(sourcePlane); DelBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlanePlugin.java,233,1) -- cutMapper = new vtkPolyDataMapper(); AddBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlanePlugin.java,233,5) ++ if (cutMapper == null) { ++ cutMapper = new vtkPolyDataMapper(); ++ outputCassMapper = pipelineManager.addMapper(cutMapper, "Cutting plane"); ++ } else ++ outputCassMapper = pipelineManager.getCassandraVtkObjectByTrueVtkObject(cutMapper); DelBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlanePlugin.java,240,1) -- //we recover the common lookup table AddBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlanePlugin.java,240,1) ++ // we recover the common lookup table DelBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlanePlugin.java,242,4) -- LookupTable Table = new LookupTable(); -- Table.Build(); -- cutMapper.SetLookupTable(Table.GetLookupTable()); -- System.out.println("Color map =" + cutMapper.GetLookupTable().Print()); AddBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlanePlugin.java,242,4) ++ * LookupTable Table = new LookupTable(); Table.Build(); ++ * cutMapper.SetLookupTable(Table.GetLookupTable()); ++ * System.out.println("Color map =" + ++ * cutMapper.GetLookupTable().Print()); DelBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlanePlugin.java,247,1) -- cutActor = new vtkActor(); AddBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlanePlugin.java,247,4) ++ if (cutActor == null) { ++ cutActor = new vtkActor(); ++ outputCassActor = pipelineManager.addActor(cutActor, "Cutting plane"); ++ } else outputCassActor = pipelineManager.getCassandraVtkObjectByTrueVtkObject(cutActor); DelBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlanePlugin.java,254,1) -- lookupTable = new vtkLookupTable(); AddBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlanePlugin.java,254,4) ++ if (lookupTable == null) { ++ lookupTable = new vtkLookupTable(); ++ outputCassLookupTable = pipelineManager.addLookupTable(lookupTable, "Clipping plane"); ++ } else outputCassLookupTable = pipelineManager.getCassandraVtkObjectByTrueVtkObject(lookupTable); DelBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlanePlugin.java,259,1) -- DelBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlanePlugin.java,263,1) -- vtkScalarBarActor scalBar = new vtkScalarBarActor(); AddBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlanePlugin.java,263,4) ++ if (scalBar == null) { ++ scalBar = new vtkScalarBarActor(); ++ outputCassScalarBar = pipelineManager.addScalarBar(scalBar, "Clipping plane"); ++ } else outputCassScalarBar = pipelineManager.getCassandraVtkObjectByTrueVtkObject(scalBar); DelBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlanePlugin.java,270,6) -- actor = pipelineManager.addActor(cutActor, "Cutting plane"); -- mapper = pipelineManager.addMapper(cutMapper, "Cutting plane"); -- dataset = pipelineManager.addDataSet(planeCut.GetOutput(), "Cutting plane"); -- filter = pipelineManager.addFilter(filterImpl, "Cutting plane"); -- pipelineManager.addLookupTable(lookupTable, "Cutting plane"); -- pipelineManager.setActorVisible(pipelineManager.addScalarBar(scalBar, "Cutting plane"), true); AddBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlanePlugin.java,270,4) ++ cassFilter = pipelineManager.addFilter(filterImpl, "Cutting plane"); ++ ++ //FIXME in the plug in UI? TBC ++ //pipelineManager.setActorVisible(pipelineManager.addScalarBar(scalBar, "Cutting plane"), true); DelBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlanePlugin.java,276,1) -- filter.getMetaData().put(VtkObject.POPUP_MENU, getContextualMenu()); AddBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlanePlugin.java,276,1) ++ cassFilter.getMetaData().put(VtkObject.POPUP_MENU, getContextualMenu()); DelBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlanePlugin.java,279,1) -- actor.setValide(false); AddBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlanePlugin.java,279,1) ++ outputCassActor.setValide(false); AddBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlanePlugin.java,281,7) ++ // just to update the position of the 3D widget if needed ++ if (planWidget != null) { ++ planWidget.SetNormal(sourcePlane.GetNormal()); ++ planWidget.SetOrigin(sourcePlane.GetOrigin()); ++ } ++ ++ //FIXME in the plug in UI? TBC DelBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlanePlugin.java,289,1) -- controlUI.setVisible(true); AddBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlanePlugin.java,289,1) ++ //controlUI.setVisible(true); AddBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlanePlugin.java,294,1) ++ * AddBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlanePlugin.java,307,7) ++ ++ //FIXME : should be moved / handle by the evente lsitener of the pipeline. Not very clean. ++ outputCassLookupTable = pipelineManager.getCassandraVtkObjectByTrueVtkObject((vtkLookupTable) cutMapper.GetLookupTable()); ++ lookupTable = (vtkLookupTable) outputCassLookupTable.getVtkObject(); ++ outputCassScalarBar = pipelineManager.getVtkObject(outputCassLookupTable.getOutputConnectivityList().get(0)); ++ scalarBar = (vtkScalarBarActor) outputCassScalarBar.getVtkObject(); ++ // DelBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlanePlugin.java,315,1) -- actor.setValide(true); AddBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlanePlugin.java,315,1) ++ outputCassActor.setValide(true); DelBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlanePlugin.java,318,2) -- plane.SetOrigin(cx, cy, cz); -- plane.SetNormal(nx, ny, nz); AddBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlanePlugin.java,318,2) ++ sourcePlane.SetOrigin(cx, cy, cz); ++ sourcePlane.SetNormal(nx, ny, nz); DelBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlanePlugin.java,329,3) -- // Set the default actor visible by default and automatically hide the source one -- if ((nbUpdate++ == 0) && pipelineManager.getActorList().getData().contains(actor)) { -- pipelineManager.setActorVisible(actor, true); AddBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlanePlugin.java,329,4) ++ // Set the default actor visible by default and automatically hide the ++ // source one ++ if ((nbUpdate++ == 0) && pipelineManager.getActorList().getData().contains(outputCassActor)) { ++ pipelineManager.setActorVisible(outputCassActor, true); DelBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlanePlugin.java,334,2) -- pipelineManager.hideInputActor(actor, vtkDataSetIn); -- AddBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlanePlugin.java,334,2) ++ pipelineManager.hideInputActor(outputCassActor, vtkDataSetIn); ++ DelBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlanePlugin.java,341,2) -- pipelineManager.notifyConnectivityChange(filter); -- AddBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlanePlugin.java,341,5) ++ filterImpl.getAlgorithm().add(sourcePlane); ++ filterImpl.getVtkImplicitFunction().clear(); ++ filterImpl.getVtkImplicitFunction().add(sourcePlane); ++ pipelineManager.notifyConnectivityChange(cassFilter); ++ DelBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlanePlugin.java,347,3) -- if( planWidget != null){ -- planWidget.SetNormal(plane.GetNormal()); -- planWidget.SetOrigin(plane.GetOrigin()); AddBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlanePlugin.java,347,3) ++ if (planWidget != null) { ++ planWidget.SetNormal(sourcePlane.GetNormal()); ++ planWidget.SetOrigin(sourcePlane.GetOrigin()); DelBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlanePlugin.java,366,4) -- pipelineManager.removeVtkObject(actor); -- pipelineManager.removeVtkObject(mapper); -- pipelineManager.removeVtkObject(dataset); -- pipelineManager.removeVtkObject(filter); AddBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlanePlugin.java,366,4) ++ pipelineManager.removeVtkObject(outputCassActor); ++ pipelineManager.removeVtkObject(outputCassMapper); ++ pipelineManager.removeVtkObject(outputCassDataset); ++ pipelineManager.removeVtkObject(cassFilter); DelBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlanePlugin.java,379,1) -- AddBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlanePlugin.java,379,1) ++ AddBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlanePlugin.java,382,1) ++ * DelBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlanePlugin.java,385,13) -- void show3DWidget(boolean widgetFlag){ -- -- if ( widgetFlag){ -- if (planWidget == null){ -- init3DWidget(); -- } -- //planWidget.PlaceWidget(lastDataSet.GetBounds()); -- -- planWidget.UpdatePlacement(); -- planWidget.On(); -- } else{ -- planWidget.Off(); -- } AddBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlanePlugin.java,385,12) ++ void show3DWidget(boolean widgetFlag) { ++ if (widgetFlag) { ++ if (planWidget == null) { ++ init3DWidget(); ++ } ++ planWidget.UpdatePlacement(); ++ planWidget.On(); ++ } else { ++ if (planWidget != null) { ++ planWidget.Off(); ++ } ++ } DelBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlanePlugin.java,398,1) -- AddBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlanePlugin.java,398,1) ++ DelBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlanePlugin.java,400,1) -- * Initialise the 3D control widget. AddBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlanePlugin.java,400,1) ++ * Initialise the 3D control widget. DelBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlanePlugin.java,402,31) -- void init3DWidget(){ -- -- //System.out.println("initialisation of the widget"); -- planWidget = new vtkImplicitPlaneWidget(); -- planWidget.SetInteractor(pipelineManager.getCassandraView().getIren()); -- -- // to make the interaction ON and be able yto control the widget -- planWidget.EnabledOn(); -- pipelineManager.getCassandraView().deepValidateView(); //Don t ask me why, apparently needed, at least under MacOSX and -- //default swing LAF, to activate the widget interactor. -- -- // size the plan on the input data set. Should be done in first -- // to allow the plan orientation AFTER. -- planWidget.SetInput(lastDataSet); -- planWidget.SetPlaceFactor(1.2); -- planWidget.PlaceWidget(); -- // then we orient the plan in the cutting plane. -- planWidget.SetNormal(plane.GetNormal()); -- System.out.println(planWidget.GetNormal()[0]+" "+planWidget.GetNormal()[1]+" "+planWidget.GetNormal()[2]); -- -- // just to see something and not only the widget. -- planWidget.GetPlaneProperty().SetOpacity(0.3); -- -- // we add the local observer for interaction events, i.e the method name -- // in last argument of the current object. -- planWidget.AddObserver("InteractionEvent", this,"interactionCallBack"); -- -- // both not needed. -- //planWidget.AddObserver("CharEvent", this, "widgetCharEvent"); -- //planWidget.AddObserver("StartInteractionEvent", this, "startInteractionCallBack"); -- AddBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlanePlugin.java,402,37) ++ void init3DWidget() { ++ ++ // System.out.println("initialisation of the widget"); ++ planWidget = new vtkImplicitPlaneWidget(); ++ planWidget.SetInteractor(pipelineManager.getCassandraView().getIren()); ++ ++ // to make the interaction ON and be able yto control the widget ++ planWidget.EnabledOn(); ++ pipelineManager.getCassandraView().deepValidateView(); // Don t ask me ++ // why, ++ // apparently ++ // needed, at ++ // least under ++ // MacOSX and ++ // default swing LAF, to activate the widget interactor. ++ ++ // size the plan on the input data set. Should be done in first ++ // to allow the plan orientation AFTER. ++ planWidget.SetInput(lastDataSet); ++ planWidget.SetPlaceFactor(1.2); ++ planWidget.PlaceWidget(); ++ // then we orient the plan in the cutting plane. ++ planWidget.SetNormal(sourcePlane.GetNormal()); ++ System.out.println(planWidget.GetNormal()[0] + " " + planWidget.GetNormal()[1] + " " + planWidget.GetNormal()[2]); ++ ++ // just to see something and not only the widget. ++ planWidget.GetPlaneProperty().SetOpacity(0.3); ++ ++ // we add the local observer for interaction events, i.e the method name ++ // in last argument of the current object. ++ planWidget.AddObserver("InteractionEvent", this, "interactionCallBack"); ++ ++ // both not needed. ++ // planWidget.AddObserver("CharEvent", this, "widgetCharEvent"); ++ // planWidget.AddObserver("StartInteractionEvent", this, ++ // "startInteractionCallBack"); ++ DelBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlanePlugin.java,440,4) -- -- private void widgetCharEvent(){ -- char code = Character.toLowerCase(pipelineManager.getCassandraView().getIren().GetKeyCode()); -- System.out.println("touch typed:"+code); DelBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlanePlugin.java,441,3) -- if (code == 'b'){ // FIXME -- planWidget.SetEnabled(1); -- } AddBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlanePlugin.java,441,7) ++ private void widgetCharEvent() { ++ char code = Character.toLowerCase(pipelineManager.getCassandraView().getIren().GetKeyCode()); ++ System.out.println("touch typed:" + code); ++ ++ if (code == 'b') { // FIXME ++ planWidget.SetEnabled(1); ++ } DelBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlanePlugin.java,449,4) -- -- // needed to initialise the interaction control on the widget. -- private void startInteractionCallBack(){ -- System.out.println("wiget interaction started"); AddBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlanePlugin.java,449,4) ++ ++ // needed to initialise the interaction control on the widget. ++ private void startInteractionCallBack() { ++ System.out.println("wiget interaction started"); DelBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlanePlugin.java,454,3) -- -- -- /** AddBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlanePlugin.java,454,2) ++ ++ /** DelBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlanePlugin.java,458,5) -- private void interactionCallBack(){ -- plane.SetNormal(planWidget.GetNormal()); -- controlUI.setNormalFieldsValues(planWidget.GetNormal()); -- controlUI.setOrigineFieldsValues(planWidget.GetOrigin()); -- plane.SetOrigin(planWidget.GetOrigin()[0], planWidget.GetOrigin()[1], planWidget.GetOrigin()[2]); AddBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlanePlugin.java,458,5) ++ private void interactionCallBack() { ++ sourcePlane.SetNormal(planWidget.GetNormal()); ++ controlUI.setNormalFieldsValues(planWidget.GetNormal()); ++ controlUI.setOrigineFieldsValues(planWidget.GetOrigin()); ++ sourcePlane.SetOrigin(planWidget.GetOrigin()[0], planWidget.GetOrigin()[1], planWidget.GetOrigin()[2]); DelBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlanePlugin.java,464,4) -- -- public Filter getInternalFilter() { -- return filterImpl; -- } DelBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlanePlugin.java,465,4) -- public CassandraPlugInProperty getPlugInProperty() { -- // TODO Auto-generated method stub -- return null; -- } AddBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlanePlugin.java,465,3) ++ public Filter getInternalFilter() { ++ return filterImpl; ++ } AddBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlanePlugin.java,469,11) ++ /** ++ * return the properties of the current plug-in ++ */ ++ @Override ++ public CassandraPlugInProperty getPlugInProperty() { ++ //FIXME : should be moved / handle by the evente lsitener of the pipeline. Not very clean. ++ outputCassLookupTable = pipelineManager.getCassandraVtkObjectByTrueVtkObject((vtkLookupTable) cutMapper.GetLookupTable()); ++ lookupTable = (vtkLookupTable) outputCassLookupTable.getVtkObject(); ++ outputCassScalarBar = pipelineManager.getVtkObject(outputCassLookupTable.getOutputConnectivityList().get(0)); ++ scalarBar = (vtkScalarBarActor) outputCassScalarBar.getVtkObject(); ++ // AddBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlanePlugin.java,481,1) ++ SimplePlugInProperty prop = new SimplePlugInProperty(); DelBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlanePlugin.java,483,3) -- public PlugInControlUI getControlUI() { -- return controlUI; -- } AddBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlanePlugin.java,483,3) ++ prop.put(PERSISTENCE_KEY_CX, new Double(sourcePlane.GetOrigin()[0])); ++ prop.put(PERSISTENCE_KEY_CY, new Double(sourcePlane.GetOrigin()[1])); ++ prop.put(PERSISTENCE_KEY_CZ, new Double(sourcePlane.GetOrigin()[2])); AddBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlanePlugin.java,487,3) ++ prop.put(PERSISTENCE_KEY_NX, new Double(sourcePlane.GetNormal()[0])); ++ prop.put(PERSISTENCE_KEY_NY, new Double(sourcePlane.GetNormal()[1])); ++ prop.put(PERSISTENCE_KEY_NZ, new Double(sourcePlane.GetNormal()[2])); DelBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlanePlugin.java,491,5) -- @Override -- public void initAndUpdate(CassandraPlugInProperty prop) { -- // TODO Auto-generated method stub -- -- } AddBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlanePlugin.java,491,11) ++ prop.put(PERSISTENCE_KEY_INPUT_DATASET, planeCut.GetInput()); ++ ++ prop.put(PERSISTENCE_KEY_OUPUT_DATASET, planeCut.GetOutput()); ++ prop.put(PERSISTENCE_KEY_OUPUT_MAPPER, cutMapper); ++ prop.put(PERSISTENCE_KEY_OUPUT_LOOKUP_TABLE, outputCassLookupTable.getVtkObject()); ++ prop.put(PERSISTENCE_KEY_OUTPUT_ACTOR, outputCassActor.getVtkObject()); ++ prop.put(PERSISTENCE_KEY_OUTPUT_SCALAR_BAR, outputCassScalarBar.getVtkObject()); ++ ++ Point cellPosition = ((VtkObjectCellAdapter) cassFilter.getMetaData().get(VtkObject.CELL)).getPosition(); ++ prop.put(PERSISTENCE_KEY_CELL_POS_X, cellPosition.x); ++ prop.put(PERSISTENCE_KEY_CELL_POS_Y, cellPosition.y); AddBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlanePlugin.java,503,57) ++ return prop; ++ } ++ ++ public PlugInControlUI getControlUI() { ++ return controlUI; ++ } ++ ++ /** ++ * update of the current clipping using a ++ * CassandraPlugInProperty. This update the setting of the plug-in and call ++ * the updateClippingPlane method. ++ */ ++ @Override ++ public void initAndUpdate(CassandraPlugInProperty prop) { ++ double cx = 0; ++ double cy = 0; ++ double cz = 0; ++ ++ double nx = 0; ++ double ny = 0; ++ double nz = 0; ++ ++ vtkDataSet tmpInputDataSet; ++ ++ boolean inOut = false; ++ ++ int cellPosX; ++ int cellPosY; ++ ++ cx = prop.getSafely(PERSISTENCE_KEY_CX, 0.0); ++ cy = prop.getSafely(PERSISTENCE_KEY_CY, 0.0); ++ cz = prop.getSafely(PERSISTENCE_KEY_CZ, 0.0); ++ ++ nx = prop.getSafely(PERSISTENCE_KEY_NX, 1.0); ++ ny = prop.getSafely(PERSISTENCE_KEY_NY, 0.0); ++ nz = prop.getSafely(PERSISTENCE_KEY_NZ, 0.0); ++ ++ this.planeCut = new vtkCutter(); ++ this.planeCut.SetOutput((vtkDataObject) prop.getSafely(PERSISTENCE_KEY_OUPUT_DATASET, null)); // FIXME ++ tmpInputDataSet = (vtkDataSet) prop.getSafely(PERSISTENCE_KEY_INPUT_DATASET, (vtkDataSet) (planeCut.GetInput())); ++ ++ lookupTable = (vtkLookupTable) prop.getSafely(PERSISTENCE_KEY_OUPUT_LOOKUP_TABLE, null); // FIXME ++ cutMapper = (vtkPolyDataMapper) prop.getSafely(PERSISTENCE_KEY_OUPUT_MAPPER, null); // FIXME ++ cutActor = (vtkActor) prop.getSafely(PERSISTENCE_KEY_OUTPUT_ACTOR, null); // FIXME ++ scalarBar = (vtkScalarBarActor) prop.getSafely(PERSISTENCE_KEY_OUTPUT_SCALAR_BAR, null); // FIXME ++ ++ this.initPipeline(); ++ controlUI.setNormalFieldsValues(nx, ny, nz); ++ controlUI.setOrigineFieldsValues(cx, cy, cz); ++ controlUI.setSelectedInput(pipelineManager.getCassandraVtkObjectByTrueVtkObject(tmpInputDataSet)); //FIXME: nasty ++ this.updateCuttingPlane(cx, cy, cy, nx, ny, cy, tmpInputDataSet); ++ ++ cellPosX = prop.getSafely(PERSISTENCE_KEY_CELL_POS_X, -1); ++ cellPosY = prop.getSafely(PERSISTENCE_KEY_CELL_POS_Y, -1); ++ if (cellPosX > 0 && cellPosY > 0) ((VtkObjectCellAdapter) cassFilter.getMetaData().get(VtkObject.CELL)).setPosition(new Point(cellPosX, cellPosY)); ++ } ++ DelBlock(Plugins/IsoLevel/src/com/artenum/cassandra/plugin/isolevel/IsoLevelControlUI.java,104,1) -- super(owner, "Iso lvel configuration panel"); AddBlock(Plugins/IsoLevel/src/com/artenum/cassandra/plugin/isolevel/IsoLevelControlUI.java,104,1) ++ super(owner, "Iso level configuration panel"); AddBlock(Plugins/IsoLevel/src/com/artenum/cassandra/plugin/isolevel/IsoLevelControlUI.java,255,14) ++ /** ++ * Select the index of the type of isolevel (i.e one or multi-isolevels) ++ * @param levelType, should 0 (simple) or 1 (multi). ++ */ ++ public void setLevelType(int levelType){ ++ if (levelType >=0 && levelType < this.levelType.getTabCount()){ ++ this.levelType.setSelectedIndex(levelType); ++ } else{ ++ System.out.println("Error, index not found. Set to one unique leve by default"); ++ this.levelType.setSelectedIndex(0); ++ } ++ } ++ ++ AddBlock(Plugins/IsoLevel/src/com/artenum/cassandra/plugin/isolevel/IsoLevelPlugin.java,300,1) ++ System.out.println("Error input data set null"); AddBlock(Plugins/IsoLevel/src/com/artenum/cassandra/plugin/isolevel/IsoLevelPlugin.java,307,7) ++ //FIXME : should be moved / handle by the evente lsitener of the pipeline. Not very clean. ++ outputCassLookupTable = pipelineManager.getCassandraVtkObjectByTrueVtkObject((vtkLookupTable) isoLevelMapper.GetLookupTable()); ++ lookupTable = (vtkLookupTable) outputCassLookupTable.getVtkObject(); ++ outputCassScalarBar = pipelineManager.getVtkObject(outputCassLookupTable.getOutputConnectivityList().get(0)); ++ scalarBar = (vtkScalarBarActor) outputCassScalarBar.getVtkObject(); ++ // ++ AddBlock(Plugins/IsoLevel/src/com/artenum/cassandra/plugin/isolevel/IsoLevelPlugin.java,412,8) ++ ++ //FIXME : should be moved / handle by the evente lsitener of the pipeline. Not very clean. ++ outputCassLookupTable = pipelineManager.getCassandraVtkObjectByTrueVtkObject((vtkLookupTable) isoLevelMapper.GetLookupTable()); ++ lookupTable = (vtkLookupTable) outputCassLookupTable.getVtkObject(); ++ outputCassScalarBar = pipelineManager.getVtkObject(outputCassLookupTable.getOutputConnectivityList().get(0)); ++ scalarBar = (vtkScalarBarActor) outputCassScalarBar.getVtkObject(); ++ // ++ DelBlock(Plugins/IsoLevel/src/com/artenum/cassandra/plugin/isolevel/IsoLevelPlugin.java,473,1) -- AddBlock(Plugins/IsoLevel/src/com/artenum/cassandra/plugin/isolevel/IsoLevelPlugin.java,473,1) ++ AddBlock(Plugins/IsoLevel/src/com/artenum/cassandra/plugin/isolevel/IsoLevelPlugin.java,480,1) ++ controlUI.setLevelType(localLevelFlag); UpdateBinaryFile(Renderer/CassandraRenderer-1.1.0-all-all-none-jvm1_6-stable/CassandraRenderer-1.1.0-all-all-none-jvm1_6-stable.jar) DelBlock(Renderer/CassandraRenderer-1.1.0-all-all-none-jvm1_6-stable/version.txt,9,2) -- Date of build: 20110407 -- Hour of build: 1005 AddBlock(Renderer/CassandraRenderer-1.1.0-all-all-none-jvm1_6-stable/version.txt,9,2) ++ Date of build: 20110418 ++ Hour of build: 1232 DelBlock(Renderer/CassandraRenderer-1.1.0-all-all-none-jvm1_6-stable/version.txt,12,1) -- Cassandra CORE branch development ticket: 5569 AddBlock(Renderer/CassandraRenderer-1.1.0-all-all-none-jvm1_6-stable/version.txt,12,1) ++ Cassandra CORE branch development ticket: 5723 AddDir(thirdpartSansVtk) AddDir(thirdpartSansVtk/ArtTk) AddBinaryFile(thirdpartSansVtk/ArtTk/ArtTk.jar) AddTxtFile(thirdpartSansVtk/ArtTk/COPYRIGHT) AddTxtFile(thirdpartSansVtk/ArtTk/LICENSE.txt) AddDir(thirdpartSansVtk/CassandraRenderer-1.1.0-all-all-none-jvm1_6-stable) AddBinaryFile(thirdpartSansVtk/CassandraRenderer-1.1.0-all-all-none-jvm1_6-stable/CassandraRenderer-1.1.0-all-all-none-jvm1_6-stable.jar) AddTxtFile(thirdpartSansVtk/CassandraRenderer-1.1.0-all-all-none-jvm1_6-stable/CHANGE.txt) AddTxtFile(thirdpartSansVtk/CassandraRenderer-1.1.0-all-all-none-jvm1_6-stable/INSTALL.txt) AddTxtFile(thirdpartSansVtk/CassandraRenderer-1.1.0-all-all-none-jvm1_6-stable/LICENSE.txt) AddTxtFile(thirdpartSansVtk/CassandraRenderer-1.1.0-all-all-none-jvm1_6-stable/README.txt) AddTxtFile(thirdpartSansVtk/CassandraRenderer-1.1.0-all-all-none-jvm1_6-stable/version.txt) AddDir(thirdpartSansVtk/DedaleGraph) AddBinaryFile(thirdpartSansVtk/DedaleGraph/DedaleGraph.jar) AddTxtFile(thirdpartSansVtk/DedaleGraph/LICENSE.txt) AddBinaryFile(thirdpartSansVtk.zip) UpdateBinaryFile(tmpCrossDepDir/CorePipeline.jar)
- introduction opf the persistence scheme in the iso-level plugin - bug fixes in the plug-in properties saving scheme
DelBlock(Core/src/com/artenum/cassandra/pipeline/io/PipelineToJythonExporter.java,176,1) -- String tmpCanonicalClassName; AddBlock(Core/src/com/artenum/cassandra/pipeline/io/PipelineToJythonExporter.java,176,1) ++ //String tmpCanonicalClassName; DelBlock(Core/src/com/artenum/cassandra/pipeline/io/PipelineToJythonExporter.java,178,1) -- String[] tmpSplittedClassName; DelBlock(Core/src/com/artenum/cassandra/pipeline/io/PipelineToJythonExporter.java,185,1) -- AddBlock(Core/src/com/artenum/cassandra/pipeline/io/PipelineToJythonExporter.java,191,5) ++ String tmpPlugInPropertyInstanceName; ++ CassandraPlugInProperty plugInProperty; ++ HashMap <Object, Object> propertyMap; ++ Object keyProp; ++ Object tmpPro; DelBlock(Core/src/com/artenum/cassandra/pipeline/io/PipelineToJythonExporter.java,203,6) -- if (cassandraContext) { -- exportConnectivity = true; -- } -- if (exportConnectivity) { -- exportNodes = true; -- } AddBlock(Core/src/com/artenum/cassandra/pipeline/io/PipelineToJythonExporter.java,203,2) ++ if (cassandraContext) exportConnectivity = true; ++ if (exportConnectivity) exportNodes = true; DelBlock(Core/src/com/artenum/cassandra/pipeline/io/PipelineToJythonExporter.java,266,1) -- // managment of Cassandra's plug-ins AddBlock(Core/src/com/artenum/cassandra/pipeline/io/PipelineToJythonExporter.java,266,1) ++ // management of Cassandra's plug-ins AddBlock(Core/src/com/artenum/cassandra/pipeline/io/PipelineToJythonExporter.java,270,1) ++ // recover the parent plug-in of the current Cassnadra filter DelBlock(Core/src/com/artenum/cassandra/pipeline/io/PipelineToJythonExporter.java,273,2) -- CassandraPlugInProperty plugInProperty = parentPlugIn.getPlugInProperty(); -- HashMap propertyMap = plugInProperty.getPropertyMap(); AddBlock(Core/src/com/artenum/cassandra/pipeline/io/PipelineToJythonExporter.java,273,3) ++ // management of the corresponding property ++ plugInProperty = parentPlugIn.getPlugInProperty(); ++ propertyMap = plugInProperty.getPropertyMap(); DelBlock(Core/src/com/artenum/cassandra/pipeline/io/PipelineToJythonExporter.java,277,1) -- // construction of the needed property AddBlock(Core/src/com/artenum/cassandra/pipeline/io/PipelineToJythonExporter.java,277,1) ++ // construction of the needed property as Jython script DelBlock(Core/src/com/artenum/cassandra/pipeline/io/PipelineToJythonExporter.java,282,1) -- String tmpPlugInPropertyInstanceName = plugInProperty.getClass().getSimpleName() + "_" + obj.getId(); AddBlock(Core/src/com/artenum/cassandra/pipeline/io/PipelineToJythonExporter.java,282,2) ++ // set the name of the current instance of the plugin property ++ tmpPlugInPropertyInstanceName = plugInProperty.getClass().getSimpleName() + "_" + obj.getId(); DelBlock(Core/src/com/artenum/cassandra/pipeline/io/PipelineToJythonExporter.java,285,2) -- tmpPlugInsConnectivityLine = "if CASSANDRA_CONTEXT:" + eol; -- DelBlock(Core/src/com/artenum/cassandra/pipeline/io/PipelineToJythonExporter.java,286,1) -- tmpPlugInsConnectivityLine = tmpPlugInsConnectivityLine AddBlock(Core/src/com/artenum/cassandra/pipeline/io/PipelineToJythonExporter.java,286,1) ++ tmpPlugInsConnectivityLine = "if CASSANDRA_CONTEXT:" + eol DelBlock(Core/src/com/artenum/cassandra/pipeline/io/PipelineToJythonExporter.java,289,5) -- Iterator iter = propertyMap.keySet().iterator(); -- while (iter.hasNext()) { -- Object keyProp = iter.next(); -- Object tmpProp = plugInProperty.get(keyProp); -- AddBlock(Core/src/com/artenum/cassandra/pipeline/io/PipelineToJythonExporter.java,289,2) ++ ++ for ( Map.Entry<Object, Object> currentEntry : propertyMap.entrySet() ) { DelBlock(Core/src/com/artenum/cassandra/pipeline/io/PipelineToJythonExporter.java,292,1) -- if (tmpProp instanceof vtkObject) { AddBlock(Core/src/com/artenum/cassandra/pipeline/io/PipelineToJythonExporter.java,292,3) ++ if (currentEntry.getValue() instanceof vtkObject) { ++ ++ vtkObject tmpVtkObject = (vtkObject) currentEntry.getValue(); DelBlock(Core/src/com/artenum/cassandra/pipeline/io/PipelineToJythonExporter.java,296,4) -- vtkObject tmpVtkObject = (vtkObject) tmpProp; -- -- String tmpName; -- for ( Entry<Integer, vtkObject> tmpEntry : exportedVtkObjArray.entrySet() ){ //FIXME: not clean AddBlock(Core/src/com/artenum/cassandra/pipeline/io/PipelineToJythonExporter.java,296,1) ++ for ( Entry<Integer, vtkObject> tmpEntry : exportedVtkObjArray.entrySet() ){ DelBlock(Core/src/com/artenum/cassandra/pipeline/io/PipelineToJythonExporter.java,298,1) -- tmpName = exportedVtkObjCanonicalNameArray.get(tmpEntry.getKey()); AddBlock(Core/src/com/artenum/cassandra/pipeline/io/PipelineToJythonExporter.java,298,1) ++ // the Jython line DelBlock(Core/src/com/artenum/cassandra/pipeline/io/PipelineToJythonExporter.java,301,2) -- + tmpPlugInPropertyInstanceName + ".put( \"" + keyProp + "\", " -- + tmpName + ")" + eol; AddBlock(Core/src/com/artenum/cassandra/pipeline/io/PipelineToJythonExporter.java,301,2) ++ + tmpPlugInPropertyInstanceName + ".put( \"" + currentEntry.getKey() + "\", " ++ + exportedVtkObjCanonicalNameArray.get(tmpEntry.getKey()) + ")" + eol; AddBlock(Core/src/com/artenum/cassandra/pipeline/io/PipelineToJythonExporter.java,307,1) ++ // the Jython line DelBlock(Core/src/com/artenum/cassandra/pipeline/io/PipelineToJythonExporter.java,310,1) -- + tmpPlugInPropertyInstanceName + ".put( \"" + keyProp + "\", " + tmpProp + ")" + eol; AddBlock(Core/src/com/artenum/cassandra/pipeline/io/PipelineToJythonExporter.java,310,1) ++ + tmpPlugInPropertyInstanceName + ".put( \"" + currentEntry.getKey() + "\", " + currentEntry.getValue() + ")" + eol; DelBlock(Core/src/com/artenum/cassandra/pipeline/io/PipelineToJythonExporter.java,313,1) -- AddBlock(Core/src/com/artenum/cassandra/pipeline/io/PipelineToJythonExporter.java,313,1) ++ //the jython line DelBlock(Core/src/com/artenum/cassandra/pipeline/io/PipelineToJythonExporter.java,317,1) -- AddBlock(Core/src/com/artenum/cassandra/pipeline/io/PipelineToJythonExporter.java,317,1) ++ //gather everything AddTxtFile(Core/src/com/artenum/cassandra/plugin/SimplePlugInProperty.java) AddBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,22,1) ++ import com.artenum.cassandra.plugin.SimplePlugInProperty; AddBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,102,2) ++ private VtkObject outputCassLookupTable; ++ private VtkObject outputCassScalarBar; DelBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,108,1) -- private boolean loadOutputPipelineComponents = true; AddBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,108,1) ++ //private boolean loadOutputPipelineComponents = true; DelBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,221,3) -- } else { -- this.outputCassDataset = pipelineManager.getCassandraVtkObjectByTrueVtkObject(planeClip); -- } AddBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,221,2) ++ } else outputCassDataset = pipelineManager.getCassandraVtkObjectByTrueVtkObject(planeClip); ++ DelBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,228,3) -- } else { -- outputCassMapper = pipelineManager.getCassandraVtkObjectByTrueVtkObject(outputMapper); -- } AddBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,228,2) ++ } else outputCassMapper = pipelineManager.getCassandraVtkObjectByTrueVtkObject(outputMapper); ++ DelBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,242,3) -- } else { -- outputCassActor = pipelineManager.getCassandraVtkObjectByTrueVtkObject(outputActor); -- } AddBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,242,2) ++ } else outputCassActor = pipelineManager.getCassandraVtkObjectByTrueVtkObject(outputActor); ++ DelBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,249,2) -- pipelineManager.addLookupTable(outputLookupTable, "Clipping plane"); -- } AddBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,249,2) ++ outputCassLookupTable = pipelineManager.addLookupTable(outputLookupTable, "Clipping plane"); ++ } else outputCassLookupTable = pipelineManager.getCassandraVtkObjectByTrueVtkObject(outputLookupTable); DelBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,259,1) -- pipelineManager.addScalarBar(outputScalarBar, "Clipping plane"); AddBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,259,1) ++ outputCassScalarBar = pipelineManager.addScalarBar(outputScalarBar, "Clipping plane"); DelBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,261,1) -- } AddBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,261,1) ++ } else outputCassScalarBar = pipelineManager.getCassandraVtkObjectByTrueVtkObject(outputScalarBar); DelBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,272,4) -- // to see directly the control panel when we instantiate the plugin -- // /controlUI.setVisible(true); Since 1.2, done in the instantiation -- // manager -- AddBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,288,1) ++ @Deprecated DelBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,507,1) -- loadOutputPipelineComponents = false; AddBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,507,1) ++ //loadOutputPipelineComponents = false; DelBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,528,1) -- ClipingPlanePlugInProperty prop = new ClipingPlanePlugInProperty(); AddBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,528,1) ++ SimplePlugInProperty prop = new SimplePlugInProperty(); AddBlock(Plugins/IsoLevel/src/com/artenum/cassandra/plugin/isolevel/IsoLevelControlUI.java,269,12) ++ ++ /** ++ * set the selected input data set. ++ * @param selectedInput ++ */ ++ public void setSelectedInput(VtkObject selectedInput){ ++ if (selectedInput != null){ ++ inputDataset.getModel().setSelectedItem(selectedInput); ++ } else { ++ System.out.println("Selection is null"); ++ } ++ } AddBlock(Plugins/IsoLevel/src/com/artenum/cassandra/plugin/isolevel/IsoLevelPlugin.java,30,1) ++ import com.artenum.cassandra.pipeline.graph.VtkObjectCellAdapter; AddBlock(Plugins/IsoLevel/src/com/artenum/cassandra/plugin/isolevel/IsoLevelPlugin.java,35,1) ++ import com.artenum.cassandra.plugin.SimplePlugInProperty; AddBlock(Plugins/IsoLevel/src/com/artenum/cassandra/plugin/isolevel/IsoLevelPlugin.java,37,1) ++ import sun.management.snmp.util.MibLogger; AddBlock(Plugins/IsoLevel/src/com/artenum/cassandra/plugin/isolevel/IsoLevelPlugin.java,40,1) ++ import vtk.vtkClipDataSet; AddBlock(Plugins/IsoLevel/src/com/artenum/cassandra/plugin/isolevel/IsoLevelPlugin.java,43,1) ++ import vtk.vtkDataObject; AddBlock(Plugins/IsoLevel/src/com/artenum/cassandra/plugin/isolevel/IsoLevelPlugin.java,45,1) ++ import vtk.vtkDataSetMapper; AddBlock(Plugins/IsoLevel/src/com/artenum/cassandra/plugin/isolevel/IsoLevelPlugin.java,53,1) ++ import java.awt.Point; DelBlock(Plugins/IsoLevel/src/com/artenum/cassandra/plugin/isolevel/IsoLevelPlugin.java,86,1) -- * @author Julien Forest, ARTENUM SARL AddBlock(Plugins/IsoLevel/src/com/artenum/cassandra/plugin/isolevel/IsoLevelPlugin.java,86,1) ++ * @author Julien Forest, ARTENUM SARL DelBlock(Plugins/IsoLevel/src/com/artenum/cassandra/plugin/isolevel/IsoLevelPlugin.java,91,6) -- private String name; -- private PipeLineManager pipelineManager; -- private PluginManager pluginManager; -- private JPopupMenu contextualMenu; -- private IsoLevelControlUI controlUI; -- private int nbUpdate = 0; AddBlock(Plugins/IsoLevel/src/com/artenum/cassandra/plugin/isolevel/IsoLevelPlugin.java,91,6) ++ private String name; ++ private PipeLineManager pipelineManager; ++ private PluginManager pluginManager; ++ private JPopupMenu contextualMenu; ++ private IsoLevelControlUI controlUI; ++ private int nbUpdate = 0; DelBlock(Plugins/IsoLevel/src/com/artenum/cassandra/plugin/isolevel/IsoLevelPlugin.java,98,10) -- // Vtk data -- private vtkDataSet lastDataSet; -- private vtkLookupTable lookupTable; -- private vtkScalarBarActor scalarBar; -- private vtkPlane plane; -- private vtkCutter planeCut; -- private vtkPolyDataMapper isoLevelMapper; -- private vtkActor isoLevelActor; -- private vtkContourFilter contour; -- private vtkPolyDataNormals normals; AddBlock(Plugins/IsoLevel/src/com/artenum/cassandra/plugin/isolevel/IsoLevelPlugin.java,98,11) ++ // Vtk data ++ private vtkDataSet lastDataSet; ++ private vtkLookupTable lookupTable; ++ private vtkScalarBarActor scalarBar; ++ private vtkPlane plane; ++ private vtkCutter planeCut; ++ private vtkPolyDataMapper isoLevelMapper; ++ private vtkActor isoLevelActor; ++ private vtkContourFilter contour; ++ private vtkPolyDataNormals normals; ++ private vtkAssembly assembly; DelBlock(Plugins/IsoLevel/src/com/artenum/cassandra/plugin/isolevel/IsoLevelPlugin.java,110,9) -- // Pipeline VtkObjects -- private VtkObject actor; -- private VtkObject mapper; -- private VtkObject dataset; -- private VtkObject datasetN; -- private VtkObject filter; -- private Filter filterImpl; -- private vtkAssembly assembly; -- private boolean normalFlag; AddBlock(Plugins/IsoLevel/src/com/artenum/cassandra/plugin/isolevel/IsoLevelPlugin.java,110,9) ++ // Pipeline VtkObjects ++ private VtkObject outputCassActor; ++ private VtkObject outputCassMapper; ++ private VtkObject outputCassDataset; ++ private VtkObject outputCassDatasetN; ++ private VtkObject outputCassLookupTable; ++ private VtkObject outputCassScalarBar; ++ private VtkObject cassFilter; ++ private Filter filterImpl; DelBlock(Plugins/IsoLevel/src/com/artenum/cassandra/plugin/isolevel/IsoLevelPlugin.java,120,4) -- public IsoLevelPlugin() { -- this.name = "Iso level"; -- filterImpl = new FilterImpl(); -- } AddBlock(Plugins/IsoLevel/src/com/artenum/cassandra/plugin/isolevel/IsoLevelPlugin.java,120,6) ++ private boolean normalFlag; ++ ++ private Point cellPosition; ++ ++ private double minValue; ++ private double maxValue; DelBlock(Plugins/IsoLevel/src/com/artenum/cassandra/plugin/isolevel/IsoLevelPlugin.java,127,5) -- public IsoLevelPlugin(PipeLineManager pipelineManager, -- PluginManager pluginManager, Frame owner) { -- this(); -- this.pipelineManager = pipelineManager; -- this.pluginManager = pluginManager; AddBlock(Plugins/IsoLevel/src/com/artenum/cassandra/plugin/isolevel/IsoLevelPlugin.java,127,1) ++ // private boolean loadOutputPipelineComponents = true; DelBlock(Plugins/IsoLevel/src/com/artenum/cassandra/plugin/isolevel/IsoLevelPlugin.java,129,2) -- // Init control UI -- controlUI = new IsoLevelControlUI(pipelineManager, this, owner); AddBlock(Plugins/IsoLevel/src/com/artenum/cassandra/plugin/isolevel/IsoLevelPlugin.java,129,19) ++ public static final String PERSISTENCE_KEY_INPUT_DATASET = "persistence.key.inputVtkDataSet"; ++ public static final String PERSISTENCE_KEY_INOUT = "persistence.key.insideOut"; ++ public static final String PERSISTENCE_KEY_OUPUT_DATASET = "persistence.key.outputDataSet"; ++ public static final String PERSISTENCE_KEY_OUPUT_MAPPER = "persistence.key.outputMapper"; ++ public static final String PERSISTENCE_KEY_OUPUT_LOOKUP_TABLE = "persistence.key.outputlookUpTable"; ++ public static final String PERSISTENCE_KEY_OUTPUT_ACTOR = "persistence.key.outputActor"; ++ public static final String PERSISTENCE_KEY_OUTPUT_SCALAR_BAR = "persistence.key.ouputScalarBar"; ++ public static final String PERSISTENCE_KEY_CELL_POS_X = "persistence.key.cell.PosX"; ++ public static final String PERSISTENCE_KEY_CELL_POS_Y = "persistence.key.cell.PosY"; ++ public static final String PERSISTENCE_KEY_LEVEL_VALUE = "persistence.key.level.value"; ++ public static final String PERSISTENCE_KEY_LEVEL_FLAG = "persistence.key.level.flag"; ++ public static final String PERSISTENCE_KEY_LEVEL_NUMBER = "persistence.key.level.number"; ++ public static final String PERSISTENCE_KEY_LEVEL_MIN = "persistence.key.level.min"; ++ public static final String PERSISTENCE_KEY_LEVEL_MAX = "persistence.key.level.max"; ++ ++ public IsoLevelPlugin(PipeLineManager pipelineManager, PluginManager pluginManager, Frame owner) { ++ initPlugIn(pipelineManager, pluginManager, owner); ++ initPipeline(); ++ } DelBlock(Plugins/IsoLevel/src/com/artenum/cassandra/plugin/isolevel/IsoLevelPlugin.java,149,17) -- // Init contextual menu -- contextualMenu = new JPopupMenu("Iso level menu"); -- JMenuItem showControl = new JMenuItem("Show control"); -- showControl.addActionListener(new ActionListener() { -- public void actionPerformed(ActionEvent e) { -- controlUI.setVisible(true); -- } -- }); -- contextualMenu.add(showControl); -- contextualMenu.addSeparator(); -- JMenuItem remove = new JMenuItem("Remove"); -- remove.addActionListener(new ActionListener() { -- public void actionPerformed(ActionEvent e) { -- remove(); -- } -- }); -- contextualMenu.add(remove); AddBlock(Plugins/IsoLevel/src/com/artenum/cassandra/plugin/isolevel/IsoLevelPlugin.java,149,6) ++ public IsoLevelPlugin(PipeLineManager pipelineManager, PluginManager pluginManager, Frame owner, boolean initPipeline) { ++ initPlugIn(pipelineManager, pluginManager, owner); ++ if (initPipeline) { ++ initPipeline(); ++ } ++ } DelBlock(Plugins/IsoLevel/src/com/artenum/cassandra/plugin/isolevel/IsoLevelPlugin.java,156,3) -- // Init pipeline -- // Here write your processing pipeline -- contour = new vtkContourFilter(); AddBlock(Plugins/IsoLevel/src/com/artenum/cassandra/plugin/isolevel/IsoLevelPlugin.java,156,6) ++ public IsoLevelPlugin(PipeLineManager pipelineManager, PluginManager pluginManager, Frame owner, int initPipeline) { ++ initPlugIn(pipelineManager, pluginManager, owner); ++ if (initPipeline == 1) { ++ initPipeline(); ++ } ++ } DelBlock(Plugins/IsoLevel/src/com/artenum/cassandra/plugin/isolevel/IsoLevelPlugin.java,163,1) -- contour.SetValue(0, 0.1); // to have a default value AddBlock(Plugins/IsoLevel/src/com/artenum/cassandra/plugin/isolevel/IsoLevelPlugin.java,163,1) ++ public void initPlugIn(PipeLineManager pipelineManager, PluginManager pluginManager, Frame owner) { DelBlock(Plugins/IsoLevel/src/com/artenum/cassandra/plugin/isolevel/IsoLevelPlugin.java,165,3) -- normals = new vtkPolyDataNormals(); -- normals.SetInput(contour.GetOutput()); -- normals.SetFeatureAngle(45); AddBlock(Plugins/IsoLevel/src/com/artenum/cassandra/plugin/isolevel/IsoLevelPlugin.java,165,1) ++ this.name = "Iso level"; DelBlock(Plugins/IsoLevel/src/com/artenum/cassandra/plugin/isolevel/IsoLevelPlugin.java,167,1) -- isoLevelMapper = new vtkPolyDataMapper(); AddBlock(Plugins/IsoLevel/src/com/artenum/cassandra/plugin/isolevel/IsoLevelPlugin.java,167,4) ++ // Cassandra filter macro ++ filterImpl = new FilterImpl(); ++ filterImpl.addRemoveListener(this); ++ filterImpl.setParentPlugin(this); DelBlock(Plugins/IsoLevel/src/com/artenum/cassandra/plugin/isolevel/IsoLevelPlugin.java,172,2) -- // to see something by default -- isoLevelMapper.ScalarVisibilityOn(); AddBlock(Plugins/IsoLevel/src/com/artenum/cassandra/plugin/isolevel/IsoLevelPlugin.java,172,2) ++ this.pipelineManager = pipelineManager; ++ this.pluginManager = pluginManager; DelBlock(Plugins/IsoLevel/src/com/artenum/cassandra/plugin/isolevel/IsoLevelPlugin.java,175,4) -- // and something colored -- isoLevelMapper.ColorByArrayComponent("Magnitude", 0); -- isoLevelActor = new vtkActor(); -- isoLevelActor.SetMapper(isoLevelMapper); AddBlock(Plugins/IsoLevel/src/com/artenum/cassandra/plugin/isolevel/IsoLevelPlugin.java,175,2) ++ // Init control UI ++ controlUI = new IsoLevelControlUI(pipelineManager, this, owner); DelBlock(Plugins/IsoLevel/src/com/artenum/cassandra/plugin/isolevel/IsoLevelPlugin.java,178,4) -- // -- filterImpl.getOutputDataSet().add(contour.GetOutput()); -- filterImpl.getOutputDataSet().add(normals.GetOutput()); -- filterImpl.addRemoveListener(this); AddBlock(Plugins/IsoLevel/src/com/artenum/cassandra/plugin/isolevel/IsoLevelPlugin.java,178,18) ++ // Init contextual menu ++ contextualMenu = new JPopupMenu("Iso level menu"); ++ JMenuItem showControl = new JMenuItem("Show control"); ++ showControl.addActionListener(new ActionListener() { ++ public void actionPerformed(ActionEvent e) { ++ controlUI.setVisible(true); ++ } ++ }); ++ contextualMenu.add(showControl); ++ contextualMenu.addSeparator(); ++ JMenuItem remove = new JMenuItem("Remove"); ++ remove.addActionListener(new ActionListener() { ++ public void actionPerformed(ActionEvent e) { ++ remove(); ++ } ++ }); ++ contextualMenu.add(remove); ++ } DelBlock(Plugins/IsoLevel/src/com/artenum/cassandra/plugin/isolevel/IsoLevelPlugin.java,197,3) -- // Build lookupTable -- lookupTable = new vtkLookupTable(); -- lookupTable.SetHueRange(0.66667, 0); AddBlock(Plugins/IsoLevel/src/com/artenum/cassandra/plugin/isolevel/IsoLevelPlugin.java,197,14) ++ /** ++ * intialise the processing pipeline it-self. Should be called after the ++ * initPlugIn. If its elements (i.e internal vtk components and the ++ * post-filter pipeline) are not set before, their are built as new ++ * instances and registered into the pipeline. ++ */ ++ public void initPipeline() { ++ // Here write your processing pipeline ++ ++ if (contour == null) { ++ contour = new vtkContourFilter(); ++ outputCassDataset = pipelineManager.addDataSet(contour.GetOutput(), "Contour"); ++ } else outputCassDataset = pipelineManager.getCassandraVtkObjectByTrueVtkObject(contour.GetOutput()); ++ contour.SetValue(0, 0.1); // to have a default value DelBlock(Plugins/IsoLevel/src/com/artenum/cassandra/plugin/isolevel/IsoLevelPlugin.java,212,2) -- lookupTable.Build(); -- isoLevelMapper.SetLookupTable(lookupTable); AddBlock(Plugins/IsoLevel/src/com/artenum/cassandra/plugin/isolevel/IsoLevelPlugin.java,212,4) ++ ++ normals = new vtkPolyDataNormals(); ++ normals.SetInput(contour.GetOutput()); ++ normals.SetFeatureAngle(45); DelBlock(Plugins/IsoLevel/src/com/artenum/cassandra/plugin/isolevel/IsoLevelPlugin.java,217,3) -- // Scalar bar -- vtkScalarBarActor scalBar = new vtkScalarBarActor(); -- scalBar.SetLookupTable(lookupTable); AddBlock(Plugins/IsoLevel/src/com/artenum/cassandra/plugin/isolevel/IsoLevelPlugin.java,217,5) ++ if (isoLevelMapper == null) { ++ isoLevelMapper = new vtkPolyDataMapper(); ++ outputCassMapper = pipelineManager.addMapper(isoLevelMapper, "IsoLevel"); ++ } else ++ outputCassMapper = pipelineManager.getCassandraVtkObjectByTrueVtkObject(isoLevelMapper); DelBlock(Plugins/IsoLevel/src/com/artenum/cassandra/plugin/isolevel/IsoLevelPlugin.java,223,9) -- // -- actor = pipelineManager.addActor(isoLevelActor, "IsoLevel"); -- mapper = pipelineManager.addMapper(isoLevelMapper, "IsoLevel"); -- dataset = pipelineManager.addDataSet(contour.GetOutput(), "Contour"); -- datasetN = pipelineManager.addDataSet(normals.GetOutput(), "Normal"); -- filter = pipelineManager.addFilter(filterImpl, "IsoLevel"); -- pipelineManager.addLookupTable(lookupTable, "IsoLevel"); -- pipelineManager.setActorVisible(pipelineManager.addScalarBar(scalBar, -- "IsoLevel"), true); AddBlock(Plugins/IsoLevel/src/com/artenum/cassandra/plugin/isolevel/IsoLevelPlugin.java,223,2) ++ // to see something by default ++ isoLevelMapper.ScalarVisibilityOn(); DelBlock(Plugins/IsoLevel/src/com/artenum/cassandra/plugin/isolevel/IsoLevelPlugin.java,226,2) -- // -- filter.getMetaData().put(VtkObject.POPUP_MENU, getContextualMenu()); AddBlock(Plugins/IsoLevel/src/com/artenum/cassandra/plugin/isolevel/IsoLevelPlugin.java,226,2) ++ // and something colored ++ isoLevelMapper.ColorByArrayComponent("Magnitude", 0); DelBlock(Plugins/IsoLevel/src/com/artenum/cassandra/plugin/isolevel/IsoLevelPlugin.java,229,4) -- // -- actor.setValide(false); -- -- } AddBlock(Plugins/IsoLevel/src/com/artenum/cassandra/plugin/isolevel/IsoLevelPlugin.java,229,5) ++ if (isoLevelActor == null) { ++ isoLevelActor = new vtkActor(); ++ outputCassActor = pipelineManager.addActor(isoLevelActor, "IsoLevel"); ++ } else ++ outputCassActor = pipelineManager.getCassandraVtkObjectByTrueVtkObject(isoLevelActor); DelBlock(Plugins/IsoLevel/src/com/artenum/cassandra/plugin/isolevel/IsoLevelPlugin.java,235,5) -- public void updateIsoLevel(vtkDataSet vtkDataSet, double level, -- int nbLevel, int levelFlag, double min, double max) { -- if (vtkDataSet == null) { -- return; -- } AddBlock(Plugins/IsoLevel/src/com/artenum/cassandra/plugin/isolevel/IsoLevelPlugin.java,235,1) ++ isoLevelActor.SetMapper(isoLevelMapper); DelBlock(Plugins/IsoLevel/src/com/artenum/cassandra/plugin/isolevel/IsoLevelPlugin.java,237,3) -- filterImpl.getInputDataSet().clear(); -- filterImpl.getInputDataSet().add(vtkDataSet); -- pipelineManager.notifyConnectivityChange(dataset); AddBlock(Plugins/IsoLevel/src/com/artenum/cassandra/plugin/isolevel/IsoLevelPlugin.java,237,4) ++ // ++ filterImpl.getOutputDataSet().add(contour.GetOutput()); ++ filterImpl.getOutputDataSet().add(normals.GetOutput()); ++ filterImpl.addRemoveListener(this); DelBlock(Plugins/IsoLevel/src/com/artenum/cassandra/plugin/isolevel/IsoLevelPlugin.java,242,5) -- actor.setValide(true); -- contour.SetInput(vtkDataSet); -- setNormal(normalFlag); // normalFlag); -- contour.ComputeScalarsOn(); -- isoLevelMapper.ColorByArrayComponent("Magnitude", 0); AddBlock(Plugins/IsoLevel/src/com/artenum/cassandra/plugin/isolevel/IsoLevelPlugin.java,242,6) ++ // Build lookupTable ++ if (lookupTable == null) { ++ lookupTable = new vtkLookupTable(); ++ outputCassLookupTable = pipelineManager.addLookupTable(lookupTable, "IsoLevel"); ++ } else ++ outputCassLookupTable = pipelineManager.getCassandraVtkObjectByTrueVtkObject(lookupTable); DelBlock(Plugins/IsoLevel/src/com/artenum/cassandra/plugin/isolevel/IsoLevelPlugin.java,249,6) -- if (levelFlag == 0) { -- contour.SetNumberOfContours(1); -- contour.SetValue(0, level); -- } else { -- contour.GenerateValues(nbLevel, min, max); -- } AddBlock(Plugins/IsoLevel/src/com/artenum/cassandra/plugin/isolevel/IsoLevelPlugin.java,249,3) ++ lookupTable.SetHueRange(0.66667, 0); ++ lookupTable.Build(); ++ isoLevelMapper.SetLookupTable(lookupTable); DelBlock(Plugins/IsoLevel/src/com/artenum/cassandra/plugin/isolevel/IsoLevelPlugin.java,253,11) -- /* -- * if (vtkDataSet.GetPointData().GetScalars() != null) { -- * isoLevelMapper.SetScalarRange -- * (vtkDataSet.GetPointData().GetScalars().GetRange()); } -- */ -- if (((lastDataSet == null) || !lastDataSet.equals(vtkDataSet)) -- && isoLevelMapper.GetLookupTable().equals(lookupTable)) { -- isoLevelMapper.SetScalarRange(vtkDataSet.GetScalarRange()); -- lookupTable.SetTableRange(vtkDataSet.GetScalarRange()); -- lastDataSet = vtkDataSet; -- } AddBlock(Plugins/IsoLevel/src/com/artenum/cassandra/plugin/isolevel/IsoLevelPlugin.java,253,6) ++ // Scalar bar ++ if (scalarBar == null) { ++ scalarBar = new vtkScalarBarActor(); ++ outputCassScalarBar = pipelineManager.addScalarBar(scalarBar, "Iso Level"); ++ } else ++ outputCassScalarBar = pipelineManager.getCassandraVtkObjectByTrueVtkObject(scalarBar); DelBlock(Plugins/IsoLevel/src/com/artenum/cassandra/plugin/isolevel/IsoLevelPlugin.java,260,7) -- // Set the default actor visible by default -- if ((nbUpdate++ == 0) -- && pipelineManager.getActorList().getData().contains(actor)) { -- pipelineManager.setActorVisible(actor, true); -- } -- // and we hide the actor corresponding to the source -- pipelineManager.hideInputActor(actor, vtkDataSet); AddBlock(Plugins/IsoLevel/src/com/artenum/cassandra/plugin/isolevel/IsoLevelPlugin.java,260,2) ++ scalarBar.SetLookupTable(lookupTable); ++ pipelineManager.setActorVisible(outputCassScalarBar, true); DelBlock(Plugins/IsoLevel/src/com/artenum/cassandra/plugin/isolevel/IsoLevelPlugin.java,263,2) -- pipelineManager.notifyConnectivityChange(dataset); -- } AddBlock(Plugins/IsoLevel/src/com/artenum/cassandra/plugin/isolevel/IsoLevelPlugin.java,263,4) ++ if (normals.GetOutput() == null) { ++ outputCassDatasetN = pipelineManager.addDataSet(normals.GetOutput(), "Normal"); ++ } else ++ outputCassDatasetN = pipelineManager.getCassandraVtkObjectByTrueVtkObject(normals.GetOutput()); DelBlock(Plugins/IsoLevel/src/com/artenum/cassandra/plugin/isolevel/IsoLevelPlugin.java,268,3) -- public void setControls(boolean normalFlagIn, boolean scalarFlag) { -- normalFlag = normalFlagIn; -- } AddBlock(Plugins/IsoLevel/src/com/artenum/cassandra/plugin/isolevel/IsoLevelPlugin.java,268,3) ++ // ++ cassFilter = pipelineManager.addFilter(filterImpl, "IsoLevel"); ++ cassFilter.getMetaData().put(VtkObject.POPUP_MENU, getContextualMenu()); DelBlock(Plugins/IsoLevel/src/com/artenum/cassandra/plugin/isolevel/IsoLevelPlugin.java,272,13) -- private void setNormal(boolean normalFlag) { -- if (normalFlag == true) { -- // /// test a revoir -- if (normals.GetOutput() != null) { -- isoLevelMapper.SetInput(normals.GetOutput()); -- } else { -- System.out.println("No data to generate normals for!"); -- isoLevelMapper.SetInput(contour.GetOutput()); -- } -- } else { -- isoLevelMapper.SetInput(contour.GetOutput()); -- } -- } AddBlock(Plugins/IsoLevel/src/com/artenum/cassandra/plugin/isolevel/IsoLevelPlugin.java,272,3) ++ // ++ outputCassActor.setValide(false); ++ } DelBlock(Plugins/IsoLevel/src/com/artenum/cassandra/plugin/isolevel/IsoLevelPlugin.java,276,3) -- public String getName() { -- return name; -- } AddBlock(Plugins/IsoLevel/src/com/artenum/cassandra/plugin/isolevel/IsoLevelPlugin.java,276,9) ++ /** ++ * Set the internal component from an external pipeline like in the Jython ++ * script reloading procedure. ++ * ++ */ ++ @Deprecated ++ public void setInternalPipelineComponents(vtkContourFilter contour, vtkDataSetMapper cutMapper, vtkActor cutActor) { ++ this.contour = contour; ++ } DelBlock(Plugins/IsoLevel/src/com/artenum/cassandra/plugin/isolevel/IsoLevelPlugin.java,286,7) -- public void remove() { -- pluginManager.removePlugin(this); -- pipelineManager.removeVtkObject(actor); -- pipelineManager.removeVtkObject(mapper); -- pipelineManager.removeVtkObject(dataset); -- pipelineManager.removeVtkObject(filter); -- } AddBlock(Plugins/IsoLevel/src/com/artenum/cassandra/plugin/isolevel/IsoLevelPlugin.java,286,16) ++ /** ++ * Update the setting of the current plug-in / processing filter. ++ * ++ * @param vtkDataSet set the input dataset to be processed. ++ * @param level set the value of the level if levelFlag equals 0. ++ * @param nbLevel set the number of levels if levelFlag equals 1. ++ * @param levelFlag set if only one (if equal to 0) or several levels (if equal to 1) are defined. If only one level is selected ++ * the corresponding value is defined by the level parameter. Otherwise, the values are uniformly distributed in nbLevel between the ++ * min and max values. ++ * @param min set the minimum value of levels if levelFlag equals 1. ++ * @param max set the maxima value of levels if levelFlag equals 1. ++ */ ++ public void updateIsoLevel(vtkDataSet vtkDataSet, double level, int nbLevel, int levelFlag, double min, double max) { ++ if (vtkDataSet == null) { ++ return; ++ } DelBlock(Plugins/IsoLevel/src/com/artenum/cassandra/plugin/isolevel/IsoLevelPlugin.java,303,3) -- public JPopupMenu getContextualMenu() { -- return contextualMenu; -- } AddBlock(Plugins/IsoLevel/src/com/artenum/cassandra/plugin/isolevel/IsoLevelPlugin.java,303,13) ++ minValue = min; ++ maxValue = max; ++ ++ filterImpl.getInputDataSet().clear(); ++ filterImpl.getInputDataSet().add(vtkDataSet); ++ pipelineManager.notifyConnectivityChange(outputCassDataset); ++ this.cellPosition = ((VtkObjectCellAdapter) cassFilter.getMetaData().get(VtkObject.CELL)).getPosition(); ++ ++ outputCassActor.setValide(true); ++ contour.SetInput(vtkDataSet); ++ setNormal(normalFlag); // normalFlag); ++ contour.ComputeScalarsOn(); ++ isoLevelMapper.ColorByArrayComponent("Magnitude", 0); DelBlock(Plugins/IsoLevel/src/com/artenum/cassandra/plugin/isolevel/IsoLevelPlugin.java,317,3) -- public String toString() { -- return getName(); -- } AddBlock(Plugins/IsoLevel/src/com/artenum/cassandra/plugin/isolevel/IsoLevelPlugin.java,317,6) ++ if (levelFlag == 0) { ++ contour.SetNumberOfContours(1); ++ contour.SetValue(0, level); ++ } else { ++ contour.GenerateValues(nbLevel, min, max); ++ } DelBlock(Plugins/IsoLevel/src/com/artenum/cassandra/plugin/isolevel/IsoLevelPlugin.java,324,3) -- public VtkObject getOutputDataSet() { -- return dataset; -- } AddBlock(Plugins/IsoLevel/src/com/artenum/cassandra/plugin/isolevel/IsoLevelPlugin.java,324,10) ++ /* ++ * if (vtkDataSet.GetPointData().GetScalars() != null) { ++ * isoLevelMapper.SetScalarRange ++ * (vtkDataSet.GetPointData().GetScalars().GetRange()); } ++ */ ++ if (((lastDataSet == null) || !lastDataSet.equals(vtkDataSet)) && isoLevelMapper.GetLookupTable().equals(lookupTable)) { ++ isoLevelMapper.SetScalarRange(vtkDataSet.GetScalarRange()); ++ lookupTable.SetTableRange(vtkDataSet.GetScalarRange()); ++ lastDataSet = vtkDataSet; ++ } DelBlock(Plugins/IsoLevel/src/com/artenum/cassandra/plugin/isolevel/IsoLevelPlugin.java,335,5) -- public VtkObject getActor() { -- return actor; -- } -- -- public Filter getInternalFilter() { AddBlock(Plugins/IsoLevel/src/com/artenum/cassandra/plugin/isolevel/IsoLevelPlugin.java,335,56) ++ // Set the default actor visible by default ++ if ((nbUpdate++ == 0) && pipelineManager.getActorList().getData().contains(outputCassActor)) { ++ pipelineManager.setActorVisible(outputCassActor, true); ++ } ++ // and we hide the actor corresponding to the source ++ pipelineManager.hideInputActor(outputCassActor, vtkDataSet); ++ pipelineManager.notifyConnectivityChange(outputCassDataset); ++ } ++ ++ public void setControls(boolean normalFlagIn, boolean scalarFlag) { ++ normalFlag = normalFlagIn; ++ } ++ ++ private void setNormal(boolean normalFlag) { ++ if (normalFlag == true) { ++ // FIXME test a revoir ++ if (normals.GetOutput() != null) { ++ isoLevelMapper.SetInput(normals.GetOutput()); ++ } else { ++ System.out.println("No data to generate normals for!"); ++ isoLevelMapper.SetInput(contour.GetOutput()); ++ } ++ } else { ++ isoLevelMapper.SetInput(contour.GetOutput()); ++ } ++ } ++ ++ public String getName() { ++ return name; ++ } ++ ++ public void remove() { ++ pluginManager.removePlugin(this); ++ pipelineManager.removeVtkObject(outputCassActor); ++ pipelineManager.removeVtkObject(outputCassMapper); ++ pipelineManager.removeVtkObject(outputCassDataset); ++ pipelineManager.removeVtkObject(cassFilter); ++ } ++ ++ public JPopupMenu getContextualMenu() { ++ return contextualMenu; ++ } ++ ++ public String toString() { ++ return getName(); ++ } ++ ++ public VtkObject getOutputDataSet() { ++ return outputCassDataset; ++ } ++ ++ public VtkObject getActor() { ++ return outputCassActor; ++ } ++ ++ public Filter getInternalFilter() { AddBlock(Plugins/IsoLevel/src/com/artenum/cassandra/plugin/isolevel/IsoLevelPlugin.java,394,4) ++ /** ++ * return the control panel of the current plug-in. ++ */ ++ @Override DelBlock(Plugins/IsoLevel/src/com/artenum/cassandra/plugin/isolevel/IsoLevelPlugin.java,404,3) -- // TODO Auto-generated method stub -- return null; -- } AddBlock(Plugins/IsoLevel/src/com/artenum/cassandra/plugin/isolevel/IsoLevelPlugin.java,404,1) ++ SimplePlugInProperty prop = new SimplePlugInProperty(); AddBlock(Plugins/IsoLevel/src/com/artenum/cassandra/plugin/isolevel/IsoLevelPlugin.java,406,6) ++ prop.put(PERSISTENCE_KEY_INPUT_DATASET, contour.GetInput()); ++ prop.put(PERSISTENCE_KEY_OUPUT_DATASET, contour.GetOutput()); ++ prop.put(PERSISTENCE_KEY_OUPUT_MAPPER, isoLevelMapper); ++ prop.put(PERSISTENCE_KEY_OUPUT_LOOKUP_TABLE, lookupTable); ++ prop.put(PERSISTENCE_KEY_OUTPUT_ACTOR, isoLevelActor); ++ prop.put(PERSISTENCE_KEY_OUTPUT_SCALAR_BAR, scalarBar); AddBlock(Plugins/IsoLevel/src/com/artenum/cassandra/plugin/isolevel/IsoLevelPlugin.java,413,17) ++ this.cellPosition = ((VtkObjectCellAdapter) cassFilter.getMetaData().get(VtkObject.CELL)).getPosition(); ++ prop.put(PERSISTENCE_KEY_CELL_POS_X, cellPosition.x); ++ prop.put(PERSISTENCE_KEY_CELL_POS_Y, cellPosition.y); ++ ++ if (contour.GetNumberOfContours() > 1){ ++ prop.put(PERSISTENCE_KEY_LEVEL_FLAG, 1); ++ prop.put(PERSISTENCE_KEY_LEVEL_NUMBER, contour.GetNumberOfContours()); ++ } else { ++ prop.put(PERSISTENCE_KEY_LEVEL_FLAG, 0); ++ prop.put(PERSISTENCE_KEY_LEVEL_NUMBER, 1); ++ } ++ prop.put(PERSISTENCE_KEY_LEVEL_MIN, minValue); ++ prop.put(PERSISTENCE_KEY_LEVEL_MAX, maxValue); ++ ++ return prop; ++ } ++ DelBlock(Plugins/IsoLevel/src/com/artenum/cassandra/plugin/isolevel/IsoLevelPlugin.java,432,1) -- // TODO Auto-generated method stub AddBlock(Plugins/IsoLevel/src/com/artenum/cassandra/plugin/isolevel/IsoLevelPlugin.java,432,5) ++ ++ vtkDataSet tmpInputDataSet; ++ ++ int cellPosX; ++ int cellPosY; AddBlock(Plugins/IsoLevel/src/com/artenum/cassandra/plugin/isolevel/IsoLevelPlugin.java,438,34) ++ int localLevelFlag; ++ int localNbLevel; ++ int localLevel; ++ ++ contour = new vtkContourFilter(); ++ contour.SetOutput((vtkDataObject) prop.getSafely(PERSISTENCE_KEY_OUPUT_DATASET, null)); // FIXME ++ tmpInputDataSet = (vtkDataSet) prop.getSafely(PERSISTENCE_KEY_INPUT_DATASET, (vtkDataSet) (contour.GetInput())); ++ ++ lookupTable = (vtkLookupTable) prop.getSafely(PERSISTENCE_KEY_OUPUT_LOOKUP_TABLE, null); // FIXME ++ isoLevelMapper = (vtkPolyDataMapper) prop.getSafely(PERSISTENCE_KEY_OUPUT_MAPPER, null); // FIXME ++ isoLevelActor = (vtkActor) prop.getSafely(PERSISTENCE_KEY_OUTPUT_ACTOR, null); // FIXME ++ scalarBar = (vtkScalarBarActor) prop.getSafely(PERSISTENCE_KEY_OUTPUT_SCALAR_BAR, null); // FIXME ++ ++ minValue = prop.getSafely(PERSISTENCE_KEY_LEVEL_MIN, -10.0); ++ maxValue = prop.getSafely(PERSISTENCE_KEY_LEVEL_MIN, 10.0); ++ ++ localLevelFlag = prop.getSafely(PERSISTENCE_KEY_LEVEL_FLAG, 0); ++ localNbLevel = prop.getSafely(PERSISTENCE_KEY_LEVEL_NUMBER, 1); ++ localLevel = prop.getSafely(PERSISTENCE_KEY_LEVEL_VALUE, 1); ++ ++ // because their are already loaded now ++ // loadOutputPipelineComponents = false; ++ ++ this.initPipeline(); ++ controlUI.setSelectedInput(pipelineManager.getCassandraVtkObjectByTrueVtkObject(tmpInputDataSet)); // FIXME: ++ // nasty ++ this.updateIsoLevel(tmpInputDataSet, localLevel, localNbLevel, localLevelFlag, minValue, maxValue); ++ ++ cellPosX = prop.getSafely(PERSISTENCE_KEY_CELL_POS_X, -1); ++ cellPosY = prop.getSafely(PERSISTENCE_KEY_CELL_POS_Y, -1); ++ if (cellPosX > 0 && cellPosY > 0) { ++ ((VtkObjectCellAdapter) cassFilter.getMetaData().get(VtkObject.CELL)).setPosition(new Point(cellPosX, cellPosY)); ++ } ++ UpdateBinaryFile(Renderer/CassandraRenderer-1.1.0-all-all-none-jvm1_6-stable/CassandraRenderer-1.1.0-all-all-none-jvm1_6-stable.jar) DelBlock(Renderer/CassandraRenderer-1.1.0-all-all-none-jvm1_6-stable/version.txt,9,2) -- Date of build: 20110406 -- Hour of build: 1417 AddBlock(Renderer/CassandraRenderer-1.1.0-all-all-none-jvm1_6-stable/version.txt,9,2) ++ Date of build: 20110407 ++ Hour of build: 1005 DelBlock(Renderer/CassandraRenderer-1.1.0-all-all-none-jvm1_6-stable/version.txt,12,1) -- Cassandra CORE branch development ticket: 5418 AddBlock(Renderer/CassandraRenderer-1.1.0-all-all-none-jvm1_6-stable/version.txt,12,1) ++ Cassandra CORE branch development ticket: 5569 UpdateBinaryFile(tmpCrossDepDir/CorePipeline.jar) Remove(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClipingPlanePlugInProperty.java)
- Pipeline exporter format 1.0 operationnal for Clipping plug-in and vtkObjects. Inlcudes position view saving.
AddBlock(Core/src/com/artenum/cassandra/pipeline/io/PipelineToJythonExporter.java,27,1) ++ import java.awt.Point; AddBlock(Core/src/com/artenum/cassandra/pipeline/io/PipelineToJythonExporter.java,51,1) ++ import com.artenum.cassandra.pipeline.graph.VtkObjectCellAdapter; DelBlock(Core/src/com/artenum/cassandra/pipeline/io/PipelineToJythonExporter.java,80,1) -- private String scriptHeader = "# Exported from Cassandra's pipeline (see http://www.artenum.com/cassandra" + eol; AddBlock(Core/src/com/artenum/cassandra/pipeline/io/PipelineToJythonExporter.java,80,3) ++ public static final double REF_FILE_FORMAT_VERSION = 1.0; ++ ++ private String scriptHeader = "# Exported from Cassandra's pipeline (see http://www.artenum.com/cassandra)" + eol; AddBlock(Core/src/com/artenum/cassandra/pipeline/io/PipelineToJythonExporter.java,124,1) ++ fw.write("FILE_FORMAT_VERSION = " + REF_FILE_FORMAT_VERSION +eol); DelBlock(Core/src/com/artenum/cassandra/pipeline/io/PipelineToJythonExporter.java,155,1) -- AddBlock(Core/src/com/artenum/cassandra/pipeline/io/PipelineToJythonExporter.java,155,1) ++ System.out.println("Pipeline saved."); AddBlock(Core/src/com/artenum/cassandra/pipeline/io/PipelineToJythonExporter.java,379,2) ++ Point cellPosition = ((VtkObjectCellAdapter) obj.getMetaData().get(VtkObject.CELL)).getPosition(); ++ DelBlock(Core/src/com/artenum/cassandra/pipeline/io/PipelineToJythonExporter.java,382,2) -- tmpLine = scriptTab + "pipeline.addMapper(" + exportedVtkObjCanonicalNameArray.get(obj.getId()) + ", \"" + exportedVtkObjCanonicalNameArray.get(obj.getId()) -- + "\" )"; AddBlock(Core/src/com/artenum/cassandra/pipeline/io/PipelineToJythonExporter.java,382,3) ++ tmpLine = scriptTab + "pipeline.addMapper(" + exportedVtkObjCanonicalNameArray.get(obj.getId()) ++ + ", \"" + exportedVtkObjCanonicalNameArray.get(obj.getId()) ++ + "\", " + cellPosition.x +", " + cellPosition.y + ")"; DelBlock(Core/src/com/artenum/cassandra/pipeline/io/PipelineToJythonExporter.java,387,1) -- + "\" )"; AddBlock(Core/src/com/artenum/cassandra/pipeline/io/PipelineToJythonExporter.java,387,1) ++ + "\", " + cellPosition.x +", " + cellPosition.y + ")"; DelBlock(Core/src/com/artenum/cassandra/pipeline/io/PipelineToJythonExporter.java,390,1) -- + "\" )"; AddBlock(Core/src/com/artenum/cassandra/pipeline/io/PipelineToJythonExporter.java,390,1) ++ + "\", " + cellPosition.x +", " + cellPosition.y + ")"; DelBlock(Core/src/com/artenum/cassandra/pipeline/io/PipelineToJythonExporter.java,393,1) -- + exportedVtkObjCanonicalNameArray.get(obj.getId()) + "\" )"; AddBlock(Core/src/com/artenum/cassandra/pipeline/io/PipelineToJythonExporter.java,393,1) ++ + exportedVtkObjCanonicalNameArray.get(obj.getId()) + "\", " + cellPosition.x +", " + cellPosition.y + ")"; DelBlock(Core/src/com/artenum/cassandra/pipeline/io/PipelineToJythonExporter.java,396,1) -- + exportedVtkObjCanonicalNameArray.get(obj.getId()) + "\" )"; AddBlock(Core/src/com/artenum/cassandra/pipeline/io/PipelineToJythonExporter.java,396,1) ++ + exportedVtkObjCanonicalNameArray.get(obj.getId()) + "\", " + cellPosition.x +", " + cellPosition.y + ")"; DelBlock(Core/src/com/artenum/cassandra/pipeline/io/PipelineToJythonExporter.java,405,6) -- System.out.println(scriptImportSection); -- System.out.println(scriptInstanciationSection); -- System.out.println(scriptConnectivitySection); -- System.out.println(scriptPlugInConnectivitySection); -- System.out.println(scriptCassandraReloadingSection); -- AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkObjectCellAdapter.java,134,4) ++ ++ public void setPosition(Point point){ ++ ui.setPosition(point); ++ } AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,11,1) ++ import com.artenum.cassandra.pipeline.graph.VtkObjectCellAdapter; AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,30,1) ++ import java.awt.Point; AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,297,7) ++ ++ ++ synchronized public VtkObject addActor(Object actor, String name, int cellPosX, int cellPosY) { ++ VtkObject casActor = addActor( actor, name); ++ ((VtkObjectCellAdapter) casActor.getMetaData().get(VtkObject.CELL)).setPosition(new Point(cellPosX, cellPosY)); ++ return(casActor); ++ } AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,327,6) ++ ++ synchronized public VtkObject addMapper(Object mapper, String name, int cellPosX, int cellPosY) { ++ VtkObject casMapper = addMapper( mapper, name); ++ ((VtkObjectCellAdapter) casMapper.getMetaData().get(VtkObject.CELL)).setPosition(new Point(cellPosX, cellPosY)); ++ return(casMapper); ++ } AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,346,6) ++ synchronized public VtkObject addDataSet(Object dataset, String name, int cellPosX, int cellPosY) { ++ VtkObject casDataset = addDataSet( dataset, name); ++ ((VtkObjectCellAdapter) casDataset.getMetaData().get(VtkObject.CELL)).setPosition(new Point(cellPosX, cellPosY)); ++ return(casDataset); ++ } ++ AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,403,6) ++ ++ synchronized public VtkObject addFilter(Filter filter, String name, int cellPosX, int cellPosY) { ++ VtkObject cassFilter = addFilter( filter, name); ++ ((VtkObjectCellAdapter) cassFilter.getMetaData().get(VtkObject.CELL)).setPosition(new Point(cellPosX, cellPosY)); ++ return(cassFilter); ++ } AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,428,6) ++ ++ synchronized public VtkObject addLookupTable(vtkLookupTable lookupTable, String name, int cellPosX, int cellPosY) { ++ VtkObject cassLookupTable = addLookupTable( lookupTable, name); ++ ((VtkObjectCellAdapter) cassLookupTable.getMetaData().get(VtkObject.CELL)).setPosition(new Point(cellPosX, cellPosY)); ++ return(cassLookupTable); ++ } AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,447,6) ++ synchronized public VtkObject addScalarBar(vtkScalarBarActor scalarBar, String name, int cellPosX, int cellPosY) { ++ VtkObject cassScalarBar = addScalarBar( scalarBar, name); ++ ((VtkObjectCellAdapter) cassScalarBar.getMetaData().get(VtkObject.CELL)).setPosition(new Point(cellPosX, cellPosY)); ++ return(cassScalarBar); ++ } ++ AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,467,6) ++ ++ synchronized public VtkObject addTxtActor(vtkTextActor txtActor, String name, int cellPosX, int cellPosY) { ++ VtkObject cassTextActor = addTxtActor( txtActor, name); ++ ((VtkObjectCellAdapter) cassTextActor.getMetaData().get(VtkObject.CELL)).setPosition(new Point(cellPosX, cellPosY)); ++ return(cassTextActor); ++ } DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,523,2) -- -- while (((inputDataSet == vtkDataSet) && (inputActor != actor)) != true) { AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,523,4) ++ boolean isValid = true; ++ ++ while ( (((inputDataSet == vtkDataSet) && (inputActor != actor)) != true) && isValid) { ++ try{ AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,528,4) ++ } catch (Exception e) { ++ System.out.println("Error, actor not found."); ++ isValid = false; ++ } DelBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlaneControlUI.java,198,1) -- DelBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlaneControlUI.java,199,1) -- DelBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlaneControlUI.java,200,2) -- // System.out.println( -- // "3D widgetBox is: "+widgetCheckBox.isSelected()); AddBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlaneControlUI.java,206,4) ++ /** ++ * set the selected input data set. ++ * @param selectedInput ++ */ DelBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlaneControlUI.java,211,1) -- input.setSelectedItem(selectedInput); AddBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlaneControlUI.java,211,5) ++ if (selectedInput != null){ ++ input.getModel().setSelectedItem(selectedInput); ++ } else { ++ System.out.println("Selection is null"); ++ } DelBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlaneControlUI.java,250,1) -- //widgetCheckBox.setSelected(false); DelBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlaneControlUI.java,309,1) -- * Define the data model for the input combobox. AddBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlaneControlUI.java,309,1) ++ * Define the data model for the input combo box. AddBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,17,1) ++ import com.artenum.cassandra.pipeline.graph.VtkObjectCellAdapter; AddBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,36,1) ++ import java.awt.Point; DelBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,87,1) -- // Vtk data AddBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,87,1) ++ // vtk object of the sub-pipeline built into the plug-in DelBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,89,3) -- private vtkLookupTable lookupTable; -- private vtkScalarBarActor scalarBar; -- private vtkPlane plane; AddBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,89,3) ++ private vtkLookupTable outputLookupTable; ++ private vtkScalarBarActor outputScalarBar; ++ private vtkPlane sourcePlane; DelBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,93,2) -- private vtkDataSetMapper cutMapper; -- private vtkActor cutActor; AddBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,93,2) ++ private vtkDataSetMapper outputMapper; ++ private vtkActor outputActor; DelBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,97,5) -- // Pipeline VtkObjects -- private VtkObject actor; -- private VtkObject mapper; -- private VtkObject dataset; -- private VtkObject filter; AddBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,97,5) ++ // Cassandra VtkObjects for the pipeline models ++ private VtkObject outputCassActor; ++ private VtkObject outputCassMapper; ++ private VtkObject outputCassDataset; ++ private VtkObject cassfilter; DelBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,106,11) -- -- public static final String PERSISTENCE_KEY_CX = "persistence.key.cx"; -- public static final String PERSISTENCE_KEY_CY = "persistence.key.cy"; -- public static final String PERSISTENCE_KEY_CZ = "persistence.key.cz"; -- public static final String PERSISTENCE_KEY_NX = "persistence.key.nx"; -- public static final String PERSISTENCE_KEY_NY = "persistence.key.ny"; -- public static final String PERSISTENCE_KEY_NZ = "persistence.key.nz"; -- public static final String PERSISTENCE_KEY_INPUT_DATASET = "persistence.key.inputVtkDataSet"; -- public static final String PERSISTENCE_KEY_INOUT = "persistence.key.insideOut"; -- public static final String PERSISTENCE_KEY_OUPUT_DATASET = "persistence.key.outputDataSet"; -- public static final String PERSISTENCE_KEY_OUPUT_MAPPER = "persistence.key.outputMapper"; AddBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,106,11) ++ ++ public static final String PERSISTENCE_KEY_CX = "persistence.key.cx"; ++ public static final String PERSISTENCE_KEY_CY = "persistence.key.cy"; ++ public static final String PERSISTENCE_KEY_CZ = "persistence.key.cz"; ++ public static final String PERSISTENCE_KEY_NX = "persistence.key.nx"; ++ public static final String PERSISTENCE_KEY_NY = "persistence.key.ny"; ++ public static final String PERSISTENCE_KEY_NZ = "persistence.key.nz"; ++ public static final String PERSISTENCE_KEY_INPUT_DATASET = "persistence.key.inputVtkDataSet"; ++ public static final String PERSISTENCE_KEY_INOUT = "persistence.key.insideOut"; ++ public static final String PERSISTENCE_KEY_OUPUT_DATASET = "persistence.key.outputDataSet"; ++ public static final String PERSISTENCE_KEY_OUPUT_MAPPER = "persistence.key.outputMapper"; DelBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,118,2) -- public static final String PERSISTENCE_KEY_OUTPUT_ACTOR = "persistence.key.outputActor"; -- public static final String PERSISTENCE_KEY_OUTPUT_SCALAR_BAR = "persistence.key.ouputScalarBar"; AddBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,118,4) ++ public static final String PERSISTENCE_KEY_OUTPUT_ACTOR = "persistence.key.outputActor"; ++ public static final String PERSISTENCE_KEY_OUTPUT_SCALAR_BAR = "persistence.key.ouputScalarBar"; ++ public static final String PERSISTENCE_KEY_CELL_POS_X = "persistence.key.cell.PosX"; ++ public static final String PERSISTENCE_KEY_CELL_POS_Y = "persistence.key.cell.PosY"; AddBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,201,6) ++ /** ++ * intialise the processing pipeline it-self. Should be called after the ++ * initPlugIn. If its elements (i.e internal vtk components and the ++ * post-filter pipeline) are not set before, their are built as new ++ * instances and registered into the pipeline. ++ */ DelBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,208,1) -- DelBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,209,2) -- if (plane == null) { -- plane = new vtkPlane(); AddBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,209,2) ++ if (sourcePlane == null) { ++ sourcePlane = new vtkPlane(); DelBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,212,2) -- plane.SetOrigin(0.0, 0.0, 0.0); -- plane.SetNormal(0, 0, 1.0); AddBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,212,2) ++ sourcePlane.SetOrigin(0.0, 0.0, 0.0); ++ sourcePlane.SetNormal(0, 0, 1.0); DelBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,217,1) -- dataset = pipelineManager.addDataSet(planeClip.GetOutput(), "Clipping Plane Output"); AddBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,217,1) ++ this.outputCassDataset = pipelineManager.addDataSet(planeClip.GetOutput(), "Clipping Plane Output"); DelBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,219,1) -- dataset = pipelineManager.getCassandraVtkObjectByTrueVtkObject(planeClip); AddBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,219,1) ++ this.outputCassDataset = pipelineManager.getCassandraVtkObjectByTrueVtkObject(planeClip); DelBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,221,1) -- planeClip.SetClipFunction(plane); AddBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,221,1) ++ planeClip.SetClipFunction(sourcePlane); DelBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,223,3) -- if (cutMapper == null) { -- cutMapper = new vtkDataSetMapper(); -- mapper = pipelineManager.addMapper(cutMapper, "Clipping plane Mapper"); AddBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,223,3) ++ if (outputMapper == null) { ++ outputMapper = new vtkDataSetMapper(); ++ outputCassMapper = pipelineManager.addMapper(outputMapper, "Clipping plane Mapper"); DelBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,227,1) -- mapper = pipelineManager.getCassandraVtkObjectByTrueVtkObject(cutMapper); AddBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,227,1) ++ outputCassMapper = pipelineManager.getCassandraVtkObjectByTrueVtkObject(outputMapper); DelBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,229,1) -- cutMapper.SetInput(planeClip.GetOutput()); AddBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,229,1) ++ outputMapper.SetInput(planeClip.GetOutput()); DelBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,238,3) -- if (cutActor == null) { -- cutActor = new vtkActor(); -- actor = pipelineManager.addActor(cutActor, "Clipping plane Actor"); AddBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,238,3) ++ if (outputActor == null) { ++ outputActor = new vtkActor(); ++ outputCassActor = pipelineManager.addActor(outputActor, "Clipping plane Actor"); DelBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,242,1) -- actor = pipelineManager.getCassandraVtkObjectByTrueVtkObject(cutActor); AddBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,242,1) ++ outputCassActor = pipelineManager.getCassandraVtkObjectByTrueVtkObject(outputActor); DelBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,244,1) -- cutActor.SetMapper(cutMapper); AddBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,244,1) ++ outputActor.SetMapper(outputMapper); DelBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,247,3) -- if (lookupTable == null) { -- lookupTable = new vtkLookupTable(); -- pipelineManager.addLookupTable(lookupTable, "Clipping plane"); AddBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,247,3) ++ if (outputLookupTable == null) { ++ outputLookupTable = new vtkLookupTable(); ++ pipelineManager.addLookupTable(outputLookupTable, "Clipping plane"); DelBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,251,1) -- lookupTable.SetHueRange(0.66667, 0); AddBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,251,1) ++ outputLookupTable.SetHueRange(0.66667, 0); DelBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,253,2) -- lookupTable.Build(); -- cutMapper.SetLookupTable(lookupTable); AddBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,253,2) ++ outputLookupTable.Build(); ++ outputMapper.SetLookupTable(outputLookupTable); DelBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,257,4) -- if (scalarBar == null) { -- scalarBar = new vtkScalarBarActor(); -- pipelineManager.addScalarBar(scalarBar, "Clipping plane"); -- scalarBar.SetLookupTable(lookupTable); AddBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,257,4) ++ if (outputScalarBar == null) { ++ outputScalarBar = new vtkScalarBarActor(); ++ pipelineManager.addScalarBar(outputScalarBar, "Clipping plane"); ++ outputScalarBar.SetLookupTable(outputLookupTable); DelBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,264,1) -- filter = pipelineManager.addFilter(filterImpl, "Clipping Plane Filter"); AddBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,264,1) ++ cassfilter = pipelineManager.addFilter(filterImpl, "Clipping Plane Filter"); DelBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,267,1) -- filter.getMetaData().put(VtkObject.POPUP_MENU, getContextualMenu()); AddBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,267,1) ++ cassfilter.getMetaData().put(VtkObject.POPUP_MENU, getContextualMenu()); DelBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,270,1) -- actor.setValide(false); AddBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,270,1) ++ outputCassActor.setValide(false); DelBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,278,2) -- planWidget.SetNormal(plane.GetNormal()); -- planWidget.SetOrigin(plane.GetOrigin()); AddBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,278,2) ++ planWidget.SetNormal(sourcePlane.GetNormal()); ++ planWidget.SetOrigin(sourcePlane.GetOrigin()); DelBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,293,1) -- this.plane = plane; AddBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,293,1) ++ this.sourcePlane = plane; DelBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,313,1) -- actor.setValide(true); AddBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,313,1) ++ outputCassActor.setValide(true); DelBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,316,2) -- plane.SetOrigin(cx, cy, cz); -- plane.SetNormal(nx, ny, nz); AddBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,316,2) ++ sourcePlane.SetOrigin(cx, cy, cz); ++ sourcePlane.SetNormal(nx, ny, nz); DelBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,321,3) -- if (((lastDataSet == null) || !lastDataSet.equals(vtkDataSet)) && cutMapper.GetLookupTable().equals(lookupTable)) { -- cutMapper.SetScalarRange(vtkDataSet.GetScalarRange()); -- lookupTable.SetTableRange(vtkDataSet.GetScalarRange()); AddBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,321,3) ++ if (((lastDataSet == null) || !lastDataSet.equals(vtkDataSet)) && outputMapper.GetLookupTable().equals(outputLookupTable)) { ++ outputMapper.SetScalarRange(vtkDataSet.GetScalarRange()); ++ outputLookupTable.SetTableRange(vtkDataSet.GetScalarRange()); DelBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,331,2) -- if (pipelineManager.getActorList().getData().contains(actor)) { -- pipelineManager.setActorVisible(actor, true); AddBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,331,2) ++ if (pipelineManager.getActorList().getData().contains(outputCassActor)) { ++ pipelineManager.setActorVisible(outputCassActor, true); DelBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,335,1) -- pipelineManager.hideInputActor(actor, vtkDataSet); AddBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,335,1) ++ pipelineManager.hideInputActor(outputCassActor, vtkDataSet); DelBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,345,3) -- filterImpl.getVtkImplicitFunction().add(plane); -- pipelineManager.notifyConnectivityChange(filter); -- AddBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,345,2) ++ filterImpl.getVtkImplicitFunction().add(sourcePlane); ++ pipelineManager.notifyConnectivityChange(cassfilter); DelBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,366,4) -- pipelineManager.removeVtkObject(actor); -- pipelineManager.removeVtkObject(mapper); -- pipelineManager.removeVtkObject(dataset); -- pipelineManager.removeVtkObject(filter); AddBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,366,4) ++ pipelineManager.removeVtkObject(outputCassActor); ++ pipelineManager.removeVtkObject(outputCassMapper); ++ pipelineManager.removeVtkObject(outputCassDataset); ++ pipelineManager.removeVtkObject(cassfilter); DelBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,393,1) -- planWidget.Off(); AddBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,393,1) ++ planWidget.Off(); DelBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,418,1) -- planWidget.SetNormal(plane.GetNormal()); AddBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,418,1) ++ planWidget.SetNormal(sourcePlane.GetNormal()); DelBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,437,1) -- DelBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,448,1) -- * Handle the 3D call-backs. AddBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,448,1) ++ * Handle the 3D call-backs for the 3D widget. DelBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,451,1) -- plane.SetNormal(planWidget.GetNormal()); AddBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,451,1) ++ sourcePlane.SetNormal(planWidget.GetNormal()); DelBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,454,1) -- plane.SetOrigin(planWidget.GetOrigin()[0], planWidget.GetOrigin()[1], planWidget.GetOrigin()[2]); AddBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,454,1) ++ sourcePlane.SetOrigin(planWidget.GetOrigin()[0], planWidget.GetOrigin()[1], planWidget.GetOrigin()[2]); AddBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,461,4) ++ /** ++ * return the control panel of the current plug-in. ++ */ ++ @Override DelBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,484,1) -- vtkDataSet dataSet; AddBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,484,1) ++ vtkDataSet tmpInputDataSet; AddBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,487,3) ++ ++ int cellPosX; ++ int cellPosY; DelBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,491,1) -- cx = prop.getSafely(PERSISTENCE_KEY_CX, 0.0); AddBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,491,1) ++ cx = prop.getSafely(PERSISTENCE_KEY_CX, 0.0); DelBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,500,1) -- this.planeClip.SetOutput((vtkDataObject) prop.getSafely(PERSISTENCE_KEY_OUPUT_DATASET, null)); //FIXME AddBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,500,1) ++ this.planeClip.SetOutput((vtkDataObject) prop.getSafely(PERSISTENCE_KEY_OUPUT_DATASET, null)); // FIXME DelBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,502,1) -- dataSet = (vtkDataSet) prop.getSafely(PERSISTENCE_KEY_INPUT_DATASET, (vtkDataSet) (planeClip.GetInput())); AddBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,502,1) ++ tmpInputDataSet = (vtkDataSet) prop.getSafely(PERSISTENCE_KEY_INPUT_DATASET, (vtkDataSet) (planeClip.GetInput())); DelBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,504,4) -- this.lookupTable = (vtkLookupTable) prop.getSafely(PERSISTENCE_KEY_OUPUT_LOOKUP_TABLE, null); //FIXME -- this.cutMapper = (vtkDataSetMapper) prop.getSafely(PERSISTENCE_KEY_OUPUT_MAPPER, null); //FIXME -- this.cutActor = (vtkActor) prop.getSafely(PERSISTENCE_KEY_OUTPUT_ACTOR, null); //FIXME -- this.scalarBar = (vtkScalarBarActor) prop.getSafely(PERSISTENCE_KEY_OUTPUT_SCALAR_BAR, null); //FIXME AddBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,504,4) ++ outputLookupTable = (vtkLookupTable) prop.getSafely(PERSISTENCE_KEY_OUPUT_LOOKUP_TABLE, null); // FIXME ++ outputMapper = (vtkDataSetMapper) prop.getSafely(PERSISTENCE_KEY_OUPUT_MAPPER, null); // FIXME ++ outputActor = (vtkActor) prop.getSafely(PERSISTENCE_KEY_OUTPUT_ACTOR, null); // FIXME ++ outputScalarBar = (vtkScalarBarActor) prop.getSafely(PERSISTENCE_KEY_OUTPUT_SCALAR_BAR, null); // FIXME DelBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,515,2) -- controlUI.setSelectedInput(dataset); -- this.updateClippingPlane(cx, cy, cy, nx, ny, cy, dataSet, inOut); AddBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,515,8) ++ controlUI.setSelectedInput(pipelineManager.getCassandraVtkObjectByTrueVtkObject(tmpInputDataSet)); //FIXME: nasty ++ this.updateClippingPlane(cx, cy, cy, nx, ny, cy, tmpInputDataSet, inOut); ++ ++ cellPosX = prop.getSafely(PERSISTENCE_KEY_CELL_POS_X, -1); ++ cellPosY = prop.getSafely(PERSISTENCE_KEY_CELL_POS_Y, -1); ++ if (cellPosX > 0 && cellPosY > 0){ ++ ((VtkObjectCellAdapter) cassfilter.getMetaData().get(VtkObject.CELL)).setPosition(new Point(cellPosX, cellPosY)); ++ } DelBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,524,2) -- -- AddBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,524,1) ++ DelBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,533,3) -- prop.put(PERSISTENCE_KEY_CX, new Double(plane.GetOrigin()[0])); -- prop.put(PERSISTENCE_KEY_CY, new Double(plane.GetOrigin()[1])); -- prop.put(PERSISTENCE_KEY_CZ, new Double(plane.GetOrigin()[2])); AddBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,533,3) ++ prop.put(PERSISTENCE_KEY_CX, new Double(sourcePlane.GetOrigin()[0])); ++ prop.put(PERSISTENCE_KEY_CY, new Double(sourcePlane.GetOrigin()[1])); ++ prop.put(PERSISTENCE_KEY_CZ, new Double(sourcePlane.GetOrigin()[2])); DelBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,537,3) -- prop.put(PERSISTENCE_KEY_NX, new Double(plane.GetNormal()[0])); -- prop.put(PERSISTENCE_KEY_NY, new Double(plane.GetNormal()[1])); -- prop.put(PERSISTENCE_KEY_NZ, new Double(plane.GetNormal()[2])); AddBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,537,3) ++ prop.put(PERSISTENCE_KEY_NX, new Double(sourcePlane.GetNormal()[0])); ++ prop.put(PERSISTENCE_KEY_NY, new Double(sourcePlane.GetNormal()[1])); ++ prop.put(PERSISTENCE_KEY_NZ, new Double(sourcePlane.GetNormal()[2])); DelBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,543,5) -- prop.put(PERSISTENCE_KEY_OUPUT_DATASET, this.planeClip.GetOutput()); -- prop.put(PERSISTENCE_KEY_OUPUT_MAPPER, this.cutMapper); -- prop.put(PERSISTENCE_KEY_OUPUT_LOOKUP_TABLE, this.lookupTable); -- prop.put(PERSISTENCE_KEY_OUTPUT_ACTOR, this.cutActor); -- prop.put(PERSISTENCE_KEY_OUTPUT_SCALAR_BAR, this.scalarBar); AddBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,543,9) ++ prop.put(PERSISTENCE_KEY_OUPUT_DATASET, planeClip.GetOutput()); ++ prop.put(PERSISTENCE_KEY_OUPUT_MAPPER, outputMapper); ++ prop.put(PERSISTENCE_KEY_OUPUT_LOOKUP_TABLE, outputLookupTable); ++ prop.put(PERSISTENCE_KEY_OUTPUT_ACTOR, outputActor); ++ prop.put(PERSISTENCE_KEY_OUTPUT_SCALAR_BAR, outputScalarBar); ++ ++ Point cellPosition = ((VtkObjectCellAdapter) cassfilter.getMetaData().get(VtkObject.CELL)).getPosition(); ++ prop.put(PERSISTENCE_KEY_CELL_POS_X, cellPosition.x); ++ prop.put(PERSISTENCE_KEY_CELL_POS_Y, cellPosition.y); DelBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,556,1) -- UpdateBinaryFile(Renderer/CassandraRenderer-1.1.0-all-all-none-jvm1_6-stable/CassandraRenderer-1.1.0-all-all-none-jvm1_6-stable.jar) DelBlock(Renderer/CassandraRenderer-1.1.0-all-all-none-jvm1_6-stable/version.txt,10,1) -- Hour of build: 0201 AddBlock(Renderer/CassandraRenderer-1.1.0-all-all-none-jvm1_6-stable/version.txt,10,1) ++ Hour of build: 1417 DelBlock(Renderer/CassandraRenderer-1.1.0-all-all-none-jvm1_6-stable/version.txt,12,1) -- Cassandra CORE branch development ticket: 5014 AddBlock(Renderer/CassandraRenderer-1.1.0-all-all-none-jvm1_6-stable/version.txt,12,1) ++ Cassandra CORE branch development ticket: 5418 UpdateBinaryFile(tmpCrossDepDir/CorePipeline.jar)
- bug fixes in the pipeline saving/loading fonctions.
AddBlock(Core/src/com/artenum/cassandra/action/CassandraActionListener.java,103,1) ++ public final static String IMPORT_PIPELINE_FROM_JYTHON = "import.pipeline.from.jython"; AddBlock(Core/src/com/artenum/cassandra/action/CassandraActionListener.java,375,11) ++ }else if (actionCommand.equals(IMPORT_PIPELINE_FROM_JYTHON)) { ++ ++ JFileChooser chooser = new JFileChooser(); ++ int answer = chooser.showOpenDialog(view); ++ if (answer == 0){ ++ File selectedFile = chooser.getSelectedFile(); ++ System.out.println( selectedFile.getName()); ++ view.getPyConsole().executePythonFile(selectedFile); ++ } ++ ++ DelBlock(Core/src/com/artenum/cassandra/pipeline/Filter.java,85,3) -- void setRelatedPluginClass(Class class1); -- -- Class getRelatedPluginClass(); AddBlock(Core/src/com/artenum/cassandra/pipeline/Filter.java,85,1) ++ public void setParentPlugin(CassandraPlugin parentPlugin); AddBlock(Core/src/com/artenum/cassandra/pipeline/Filter.java,87,2) ++ public CassandraPlugin getParentPlugin(); ++ DelBlock(Core/src/com/artenum/cassandra/pipeline/FilterImpl.java,66,1) -- private Class relatedPluginType; AddBlock(Core/src/com/artenum/cassandra/pipeline/FilterImpl.java,66,1) ++ private CassandraPlugin parentPlugin; DelBlock(Core/src/com/artenum/cassandra/pipeline/FilterImpl.java,143,2) -- public void setRelatedPluginClass(Class relatedPluginType) { -- this.relatedPluginType = relatedPluginType; AddBlock(Core/src/com/artenum/cassandra/pipeline/FilterImpl.java,143,2) ++ public void setParentPlugin(CassandraPlugin parentPlugin) { ++ this.parentPlugin = parentPlugin; DelBlock(Core/src/com/artenum/cassandra/pipeline/FilterImpl.java,148,2) -- public Class getRelatedPluginClass() { -- return relatedPluginType; AddBlock(Core/src/com/artenum/cassandra/pipeline/FilterImpl.java,148,2) ++ public CassandraPlugin getParentPlugin() { ++ return parentPlugin; AddBlock(Core/src/com/artenum/cassandra/pipeline/io/PipelineToJythonExporter.java,36,3) ++ import java.util.Map; ++ import java.util.Set; ++ import java.util.Map.Entry; AddBlock(Core/src/com/artenum/cassandra/pipeline/io/PipelineToJythonExporter.java,47,1) ++ import com.artenum.cassandra.pipeline.Filter; AddBlock(Core/src/com/artenum/cassandra/pipeline/io/PipelineToJythonExporter.java,50,2) ++ import com.artenum.cassandra.plugin.CassandraPlugInProperty; ++ import com.artenum.cassandra.plugin.CassandraPlugin; DelBlock(Core/src/com/artenum/cassandra/pipeline/io/PipelineToJythonExporter.java,55,2) -- * directly loadable into the VTK compliant Python/Jython interpreter or -- * Cassandra/Kerdiwen JyConsole base system. AddBlock(Core/src/com/artenum/cassandra/pipeline/io/PipelineToJythonExporter.java,55,1) ++ * directly loadable into the Cassandra/Kerdiwen JyConsole base system. AddBlock(Core/src/com/artenum/cassandra/pipeline/io/PipelineToJythonExporter.java,86,1) ++ private String scriptPlugInConnectivitySectionRadical = "# plug-ins connectivity" + eol; AddBlock(Core/src/com/artenum/cassandra/pipeline/io/PipelineToJythonExporter.java,92,1) ++ private String scriptPlugInConnectivitySection = scriptPlugInConnectivitySectionRadical; AddBlock(Core/src/com/artenum/cassandra/pipeline/io/PipelineToJythonExporter.java,145,1) ++ fw.write(scriptPlugInConnectivitySection); DelBlock(Core/src/com/artenum/cassandra/pipeline/io/PipelineToJythonExporter.java,147,1) -- fw.close(); AddBlock(Core/src/com/artenum/cassandra/pipeline/io/PipelineToJythonExporter.java,148,3) ++ ++ fw.close(); ++ AddBlock(Core/src/com/artenum/cassandra/pipeline/io/PipelineToJythonExporter.java,177,2) ++ String tmpPlugInsConnectivityLine = ""; ++ CassandraPlugin parentPlugIn; DelBlock(Core/src/com/artenum/cassandra/pipeline/io/PipelineToJythonExporter.java,181,1) -- HashMap<Integer, String> objCanonicalNameArray = new HashMap<Integer, String>(); AddBlock(Core/src/com/artenum/cassandra/pipeline/io/PipelineToJythonExporter.java,181,3) ++ ++ HashMap<Integer, vtkObject> exportedVtkObjArray = new HashMap<Integer, vtkObject>(); ++ HashMap<Integer, String> exportedVtkObjCanonicalNameArray = new HashMap<Integer, String>(); DelBlock(Core/src/com/artenum/cassandra/pipeline/io/PipelineToJythonExporter.java,205,1) -- // declaration, import and instanciation section AddBlock(Core/src/com/artenum/cassandra/pipeline/io/PipelineToJythonExporter.java,205,1) ++ // declaration, import and instantiation section AddBlock(Core/src/com/artenum/cassandra/pipeline/io/PipelineToJythonExporter.java,212,1) ++ // management of Cassandra plug-ins DelBlock(Core/src/com/artenum/cassandra/pipeline/io/PipelineToJythonExporter.java,215,1) -- plugInCanonicalClass = ((FilterImpl) obj.getVtkObject()).getRelatedPluginClass(); AddBlock(Core/src/com/artenum/cassandra/pipeline/io/PipelineToJythonExporter.java,215,1) ++ plugInCanonicalClass = ((FilterImpl) obj.getVtkObject()).getParentPlugin().getClass(); DelBlock(Core/src/com/artenum/cassandra/pipeline/io/PipelineToJythonExporter.java,219,1) -- System.out.print(plugInCanonicalClass.getPackage().getName() + " import " + plugInCanonicalClass.getSimpleName().toString()); DelBlock(Core/src/com/artenum/cassandra/pipeline/io/PipelineToJythonExporter.java,225,1) -- objCanonicalNameArray.put(obj.getId(), tmpObjectName); AddBlock(Core/src/com/artenum/cassandra/pipeline/io/PipelineToJythonExporter.java,225,1) ++ exportedVtkObjCanonicalNameArray.put(obj.getId(), tmpObjectName); DelBlock(Core/src/com/artenum/cassandra/pipeline/io/PipelineToJythonExporter.java,228,1) -- + "(cassandra.getPipeLineManager(), cassandra.getPluginManager(), CassandraToolBox.getParentFrame(cassandra.getDefaultUI()))"; AddBlock(Core/src/com/artenum/cassandra/pipeline/io/PipelineToJythonExporter.java,228,1) ++ + "(cassandra.getPipeLineManager(), cassandra.getPluginManager(), CassandraToolBox.getParentFrame(cassandra.getDefaultUI()), 0)"; AddBlock(Core/src/com/artenum/cassandra/pipeline/io/PipelineToJythonExporter.java,235,1) ++ // management of VTK objects DelBlock(Core/src/com/artenum/cassandra/pipeline/io/PipelineToJythonExporter.java,243,1) -- objCanonicalNameArray.put(obj.getId(), tmpObjectName); AddBlock(Core/src/com/artenum/cassandra/pipeline/io/PipelineToJythonExporter.java,243,2) ++ exportedVtkObjCanonicalNameArray.put(obj.getId(), tmpObjectName); ++ exportedVtkObjArray.put(obj.getId(), vtkObj); AddBlock(Core/src/com/artenum/cassandra/pipeline/io/PipelineToJythonExporter.java,262,1) ++ // managment of Cassandra's plug-ins AddBlock(Core/src/com/artenum/cassandra/pipeline/io/PipelineToJythonExporter.java,265,2) ++ ++ parentPlugIn = ((FilterImpl) obj.getVtkObject()).getParentPlugin(); DelBlock(Core/src/com/artenum/cassandra/pipeline/io/PipelineToJythonExporter.java,268,9) -- inputConnectivityList = obj.getInputConnectivityList(); -- if (!inputConnectivityList.isEmpty()) { -- Iterator<Integer> iter = inputConnectivityList.iterator(); -- while (iter.hasNext()) { -- tmpId = iter.next(); -- tmpConnectivityLine = objCanonicalNameArray.get(obj.getId()) + ".updateClippingPlane(" + "0.0, 0.0, 0.0, 1.0, -1.0, 0.0, " -- + objCanonicalNameArray.get(tmpId) + ")"; -- } -- } AddBlock(Core/src/com/artenum/cassandra/pipeline/io/PipelineToJythonExporter.java,268,2) ++ CassandraPlugInProperty plugInProperty = parentPlugIn.getPlugInProperty(); ++ HashMap propertyMap = plugInProperty.getPropertyMap(); AddBlock(Core/src/com/artenum/cassandra/pipeline/io/PipelineToJythonExporter.java,271,48) ++ // construction of the needed property ++ tmpImportLine = "if CASSANDRA_CONTEXT:" + eol + scriptTab + "from com.artenum.cassandra.util import CassandraToolBox" + eol + scriptTab ++ + "from " + plugInProperty.getClass().getPackage().getName() + " import " + plugInProperty.getClass().getSimpleName().toString() + eol; ++ scriptImportSection = scriptImportSection + tmpImportLine; ++ ++ String tmpPlugInPropertyInstanceName = plugInProperty.getClass().getSimpleName() + "_" + obj.getId(); ++ ++ tmpPlugInsConnectivityLine = "if CASSANDRA_CONTEXT:" + eol; ++ ++ // setting of the plug-in properties ++ tmpPlugInsConnectivityLine = tmpPlugInsConnectivityLine ++ + scriptTab + tmpPlugInPropertyInstanceName + " = " + plugInProperty.getClass().getSimpleName() + "()" + eol; ++ ++ Iterator iter = propertyMap.keySet().iterator(); ++ while (iter.hasNext()) { ++ Object keyProp = iter.next(); ++ Object tmpProp = plugInProperty.get(keyProp); ++ ++ // we manage the case if the property is a vtkObject ++ if (tmpProp instanceof vtkObject) { ++ ++ vtkObject tmpVtkObject = (vtkObject) tmpProp; ++ ++ String tmpName; ++ for ( Entry<Integer, vtkObject> tmpEntry : exportedVtkObjArray.entrySet() ){ //FIXME: not clean ++ if (tmpVtkObject == tmpEntry.getValue()){ ++ tmpName = exportedVtkObjCanonicalNameArray.get(tmpEntry.getKey()); ++ tmpPlugInsConnectivityLine = tmpPlugInsConnectivityLine ++ + scriptTab ++ + tmpPlugInPropertyInstanceName + ".put( \"" + keyProp + "\", " ++ + tmpName + ")" + eol; ++ } ++ } ++ ++ }else { ++ tmpPlugInsConnectivityLine = tmpPlugInsConnectivityLine ++ + scriptTab ++ + tmpPlugInPropertyInstanceName + ".put( \"" + keyProp + "\", " + tmpProp + ")" + eol; ++ } ++ } ++ ++ tmpPlugInsConnectivityLine = tmpPlugInsConnectivityLine ++ + scriptTab ++ + exportedVtkObjCanonicalNameArray.get(obj.getId()) + ".initAndUpdate(" + tmpPlugInPropertyInstanceName + " )" + eol; ++ ++ scriptPlugInConnectivitySection = scriptPlugInConnectivitySection + tmpPlugInsConnectivityLine; ++ ++ // management of VTK objects DelBlock(Core/src/com/artenum/cassandra/pipeline/io/PipelineToJythonExporter.java,330,1) -- tmpConnectivityLine = objCanonicalNameArray.get(obj.getId()) + ".SetInput(" + objCanonicalNameArray.get(tmpId) + ")"; AddBlock(Core/src/com/artenum/cassandra/pipeline/io/PipelineToJythonExporter.java,330,1) ++ tmpConnectivityLine = exportedVtkObjCanonicalNameArray.get(obj.getId()) + ".SetInput(" + exportedVtkObjCanonicalNameArray.get(tmpId) + ")"; DelBlock(Core/src/com/artenum/cassandra/pipeline/io/PipelineToJythonExporter.java,341,1) -- tmpConnectivityLine = objCanonicalNameArray.get(obj.getId()) + ".SetMapper(" + objCanonicalNameArray.get(tmpId) + ")"; AddBlock(Core/src/com/artenum/cassandra/pipeline/io/PipelineToJythonExporter.java,341,1) ++ tmpConnectivityLine = exportedVtkObjCanonicalNameArray.get(obj.getId()) + ".SetMapper(" + exportedVtkObjCanonicalNameArray.get(tmpId) + ")"; DelBlock(Core/src/com/artenum/cassandra/pipeline/io/PipelineToJythonExporter.java,344,1) -- tmpConnectivityLine = objCanonicalNameArray.get(obj.getId()) + ".SetLookupTable(" + objCanonicalNameArray.get(tmpId) + ")"; AddBlock(Core/src/com/artenum/cassandra/pipeline/io/PipelineToJythonExporter.java,344,1) ++ tmpConnectivityLine = exportedVtkObjCanonicalNameArray.get(obj.getId()) + ".SetLookupTable(" + exportedVtkObjCanonicalNameArray.get(tmpId) + ")"; DelBlock(Core/src/com/artenum/cassandra/pipeline/io/PipelineToJythonExporter.java,347,1) -- tmpConnectivityLine = objCanonicalNameArray.get(tmpId) + ".SetLookupTable(" + objCanonicalNameArray.get(obj.getId()) + ")"; AddBlock(Core/src/com/artenum/cassandra/pipeline/io/PipelineToJythonExporter.java,347,1) ++ tmpConnectivityLine = exportedVtkObjCanonicalNameArray.get(tmpId) + ".SetLookupTable(" + exportedVtkObjCanonicalNameArray.get(obj.getId()) + ")"; DelBlock(Core/src/com/artenum/cassandra/pipeline/io/PipelineToJythonExporter.java,368,5) -- // tmpLine = scriptTab + "pipeline.addFilter(" + -- // objCanonicalNameArray.get(obj.getId()) + -- // ".getInternalFilter()" + ", \"" + -- // objCanonicalNameArray.get(obj.getId()) -- // + "\" )"; DelBlock(Core/src/com/artenum/cassandra/pipeline/io/PipelineToJythonExporter.java,369,1) -- scriptCassandraReloadingSection = scriptCassandraReloadingSection + tmpLine + eol; AddBlock(Core/src/com/artenum/cassandra/pipeline/io/PipelineToJythonExporter.java,369,2) ++ //FIXME ++ //scriptCassandraReloadingSection = scriptCassandraReloadingSection + tmpLine + eol; DelBlock(Core/src/com/artenum/cassandra/pipeline/io/PipelineToJythonExporter.java,375,1) -- tmpLine = scriptTab + "pipeline.addMapper(" + objCanonicalNameArray.get(obj.getId()) + ", \"" + objCanonicalNameArray.get(obj.getId()) AddBlock(Core/src/com/artenum/cassandra/pipeline/io/PipelineToJythonExporter.java,375,1) ++ tmpLine = scriptTab + "pipeline.addMapper(" + exportedVtkObjCanonicalNameArray.get(obj.getId()) + ", \"" + exportedVtkObjCanonicalNameArray.get(obj.getId()) DelBlock(Core/src/com/artenum/cassandra/pipeline/io/PipelineToJythonExporter.java,378,1) -- tmpLine = scriptTab + "pipeline.addDataSet(" + objCanonicalNameArray.get(obj.getId()) + ", \"" + objCanonicalNameArray.get(obj.getId()) AddBlock(Core/src/com/artenum/cassandra/pipeline/io/PipelineToJythonExporter.java,378,1) ++ tmpLine = scriptTab + "pipeline.addDataSet(" + exportedVtkObjCanonicalNameArray.get(obj.getId()) + ", \"" + exportedVtkObjCanonicalNameArray.get(obj.getId()) DelBlock(Core/src/com/artenum/cassandra/pipeline/io/PipelineToJythonExporter.java,381,1) -- tmpLine = scriptTab + "pipeline.addActor(" + objCanonicalNameArray.get(obj.getId()) + ", \"" + objCanonicalNameArray.get(obj.getId()) AddBlock(Core/src/com/artenum/cassandra/pipeline/io/PipelineToJythonExporter.java,381,1) ++ tmpLine = scriptTab + "pipeline.addActor(" + exportedVtkObjCanonicalNameArray.get(obj.getId()) + ", \"" + exportedVtkObjCanonicalNameArray.get(obj.getId()) DelBlock(Core/src/com/artenum/cassandra/pipeline/io/PipelineToJythonExporter.java,384,2) -- tmpLine = scriptTab + "pipeline.addScalarBar(" + objCanonicalNameArray.get(obj.getId()) + ", \"" -- + objCanonicalNameArray.get(obj.getId()) + "\" )"; AddBlock(Core/src/com/artenum/cassandra/pipeline/io/PipelineToJythonExporter.java,384,2) ++ tmpLine = scriptTab + "pipeline.addScalarBar(" + exportedVtkObjCanonicalNameArray.get(obj.getId()) + ", \"" ++ + exportedVtkObjCanonicalNameArray.get(obj.getId()) + "\" )"; DelBlock(Core/src/com/artenum/cassandra/pipeline/io/PipelineToJythonExporter.java,387,2) -- tmpLine = scriptTab + "pipeline.addLookupTable(" + objCanonicalNameArray.get(obj.getId()) + ", \"" -- + objCanonicalNameArray.get(obj.getId()) + "\" )"; AddBlock(Core/src/com/artenum/cassandra/pipeline/io/PipelineToJythonExporter.java,387,2) ++ tmpLine = scriptTab + "pipeline.addLookupTable(" + exportedVtkObjCanonicalNameArray.get(obj.getId()) + ", \"" ++ + exportedVtkObjCanonicalNameArray.get(obj.getId()) + "\" )"; AddBlock(Core/src/com/artenum/cassandra/pipeline/io/PipelineToJythonExporter.java,400,1) ++ System.out.println(scriptPlugInConnectivitySection); AddBlock(Core/src/com/artenum/cassandra/pipeline/PipeLineManager.java,29,1) ++ import vtk.vtkObject; AddBlock(Core/src/com/artenum/cassandra/pipeline/PipeLineManager.java,118,2) ++ ++ VtkObject getCassandraVtkObjectByTrueVtkObject(vtkObject obj); DelBlock(Core/src/com/artenum/cassandra/pipeline/VtkObject.java,47,1) -- * @version 0.1 AddBlock(Core/src/com/artenum/cassandra/pipeline/VtkObject.java,47,3) ++ * @author Julien Forest ++ * ++ * @version 1.2 AddBlock(Core/src/com/artenum/cassandra/plugin/CassandraPlugin.java,25,2) ++ import java.util.HashMap; ++ AddBlock(Core/src/com/artenum/cassandra/plugin/CassandraPlugin.java,29,7) ++ import vtk.vtkActor; ++ import vtk.vtkDataSet; ++ import vtk.vtkDataSetMapper; ++ import vtk.vtkLookupTable; ++ import vtk.vtkObject; ++ import vtk.vtkScalarBarActor; ++ DelBlock(Core/src/com/artenum/cassandra/plugin/CassandraPlugin.java,68,2) -- void updatePlugIn(CassandraPlugInProperty prop); -- AddBlock(Core/src/com/artenum/cassandra/plugin/CassandraPlugin.java,68,4) ++ /** ++ * @return all settings of the current plugin into a plugIn property. ++ * Typically used for the pipeline saving procedure. ++ */ AddBlock(Core/src/com/artenum/cassandra/plugin/CassandraPlugin.java,75,8) ++ ++ ++ /** ++ * Initialise and update the plugin according the pluginProperty given in argument. Used ++ * during the pipeline reloading procedure. ++ * @param prop ++ */ ++ void initAndUpdate(CassandraPlugInProperty prop); AddBlock(Core/src/com/artenum/cassandra/plugin/CassandraPlugInProperty.java,3,2) ++ import java.util.HashMap; ++ DelBlock(Core/src/com/artenum/cassandra/plugin/CassandraPlugInProperty.java,7,2) -- void addPropety(Object key, Object prop); -- Object getProperty(Object key); AddBlock(Core/src/com/artenum/cassandra/plugin/CassandraPlugInProperty.java,7,8) ++ void put(Object key, Object prop); ++ Object get(Object key); ++ HashMap getPropertyMap(); ++ boolean containsKey(Object key); ++ Object getSafely(Object key, Object defaultValue); ++ double getSafely(Object key, double defaultValue); ++ int getSafely(Object key, int defaultValue); ++ float getSafely(Object key, float defaultValue); AddBlock(Core/src/com/artenum/cassandra/ui/CassandraGUI.java,146,3) ++ /** ++ * @return the JConsole of the GUI. ++ */ DelBlock(Core/src/com/artenum/cassandra/ui/CassandraMenu.java,55,2) -- * @author Sebastien Jourdain -- * @author Julien Forest AddBlock(Core/src/com/artenum/cassandra/ui/CassandraMenu.java,55,2) ++ * @author Sebastien Jourdain, ARTENUM SARL ++ * @author Julien Forest, ARTENUM SARL AddBlock(Core/src/com/artenum/cassandra/ui/CassandraMenu.java,79,3) ++ private JMenu importPipeline; ++ private JMenuItem importPipelineFromJython; ++ AddBlock(Core/src/com/artenum/cassandra/ui/CassandraMenu.java,165,6) ++ importPipeline = new JMenu("Import Pipeline from"); ++ ++ importPipelineFromJython = new JMenuItem("Jython"); ++ importPipelineFromJython.setActionCommand( CassandraActionListener.IMPORT_PIPELINE_FROM_JYTHON); ++ importPipelineFromJython.addActionListener(listener); ++ AddBlock(Core/src/com/artenum/cassandra/ui/CassandraMenu.java,195,2) ++ file.add(importPipeline); ++ importPipeline.add(importPipelineFromJython); AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,16,1) ++ import vtk.vtkAlgorithm; DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,43,12) -- public class SimplePipeLineManager extends Observable implements -- PipeLineManager { -- private CassandraView view; -- private ArrayList connectivityListener; -- private Hashtable vtkObjectHashtable; -- private VtkObjectListModel actorList; -- private VtkObjectListModel mapperList; -- private VtkObjectListModel datasetList; -- private VtkObjectListModel filterList; -- private VtkObjectListModel lookupTableList; -- private VtkObjectListModel scalarBarList; -- private VtkObjectListModel txtActorList; AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,43,11) ++ public class SimplePipeLineManager extends Observable implements PipeLineManager { ++ private CassandraView view; ++ private ArrayList connectivityListener; ++ private Hashtable vtkObjectHashtable; ++ private VtkObjectListModel actorList; ++ private VtkObjectListModel mapperList; ++ private VtkObjectListModel datasetList; ++ private VtkObjectListModel filterList; ++ private VtkObjectListModel lookupTableList; ++ private VtkObjectListModel scalarBarList; ++ private VtkObjectListModel txtActorList; DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,55,2) -- private Integer vtkObjectIndex = new Integer(0); -- public Integer getVtkObjectIndex() { AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,55,3) ++ private Integer vtkObjectIndex = new Integer(0); ++ ++ public Integer getVtkObjectIndex() { DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,62,7) -- private int actorNumber = 1; -- private int sourceNumber = 1; -- private int mapperNumber = 1; -- private int filterNumber = 1; -- private int lookupNumber = 1; -- private int scalarBarNumber = 1; -- private int txtActorNumber = 1; AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,62,7) ++ private int actorNumber = 1; ++ private int sourceNumber = 1; ++ private int mapperNumber = 1; ++ private int filterNumber = 1; ++ private int lookupNumber = 1; ++ private int scalarBarNumber = 1; ++ private int txtActorNumber = 1; DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,70,2) -- // -- private DefaultAxes axes; AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,70,2) ++ // ++ private DefaultAxes axes; DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,73,1) -- public SimplePipeLineManager() { AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,73,1) ++ public SimplePipeLineManager() { DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,75,9) -- // loading of the VTK based context. -- try { -- VtkContextLoader contextLoader = new VtkContextLoader(4); -- if (contextLoader.load() == false) { -- System.exit(-1); -- } -- } catch (Exception e) { -- System.out.print("Error in the call to native context loader"); -- } AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,75,9) ++ // loading of the VTK based context. ++ try { ++ VtkContextLoader contextLoader = new VtkContextLoader(4); ++ if (contextLoader.load() == false) { ++ System.exit(-1); ++ } ++ } catch (Exception e) { ++ System.out.print("Error in the call to native context loader"); ++ } DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,85,8) -- // Instantiation of the VTK based renderer. -- try { -- view = new CassandraView(); -- } catch (Exception e) { -- System.out -- .println("Error: impossible to build the VTK based renderer and/or view"); -- System.exit(-1); -- } AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,85,7) ++ // Instantiation of the VTK based renderer. ++ try { ++ view = new CassandraView(); ++ } catch (Exception e) { ++ System.out.println("Error: impossible to build the VTK based renderer and/or view"); ++ System.exit(-1); ++ } DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,93,11) -- vtkObjectHashtable = new Hashtable(); -- actorList = new VtkObjectListModel(VtkObject.ACTOR); -- mapperList = new VtkObjectListModel(VtkObject.MAPPER); -- datasetList = new VtkObjectListModel(VtkObject.DATASET); -- filterList = new VtkObjectListModel(VtkObject.FILTER); -- lookupTableList = new VtkObjectListModel(VtkObject.LOOKUP_TABLE); -- scalarBarList = new VtkObjectListModel(VtkObject.SCALAR_BAR); -- txtActorList = new VtkObjectListModel(VtkObject.TXT_ACTOR); -- axes = new DefaultAxes(this); -- connectivityListener = new ArrayList(); -- } AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,93,11) ++ vtkObjectHashtable = new Hashtable(); ++ actorList = new VtkObjectListModel(VtkObject.ACTOR); ++ mapperList = new VtkObjectListModel(VtkObject.MAPPER); ++ datasetList = new VtkObjectListModel(VtkObject.DATASET); ++ filterList = new VtkObjectListModel(VtkObject.FILTER); ++ lookupTableList = new VtkObjectListModel(VtkObject.LOOKUP_TABLE); ++ scalarBarList = new VtkObjectListModel(VtkObject.SCALAR_BAR); ++ txtActorList = new VtkObjectListModel(VtkObject.TXT_ACTOR); ++ axes = new DefaultAxes(this); ++ connectivityListener = new ArrayList(); ++ } DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,105,2) -- @Override -- public Hashtable getVtkObjectHashtable() { AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,105,2) ++ @Override ++ public Hashtable getVtkObjectHashtable() { DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,115,5) -- /** -- * Add a VtkDataSet from a file reading into the pipeline manager and -- * build-up the corresponding visualisation pipeline. -- */ -- synchronized public void addVtkFile(File vtkFile) { AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,115,5) ++ /** ++ * Add a VtkDataSet from a file reading into the pipeline manager and ++ * build-up the corresponding visualisation pipeline. ++ */ ++ synchronized public void addVtkFile(File vtkFile) { DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,121,1) -- vtkDataSet inputDataSet; AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,121,1) ++ vtkDataSet inputDataSet; DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,123,5) -- if (!vtkFile.exists()) { -- System.err.println("File does not exist: " -- + vtkFile.getAbsolutePath()); -- return; -- } AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,123,4) ++ if (!vtkFile.exists()) { ++ System.err.println("File does not exist: " + vtkFile.getAbsolutePath()); ++ return; ++ } DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,128,11) -- if (vtkFile.getName().endsWith(".vtu")) { -- vtkXMLUnstructuredGridReader dataSetXMLReader = new vtkXMLUnstructuredGridReader(); -- dataSetXMLReader.SetFileName(vtkFile.getAbsolutePath()); -- dataSetXMLReader.Update(); -- inputDataSet = dataSetXMLReader.GetOutput(); -- } else { -- vtkDataSetReader dataSetReader = new vtkDataSetReader(); -- dataSetReader.SetFileName(vtkFile.getAbsolutePath()); -- dataSetReader.Update(); -- inputDataSet = dataSetReader.GetOutput(); -- } AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,128,11) ++ if (vtkFile.getName().endsWith(".vtu")) { ++ vtkXMLUnstructuredGridReader dataSetXMLReader = new vtkXMLUnstructuredGridReader(); ++ dataSetXMLReader.SetFileName(vtkFile.getAbsolutePath()); ++ dataSetXMLReader.Update(); ++ inputDataSet = dataSetXMLReader.GetOutput(); ++ } else { ++ vtkDataSetReader dataSetReader = new vtkDataSetReader(); ++ dataSetReader.SetFileName(vtkFile.getAbsolutePath()); ++ dataSetReader.Update(); ++ inputDataSet = dataSetReader.GetOutput(); ++ } DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,140,6) -- // Set pipeline -- vtkDataSetMapper mapper = new vtkDataSetMapper(); -- mapper.SetInput(inputDataSet); -- mapper.Update(); -- vtkActor actor = new vtkActor(); -- actor.SetMapper(mapper); AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,140,6) ++ // Set pipeline ++ vtkDataSetMapper mapper = new vtkDataSetMapper(); ++ mapper.SetInput(inputDataSet); ++ mapper.Update(); ++ vtkActor actor = new vtkActor(); ++ actor.SetMapper(mapper); DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,147,13) -- // vtkScalarBarWidget scalBarWidget = new vtkScalarBarWidget(); -- // scalBarWidget.SetScalarBarActor(scalBar); -- // vtkRenderWindowInteractor iren = new vtkRenderWindowInteractor(); -- // scalBarWidget.SetInteractor(getCassandraView().GetRenderWindow().GetInteractor()); -- // scalBarWidget.SetInteractor(iren); -- // iren.SetRenderWindow(getCassandraView().GetRenderWindow()); -- // scalBarWidget.SetInteractor(iren); -- // iren.Initialize(); -- // iren.Start(); -- // -- // Register vtkObject in pipeline -- addDataSet(inputDataSet, vtkFile.getName()); -- addMapper(mapper, vtkFile.getName()); AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,147,13) ++ // vtkScalarBarWidget scalBarWidget = new vtkScalarBarWidget(); ++ // scalBarWidget.SetScalarBarActor(scalBar); ++ // vtkRenderWindowInteractor iren = new vtkRenderWindowInteractor(); ++ // scalBarWidget.SetInteractor(getCassandraView().GetRenderWindow().GetInteractor()); ++ // scalBarWidget.SetInteractor(iren); ++ // iren.SetRenderWindow(getCassandraView().GetRenderWindow()); ++ // scalBarWidget.SetInteractor(iren); ++ // iren.Initialize(); ++ // iren.Start(); ++ // ++ // Register vtkObject in pipeline ++ addDataSet(inputDataSet, vtkFile.getName()); ++ addMapper(mapper, vtkFile.getName()); DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,161,2) -- // Show actors -- setActorVisible(addActor(actor, vtkFile.getName()), true); AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,161,2) ++ // Show actors ++ setActorVisible(addActor(actor, vtkFile.getName()), true); DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,164,8) -- // lookup table -- if (inputDataSet.GetScalarRange() != null) { -- vtkLookupTable lookupTable = new vtkLookupTable(); -- lookupTable.SetHueRange(0.66667, 0); -- lookupTable.SetTableRange(inputDataSet.GetScalarRange()); -- lookupTable.Build(); -- mapper.SetLookupTable(lookupTable); -- mapper.SetScalarRange(inputDataSet.GetScalarRange()); AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,164,8) ++ // lookup table ++ if (inputDataSet.GetScalarRange() != null) { ++ vtkLookupTable lookupTable = new vtkLookupTable(); ++ lookupTable.SetHueRange(0.66667, 0); ++ lookupTable.SetTableRange(inputDataSet.GetScalarRange()); ++ lookupTable.Build(); ++ mapper.SetLookupTable(lookupTable); ++ mapper.SetScalarRange(inputDataSet.GetScalarRange()); DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,173,3) -- // Scalar bar -- vtkScalarBarActor scalBar = new vtkScalarBarActor(); -- scalBar.SetLookupTable(lookupTable); AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,173,3) ++ // Scalar bar ++ vtkScalarBarActor scalBar = new vtkScalarBarActor(); ++ scalBar.SetLookupTable(lookupTable); DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,177,4) -- // register -- addLookupTable(lookupTable, vtkFile.getName()); -- setActorVisible(addScalarBar(scalBar, vtkFile.getName()), true); -- } AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,177,4) ++ // register ++ addLookupTable(lookupTable, vtkFile.getName()); ++ setActorVisible(addScalarBar(scalBar, vtkFile.getName()), true); ++ } DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,182,3) -- // to resize automatically the view on the loaded data -- view.resetCamera(); -- } AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,182,3) ++ // to resize automatically the view on the loaded data ++ view.resetCamera(); ++ } DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,187,2) -- * Set the actor of Id vtkObjectId, visible (if true) or not (if false) in -- * both the 3D (CassandraView) and 2D (pipeline Editor). AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,187,2) ++ * Set the actor of Id vtkObjectId, visible (if true) or not (if false) in ++ * both the 3D (CassandraView) and 2D (pipeline Editor). DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,193,4) -- public void setActorVisible(Integer vtkObjectId, boolean viewActor) { -- setActorVisible((VtkObject) vtkObjectHashtable.get(vtkObjectId), -- viewActor); -- } AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,193,3) ++ public void setActorVisible(Integer vtkObjectId, boolean viewActor) { ++ setActorVisible((VtkObject) vtkObjectHashtable.get(vtkObjectId), viewActor); ++ } DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,197,10) -- /** -- * set the actor visible or not in both 3D and 2D view. -- */ -- public void setActorVisible(VtkObject vtkObject, boolean viewActor) { -- if ((vtkObject.getType() == VtkObject.ACTOR) -- || (vtkObject.getType() == VtkObject.TXT_ACTOR) -- || (vtkObject.getType() == VtkObject.SCALAR_BAR)) { -- if (!vtkObject.isValide()) { -- return; -- } AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,197,8) ++ /** ++ * set the actor visible or not in both 3D and 2D view. ++ */ ++ public void setActorVisible(VtkObject vtkObject, boolean viewActor) { ++ if ((vtkObject.getType() == VtkObject.ACTOR) || (vtkObject.getType() == VtkObject.TXT_ACTOR) || (vtkObject.getType() == VtkObject.SCALAR_BAR)) { ++ if (!vtkObject.isValide()) { ++ return; ++ } DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,206,22) -- vtkObject.getMetaData().put(VtkObject.ACTOR_VISIBLE, -- Boolean.toString(viewActor)); -- if (vtkObject.getVtkObject() instanceof vtkActor) { -- // 3D -- if (viewActor) { -- view.GetRenderer().AddActor( -- (vtkProp) vtkObject.getVtkObject()); -- } else { -- view.GetRenderer().RemoveActor( -- (vtkProp) vtkObject.getVtkObject()); -- } -- } else { -- // 2D -- if (viewActor) { -- view.GetRenderer().AddActor2D( -- (vtkProp) vtkObject.getVtkObject()); -- } else { -- view.GetRenderer().RemoveActor2D( -- (vtkProp) vtkObject.getVtkObject()); -- } -- } -- } AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,206,17) ++ vtkObject.getMetaData().put(VtkObject.ACTOR_VISIBLE, Boolean.toString(viewActor)); ++ if (vtkObject.getVtkObject() instanceof vtkActor) { ++ // 3D ++ if (viewActor) { ++ view.GetRenderer().AddActor((vtkProp) vtkObject.getVtkObject()); ++ } else { ++ view.GetRenderer().RemoveActor((vtkProp) vtkObject.getVtkObject()); ++ } ++ } else { ++ // 2D ++ if (viewActor) { ++ view.GetRenderer().AddActor2D((vtkProp) vtkObject.getVtkObject()); ++ } else { ++ view.GetRenderer().RemoveActor2D((vtkProp) vtkObject.getVtkObject()); ++ } ++ } ++ } DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,224,3) -- this.setChanged(); -- this.notifyObservers(vtkObjectHashtable); -- } AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,224,3) ++ this.setChanged(); ++ this.notifyObservers(vtkObjectHashtable); ++ } DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,228,7) -- /** -- * return the vtkObject corresponding to the current object in the pipeline -- * manager. -- */ -- public VtkObject getVtkObject(Integer vtkObjectId) { -- return (VtkObject) vtkObjectHashtable.get(vtkObjectId); -- } AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,228,7) ++ /** ++ * return the vtkObject corresponding to the current object in the pipeline ++ * manager. ++ */ ++ public VtkObject getVtkObject(Integer vtkObjectId) { ++ return (VtkObject) vtkObjectHashtable.get(vtkObjectId); ++ } DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,236,9) -- /** -- * return a new Id for a new VtkObject in the pipeline manager. -- * -- * @return vtkObjectIndex -- */ -- public Integer getNextVtkObjectId() { -- vtkObjectIndex = new Integer(vtkObjectIndex.intValue() + 1); -- return vtkObjectIndex; -- } AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,236,9) ++ /** ++ * return a new Id for a new VtkObject in the pipeline manager. ++ * ++ * @return vtkObjectIndex ++ */ ++ public Integer getNextVtkObjectId() { ++ vtkObjectIndex = new Integer(vtkObjectIndex.intValue() + 1); ++ return vtkObjectIndex; ++ } DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,246,6) -- /** -- * return the list of actors -- */ -- public VtkObjectListModel getActorList() { -- return actorList; -- } AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,246,6) ++ /** ++ * return the list of actors ++ */ ++ public VtkObjectListModel getActorList() { ++ return actorList; ++ } DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,253,3) -- public VtkObjectListModel getDataSetList() { -- return datasetList; -- } AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,253,3) ++ public VtkObjectListModel getDataSetList() { ++ return datasetList; ++ } DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,257,3) -- public VtkObjectListModel getFilterList() { -- return filterList; -- } AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,257,3) ++ public VtkObjectListModel getFilterList() { ++ return filterList; ++ } DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,261,3) -- public VtkObjectListModel getMapperList() { -- return mapperList; -- } AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,261,3) ++ public VtkObjectListModel getMapperList() { ++ return mapperList; ++ } DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,265,3) -- public VtkObjectListModel getLookupTableList() { -- return lookupTableList; -- } AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,265,3) ++ public VtkObjectListModel getLookupTableList() { ++ return lookupTableList; ++ } DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,269,3) -- public VtkObjectListModel getScalarBarList() { -- return scalarBarList; -- } AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,269,3) ++ public VtkObjectListModel getScalarBarList() { ++ return scalarBarList; ++ } DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,273,3) -- public VtkObjectListModel getTextActorList() { -- return txtActorList; -- } AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,273,3) ++ public VtkObjectListModel getTextActorList() { ++ return txtActorList; ++ } DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,277,19) -- /** -- * Add a new actor into the pipeline manager. -- * -- * @param actor -- * @param name -- * @return -- */ -- synchronized public VtkObject addActor(Object actor, String name) { -- int id = actorNumber++; -- String actorId = name + " (" + id + ")"; -- VtkObjectAdapter vtkObject = new VtkObjectAdapter(actor, -- VtkObject.ACTOR, actorId, getNextVtkObjectId()); -- vtkObject.setLocalTypeId(id); -- vtkObjectHashtable.put(vtkObject.getId(), vtkObject); -- actorList.addVtkObject(vtkObject); -- this.setChanged(); -- this.notifyObservers(vtkObjectHashtable); -- return vtkObject; -- } AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,277,18) ++ /** ++ * Add a new actor into the pipeline manager. ++ * ++ * @param actor ++ * @param name ++ * @return ++ */ ++ synchronized public VtkObject addActor(Object actor, String name) { ++ int id = actorNumber++; ++ String actorId = name + " (" + id + ")"; ++ VtkObjectAdapter vtkObject = new VtkObjectAdapter(actor, VtkObject.ACTOR, actorId, getNextVtkObjectId()); ++ vtkObject.setLocalTypeId(id); ++ vtkObjectHashtable.put(vtkObject.getId(), vtkObject); ++ actorList.addVtkObject(vtkObject); ++ this.setChanged(); ++ this.notifyObservers(vtkObjectHashtable); ++ return vtkObject; ++ } DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,296,10) -- /** -- * Add a new mapper into the pipeline manager. -- * -- * @param mapper -- * @param name -- * @return the built VtkObject -- */ -- synchronized public VtkObject addMapper(Object mapper, String name) { -- int id = mapperNumber++; -- String mapperId = name + " (" + id + ")"; AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,296,10) ++ /** ++ * Add a new mapper into the pipeline manager. ++ * ++ * @param mapper ++ * @param name ++ * @return the built VtkObject ++ */ ++ synchronized public VtkObject addMapper(Object mapper, String name) { ++ int id = mapperNumber++; ++ String mapperId = name + " (" + id + ")"; DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,307,2) -- // for a better color mapping FIX ME: should be linked with the GUI -- ((vtkMapper) mapper).SetInterpolateScalarsBeforeMapping(1); AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,307,2) ++ // for a better color mapping FIX ME: should be linked with the GUI ++ ((vtkMapper) mapper).SetInterpolateScalarsBeforeMapping(1); DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,310,9) -- VtkObjectAdapter vtkObject = new VtkObjectAdapter(mapper, -- VtkObject.MAPPER, mapperId, getNextVtkObjectId()); -- vtkObject.setLocalTypeId(id); -- vtkObjectHashtable.put(vtkObject.getId(), vtkObject); -- mapperList.addVtkObject(vtkObject); -- this.setChanged(); -- this.notifyObservers(vtkObjectHashtable); -- return vtkObject; -- } AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,310,8) ++ VtkObjectAdapter vtkObject = new VtkObjectAdapter(mapper, VtkObject.MAPPER, mapperId, getNextVtkObjectId()); ++ vtkObject.setLocalTypeId(id); ++ vtkObjectHashtable.put(vtkObject.getId(), vtkObject); ++ mapperList.addVtkObject(vtkObject); ++ this.setChanged(); ++ this.notifyObservers(vtkObjectHashtable); ++ return vtkObject; ++ } DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,319,12) -- synchronized public VtkObject addDataSet(Object dataset, String name) { -- int id = sourceNumber++; -- String datasetId = name + " (" + id + ")"; -- VtkObjectAdapter vtkObject = new VtkObjectAdapter(dataset, -- VtkObject.DATASET, datasetId, getNextVtkObjectId()); -- vtkObject.setLocalTypeId(id); -- vtkObjectHashtable.put(vtkObject.getId(), vtkObject); -- datasetList.addVtkObject(vtkObject); -- this.setChanged(); -- this.notifyObservers(vtkObjectHashtable); -- return vtkObject; -- } AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,319,11) ++ synchronized public VtkObject addDataSet(Object dataset, String name) { ++ int id = sourceNumber++; ++ String datasetId = name + " (" + id + ")"; ++ VtkObjectAdapter vtkObject = new VtkObjectAdapter(dataset, VtkObject.DATASET, datasetId, getNextVtkObjectId()); ++ vtkObject.setLocalTypeId(id); ++ vtkObjectHashtable.put(vtkObject.getId(), vtkObject); ++ datasetList.addVtkObject(vtkObject); ++ this.setChanged(); ++ this.notifyObservers(vtkObjectHashtable); ++ return vtkObject; ++ } DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,331,9) -- /** -- * Add a data set into the pipeline manager and automatically build-up the -- * downstream pipeline. Useful to load a data set already in memory like a -- * file. -- * -- * @param dataset -- * @param name -- */ -- synchronized public void addDataSetAndBuildPipeline(Object dataset, String name) { AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,331,9) ++ /** ++ * Add a data set into the pipeline manager and automatically build-up the ++ * downstream pipeline. Useful to load a data set already in memory like a ++ * file. ++ * ++ * @param dataset ++ * @param name ++ */ ++ synchronized public void addDataSetAndBuildPipeline(Object dataset, String name) { DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,341,1) -- VtkObject tmpDataSet = this.addDataSet(dataset, name); AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,341,1) ++ VtkObject tmpDataSet = this.addDataSet(dataset, name); DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,343,3) -- vtkDataSetMapper mapper = new vtkDataSetMapper(); -- vtkActor actor = new vtkActor(); -- mapper.SetInput((vtkDataSet) dataset); AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,343,3) ++ vtkDataSetMapper mapper = new vtkDataSetMapper(); ++ vtkActor actor = new vtkActor(); ++ mapper.SetInput((vtkDataSet) dataset); DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,347,7) -- actor.SetMapper(mapper); -- vtkLookupTable lookupTable = new vtkLookupTable(); -- lookupTable.SetHueRange(0.66667, 0); -- mapper.SetLookupTable(lookupTable); -- mapper.SetScalarRange(((vtkDataSet) dataset).GetScalarRange()); -- vtkScalarBarActor scalarBar = new vtkScalarBarActor(); -- scalarBar.SetLookupTable(lookupTable); AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,347,7) ++ actor.SetMapper(mapper); ++ vtkLookupTable lookupTable = new vtkLookupTable(); ++ lookupTable.SetHueRange(0.66667, 0); ++ mapper.SetLookupTable(lookupTable); ++ mapper.SetScalarRange(((vtkDataSet) dataset).GetScalarRange()); ++ vtkScalarBarActor scalarBar = new vtkScalarBarActor(); ++ scalarBar.SetLookupTable(lookupTable); DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,355,8) -- // -- VtkObject tmpMapper = this.addMapper(mapper, name + " mapper"); -- VtkObject tmpActor = this.addActor(actor, name + " actor"); -- this.setActorVisible(tmpActor, true); -- VtkObject tmpLookUpTable = this.addLookupTable(lookupTable, name + " lookup table"); -- this.setActorVisible(addScalarBar(scalarBar, name), true); -- this.validateViewAndGo(); -- } AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,355,8) ++ // ++ VtkObject tmpMapper = this.addMapper(mapper, name + " mapper"); ++ VtkObject tmpActor = this.addActor(actor, name + " actor"); ++ this.setActorVisible(tmpActor, true); ++ VtkObject tmpLookUpTable = this.addLookupTable(lookupTable, name + " lookup table"); ++ this.setActorVisible(addScalarBar(scalarBar, name), true); ++ this.validateViewAndGo(); ++ } DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,364,19) -- /** -- * add a simple vtkFilter into the pipeline manager. -- * -- * @param filter -- * @param name -- * @return -- */ -- synchronized public VtkObject addFilter(Filter filter, String name) { -- int id = filterNumber++; -- String filterId = name + " (" + id + ")"; -- VtkObjectAdapter vtkObject = new VtkObjectAdapter(filter, -- VtkObject.FILTER, filterId, getNextVtkObjectId()); -- vtkObject.setLocalTypeId(id); -- vtkObjectHashtable.put(vtkObject.getId(), vtkObject); -- filterList.addVtkObject(vtkObject); -- this.setChanged(); -- this.notifyObservers(vtkObjectHashtable); -- return vtkObject; -- } AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,364,18) ++ /** ++ * add a simple vtkFilter into the pipeline manager. ++ * ++ * @param filter ++ * @param name ++ * @return ++ */ ++ synchronized public VtkObject addFilter(Filter filter, String name) { ++ int id = filterNumber++; ++ String filterId = name + " (" + id + ")"; ++ VtkObjectAdapter vtkObject = new VtkObjectAdapter(filter, VtkObject.FILTER, filterId, getNextVtkObjectId()); ++ vtkObject.setLocalTypeId(id); ++ vtkObjectHashtable.put(vtkObject.getId(), vtkObject); ++ filterList.addVtkObject(vtkObject); ++ this.setChanged(); ++ this.notifyObservers(vtkObjectHashtable); ++ return vtkObject; ++ } DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,383,20) -- /** -- * add a lookup table into the pipeline manager. -- * -- * @param lookupTable -- * @param name -- * @return -- */ -- synchronized public VtkObject addLookupTable(vtkLookupTable lookupTable, -- String name) { -- int id = lookupNumber++; -- String lookupTableId = name + " (" + id + ")"; -- VtkObjectAdapter vtkObject = new VtkObjectAdapter(lookupTable, -- VtkObject.LOOKUP_TABLE, lookupTableId, getNextVtkObjectId()); -- vtkObject.setLocalTypeId(id); -- vtkObjectHashtable.put(vtkObject.getId(), vtkObject); -- lookupTableList.addVtkObject(vtkObject); -- this.setChanged(); -- this.notifyObservers(vtkObjectHashtable); -- return vtkObject; -- } AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,383,18) ++ /** ++ * add a lookup table into the pipeline manager. ++ * ++ * @param lookupTable ++ * @param name ++ * @return ++ */ ++ synchronized public VtkObject addLookupTable(vtkLookupTable lookupTable, String name) { ++ int id = lookupNumber++; ++ String lookupTableId = name + " (" + id + ")"; ++ VtkObjectAdapter vtkObject = new VtkObjectAdapter(lookupTable, VtkObject.LOOKUP_TABLE, lookupTableId, getNextVtkObjectId()); ++ vtkObject.setLocalTypeId(id); ++ vtkObjectHashtable.put(vtkObject.getId(), vtkObject); ++ lookupTableList.addVtkObject(vtkObject); ++ this.setChanged(); ++ this.notifyObservers(vtkObjectHashtable); ++ return vtkObject; ++ } DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,402,13) -- synchronized public VtkObject addScalarBar(vtkScalarBarActor scalarBar, -- String name) { -- int id = scalarBarNumber++; -- String scalarBarId = name + " (" + id + ")"; -- VtkObjectAdapter vtkObject = new VtkObjectAdapter(scalarBar, -- VtkObject.SCALAR_BAR, scalarBarId, getNextVtkObjectId()); -- vtkObject.setLocalTypeId(id); -- vtkObjectHashtable.put(vtkObject.getId(), vtkObject); -- scalarBarList.addVtkObject(vtkObject); -- this.setChanged(); -- this.notifyObservers(vtkObjectHashtable); -- return vtkObject; -- } AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,402,11) ++ synchronized public VtkObject addScalarBar(vtkScalarBarActor scalarBar, String name) { ++ int id = scalarBarNumber++; ++ String scalarBarId = name + " (" + id + ")"; ++ VtkObjectAdapter vtkObject = new VtkObjectAdapter(scalarBar, VtkObject.SCALAR_BAR, scalarBarId, getNextVtkObjectId()); ++ vtkObject.setLocalTypeId(id); ++ vtkObjectHashtable.put(vtkObject.getId(), vtkObject); ++ scalarBarList.addVtkObject(vtkObject); ++ this.setChanged(); ++ this.notifyObservers(vtkObjectHashtable); ++ return vtkObject; ++ } DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,414,15) -- /** -- * add text (i.e 2D) actor into the pipeline manager. -- */ -- synchronized public VtkObject addTxtActor(vtkTextActor txtActor, String name) { -- int id = txtActorNumber++; -- String txtActorId = name + " (" + id + ")"; -- VtkObjectAdapter vtkObject = new VtkObjectAdapter(txtActor, -- VtkObject.TXT_ACTOR, txtActorId, getNextVtkObjectId()); -- vtkObject.setLocalTypeId(id); -- vtkObjectHashtable.put(vtkObject.getId(), vtkObject); -- txtActorList.addVtkObject(vtkObject); -- this.setChanged(); -- this.notifyObservers(vtkObjectHashtable); -- return vtkObject; -- } AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,414,14) ++ /** ++ * add text (i.e 2D) actor into the pipeline manager. ++ */ ++ synchronized public VtkObject addTxtActor(vtkTextActor txtActor, String name) { ++ int id = txtActorNumber++; ++ String txtActorId = name + " (" + id + ")"; ++ VtkObjectAdapter vtkObject = new VtkObjectAdapter(txtActor, VtkObject.TXT_ACTOR, txtActorId, getNextVtkObjectId()); ++ vtkObject.setLocalTypeId(id); ++ vtkObjectHashtable.put(vtkObject.getId(), vtkObject); ++ txtActorList.addVtkObject(vtkObject); ++ this.setChanged(); ++ this.notifyObservers(vtkObjectHashtable); ++ return vtkObject; ++ } DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,429,33) -- /** -- * remove the VtkObject defined by Id for the pipeline manager. -- */ -- synchronized public void removeVtkObject(Integer vtkObjectId) { -- VtkObject vtkObject = (VtkObject) vtkObjectHashtable -- .remove(vtkObjectId); -- if (vtkObject != null) { -- switch (vtkObject.getType()) { -- case VtkObject.ACTOR: -- setActorVisible(vtkObject, false); -- actorList.removeVtkObject(vtkObject); -- break; -- case VtkObject.MAPPER: -- mapperList.removeVtkObject(vtkObject); -- break; -- case VtkObject.DATASET: -- datasetList.removeVtkObject(vtkObject); -- break; -- case VtkObject.FILTER: -- filterList.removeVtkObject(vtkObject); -- break; -- case VtkObject.LOOKUP_TABLE: -- lookupTableList.removeVtkObject(vtkObject); -- break; -- case VtkObject.SCALAR_BAR: -- setActorVisible(vtkObject, false); -- scalarBarList.removeVtkObject(vtkObject); -- break; -- case VtkObject.TXT_ACTOR: -- setActorVisible(vtkObject, false); -- txtActorList.removeVtkObject(vtkObject); -- break; -- } AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,429,32) ++ /** ++ * remove the VtkObject defined by Id for the pipeline manager. ++ */ ++ synchronized public void removeVtkObject(Integer vtkObjectId) { ++ VtkObject vtkObject = (VtkObject) vtkObjectHashtable.remove(vtkObjectId); ++ if (vtkObject != null) { ++ switch (vtkObject.getType()) { ++ case VtkObject.ACTOR: ++ setActorVisible(vtkObject, false); ++ actorList.removeVtkObject(vtkObject); ++ break; ++ case VtkObject.MAPPER: ++ mapperList.removeVtkObject(vtkObject); ++ break; ++ case VtkObject.DATASET: ++ datasetList.removeVtkObject(vtkObject); ++ break; ++ case VtkObject.FILTER: ++ filterList.removeVtkObject(vtkObject); ++ break; ++ case VtkObject.LOOKUP_TABLE: ++ lookupTableList.removeVtkObject(vtkObject); ++ break; ++ case VtkObject.SCALAR_BAR: ++ setActorVisible(vtkObject, false); ++ scalarBarList.removeVtkObject(vtkObject); ++ break; ++ case VtkObject.TXT_ACTOR: ++ setActorVisible(vtkObject, false); ++ txtActorList.removeVtkObject(vtkObject); ++ break; ++ } DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,462,4) -- this.setChanged(); -- this.notifyObservers(vtkObjectHashtable); -- } -- } AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,462,4) ++ this.setChanged(); ++ this.notifyObservers(vtkObjectHashtable); ++ } ++ } DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,467,12) -- /** -- * hide automatically the actor corresponding to the input data set of a -- * filter. -- */ -- synchronized public void hideInputActor(VtkObject actor, -- vtkDataSet vtkDataSet) { -- // we search the actor corresponding to the input dataset, in order to -- // hide it -- int i = 0; -- VtkObject inputPipelineActor = null; -- vtkDataSet inputDataSet = null; -- vtkObject inputActor = null; AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,467,11) ++ /** ++ * hide automatically the actor corresponding to the input data set of a ++ * filter. ++ */ ++ synchronized public void hideInputActor(VtkObject actor, vtkDataSet vtkDataSet) { ++ // we search the actor corresponding to the input dataset, in order to ++ // hide it ++ int i = 0; ++ VtkObject inputPipelineActor = null; ++ vtkDataSet inputDataSet = null; ++ vtkObject inputActor = null; DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,479,16) -- while (((inputDataSet == vtkDataSet) && (inputActor != actor)) != true) { -- inputPipelineActor = (VtkObject) this.getActorList().getElementAt(i); -- inputActor = (vtkObject) inputPipelineActor.getVtkObject(); -- vtkMapper inputMapper = ((vtkActor) inputActor).GetMapper(); -- // because the common abstract mapper class has no getInput -- // method... -- if (inputMapper instanceof vtkDataSetMapper) { -- inputDataSet = ((vtkDataSetMapper) inputMapper).GetInput(); -- } -- if (inputMapper instanceof vtkPolyDataMapper) { -- inputDataSet = ((vtkPolyDataMapper) inputMapper).GetInput(); -- } -- i++; -- } -- setActorVisible(inputPipelineActor, false); -- } AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,479,16) ++ while (((inputDataSet == vtkDataSet) && (inputActor != actor)) != true) { ++ inputPipelineActor = (VtkObject) this.getActorList().getElementAt(i); ++ inputActor = (vtkObject) inputPipelineActor.getVtkObject(); ++ vtkMapper inputMapper = ((vtkActor) inputActor).GetMapper(); ++ // because the common abstract mapper class has no getInput ++ // method... ++ if (inputMapper instanceof vtkDataSetMapper) { ++ inputDataSet = ((vtkDataSetMapper) inputMapper).GetInput(); ++ } ++ if (inputMapper instanceof vtkPolyDataMapper) { ++ inputDataSet = ((vtkPolyDataMapper) inputMapper).GetInput(); ++ } ++ i++; ++ } ++ setActorVisible(inputPipelineActor, false); ++ } DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,496,6) -- /** -- * remove the VtkObject defined by the vtkObject for the pipeline manager -- */ -- synchronized public void removeVtkObject(VtkObject vtkObject) { -- removeVtkObject(vtkObject.getId()); -- } AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,496,6) ++ /** ++ * remove the VtkObject defined by the vtkObject for the pipeline manager ++ */ ++ synchronized public void removeVtkObject(VtkObject vtkObject) { ++ removeVtkObject(vtkObject.getId()); ++ } DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,504,1) -- * returns the viewer of Cassandra (i.e panel and renderer). AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,504,1) ++ * returns the viewer of Cassandra (i.e panel and renderer). DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,506,3) -- public CassandraView getCassandraView() { -- return view; -- } AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,506,3) ++ public CassandraView getCassandraView() { ++ return view; ++ } DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,510,6) -- /** -- * set the axis arrows visible or not. -- */ -- public void setAxisVisible(boolean viewAxis) { -- axes.setVisible(viewAxis); -- } AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,510,6) ++ /** ++ * set the axis arrows visible or not. ++ */ ++ public void setAxisVisible(boolean viewAxis) { ++ axes.setVisible(viewAxis); ++ } DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,517,15) -- /** -- * Set the projection parallel (i.e no perspective) or not. -- * -- * @param setParallel -- */ -- public void setParallelProjection(boolean setParallel) { -- int flag = 0; -- if (setParallel) { -- flag = 1; -- } else { -- flag = 0; -- } -- getCassandraView().GetRenderer().GetActiveCamera() -- .SetParallelProjection(flag); -- } AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,517,14) ++ /** ++ * Set the projection parallel (i.e no perspective) or not. ++ * ++ * @param setParallel ++ */ ++ public void setParallelProjection(boolean setParallel) { ++ int flag = 0; ++ if (setParallel) { ++ flag = 1; ++ } else { ++ flag = 0; ++ } ++ getCassandraView().GetRenderer().GetActiveCamera().SetParallelProjection(flag); ++ } DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,532,7) -- /** -- * requests an update (refresh) of the renderer and continues without -- * waiting this update. -- */ -- public void validateViewAndGo() { -- getCassandraView().validateViewAndGo(); -- } AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,532,7) ++ /** ++ * requests an update (refresh) of the renderer and continues without ++ * waiting this update. ++ */ ++ public void validateViewAndGo() { ++ getCassandraView().validateViewAndGo(); ++ } DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,540,3) -- public void validateViewAndWait() { -- getCassandraView().validateViewAndWait(); -- } AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,540,3) ++ public void validateViewAndWait() { ++ getCassandraView().validateViewAndWait(); ++ } DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,544,3) -- public void deepValidateView() { -- getCassandraView().deepValidateView(); -- } AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,544,3) ++ public void deepValidateView() { ++ getCassandraView().deepValidateView(); ++ } DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,548,3) -- synchronized public void addConnectivityListener(ConnectivityListener l) { -- connectivityListener.add(l); -- } AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,548,3) ++ synchronized public void addConnectivityListener(ConnectivityListener l) { ++ connectivityListener.add(l); ++ } DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,552,5) -- public void notifyConnectivityChange(VtkObject obj) { -- for (Iterator i = connectivityListener.iterator(); i.hasNext();) { -- ((ConnectivityListener) i.next()).connectivityChange(obj); -- } -- } AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,552,5) ++ public void notifyConnectivityChange(VtkObject obj) { ++ for (Iterator i = connectivityListener.iterator(); i.hasNext();) { ++ ((ConnectivityListener) i.next()).connectivityChange(obj); ++ } ++ } DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,558,7) -- synchronized public void removeConnectivityListener(ConnectivityListener l) { -- connectivityListener.remove(l); -- } -- -- public int getNbVtkObjects(){ -- return(vtkObjectHashtable.size()); -- } AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,558,94) ++ synchronized public void removeConnectivityListener(ConnectivityListener l) { ++ connectivityListener.remove(l); ++ } ++ ++ public int getNbVtkObjects() { ++ return (vtkObjectHashtable.size()); ++ } ++ ++ /** ++ * return the Cassandra's VtkObject Wrapping of the given real vtkObject. ++ */ ++ @Override ++ public VtkObject getCassandraVtkObjectByTrueVtkObject(vtkObject obj) { ++ Iterator tmpIterator; ++ ++ // if the object is an actor ++ if (obj instanceof vtkActor) { ++ tmpIterator = actorList.getData().iterator(); ++ while (tmpIterator.hasNext()) { ++ VtkObject pipelineObj = (VtkObject) tmpIterator.next(); ++ if (pipelineObj.getVtkObject().equals(obj)) { ++ return (pipelineObj); ++ } ++ } ++ } ++ ++ // if the object is a mapper ++ if (obj instanceof vtkMapper) { ++ tmpIterator = mapperList.getData().iterator(); ++ while (tmpIterator.hasNext()) { ++ VtkObject pipelineObj = (VtkObject) tmpIterator.next(); ++ if (pipelineObj.getVtkObject().equals(obj)) { ++ return (pipelineObj); ++ } ++ } ++ } ++ ++ // if the object is a dataSet ++ if (obj instanceof vtkDataSet) { ++ tmpIterator = datasetList.getData().iterator(); ++ while (tmpIterator.hasNext()) { ++ VtkObject pipelineObj = (VtkObject) tmpIterator.next(); ++ if (pipelineObj.getVtkObject().equals(obj)) { ++ return (pipelineObj); ++ } ++ } ++ } ++ ++ // if the object is vtkAlgorithm ++ if (obj instanceof vtkAlgorithm) { ++ tmpIterator = filterList.getData().iterator(); ++ while (tmpIterator.hasNext()) { ++ VtkObject pipelineObj = (VtkObject) tmpIterator.next(); ++ if (pipelineObj.getVtkObject().equals(obj)) { ++ return (pipelineObj); ++ } ++ } ++ } ++ ++ // if the object is a lookUpTable ++ if (obj instanceof vtkLookupTable) { ++ tmpIterator = lookupTableList.getData().iterator(); ++ while (tmpIterator.hasNext()) { ++ VtkObject pipelineObj = (VtkObject) tmpIterator.next(); ++ if (pipelineObj.getVtkObject().equals(obj)) { ++ return (pipelineObj); ++ } ++ } ++ } ++ ++ // if the object is a scalarBarList ++ if (obj instanceof vtkScalarBarActor) { ++ tmpIterator = scalarBarList.getData().iterator(); ++ while (tmpIterator.hasNext()) { ++ VtkObject pipelineObj = (VtkObject) tmpIterator.next(); ++ if (pipelineObj.getVtkObject().equals(obj)) { ++ return (pipelineObj); ++ } ++ } ++ } ++ ++ // if the object is a text ++ if (obj instanceof vtkTextActor) { ++ tmpIterator = txtActorList.getData().iterator(); ++ while (tmpIterator.hasNext()) { ++ VtkObject pipelineObj = (VtkObject) tmpIterator.next(); ++ if (pipelineObj.getVtkObject().equals(obj)) { ++ return (pipelineObj); ++ } ++ } ++ } ++ ++ return null; ++ } DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/VtkObjectAdapter.java,30,1) -- * @version 1.1 AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/VtkObjectAdapter.java,30,1) ++ * @version 1.2 AddBlock(Plugins/CellCenter/src/com/artenum/cassandra/plugin/cellcenter/CellCenterPlugin.java,236,1) ++ @Override DelBlock(Plugins/CellCenter/src/com/artenum/cassandra/plugin/cellcenter/CellCenterPlugin.java,242,5) -- public void updatePlugIn(CassandraPlugInProperty prop) { -- // TODO Auto-generated method stub -- -- } -- AddBlock(Plugins/CellCenter/src/com/artenum/cassandra/plugin/cellcenter/CellCenterPlugin.java,242,1) ++ @Override AddBlock(Plugins/CellCenter/src/com/artenum/cassandra/plugin/cellcenter/CellCenterPlugin.java,246,6) ++ ++ @Override ++ public void initAndUpdate(CassandraPlugInProperty prop) { ++ // TODO Auto-generated method stub ++ ++ } AddBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClipingPlanePlugInProperty.java,5,2) ++ import vtk.vtkObject; ++ DelBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClipingPlanePlugInProperty.java,9,1) -- public class ClipingPlanePlugInProperty implements CassandraPlugInProperty{ AddBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClipingPlanePlugInProperty.java,9,1) ++ public class ClipingPlanePlugInProperty implements CassandraPlugInProperty { DelBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClipingPlanePlugInProperty.java,11,2) -- HashMap propList; -- AddBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClipingPlanePlugInProperty.java,11,3) ++ private String name; ++ private HashMap propList; ++ AddBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClipingPlanePlugInProperty.java,16,1) ++ DelBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClipingPlanePlugInProperty.java,18,3) -- -- public void addPropety(Object key, Object prop) { -- propList.put(key, prop); AddBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClipingPlanePlugInProperty.java,18,4) ++ ++ @Override ++ public void put(Object key, Object prop) { ++ propList.put(key, prop); DelBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClipingPlanePlugInProperty.java,24,1) -- public Object getProperty(Object key) { AddBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClipingPlanePlugInProperty.java,24,2) ++ @Override ++ public Object get(Object key) { AddBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClipingPlanePlugInProperty.java,29,52) ++ @Override ++ public Object getSafely(Object key, Object defaultValue) { ++ ++ if (this.containsKey(key)) { ++ return(this.get(key)); ++ } else { ++ System.err.println("key " + key.toString() + " not found. Value set to default"); ++ return(defaultValue); ++ } ++ } ++ ++ @Override ++ public double getSafely(Object key, double defaultValue){ ++ try{ ++ return( ((Double) getSafely(key, new Double(defaultValue))).doubleValue()); ++ }catch (Exception e) { ++ System.err.println("Property not understood or impossible to cast. Set to the default value"); ++ return(defaultValue); ++ } ++ } ++ ++ @Override ++ public int getSafely(Object key, int defaultValue){ ++ try{ ++ return( ((Integer) getSafely(key, new Integer(defaultValue))).intValue()); ++ }catch (Exception e) { ++ System.err.println("Property not understood or impossible to cast. Set to the default value"); ++ return(defaultValue); ++ } ++ } ++ ++ @Override ++ public float getSafely(Object key, float defaultValue){ ++ try{ ++ return( ((Float) getSafely(key, new Float(defaultValue))).floatValue()); ++ }catch (Exception e) { ++ System.err.println("Property not understood or impossible to cast. Set to the default value"); ++ return(defaultValue); ++ } ++ } ++ ++ ++ ++ @Override ++ public HashMap getPropertyMap() { ++ return propList; ++ } ++ ++ @Override ++ public boolean containsKey(Object key) { ++ return (propList.containsKey(key)); ++ } DelBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlaneControlUI.java,62,1) -- * @version 0.1 AddBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlaneControlUI.java,62,2) ++ * @author Julien Forest, ARTENUM SARL ++ * @version 1.2 AddBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlaneControlUI.java,191,4) ++ ++ public void update3DWidgetStatus(){ ++ plugin.show3DWidget(widgetCheckBox.isSelected()); ++ } AddBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlaneControlUI.java,210,4) ++ public void setSelectedInput(VtkObject selectedInput){ ++ input.setSelectedItem(selectedInput); ++ } ++ AddBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlaneControlUI.java,246,2) ++ //widgetCheckBox.setSelected(false); ++ plugin.show3DWidget(false); DelBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlaneControlUI.java,254,1) -- * when the sldie bar is changed. AddBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlaneControlUI.java,254,1) ++ * when the slide bar is changed. AddBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlaneControlUI.java,281,6) ++ ++ public void setNormalFieldsValues(double nx, double ny, double nz) { ++ normalX.setValue(nx); ++ normalY.setValue(ny); ++ normalZ.setValue(nz); ++ } AddBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlaneControlUI.java,297,6) ++ ++ public void setOrigineFieldsValues(double cx, double cy, double cz) { ++ centerX.setValue(cx); ++ centerY.setValue(cy); ++ centerZ.setValue(cz); ++ } AddBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,24,1) ++ import vtk.vtkDataObject; AddBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,37,1) ++ import java.util.ArrayList; DelBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,72,1) -- * @version 0.5 AddBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,72,1) ++ * @version 1.2 DelBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,93,1) -- private vtkScalarBarActor scalBar; AddBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,103,16) ++ private boolean loadOutputPipelineComponents = true; ++ ++ public static final String PERSISTENCE_KEY_CX = "persistence.key.cx"; ++ public static final String PERSISTENCE_KEY_CY = "persistence.key.cy"; ++ public static final String PERSISTENCE_KEY_CZ = "persistence.key.cz"; ++ public static final String PERSISTENCE_KEY_NX = "persistence.key.nx"; ++ public static final String PERSISTENCE_KEY_NY = "persistence.key.ny"; ++ public static final String PERSISTENCE_KEY_NZ = "persistence.key.nz"; ++ public static final String PERSISTENCE_KEY_INPUT_DATASET = "persistence.key.inputVtkDataSet"; ++ public static final String PERSISTENCE_KEY_INOUT = "persistence.key.insideOut"; ++ public static final String PERSISTENCE_KEY_OUPUT_DATASET = "persistence.key.outputDataSet"; ++ public static final String PERSISTENCE_KEY_OUPUT_MAPPER = "persistence.key.outputMapper"; ++ public static final String PERSISTENCE_KEY_OUPUT_LOOKUP_TABLE = "persistence.key.outputlookUpTable"; ++ public static final String PERSISTENCE_KEY_OUTPUT_ACTOR = "persistence.key.outputActor"; ++ public static final String PERSISTENCE_KEY_OUTPUT_SCALAR_BAR = "persistence.key.ouputScalarBar"; ++ AddBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,148,15) ++ /** ++ * Default constructor as used during the instantiation in Cassandra. ++ * ++ * @param pipelineManager ++ * @param pluginManager ++ * @param owner ++ * @param initPipeline ++ */ ++ public ClippingPlanePlugin(PipeLineManager pipelineManager, PluginManager pluginManager, Frame owner, int initPipeline) { ++ initPlugIn(pipelineManager, pluginManager, owner); ++ if (initPipeline == 1) { ++ initPipeline(); ++ } ++ } ++ DelBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,172,1) -- filterImpl.setRelatedPluginClass(this.getClass()); AddBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,172,1) ++ filterImpl.setParentPlugin(this); AddBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,183,1) ++ controlUI.update3DWidgetStatus(); DelBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,196,1) -- DelBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,197,1) -- DelBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,200,2) -- if (plane == null){ -- plane = new vtkPlane(); AddBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,200,2) ++ if (plane == null) { ++ plane = new vtkPlane(); DelBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,206,2) -- if (planeClip == null){ -- planeClip = new vtkClipDataSet(); AddBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,206,5) ++ if (planeClip == null) { ++ planeClip = new vtkClipDataSet(); ++ dataset = pipelineManager.addDataSet(planeClip.GetOutput(), "Clipping Plane Output"); ++ } else { ++ dataset = pipelineManager.getCassandraVtkObjectByTrueVtkObject(planeClip); DelBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,214,2) -- if(cutMapper == null){ -- cutMapper = new vtkDataSetMapper(); AddBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,214,5) ++ if (cutMapper == null) { ++ cutMapper = new vtkDataSetMapper(); ++ mapper = pipelineManager.addMapper(cutMapper, "Clipping plane Mapper"); ++ } else { ++ mapper = pipelineManager.getCassandraVtkObjectByTrueVtkObject(cutMapper); DelBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,229,2) -- if(cutActor == null){ -- cutActor = new vtkActor(); AddBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,229,5) ++ if (cutActor == null) { ++ cutActor = new vtkActor(); ++ actor = pipelineManager.addActor(cutActor, "Clipping plane Actor"); ++ } else { ++ actor = pipelineManager.getCassandraVtkObjectByTrueVtkObject(cutActor); DelBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,238,2) -- if(lookupTable == null){ -- lookupTable = new vtkLookupTable(); AddBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,238,3) ++ if (lookupTable == null) { ++ lookupTable = new vtkLookupTable(); ++ pipelineManager.addLookupTable(lookupTable, "Clipping plane"); DelBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,248,2) -- scalBar = new vtkScalarBarActor(); -- scalBar.SetLookupTable(lookupTable); AddBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,248,5) ++ if (scalarBar == null) { ++ scalarBar = new vtkScalarBarActor(); ++ pipelineManager.addScalarBar(scalarBar, "Clipping plane"); ++ scalarBar.SetLookupTable(lookupTable); ++ } DelBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,255,3) -- actor = pipelineManager.addActor(cutActor, "Clipping plane Actor"); -- mapper = pipelineManager.addMapper(cutMapper, "Clipping plane Mapper"); -- dataset = pipelineManager.addDataSet(planeClip.GetOutput(), "Clipping Plane Output"); DelBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,257,6) -- // adding the vtk components to the pipeline -- pipelineManager.addLookupTable(lookupTable, "Clipping plane"); -- pipelineManager.addScalarBar(scalBar, "Clipping plane"); -- // pipelineManager.setActorVisible(pipelineManager.addScalarBar(scalBar, -- // "Clipping plane"), true); -- DelBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,264,1) -- // /controlUI.setVisible(true); Since 1.2, done in the Intanciation AddBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,264,1) ++ // /controlUI.setVisible(true); Since 1.2, done in the instantiation DelBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,273,1) -- AddBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,273,1) ++ DelBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,275,1) -- * Set the internal component from an external pipeline like in the Jython script relading procedure. AddBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,275,3) ++ * Set the internal component from an external pipeline like in the Jython ++ * script reloading procedure. ++ * DelBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,283,1) -- public void setPipelineComponents(vtkPlane plane, vtkClipDataSet planeClip, vtkDataSetMapper cutMapper, vtkActor cutActor){ AddBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,283,1) ++ public void setInternalPipelineComponents(vtkPlane plane, vtkClipDataSet planeClip, vtkDataSetMapper cutMapper, vtkActor cutActor) { DelBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,286,2) -- this.cutMapper = cutMapper; -- this.cutActor = cutActor; DelBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,288,2) -- -- DelBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,377,1) -- DelBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,381,2) -- // planWidget.PlaceWidget(lastDataSet.GetBounds()); -- AddBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,384,1) ++ if (planWidget != null) { AddBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,386,1) ++ } DelBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,401,5) -- // why, -- // apparently -- // needed, at -- // least under -- // MacOSX and AddBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,401,1) ++ // why, apparently needed, at least under MacOSX and DelBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,459,2) -- * generic method of update of the current clipping using a CassandraPlugInProperty. This update the setting of the -- * plug-in and call the updateClippingPlane method. AddBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,459,3) ++ * generic method of update of the current clipping using a ++ * CassandraPlugInProperty. This update the setting of the plug-in and call ++ * the updateClippingPlane method. DelBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,463,9) -- public void updatePlugIn(CassandraPlugInProperty prop) { -- try{ -- this.updateClippingPlane( ((Double) prop.getProperty("cx")).doubleValue(), ((Double) prop.getProperty("cy")).doubleValue(), ((Double) prop.getProperty("cz")).doubleValue(), -- ((Double)prop.getProperty("nx")).doubleValue(), ((Double)prop.getProperty("ny")).doubleValue(), ((Double)prop.getProperty("nz")).doubleValue(), -- (vtkDataSet)prop.getProperty("vtkDataSet"), ((Boolean)prop.getProperty("insideOut")).booleanValue() ); -- }catch (Exception e) { -- System.out.println("Error, property not understood."); -- } -- } AddBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,463,5) ++ @Override ++ public void initAndUpdate(CassandraPlugInProperty prop) { ++ double cx = 0; ++ double cy = 0; ++ double cz = 0; AddBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,469,37) ++ double nx = 0; ++ double ny = 0; ++ double nz = 0; ++ ++ vtkDataSet dataSet; ++ ++ boolean inOut = false; ++ ++ cx = prop.getSafely(PERSISTENCE_KEY_CX, 0.0); ++ cy = prop.getSafely(PERSISTENCE_KEY_CY, 0.0); ++ cz = prop.getSafely(PERSISTENCE_KEY_CZ, 0.0); ++ ++ nx = prop.getSafely(PERSISTENCE_KEY_NX, 1.0); ++ ny = prop.getSafely(PERSISTENCE_KEY_NY, 0.0); ++ nz = prop.getSafely(PERSISTENCE_KEY_NZ, 0.0); ++ ++ this.planeClip = new vtkClipDataSet(); ++ this.planeClip.SetOutput((vtkDataObject) prop.getSafely(PERSISTENCE_KEY_OUPUT_DATASET, null)); //FIXME ++ inOut = ((Integer) prop.getSafely(PERSISTENCE_KEY_INOUT, ((Integer) planeClip.GetInsideOut() == 1)) == 1); ++ dataSet = (vtkDataSet) prop.getSafely(PERSISTENCE_KEY_INPUT_DATASET, (vtkDataSet) (planeClip.GetInput())); ++ ++ this.lookupTable = (vtkLookupTable) prop.getSafely(PERSISTENCE_KEY_OUPUT_LOOKUP_TABLE, null); //FIXME ++ this.cutMapper = (vtkDataSetMapper) prop.getSafely(PERSISTENCE_KEY_OUPUT_MAPPER, null); //FIXME ++ this.cutActor = (vtkActor) prop.getSafely(PERSISTENCE_KEY_OUTPUT_ACTOR, null); //FIXME ++ this.scalarBar = (vtkScalarBarActor) prop.getSafely(PERSISTENCE_KEY_OUTPUT_SCALAR_BAR, null); //FIXME ++ ++ // because their are already loaded now ++ loadOutputPipelineComponents = false; ++ ++ this.initPipeline(); ++ controlUI.setNormalFieldsValues(nx, ny, nz); ++ controlUI.setOrigineFieldsValues(cx, cy, cz); ++ controlUI.setSelectedInput(dataset); ++ this.updateClippingPlane(cx, cy, cy, nx, ny, cy, dataSet, inOut); ++ } ++ ++ AddBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,509,1) ++ @Override DelBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,511,1) -- AddBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,511,1) ++ DelBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,513,13) -- -- prop.addPropety("cx", new Double(plane.GetOrigin()[0])); -- prop.addPropety("cy", new Double(plane.GetOrigin()[1])); -- prop.addPropety("cz", new Double(plane.GetOrigin()[2])); -- -- prop.addPropety("nx", new Double(plane.GetNormal()[0])); -- prop.addPropety("ny", new Double(plane.GetNormal()[0])); -- prop.addPropety("nz", new Double(plane.GetNormal()[0])); -- -- prop.addPropety("vtkDataSet", planeClip.GetInput()); -- -- prop.addPropety("insideOut", new Boolean( (planeClip.GetInsideOut() == 1) )); -- AddBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,513,17) ++ ++ prop.put(PERSISTENCE_KEY_CX, new Double(plane.GetOrigin()[0])); ++ prop.put(PERSISTENCE_KEY_CY, new Double(plane.GetOrigin()[1])); ++ prop.put(PERSISTENCE_KEY_CZ, new Double(plane.GetOrigin()[2])); ++ ++ prop.put(PERSISTENCE_KEY_NX, new Double(plane.GetNormal()[0])); ++ prop.put(PERSISTENCE_KEY_NY, new Double(plane.GetNormal()[1])); ++ prop.put(PERSISTENCE_KEY_NZ, new Double(plane.GetNormal()[2])); ++ ++ prop.put(PERSISTENCE_KEY_INPUT_DATASET, planeClip.GetInput()); ++ prop.put(PERSISTENCE_KEY_INOUT, planeClip.GetInsideOut()); ++ prop.put(PERSISTENCE_KEY_OUPUT_DATASET, this.planeClip.GetOutput()); ++ prop.put(PERSISTENCE_KEY_OUPUT_MAPPER, this.cutMapper); ++ prop.put(PERSISTENCE_KEY_OUPUT_LOOKUP_TABLE, this.lookupTable); ++ prop.put(PERSISTENCE_KEY_OUTPUT_ACTOR, this.cutActor); ++ prop.put(PERSISTENCE_KEY_OUTPUT_SCALAR_BAR, this.scalarBar); ++ AddBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,532,2) ++ ++ DelBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/InstanciationManager.java,40,1) -- // to see the controler automatically AddBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/InstanciationManager.java,40,1) ++ // to see the controller automatically AddBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlaneControlUI.java,205,5) ++ ++ public void update3DWidgetStatus(){ ++ plugin.show3DWidget(widgetCheckBox.isSelected()); ++ } ++ AddBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlaneControlUI.java,253,2) ++ plugin.show3DWidget(false); ++ widgetCheckBox.isSelected(); AddBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlanePlugin.java,126,1) ++ controlUI.update3DWidgetStatus(); DelBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlanePlugin.java,354,4) -- public void updatePlugIn(CassandraPlugInProperty prop) { -- // TODO Auto-generated method stub -- -- } AddBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlanePlugin.java,355,1) ++ AddBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlanePlugin.java,359,6) ++ ++ ++ @Override ++ public void initAndUpdate(CassandraPlugInProperty prop) { ++ // TODO Auto-generated method stub ++ AddBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlanePlugin.java,366,2) ++ ++ } DelBlock(Plugins/Default/src/com/artenum/cassandra/plugin/defaults/CubeAxis.java,210,4) -- public void updatePlugIn(CassandraPlugInProperty prop) { -- // TODO Auto-generated method stub -- -- } AddBlock(Plugins/Default/src/com/artenum/cassandra/plugin/defaults/CubeAxis.java,217,6) ++ ++ @Override ++ public void initAndUpdate(CassandraPlugInProperty prop) { ++ // TODO Auto-generated method stub ++ ++ } AddBlock(Plugins/DynamicDataset/src/com/artenum/cassandra/plugin/dynamic/dataset/DynamicDatasetPlugin.java,286,1) ++ @Override DelBlock(Plugins/DynamicDataset/src/com/artenum/cassandra/plugin/dynamic/dataset/DynamicDatasetPlugin.java,292,4) -- public void updatePlugIn(CassandraPlugInProperty prop) { -- // TODO Auto-generated method stub -- -- } AddBlock(Plugins/DynamicDataset/src/com/artenum/cassandra/plugin/dynamic/dataset/DynamicDatasetPlugin.java,293,4) ++ /** ++ * return the control panel of the current plug-in. ++ */ ++ @Override AddBlock(Plugins/DynamicDataset/src/com/artenum/cassandra/plugin/dynamic/dataset/DynamicDatasetPlugin.java,300,6) ++ ++ @Override ++ public void initAndUpdate(CassandraPlugInProperty prop) { ++ // TODO Auto-generated method stub ++ ++ } AddBlock(Plugins/GenericCutter/src/com/artenum/cassandra/plugin/cutter/CutterPlugin.java,388,1) ++ @Override DelBlock(Plugins/GenericCutter/src/com/artenum/cassandra/plugin/cutter/CutterPlugin.java,394,4) -- public void updatePlugIn(CassandraPlugInProperty prop) { -- // TODO Auto-generated method stub -- -- } AddBlock(Plugins/GenericCutter/src/com/artenum/cassandra/plugin/cutter/CutterPlugin.java,395,1) ++ @Override AddBlock(Plugins/GenericCutter/src/com/artenum/cassandra/plugin/cutter/CutterPlugin.java,399,6) ++ ++ @Override ++ public void initAndUpdate(CassandraPlugInProperty prop) { ++ // TODO Auto-generated method stub ++ ++ } AddBlock(Plugins/Glyph/src/com/artenum/cassandra/plugin/glyph/GlyphPlugin.java,288,1) ++ @Override DelBlock(Plugins/Glyph/src/com/artenum/cassandra/plugin/glyph/GlyphPlugin.java,294,1) -- public void updatePlugIn(CassandraPlugInProperty prop) { AddBlock(Plugins/Glyph/src/com/artenum/cassandra/plugin/glyph/GlyphPlugin.java,294,2) ++ @Override ++ public void initAndUpdate(CassandraPlugInProperty prop) { DelBlock(Plugins/Info2D/src/com/artenum/cassandra/plugin/info2d/Infos2DPlugin.java,225,1) -- public void updatePlugIn(CassandraPlugInProperty prop) { AddBlock(Plugins/Info2D/src/com/artenum/cassandra/plugin/info2d/Infos2DPlugin.java,225,3) ++ ++ @Override ++ public void initAndUpdate(CassandraPlugInProperty prop) { AddBlock(Plugins/IsoLevel/src/com/artenum/cassandra/plugin/isolevel/IsoLevelPlugin.java,298,1) ++ @Override DelBlock(Plugins/IsoLevel/src/com/artenum/cassandra/plugin/isolevel/IsoLevelPlugin.java,304,1) -- public void updatePlugIn(CassandraPlugInProperty prop) { AddBlock(Plugins/IsoLevel/src/com/artenum/cassandra/plugin/isolevel/IsoLevelPlugin.java,304,3) ++ ++ @Override ++ public void initAndUpdate(CassandraPlugInProperty prop) { AddBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLineControlUI.java,303,1) ++ plugin.show3DWidget(false); AddBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLineControlUI.java,310,4) ++ public void update3DWidgetStatus(){ ++ plugin.show3DWidget(widgetCheckBox.isSelected()); ++ } ++ DelBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLinePlugin.java,45,7) -- * Project ref : CASSANDRA project -- * Copyright and license : See relevant sections -- * Status : under development -- * Creation : 04/03/2005 -- * Modification : -- * -- * Description : AddBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLinePlugin.java,45,6) ++ * Project ref : CASSANDRA project ++ * Copyright and license : See relevant sections ++ * Status : under development ++ * Creation : 04/03/2005 ++ * Modification : ++ * Description : DelBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLinePlugin.java,53,1) -- * AddBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLinePlugin.java,53,1) ++ * DelBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLinePlugin.java,56,2) -- * Version number Author (name, e-mail) Corrections/Modifications -- * 0.1 Julien Forest, j.forest@artenum.com Creation AddBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLinePlugin.java,56,10) ++ * ++ * Version number ++ * Author (name, e-mail) ++ * Corrections/Modifications ++ * ++ * ++ * 0.1 ++ * Julien Forest, j.forest@artenum.com ++ * Creation ++ * DelBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLinePlugin.java,67,3) -- * -- * @author Julien Forest, ARTENUM SARL -- * @version 1.2 AddBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLinePlugin.java,67,3) ++ * ++ * @author Julien Forest, ARTENUM SARL ++ * @version 1.2 DelBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLinePlugin.java,86,1) -- private JDialog plotDialog; // we use a JDialog to keep the window on the front AddBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLinePlugin.java,86,2) ++ private JDialog plotDialog; // we use a JDialog to keep the window on the ++ // front DelBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLinePlugin.java,106,1) -- DelBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLinePlugin.java,123,4) -- public void actionPerformed(ActionEvent e) { -- controlUI.setVisible(true); -- } -- }); AddBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLinePlugin.java,123,5) ++ public void actionPerformed(ActionEvent e) { ++ controlUI.setVisible(true); ++ controlUI.update3DWidgetStatus(); ++ } ++ }); DelBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLinePlugin.java,132,4) -- public void actionPerformed(ActionEvent e) { -- remove(); -- } -- }); AddBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLinePlugin.java,132,4) ++ public void actionPerformed(ActionEvent e) { ++ remove(); ++ } ++ }); DelBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLinePlugin.java,187,2) -- //actor.setValide(false); -- AddBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLinePlugin.java,187,2) ++ // actor.setValide(false); ++ DelBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLinePlugin.java,192,1) -- * update the processing done on inputDataSet. AddBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLinePlugin.java,192,1) ++ * update the processing done on inputDataSet. DelBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLinePlugin.java,236,1) -- //System.out.println(abscisse[0] + " " + abscisse[1] + " " + abscisse[2] + " " + abscisse[3] + " " + abscisse[4]); AddBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLinePlugin.java,236,2) ++ // System.out.println(abscisse[0] + " " + abscisse[1] + " " + ++ // abscisse[2] + " " + abscisse[3] + " " + abscisse[4]); DelBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLinePlugin.java,239,1) -- y.add( (double) probe.GetOutput().GetPointData().GetScalars().GetTuple1(i)); AddBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLinePlugin.java,239,1) ++ y.add((double) probe.GetOutput().GetPointData().GetScalars().GetTuple1(i)); DelBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLinePlugin.java,245,2) -- -- // Set the default actor visible by default and automatically hide the source one AddBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLinePlugin.java,245,3) ++ ++ // Set the default actor visible by default and automatically hide ++ // the source one DelBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLinePlugin.java,251,3) -- // not always relevant. -- //pipelineManager.hideInputActor(actor, inputDataSet); -- AddBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLinePlugin.java,251,3) ++ // not always relevant. ++ // pipelineManager.hideInputActor(actor, inputDataSet); ++ DelBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLinePlugin.java,255,4) -- if (lineWidget != null){ -- // then we orient the widgetLine like the source line -- lineWidget.SetPoint1(line.GetPoint1()); -- lineWidget.SetPoint2(line.GetPoint2()); AddBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLinePlugin.java,255,4) ++ if (lineWidget != null) { ++ // then we orient the widgetLine like the source line ++ lineWidget.SetPoint1(line.GetPoint1()); ++ lineWidget.SetPoint2(line.GetPoint2()); DelBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLinePlugin.java,264,2) -- * Export the probed data into ASCII colums-raw based format as follow -- * index x y z s value AddBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLinePlugin.java,264,2) ++ * Export the probed data into ASCII colums-raw based format as follow index ++ * x y z s value DelBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLinePlugin.java,267,6) -- * Where: -- * - index: index of the value -- * - x, y, z: 3D absolute coordinates of the value in the coordinate system of the entry -- * data set. -- * - s: curvilineare coordinate along the line. -- * - value: the value. AddBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLinePlugin.java,267,3) ++ * Where: - index: index of the value - x, y, z: 3D absolute coordinates of ++ * the value in the coordinate system of the entry data set. - s: ++ * curvilineare coordinate along the line. - value: the value. DelBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLinePlugin.java,288,2) -- fw.write(abscisse[0] + " " + abscisse[1] + " " + abscisse[2] + " " + abscisse[3] + " " + abscisse[4] + " " + -- probe.GetOutput().GetPointData().GetScalars().GetTuple1(i) + "\n"); AddBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLinePlugin.java,288,2) ++ fw.write(abscisse[0] + " " + abscisse[1] + " " + abscisse[2] + " " + abscisse[3] + " " + abscisse[4] + " " ++ + probe.GetOutput().GetPointData().GetScalars().GetTuple1(i) + "\n"); DelBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLinePlugin.java,302,1) -- * Compute the curvilinear abscissa. AddBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLinePlugin.java,302,2) ++ * Compute the curvilinear abscissa. ++ * DelBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLinePlugin.java,365,2) -- -- AddBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLinePlugin.java,365,1) ++ AddBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLinePlugin.java,368,1) ++ * DelBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLinePlugin.java,371,12) -- void show3DWidget(boolean b){ -- -- if ( b){ -- if (lineWidget == null){ -- init3DWidget(); -- } -- //planWidget.PlaceWidget(lastDataSet.GetBounds()); -- -- lineWidget.On(); -- } else{ -- lineWidget.Off(); -- } AddBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLinePlugin.java,371,12) ++ void show3DWidget(boolean b) { ++ ++ if (b) { ++ if (lineWidget == null) { ++ init3DWidget(); ++ } ++ // planWidget.PlaceWidget(lastDataSet.GetBounds()); ++ ++ lineWidget.On(); ++ } else { ++ lineWidget.Off(); ++ } DelBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLinePlugin.java,384,1) -- AddBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLinePlugin.java,384,1) ++ DelBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLinePlugin.java,386,1) -- * Initialise the 3D control widget. AddBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLinePlugin.java,386,1) ++ * Initialise the 3D control widget. DelBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLinePlugin.java,388,30) -- void init3DWidget(){ -- -- //System.out.println("initialisation of the widget"); -- lineWidget = new vtkLineWidget(); -- lineWidget.SetInteractor(pipelineManager.getCassandraView().getIren()); -- -- // to make the interaction ON and be able yto control the widget -- lineWidget.EnabledOn(); -- pipelineManager.getCassandraView().deepValidateView(); //Don t ask me why, apparently needed, at least under MacOSX and -- //default swing LAF, to activate the widget interactor. -- -- // size the plan on the input data set. Should be done in first -- // to allow the plan orientation AFTER. -- lineWidget.SetInput(lastDataSet); -- lineWidget.SetPlaceFactor(1.2); -- lineWidget.PlaceWidget(); -- -- // then we orient the widgetLine like the source line -- lineWidget.SetPoint1(line.GetPoint1()); -- lineWidget.SetPoint2(line.GetPoint2()); -- -- -- // we add the local observer for interaction events, i.e the method name -- // in last argument of the current object. -- lineWidget.AddObserver("InteractionEvent", this,"interactionCallBack"); -- -- // both not needed. -- //planWidget.AddObserver("CharEvent", this, "widgetCharEvent"); -- //planWidget.AddObserver("StartInteractionEvent", this, "startInteractionCallBack"); -- AddBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLinePlugin.java,388,35) ++ void init3DWidget() { ++ ++ // System.out.println("initialisation of the widget"); ++ lineWidget = new vtkLineWidget(); ++ lineWidget.SetInteractor(pipelineManager.getCassandraView().getIren()); ++ ++ // to make the interaction ON and be able yto control the widget ++ lineWidget.EnabledOn(); ++ pipelineManager.getCassandraView().deepValidateView(); // Don t ask me ++ // why, ++ // apparently ++ // needed, at ++ // least under ++ // MacOSX and ++ // default swing LAF, to activate the widget interactor. ++ ++ // size the plan on the input data set. Should be done in first ++ // to allow the plan orientation AFTER. ++ lineWidget.SetInput(lastDataSet); ++ lineWidget.SetPlaceFactor(1.2); ++ lineWidget.PlaceWidget(); ++ ++ // then we orient the widgetLine like the source line ++ lineWidget.SetPoint1(line.GetPoint1()); ++ lineWidget.SetPoint2(line.GetPoint2()); ++ ++ // we add the local observer for interaction events, i.e the method name ++ // in last argument of the current object. ++ lineWidget.AddObserver("InteractionEvent", this, "interactionCallBack"); ++ ++ // both not needed. ++ // planWidget.AddObserver("CharEvent", this, "widgetCharEvent"); ++ // planWidget.AddObserver("StartInteractionEvent", this, ++ // "startInteractionCallBack"); ++ DelBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLinePlugin.java,424,4) -- -- private void widgetCharEvent(){ -- char code = Character.toLowerCase(pipelineManager.getCassandraView().getIren().GetKeyCode()); -- System.out.println("touch typed:"+code); DelBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLinePlugin.java,425,3) -- if (code == 'b'){ // FIXME -- lineWidget.SetEnabled(1); -- } AddBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLinePlugin.java,425,7) ++ private void widgetCharEvent() { ++ char code = Character.toLowerCase(pipelineManager.getCassandraView().getIren().GetKeyCode()); ++ System.out.println("touch typed:" + code); ++ ++ if (code == 'b') { // FIXME ++ lineWidget.SetEnabled(1); ++ } DelBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLinePlugin.java,433,4) -- -- // needed to initialise the interaction control on the widget. -- private void startInteractionCallBack(){ -- System.out.println("wiget interaction started"); AddBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLinePlugin.java,433,4) ++ ++ // needed to initialise the interaction control on the widget. ++ private void startInteractionCallBack() { ++ System.out.println("wiget interaction started"); DelBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLinePlugin.java,438,3) -- -- -- /** AddBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLinePlugin.java,438,2) ++ ++ /** DelBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLinePlugin.java,442,1) -- private void interactionCallBack(){ AddBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLinePlugin.java,442,1) ++ private void interactionCallBack() { DelBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLinePlugin.java,446,1) -- AddBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLinePlugin.java,446,1) ++ DelBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLinePlugin.java,450,1) -- AddBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLinePlugin.java,450,1) ++ DelBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLinePlugin.java,452,4) -- -- public Filter getInternalFilter() { -- return filterImpl; -- } DelBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLinePlugin.java,453,3) -- public PlugInControlUI getControlUI() { -- return controlUI; -- } AddBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLinePlugin.java,453,3) ++ public Filter getInternalFilter() { ++ return filterImpl; ++ } DelBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLinePlugin.java,457,4) -- public CassandraPlugInProperty getPlugInProperty() { -- // TODO Auto-generated method stub -- return null; -- } AddBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLinePlugin.java,457,4) ++ @Override ++ public PlugInControlUI getControlUI() { ++ return controlUI; ++ } DelBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLinePlugin.java,462,3) -- public void updatePlugIn(CassandraPlugInProperty prop) { -- // TODO Auto-generated method stub -- AddBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLinePlugin.java,462,12) ++ @Override ++ public CassandraPlugInProperty getPlugInProperty() { ++ // TODO Auto-generated method stub ++ return null; ++ } ++ ++ @Override ++ public void initAndUpdate(CassandraPlugInProperty prop) { ++ // TODO Auto-generated method stub ++ ++ } ++ DelBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLinePlugin.java,475,2) -- -- } AddBlock(Plugins/Threshold/src/com/artenum/cassandra/plugin/threshold/ThresholdPlugin.java,246,1) ++ @Override AddBlock(Plugins/Threshold/src/com/artenum/cassandra/plugin/threshold/ThresholdPlugin.java,251,1) ++ @Override DelBlock(Plugins/Threshold/src/com/artenum/cassandra/plugin/threshold/ThresholdPlugin.java,257,1) -- public void updatePlugIn(CassandraPlugInProperty prop) { AddBlock(Plugins/Threshold/src/com/artenum/cassandra/plugin/threshold/ThresholdPlugin.java,257,2) ++ @Override ++ public void initAndUpdate(CassandraPlugInProperty prop) { AddBlock(Plugins/WarpScalar/src/com/artenum/cassandra/plugin/warp/scalar/WarpScalarPlugin.java,247,1) ++ @Override DelBlock(Plugins/WarpScalar/src/com/artenum/cassandra/plugin/warp/scalar/WarpScalarPlugin.java,253,1) -- public void updatePlugIn(CassandraPlugInProperty prop) { AddBlock(Plugins/WarpScalar/src/com/artenum/cassandra/plugin/warp/scalar/WarpScalarPlugin.java,253,2) ++ @Override ++ public void initAndUpdate(CassandraPlugInProperty prop) { AddBlock(Plugins/WarpScalar/src/com/artenum/cassandra/plugin/warp/scalar/WarpScalarPlugin.java,258,1) ++ AddBlock(Plugins/X3DExporter/src/com/artenum/cassandra/plugin/X3DExporter/X3DExporterPlugin.java,146,1) ++ @Override AddBlock(Plugins/X3DExporter/src/com/artenum/cassandra/plugin/X3DExporter/X3DExporterPlugin.java,151,1) ++ @Override DelBlock(Plugins/X3DExporter/src/com/artenum/cassandra/plugin/X3DExporter/X3DExporterPlugin.java,157,1) -- public void updatePlugIn(CassandraPlugInProperty prop) { AddBlock(Plugins/X3DExporter/src/com/artenum/cassandra/plugin/X3DExporter/X3DExporterPlugin.java,157,2) ++ @Override ++ public void initAndUpdate(CassandraPlugInProperty prop) { UpdateBinaryFile(Renderer/CassandraRenderer-1.1.0-all-all-none-jvm1_6-stable/CassandraRenderer-1.1.0-all-all-none-jvm1_6-stable.jar) DelBlock(Renderer/CassandraRenderer-1.1.0-all-all-none-jvm1_6-stable/version.txt,9,2) -- Date of build: 20110331 -- Hour of build: 1804 AddBlock(Renderer/CassandraRenderer-1.1.0-all-all-none-jvm1_6-stable/version.txt,9,2) ++ Date of build: 20110406 ++ Hour of build: 0201 DelBlock(Renderer/CassandraRenderer-1.1.0-all-all-none-jvm1_6-stable/version.txt,12,1) -- Cassandra CORE branch development ticket: 4203 AddBlock(Renderer/CassandraRenderer-1.1.0-all-all-none-jvm1_6-stable/version.txt,12,1) ++ Cassandra CORE branch development ticket: 5014 UpdateBinaryFile(tmpCrossDepDir/CorePipeline.jar)
- introduction/update of the connectivity scheme in the pipeline - introduction of a first version of saving procedure for the pipeline -- Export into Jython script with Cassandra plug-in support -- Still experimental - refactoring of the plug-in interface
AddBlock(build.xml,135,2) ++ ++ AddTxtFile(cassandra.properties.OK) AddBinaryFile(cassandraIcon.icns) DelBlock(Core/build.xml,1,1) -- <project name="Cassandra Viewer Core Module" default="help" basedir="."> AddBlock(Core/build.xml,1,1) ++ <project name="Cassandra Core Module" default="help" basedir="."> DelBlock(Core/build.xml,159,1) -- <property name="java-cmd" value=" -jar ${launcher.jar.name} cassandra.properties" /> AddBlock(Core/build.xml,159,1) ++ <property name="java-cmd" value=" -jar $CASSANDRA_HOME/${launcher.jar.name} $CASSANDRA_HOME/cassandra.properties $ARGUMENT_1" /> DelBlock(Core/build.xml,163,1) -- <property name="splash-screen" value=' -splash:./Images/splashscreen_2_4.png ' /> AddBlock(Core/build.xml,163,1) ++ <property name="splash-screen" value=' -splash:$CASSANDRA_HOME/Images/splashscreen_2_4.png ' /> DelBlock(Core/build.xml,168,3) -- <property name="library-path-osx" value="export DYLD_LIBRARY_PATH=${vtk.library.path}" /> -- <property name="osx-laf" value=' -splash:./Images/splashscreen_2_4.png -Dapple.laf.useScreenMenuBar=true -Dcom.apple.mrj.application.apple.menu.about.name="Cassandra" ' /> -- <echo file="${binary-package.dir}/CassandraOSX.sh" message="${library-path-osx}${line.separator}java${osx-laf}${java-cmd}" /> AddBlock(Core/build.xml,168,12) ++ <property name="library-path-osx" value="export DYLD_LIBRARY_PATH=$CASSANDRA_HOME${file.separator}${vtk.library.path}" /> ++ <property name="osx-laf" value=' -splash:$CASSANDRA_HOME/Images/splashscreen_2_4.png -Dapple.laf.useScreenMenuBar=true -Dcom.apple.mrj.application.apple.menu.about.name="Cassandra" ' /> ++ ++ <delete file="${binary-package.dir}/CassandraOSX.sh" /> ++ ++ ++ <copy tofile="${binary-package.dir}/CassandraOSX.sh"> ++ <fileset file="${base.dir}/scriptTemplates/unixLaunchScriptHeader.txt" /> ++ </copy> ++ <echo file="${binary-package.dir}/CassandraOSX.sh" append="true" message="${library-path-osx}${line.separator}" /> ++ <echo file="${binary-package.dir}/CassandraOSX.sh" append="true" message="${line.separator}" /> ++ <echo file="${binary-package.dir}/CassandraOSX.sh" append="true" message="java${osx-laf}${java-cmd} " /> DelBlock(Core/build.xml,186,1) -- AddBlock(Core/build.xml,215,2) ++ ++ AddBlock(Core/build.xml,219,1) ++ <filter token="CASSANDRA_HOME" value="${binary-package.dir}" /> DelBlock(Core/build.xml,221,1) -- AddBlock(Core/build.xml,225,1) ++ DelBlock(Core/build.xml,231,6) -- -- <copy todir="${binary-package.dir}"> -- <fileset dir="${base.dir}"> -- <include name="PropertiesEditor.sh" /> -- </fileset> -- </copy> AddBlock(Core/build.xml,232,6) ++ <copy todir="${binary-package.dir}"> ++ <fileset dir="${base.dir}"> ++ <include name="PropertiesEditor.sh" /> ++ </fileset> ++ </copy> ++ DelBlock(Core/build.xml,246,1) -- <!-- AddBlock(Core/build.xml,246,1) ++ <!-- AddBlock(Core/cassandra.properties,1,7) ++ ++ # define the home directory of Cassandra. If this is set, it is used ++ # as root path for all other systems properties like classpath and/or ++ # plug directory. If it is not set, the exact paths (relative to the ++ # launching script or abolute) should be set. ++ cassandra.home=@CASSANDRA_HOME@ ++ UpdateBinaryFile(Core/Images/.DS_Store) AddBinaryFile(Core/Images/exit-sign.jpg) AddBinaryFile(Core/Images/Left-Emergency-Exit-Sign-S-5569.gif) AddBinaryFile(Core/Images/Left-Exit-2.gif) AddTxtFile(Core/Script/cameraDolly.py) AddTxtFile(Core/Script/exportPipeline.py) AddDir(Core/scriptTemplates) AddTxtFile(Core/scriptTemplates/unixLaunchScriptHeader.txt) AddBlock(Core/src/com/artenum/cassandra/action/CassandraActionListener.java,28,1) ++ import com.artenum.cassandra.pipeline.io.PipelineToJythonExporter; AddBlock(Core/src/com/artenum/cassandra/action/CassandraActionListener.java,34,1) ++ import com.artenum.cassandra.ui.dialog.ExportPipelineDialog; AddBlock(Core/src/com/artenum/cassandra/action/CassandraActionListener.java,103,1) ++ public final static String EXPORT_PIPELINE_TO_JYTHON = "export.pipeline.to.jython"; AddBlock(Core/src/com/artenum/cassandra/action/CassandraActionListener.java,150,3) ++ /** ++ * process actions when performed. ++ */ DelBlock(Core/src/com/artenum/cassandra/action/CassandraActionListener.java,356,1) -- } else { AddBlock(Core/src/com/artenum/cassandra/action/CassandraActionListener.java,356,19) ++ ++ //export the whole pipeline to a Jython file ++ } else if (actionCommand.equals(EXPORT_PIPELINE_TO_JYTHON)) { ++ ++ ExportPipelineDialog dialog = new ExportPipelineDialog(null, pipeLineManager); ++ int answer = dialog.showMessageDialog(); ++ System.out.println("answer = " +answer); ++ if (answer == 0){ ++ ++ PipelineToJythonExporter exporter = new PipelineToJythonExporter(); ++ exporter.setSelectedVtkObjectList( pipeLineManager.getVtkObjectHashtable() ); ++ ++ exporter.setOutputFile(dialog.getSelectedFile()); ++ exporter.write(); ++ } else { ++ System.out.println("Nothing selected"); ++ } ++ ++ }else { DelBlock(Core/src/com/artenum/cassandra/action/ConfirmationSystemExit.java,35,1) -- createImageIcon("/com/artenum/cassandra/ui/icons/icon_centre.png")); //FIX ME AddBlock(Core/src/com/artenum/cassandra/action/ConfirmationSystemExit.java,35,1) ++ createImageIcon("/com/artenum/cassandra/ui/icons/exit.png")); //FIX ME AddBlock(Core/src/com/artenum/cassandra/Cassandra.java,222,6) ++ ++ public void addVtkFile(File file){ ++ pipeLineManager.getCassandraView().lock(); ++ pipeLineManager.addVtkFile(file); ++ pipeLineManager.getCassandraView().unlock(); ++ } DelBlock(Core/src/com/artenum/cassandra/pipeline/ConnectivityListener.java,44,1) -- * @author Sebastien Jourdain AddBlock(Core/src/com/artenum/cassandra/pipeline/ConnectivityListener.java,44,1) ++ * @author Sebastien Jourdain, Artenum SARL AddBlock(Core/src/com/artenum/cassandra/pipeline/Filter.java,27,2) ++ import com.artenum.cassandra.plugin.CassandraPlugin; ++ DelBlock(Core/src/com/artenum/cassandra/pipeline/Filter.java,37,3) -- * Description : Meta object of the pipeline. -- * It is use to hide a part of the -- * underlying vtk pipeline. AddBlock(Core/src/com/artenum/cassandra/pipeline/Filter.java,37,10) ++ * Description : ++ * Cassandr's Abstract Filter. This interface is used to hide and/or gather ++ * several vtk objects into a unique filter unit, in order to simplify the representation ++ * of the pipeline. Such Filter node is typically used in most of Cassandra's plugins. ++ * ++ * The Filter register the vtk components internally gathered, typically for export purpose ++ * for instance. ++ * ++ * See the clipping plug-in as example of use. ++ * DelBlock(Core/src/com/artenum/cassandra/pipeline/Filter.java,54,2) -- * @author Sebastien Jourdain -- * @version 0.1 AddBlock(Core/src/com/artenum/cassandra/pipeline/Filter.java,54,4) ++ * @author Sebastien Jourdain, Artenum SARL ++ * @author Julien Forest, Artenum SARL ++ * ++ * @version 0.3 DelBlock(Core/src/com/artenum/cassandra/pipeline/Filter.java,60,1) -- public Collection getInputDataSet(); AddBlock(Core/src/com/artenum/cassandra/pipeline/Filter.java,60,6) ++ ++ Collection getAlgorithm(); ++ ++ Collection getInputSource(); ++ ++ Collection getInputDataSet(); DelBlock(Core/src/com/artenum/cassandra/pipeline/Filter.java,67,1) -- public Collection getInputMapper(); AddBlock(Core/src/com/artenum/cassandra/pipeline/Filter.java,67,1) ++ Collection getInputMapper(); DelBlock(Core/src/com/artenum/cassandra/pipeline/Filter.java,69,1) -- public Collection getInputActor(); AddBlock(Core/src/com/artenum/cassandra/pipeline/Filter.java,69,1) ++ Collection getInputActor(); DelBlock(Core/src/com/artenum/cassandra/pipeline/Filter.java,71,1) -- public Collection getOutputDataSet(); AddBlock(Core/src/com/artenum/cassandra/pipeline/Filter.java,71,1) ++ Collection getOutputDataSet(); DelBlock(Core/src/com/artenum/cassandra/pipeline/Filter.java,73,1) -- public Collection getOutputMapper(); AddBlock(Core/src/com/artenum/cassandra/pipeline/Filter.java,73,1) ++ Collection getOutputMapper(); DelBlock(Core/src/com/artenum/cassandra/pipeline/Filter.java,75,1) -- public Collection getOutputActor(); AddBlock(Core/src/com/artenum/cassandra/pipeline/Filter.java,75,3) ++ Collection getOutputActor(); ++ ++ Collection getVtkImplicitFunction(); DelBlock(Core/src/com/artenum/cassandra/pipeline/Filter.java,79,1) -- public void remove(); AddBlock(Core/src/com/artenum/cassandra/pipeline/Filter.java,79,1) ++ void remove(); DelBlock(Core/src/com/artenum/cassandra/pipeline/Filter.java,81,1) -- public void addRemoveListener(RemoveListener rl); AddBlock(Core/src/com/artenum/cassandra/pipeline/Filter.java,81,1) ++ void addRemoveListener(RemoveListener rl); DelBlock(Core/src/com/artenum/cassandra/pipeline/Filter.java,83,1) -- public void removeRemoveListener(RemoveListener rl); AddBlock(Core/src/com/artenum/cassandra/pipeline/Filter.java,83,9) ++ void removeRemoveListener(RemoveListener rl); ++ ++ void setRelatedPluginClass(Class class1); ++ ++ Class getRelatedPluginClass(); ++ ++ // Collection decomposeInternalComponents(); ++ ++ AddBlock(Core/src/com/artenum/cassandra/pipeline/FilterImpl.java,29,2) ++ import com.artenum.cassandra.plugin.CassandraPlugin; ++ DelBlock(Core/src/com/artenum/cassandra/pipeline/FilterImpl.java,39,1) -- * Description : Concrete class of the Filter AddBlock(Core/src/com/artenum/cassandra/pipeline/FilterImpl.java,39,1) ++ * Description : Concrete class of the Cassandra Filter interface. See clipping plug-in for example of use. DelBlock(Core/src/com/artenum/cassandra/pipeline/FilterImpl.java,47,2) -- * @author Sebastien Jourdain -- * @version 0.1 AddBlock(Core/src/com/artenum/cassandra/pipeline/FilterImpl.java,47,6) ++ * @author Sebastien Jourdain, Artenum SARL ++ * @author Julien Forest, Artenum SARL ++ * @author Benoit Thiebault, Artenum SARL ++ * @author Jeremie Turbet, Artenum SARL ++ * ++ * @version 0.3 AddBlock(Core/src/com/artenum/cassandra/pipeline/FilterImpl.java,61,2) ++ private ArrayList algorithm; ++ private ArrayList inputSource; AddBlock(Core/src/com/artenum/cassandra/pipeline/FilterImpl.java,64,3) ++ private ArrayList implicitFunction; ++ ++ private Class relatedPluginType; AddBlock(Core/src/com/artenum/cassandra/pipeline/FilterImpl.java,75,1) ++ algorithm = new ArrayList(); AddBlock(Core/src/com/artenum/cassandra/pipeline/FilterImpl.java,77,1) ++ implicitFunction = new ArrayList(); AddBlock(Core/src/com/artenum/cassandra/pipeline/FilterImpl.java,80,1) ++ @Override AddBlock(Core/src/com/artenum/cassandra/pipeline/FilterImpl.java,85,1) ++ @Override AddBlock(Core/src/com/artenum/cassandra/pipeline/FilterImpl.java,90,1) ++ @Override AddBlock(Core/src/com/artenum/cassandra/pipeline/FilterImpl.java,95,1) ++ @Override AddBlock(Core/src/com/artenum/cassandra/pipeline/FilterImpl.java,100,1) ++ @Override AddBlock(Core/src/com/artenum/cassandra/pipeline/FilterImpl.java,105,1) ++ @Override AddBlock(Core/src/com/artenum/cassandra/pipeline/FilterImpl.java,110,1) ++ @Override AddBlock(Core/src/com/artenum/cassandra/pipeline/FilterImpl.java,115,1) ++ @Override AddBlock(Core/src/com/artenum/cassandra/pipeline/FilterImpl.java,122,1) ++ @Override AddBlock(Core/src/com/artenum/cassandra/pipeline/FilterImpl.java,126,25) ++ ++ @Override ++ public Collection getAlgorithm() { ++ return algorithm; ++ } ++ ++ @Override ++ public Collection getInputSource() { ++ return inputSource; ++ } ++ ++ @Override ++ public Collection getVtkImplicitFunction() { ++ return implicitFunction; ++ } ++ ++ @Override ++ public void setRelatedPluginClass(Class relatedPluginType) { ++ this.relatedPluginType = relatedPluginType; ++ } ++ ++ @Override ++ public Class getRelatedPluginClass() { ++ return relatedPluginType; ++ } AddDir(Core/src/com/artenum/cassandra/pipeline/io) AddTxtFile(Core/src/com/artenum/cassandra/pipeline/io/PipelineExporter.java) AddTxtFile(Core/src/com/artenum/cassandra/pipeline/io/PipelineToJythonExporter.java) AddBlock(Core/src/com/artenum/cassandra/pipeline/PipeLineManager.java,33,1) ++ import java.util.Hashtable; DelBlock(Core/src/com/artenum/cassandra/pipeline/PipeLineManager.java,52,1) -- * @author Sebastien Jourdain AddBlock(Core/src/com/artenum/cassandra/pipeline/PipeLineManager.java,52,1) ++ * @author Sebastien Jourdain, Artenum sarl AddBlock(Core/src/com/artenum/cassandra/pipeline/PipeLineManager.java,115,2) ++ ++ Hashtable getVtkObjectHashtable(); AddBlock(Core/src/com/artenum/cassandra/pipeline/VtkObject.java,27,1) ++ import java.util.ArrayList; DelBlock(Core/src/com/artenum/cassandra/pipeline/VtkObject.java,46,1) -- * @author Sebastien Jourdain AddBlock(Core/src/com/artenum/cassandra/pipeline/VtkObject.java,46,1) ++ * @author Sebastien Jourdain, Artenum SARL AddBlock(Core/src/com/artenum/cassandra/pipeline/VtkObject.java,78,64) ++ ++ /** ++ * Add the VtkObject of Id vtkObjectId in input ++ * connectivity. ++ * @param vtkObjectId ++ */ ++ public void addInputConnectivtiy(int vtkObjectId); ++ ++ /** ++ * Add the VtkObject vtkObjectIn in the input connectivity list. ++ * ++ * @param vtkObjectIn ++ */ ++ public void addInputConnectivtiy(VtkObject vtkObjectIn); ++ ++ /** ++ * ++ * @param VtkObjectId ++ * @return ++ */ ++ public ArrayList<Integer> getInputConnectivityList(); ++ ++ /** ++ * return true if the VtkObject in input is in the input connectivity list. ++ */ ++ boolean isInInputConnectivityInputList(VtkObject vtkObjectIn); ++ ++ /** ++ * return true if the VtkObject of Id vtkObjectId in input is in the input connectivity list. ++ */ ++ boolean isInInputConnectivityInputList(int vtkObjectId); ++ ++ /** ++ * Add the VtkObject of Id vtkObjectId in output ++ * connectivity. ++ * @param vtkObjectId ++ */ ++ void addOutputConnectivity(int vtkObjectId); ++ ++ /** ++ * Add the VtkObject vtkObjectIn in the output connectivity list. ++ * ++ * @param vtkObjectIn ++ */ ++ void addOutputConnectivity(VtkObject vtkObjectIn); ++ ++ /** ++ * @return return the output connectivity list. ++ */ ++ ArrayList<Integer> getOutputConnectivityList(); ++ ++ /** ++ * return true if the VtkObject in input is in the input connectivity list. ++ */ ++ boolean inOutputConnectivityList(VtkObject vtkObjectIn); ++ ++ /** ++ * return true if the VtkObject of Id vtkObjectId in input is in the input connectivity list. ++ */ ++ boolean inInputConnectivityList(int vtkObjectId); ++ ++ void clearInputConnectivityList(); ++ ++ void clearOutputConnecvityLsit(); AddBlock(Core/src/com/artenum/cassandra/plugin/CassandraPlugin.java,27,2) ++ import com.artenum.cassandra.pipeline.Filter; ++ DelBlock(Core/src/com/artenum/cassandra/plugin/CassandraPlugin.java,45,2) -- * @author Sebastien Jourdain -- * @version 0.1 AddBlock(Core/src/com/artenum/cassandra/plugin/CassandraPlugin.java,45,4) ++ * @author Sebastien Jourdain, ARTENUM SARL ++ * @author Julien Forest, ARTENUM SARL ++ * ++ * @version 1.2 DelBlock(Core/src/com/artenum/cassandra/plugin/CassandraPlugin.java,53,1) -- public JPopupMenu getContextualMenu(); AddBlock(Core/src/com/artenum/cassandra/plugin/CassandraPlugin.java,53,1) ++ JPopupMenu getContextualMenu(); DelBlock(Core/src/com/artenum/cassandra/plugin/CassandraPlugin.java,55,1) -- public void remove(); AddBlock(Core/src/com/artenum/cassandra/plugin/CassandraPlugin.java,55,9) ++ void remove(); ++ ++ Filter getInternalFilter(); ++ ++ void updatePlugIn(CassandraPlugInProperty prop); ++ ++ CassandraPlugInProperty getPlugInProperty(); ++ ++ PlugInControlUI getControlUI(); AddTxtFile(Core/src/com/artenum/cassandra/plugin/CassandraPlugInProperty.java) DelBlock(Core/src/com/artenum/cassandra/plugin/DynamicPluginMenu.java,44,1) -- * @author Sebastien Jourdain AddBlock(Core/src/com/artenum/cassandra/plugin/DynamicPluginMenu.java,44,2) ++ * @author Sebastien Jourdain, ARTENUM SARL ++ * AddTxtFile(Core/src/com/artenum/cassandra/plugin/PlugInControlUI.java) DelBlock(Core/src/com/artenum/cassandra/plugin/PluginManager.java,44,1) -- * Description : The PluginManager keeps track of the plugin instances. AddBlock(Core/src/com/artenum/cassandra/plugin/PluginManager.java,44,1) ++ * Description : The Plugin anager keeps track of the plugin instances. DelBlock(Core/src/com/artenum/cassandra/plugin/PluginManager.java,52,1) -- * @author Sebastien Jourdain AddBlock(Core/src/com/artenum/cassandra/plugin/PluginManager.java,52,2) ++ * @author Sebastien Jourdain, ARTENUM SARL ++ * DelBlock(Core/src/com/artenum/cassandra/ui/CassandraHelp.java,49,1) -- * @version 0.1 AddBlock(Core/src/com/artenum/cassandra/ui/CassandraHelp.java,49,2) ++ * @author Julien Forest ++ * @version 0.2 DelBlock(Core/src/com/artenum/cassandra/ui/CassandraHelp.java,56,1) -- " (c) Copyright Artenum SARL 2005 Cassandra 2.x Autors: Sebastien Jourdain and Julien Forest Contact: cassandra@artenum.com "); AddBlock(Core/src/com/artenum/cassandra/ui/CassandraHelp.java,56,1) ++ " (c) Copyright Artenum SARL 2005 Cassandra 2.x Autors: The Artenum's Crew Contact: cassandra@artenum.com "); AddBlock(Core/src/com/artenum/cassandra/ui/CassandraMenu.java,78,4) ++ ++ private JMenu exportPipeline; ++ private JMenuItem exportPipelineToJython; ++ AddBlock(Core/src/com/artenum/cassandra/ui/CassandraMenu.java,162,6) ++ exportPipeline = new JMenu("Export Pipeline to"); ++ ++ exportPipelineToJython = new JMenuItem("Jython"); ++ exportPipelineToJython.setActionCommand( CassandraActionListener.EXPORT_PIPELINE_TO_JYTHON); ++ exportPipelineToJython.addActionListener(listener); ++ AddBlock(Core/src/com/artenum/cassandra/ui/CassandraMenu.java,186,3) ++ file.add(exportPipeline); ++ exportPipeline.add(exportPipelineToJython); ++ file.addSeparator(); DelBlock(Core/src/com/artenum/cassandra/ui/CassandraTree.java,53,1) -- * @author Sebastien Jourdain AddBlock(Core/src/com/artenum/cassandra/ui/CassandraTree.java,53,1) ++ * @author Sebastien Jourdain, Artenum SARL AddTxtFile(Core/src/com/artenum/cassandra/ui/dialog/ExportPipelineDialog.java) DelBlock(Core/src/com/artenum/cassandra/ui/dialog/LookUpTableControlDialog.java,99,1) -- super(parentFrame, "Lookup Table control"); AddBlock(Core/src/com/artenum/cassandra/ui/dialog/LookUpTableControlDialog.java,99,1) ++ super(parentFrame, "Lookup Table Control"); AddBinaryFile(Core/src/com/artenum/cassandra/ui/icons/.DS_Store) AddBinaryFile(Core/src/com/artenum/cassandra/ui/icons/exit.png) AddBinaryFile(Core/src/com/artenum/cassandra/ui/icons/history_clear.png) AddBinaryFile(Core/src/com/artenum/cassandra/ui/icons/leftexit.png) AddBinaryFile(Core/src/com/artenum/cassandra/ui/icons/player_eject.png) AddBinaryFile(Core/src/com/artenum/cassandra/ui/icons/player_end.png) AddBinaryFile(Core/src/com/artenum/cassandra/ui/icons/player_fwd.png) AddBinaryFile(Core/src/com/artenum/cassandra/ui/icons/player_pause.png) AddBinaryFile(Core/src/com/artenum/cassandra/ui/icons/player_play.png) AddBinaryFile(Core/src/com/artenum/cassandra/ui/icons/player_record.png) AddBinaryFile(Core/src/com/artenum/cassandra/ui/icons/player_rew.png) AddBinaryFile(Core/src/com/artenum/cassandra/ui/icons/player_start.png) AddBinaryFile(Core/src/com/artenum/cassandra/ui/icons/player_stop.png) AddBinaryFile(Core/src/com/artenum/cassandra/ui/icons/player_time.png) DelBlock(Core/src/com/artenum/cassandra/ui/PluginPopupMenuManager.java,45,1) -- * @author Sebastien Jourdain AddBlock(Core/src/com/artenum/cassandra/ui/PluginPopupMenuManager.java,45,1) ++ * @author Sebastien Jourdain, Artenum SARL DelBlock(Core/src-launch/com/artenum/cassandra/launcher/DynamicClassLoader.java,43,1) -- * Description : Plugin class loader, and plugin integration manager. AddBlock(Core/src-launch/com/artenum/cassandra/launcher/DynamicClassLoader.java,43,1) ++ * Description : Plugin class loader and plugin integration manager. DelBlock(Core/src-launch/com/artenum/cassandra/launcher/DynamicClassLoader.java,51,1) -- * @author Sebastien Jourdain AddBlock(Core/src-launch/com/artenum/cassandra/launcher/DynamicClassLoader.java,51,2) ++ * @author Sebastien Jourdain, ARTENUM SARL ++ * AddBlock(Core/src-launch/com/artenum/cassandra/launcher/DynamicClassLoader.java,108,3) ++ /** ++ * @return the list of available plug-ins ++ */ AddBlock(Core/src-launch/com/artenum/cassandra/launcher/Run.java,29,1) ++ import java.util.ArrayList; AddBlock(Core/src-launch/com/artenum/cassandra/launcher/Run.java,58,3) ++ ArrayList<String> inputFileList = new ArrayList<String>(); ++ ++ DelBlock(Core/src-launch/com/artenum/cassandra/launcher/Run.java,66,2) -- } -- else{ AddBlock(Core/src-launch/com/artenum/cassandra/launcher/Run.java,66,10) ++ int index = 1; ++ String arg; ++ ++ while ( index < args.length ) { ++ arg = args[index]; ++ System.out.println(arg); ++ inputFileList.add(arg); ++ index++; ++ } ++ } else{ DelBlock(Core/src-launch/com/artenum/cassandra/launcher/Run.java,86,2) -- if (System.getProperty(CASSANDRA_HOME) != null) { -- System.out.println("cassandra.home= "+System.getProperty(CASSANDRA_HOME)); AddBlock(Core/src-launch/com/artenum/cassandra/launcher/Run.java,86,5) ++ if (System.getenv().get("CASSANDRA_HOME") != null){ ++ System.setProperty(CASSANDRA_HOME, (String) System.getenv().get("CASSANDRA_HOME")); ++ System.out.println("cassandra.hoem set from the sytem to: "+System.getenv().get("CASSANDRA_HOME")); ++ } else if (System.getProperty(CASSANDRA_HOME) != null) { ++ System.out.println("cassandra.home set from the properties fiel to: "+System.getProperty(CASSANDRA_HOME)); AddBlock(Core/src-launch/com/artenum/cassandra/launcher/Run.java,92,1) ++ System.out.println("cassandra.home not pre-set. Set to user.dir"); DelBlock(Core/src-launch/com/artenum/cassandra/launcher/Run.java,114,1) -- // Management of the dynamics class paths AddBlock(Core/src-launch/com/artenum/cassandra/launcher/Run.java,114,1) ++ // Management of the dynamic class paths DelBlock(Core/src-launch/com/artenum/cassandra/launcher/Run.java,120,1) -- jarFile = new File(classPath[i]); AddBlock(Core/src-launch/com/artenum/cassandra/launcher/Run.java,120,2) ++ System.out.println("Add to classpath= " + System.getProperty(CASSANDRA_HOME) + File.separatorChar + classPath[i]); ++ jarFile = new File(System.getProperty(CASSANDRA_HOME) + File.separatorChar + classPath[i]); DelBlock(Core/src-launch/com/artenum/cassandra/launcher/Run.java,197,2) -- cassandraClassLoader.getMethod("setPreference", new Class[] { String.class, Object.class }).invoke(cassandra, -- new Object[] { CASSANDRA_PREF_SCRIPT_DIR, new File(scriptPath) }); AddBlock(Core/src-launch/com/artenum/cassandra/launcher/Run.java,197,1) ++ cassandraClassLoader.getMethod("setPreference", new Class[] { String.class, Object.class }).invoke(cassandra, new Object[] { CASSANDRA_PREF_SCRIPT_DIR, new File(scriptPath) }); AddBlock(Core/src-launch/com/artenum/cassandra/launcher/Run.java,216,17) ++ ++ Iterator<String> iterFile = inputFileList.iterator(); ++ ++ while (iterFile.hasNext()){ ++ String path = iterFile.next(); ++ System.out.println(path); ++ File fileIn = new File(path); ++ try { ++ if (fileIn.exists()) { ++ cassandraClassLoader.getMethod("addVtkFile", new Class[] { File.class }).invoke(cassandra, new Object[] { fileIn }); ++ } ++ ++ } catch (Exception e) { ++ System.out.println(e); ++ } ++ } ++ DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkPipeLineGraphModel.java,31,1) -- * @author Sebastien AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkPipeLineGraphModel.java,31,9) ++ * This class is the connectivity listener related to the pipeline manager. Its update and maintained ++ * the connectivity between the pipeline components. Currently, two models are defined: One liked to the ++ * pipeline manager and is stored into each VtkObject, the second is related to the graphical representation ++ * through the DedalEGraph library. ++ * ++ * @author Sebastien Jourdain, Artenum SARL ++ * @author Julien Forest, Artenum SARL ++ * ++ * @version 2.0 AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkPipeLineGraphModel.java,184,4) ++ /** ++ * update the connection topology between cells (i.e VtkObject) and perform ++ * the graphical connection through DedaleGraph ++ */ AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkPipeLineGraphModel.java,194,37) ++ ++ for (Iterator i = pipeLineManager.getActorList().getData().iterator(); i.hasNext();) { ++ VtkObject actor = ((VtkObject) i.next()); ++ actor.clearInputConnectivityList(); ++ actor.clearOutputConnecvityLsit(); ++ } ++ ++ for (Iterator i = pipeLineManager.getDataSetList().getData().iterator(); i.hasNext();) { ++ VtkObject dataset = ((VtkObject) i.next()); ++ dataset.clearInputConnectivityList(); ++ dataset.clearOutputConnecvityLsit(); ++ } ++ ++ for (Iterator iMap = pipeLineManager.getMapperList().getData().iterator(); iMap.hasNext();) { ++ VtkObject mapper = ((VtkObject) iMap.next()); ++ mapper.clearInputConnectivityList(); ++ mapper.clearOutputConnecvityLsit(); ++ } ++ ++ for (Iterator i = pipeLineManager.getLookupTableList().getData().iterator(); i.hasNext();) { ++ VtkObject lookupTable = ((VtkObject) i.next()); ++ lookupTable.clearInputConnectivityList(); ++ lookupTable.clearOutputConnecvityLsit(); ++ } ++ ++ for (Iterator i = pipeLineManager.getFilterList().getData().iterator(); i.hasNext();) { ++ VtkObject filter = ((VtkObject) i.next()); ++ filter.clearInputConnectivityList(); ++ filter.clearOutputConnecvityLsit(); ++ } ++ ++ for (Iterator iScalar = pipeLineManager.getScalarBarList().getData().iterator(); iScalar.hasNext();) { ++ VtkObject scalarBar = ((VtkObject) iScalar.next()); ++ scalarBar.clearInputConnectivityList(); ++ scalarBar.clearOutputConnecvityLsit(); ++ } ++ DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkPipeLineGraphModel.java,232,1) -- // Actor AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkPipeLineGraphModel.java,232,1) ++ // we scan all Actors to find their input mapper AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkPipeLineGraphModel.java,235,1) ++ AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkPipeLineGraphModel.java,238,2) ++ ++ // we scan the mappers to find the corresponding one. AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkPipeLineGraphModel.java,243,3) ++ ++ // we the update the DedalEgraph model for the view ++ // representation AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkPipeLineGraphModel.java,247,4) ++ ++ // we update the connectivity between each VtkObject. ++ actor.addInputConnectivtiy(mapper.getId()); ++ mapper.addOutputConnectivity(actor.getId()); AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkPipeLineGraphModel.java,259,1) ++ AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkPipeLineGraphModel.java,267,3) ++ ++ // we the update the DedalEgraph model for the view ++ // representation AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkPipeLineGraphModel.java,271,4) ++ ++ // we update the connectivity between each VtkObject ++ mapper.addInputConnectivtiy(dataset.getId()); ++ dataset.addOutputConnectivity(mapper.getId()); DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkPipeLineGraphModel.java,283,1) -- // Mapper link ? AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkPipeLineGraphModel.java,283,1) ++ // Mapper link AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkPipeLineGraphModel.java,286,1) ++ AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkPipeLineGraphModel.java,292,2) ++ // we the update the DedalEgraph model for the view ++ // representation AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkPipeLineGraphModel.java,295,3) ++ // we update the connectivity between each VtkObject ++ mapper.addOutputConnectivity(lookupTable.getId()); ++ lookupTable.addInputConnectivtiy(mapper.getId()); AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkPipeLineGraphModel.java,309,3) ++ ++ lookupTable.addOutputConnectivity(scalarBar.getId()); ++ scalarBar.addInputConnectivtiy(lookupTable.getId()); AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkPipeLineGraphModel.java,319,1) ++ AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkPipeLineGraphModel.java,321,2) ++ ++ // filters to mappers connectivity AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkPipeLineGraphModel.java,325,2) ++ ++ // for filters with an input mapper AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkPipeLineGraphModel.java,331,4) ++ ++ // ++ filter.addInputConnectivtiy(mapper.getId()); ++ mapper.addOutputConnectivity(filter); AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkPipeLineGraphModel.java,336,1) ++ AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkPipeLineGraphModel.java,339,1) ++ // for filters with an output mapper AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkPipeLineGraphModel.java,344,4) ++ ++ // ++ filter.addOutputConnectivity(mapper.getId()); ++ mapper.addInputConnectivtiy(filter.getId()); AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkPipeLineGraphModel.java,352,1) ++ // filters to actors connectivity AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkPipeLineGraphModel.java,355,2) ++ ++ // for filters with an actor as input AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkPipeLineGraphModel.java,361,4) ++ ++ // ++ filter.addInputConnectivtiy(actor.getId()); ++ actor.addOutputConnectivity(filter.getId()); AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkPipeLineGraphModel.java,368,1) ++ // for filter with an actor as output AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkPipeLineGraphModel.java,373,4) ++ ++ // ++ filter.addOutputConnectivity(actor.getId()); ++ actor.addInputConnectivtiy(filter.getId()); AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkPipeLineGraphModel.java,381,1) ++ // filter to data set connectivity AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkPipeLineGraphModel.java,384,2) ++ ++ // for filters with a data set as input AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkPipeLineGraphModel.java,390,4) ++ ++ // ++ filter.addInputConnectivtiy(dataset.getId()); ++ dataset.addOutputConnectivity(filter.getId()); AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkPipeLineGraphModel.java,397,1) ++ // for filters with a data set as output AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkPipeLineGraphModel.java,402,4) ++ ++ // ++ filter.addOutputConnectivity(dataset.getId()); ++ dataset.addInputConnectivtiy(filter.getId()); AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkPipeLineGraphModel.java,444,1) ++ * DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkPipeLinePanel.java,34,1) -- * @author Sebastien AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkPipeLinePanel.java,34,6) ++ * Graphical representation of the pipelien manager panel. ++ * ++ * @author Sebastien Jourdain, Artenum SARL ++ * @author Julien Forest, Artenum SARL ++ * ++ * @version 0.1 AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkPipeLinePanel.java,77,3) ++ /** ++ * Draw the line symbolizing the connection between two cells. ++ */ DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,38,1) -- * @author Sebastien Jourdain, Julien Forest, Jrmie Turbet AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,38,3) ++ * @author Sebastien Jourdain, Julien Forest, Jrmie Turbet, Benoit Thibault ++ * ++ * @version 2.0 DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,42,1) -- public class SimplePipeLineManager extends Observable implements PipeLineManager { AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,42,2) ++ public class SimplePipeLineManager extends Observable implements ++ PipeLineManager { DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,54,2) -- -- AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,54,1) ++ DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,56,1) -- private int pluginNumber = 1; AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,56,5) ++ public Integer getVtkObjectIndex() { ++ return vtkObjectIndex; ++ } ++ ++ private int pluginNumber = 1; DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,73,3) -- -- // loading of the VTK based context. -- try{ AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,73,3) ++ ++ // loading of the VTK based context. ++ try { DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,77,1) -- if (contextLoader.load() == false){ AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,77,1) ++ if (contextLoader.load() == false) { DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,83,4) -- -- // Instantiation of the VTK based renderer. -- try{ -- view = new CassandraView(); AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,83,4) ++ ++ // Instantiation of the VTK based renderer. ++ try { ++ view = new CassandraView(); DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,88,1) -- System.out.println("Error: impossible to build the VTK based renderer and/or view"); AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,88,2) ++ System.out ++ .println("Error: impossible to build the VTK based renderer and/or view"); DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,92,2) -- -- AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,92,1) ++ DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,105,1) -- // Pipeline management AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,105,10) ++ @Override ++ public Hashtable getVtkObjectHashtable() { ++ return vtkObjectHashtable; ++ } ++ ++ public void setVtkObjectHashtable(Hashtable vtkObjectHashtable) { ++ this.vtkObjectHashtable = vtkObjectHashtable; ++ } ++ ++ // Pipeline management DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,116,2) -- * Add a VtkDataSet from a file reading into the pipeline manager and -- * build-up the corresponding visualisation pipeline. AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,116,2) ++ * Add a VtkDataSet from a file reading into the pipeline manager and ++ * build-up the corresponding visualisation pipeline. DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,120,1) -- AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,120,1) ++ DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,122,1) -- AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,122,1) ++ DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,124,1) -- System.err.println("File does not exist: " + vtkFile.getAbsolutePath()); AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,124,2) ++ System.err.println("File does not exist: " ++ + vtkFile.getAbsolutePath()); DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,141,1) -- DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,187,1) -- // Connection management AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,187,7) ++ /** ++ * Set the actor of Id vtkObjectId, visible (if true) or not (if false) in ++ * both the 3D (CassandraView) and 2D (pipeline Editor). ++ * ++ * @param vtkObjectId ++ * @param viewActor ++ */ DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,195,1) -- setActorVisible((VtkObject) vtkObjectHashtable.get(vtkObjectId), viewActor); AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,195,2) ++ setActorVisible((VtkObject) vtkObjectHashtable.get(vtkObjectId), ++ viewActor); DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,203,1) -- if ((vtkObject.getType() == VtkObject.ACTOR) || (vtkObject.getType() == VtkObject.TXT_ACTOR) || (vtkObject.getType() == VtkObject.SCALAR_BAR)) { AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,203,3) ++ if ((vtkObject.getType() == VtkObject.ACTOR) ++ || (vtkObject.getType() == VtkObject.TXT_ACTOR) ++ || (vtkObject.getType() == VtkObject.SCALAR_BAR)) { DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,210,1) -- vtkObject.getMetaData().put(VtkObject.ACTOR_VISIBLE, Boolean.toString(viewActor)); AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,210,2) ++ vtkObject.getMetaData().put(VtkObject.ACTOR_VISIBLE, ++ Boolean.toString(viewActor)); DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,215,1) -- view.GetRenderer().AddActor((vtkProp) vtkObject.getVtkObject()); AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,215,2) ++ view.GetRenderer().AddActor( ++ (vtkProp) vtkObject.getVtkObject()); DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,218,1) -- view.GetRenderer().RemoveActor((vtkProp) vtkObject.getVtkObject()); AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,218,2) ++ view.GetRenderer().RemoveActor( ++ (vtkProp) vtkObject.getVtkObject()); DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,224,1) -- view.GetRenderer().AddActor2D((vtkProp) vtkObject.getVtkObject()); AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,224,2) ++ view.GetRenderer().AddActor2D( ++ (vtkProp) vtkObject.getVtkObject()); DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,227,1) -- view.GetRenderer().RemoveActor2D((vtkProp) vtkObject.getVtkObject()); AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,227,2) ++ view.GetRenderer().RemoveActor2D( ++ (vtkProp) vtkObject.getVtkObject()); DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,287,1) -- * Add a new actor into the pipeline manager. AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,287,2) ++ * Add a new actor into the pipeline manager. ++ * DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,296,1) -- VtkObjectAdapter vtkObject = new VtkObjectAdapter(actor, VtkObject.ACTOR, actorId, getNextVtkObjectId()); AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,296,2) ++ VtkObjectAdapter vtkObject = new VtkObjectAdapter(actor, ++ VtkObject.ACTOR, actorId, getNextVtkObjectId()); DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,307,1) -- * Add a new mapper into the pipeline manager. AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,307,2) ++ * Add a new mapper into the pipeline manager. ++ * DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,311,1) -- * @return AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,311,1) ++ * @return the built VtkObject DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,320,1) -- VtkObjectAdapter vtkObject = new VtkObjectAdapter(mapper, VtkObject.MAPPER, mapperId, getNextVtkObjectId()); AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,320,2) ++ VtkObjectAdapter vtkObject = new VtkObjectAdapter(mapper, ++ VtkObject.MAPPER, mapperId, getNextVtkObjectId()); DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,333,1) -- VtkObjectAdapter vtkObject = new VtkObjectAdapter(dataset, VtkObject.DATASET, datasetId, getNextVtkObjectId()); AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,333,2) ++ VtkObjectAdapter vtkObject = new VtkObjectAdapter(dataset, ++ VtkObject.DATASET, datasetId, getNextVtkObjectId()); DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,353,1) -- this.addDataSet(dataset, name); AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,353,1) ++ VtkObject tmpDataSet = this.addDataSet(dataset, name); DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,368,3) -- this.addMapper(mapper, name + " mapper"); -- this.setActorVisible(this.addActor(actor, name + " actor"), true); -- this.addLookupTable(lookupTable, name + " lookup table"); AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,368,4) ++ VtkObject tmpMapper = this.addMapper(mapper, name + " mapper"); ++ VtkObject tmpActor = this.addActor(actor, name + " actor"); ++ this.setActorVisible(tmpActor, true); ++ VtkObject tmpLookUpTable = this.addLookupTable(lookupTable, name + " lookup table"); DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,386,1) -- VtkObjectAdapter vtkObject = new VtkObjectAdapter(filter, VtkObject.FILTER, filterId, getNextVtkObjectId()); AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,386,2) ++ VtkObjectAdapter vtkObject = new VtkObjectAdapter(filter, ++ VtkObject.FILTER, filterId, getNextVtkObjectId()); DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,403,1) -- synchronized public VtkObject addLookupTable(vtkLookupTable lookupTable, String name) { AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,403,2) ++ synchronized public VtkObject addLookupTable(vtkLookupTable lookupTable, ++ String name) { DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,407,1) -- VtkObjectAdapter vtkObject = new VtkObjectAdapter(lookupTable, VtkObject.LOOKUP_TABLE, lookupTableId, getNextVtkObjectId()); AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,407,2) ++ VtkObjectAdapter vtkObject = new VtkObjectAdapter(lookupTable, ++ VtkObject.LOOKUP_TABLE, lookupTableId, getNextVtkObjectId()); DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,417,1) -- synchronized public VtkObject addScalarBar(vtkScalarBarActor scalarBar, String name) { AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,417,2) ++ synchronized public VtkObject addScalarBar(vtkScalarBarActor scalarBar, ++ String name) { DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,421,1) -- VtkObjectAdapter vtkObject = new VtkObjectAdapter(scalarBar, VtkObject.SCALAR_BAR, scalarBarId, getNextVtkObjectId()); AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,421,2) ++ VtkObjectAdapter vtkObject = new VtkObjectAdapter(scalarBar, ++ VtkObject.SCALAR_BAR, scalarBarId, getNextVtkObjectId()); AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,431,3) ++ /** ++ * add text (i.e 2D) actor into the pipeline manager. ++ */ DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,437,1) -- VtkObjectAdapter vtkObject = new VtkObjectAdapter(txtActor, VtkObject.TXT_ACTOR, txtActorId, getNextVtkObjectId()); AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,437,2) ++ VtkObjectAdapter vtkObject = new VtkObjectAdapter(txtActor, ++ VtkObject.TXT_ACTOR, txtActorId, getNextVtkObjectId()); AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,447,3) ++ /** ++ * remove the VtkObject defined by Id for the pipeline manager. ++ */ DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,451,1) -- VtkObject vtkObject = (VtkObject) vtkObjectHashtable.remove(vtkObjectId); AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,451,2) ++ VtkObject vtkObject = (VtkObject) vtkObjectHashtable ++ .remove(vtkObjectId); DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,490,1) -- synchronized public void hideInputActor(VtkObject actor, vtkDataSet vtkDataSet) { AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,490,2) ++ synchronized public void hideInputActor(VtkObject actor, ++ vtkDataSet vtkDataSet) { AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,516,3) ++ /** ++ * remove the VtkObject defined by the vtkObject for the pipeline manager ++ */ DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,523,1) -- // View management AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,523,3) ++ /** ++ * returns the viewer of Cassandra (i.e panel and renderer). ++ */ DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,549,1) -- getCassandraView().GetRenderer().GetActiveCamera().SetParallelProjection(flag); AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,549,2) ++ getCassandraView().GetRenderer().GetActiveCamera() ++ .SetParallelProjection(flag); AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,582,4) ++ ++ public int getNbVtkObjects(){ ++ return(vtkObjectHashtable.size()); ++ } AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/VtkObjectAdapter.java,14,1) ++ import java.util.ArrayList; DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/VtkObjectAdapter.java,20,1) -- * @author seb AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/VtkObjectAdapter.java,20,11) ++ * This class define a implementation of the the Cassandra's VtkObject interface ++ * wich is a generic overload of vtkObject for a better adaptation to the ++ * Cassandra pipeline manager. ++ * ++ * Such object simplify the registration of the object into the pipeline, its ++ * managment and the pipeline connectivity. ++ * ++ * @author Sebastien Jourdain, Artenum SARL ++ * @author Julien Forest, Artenum SARL ++ * ++ * @version 1.1 DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/VtkObjectAdapter.java,33,7) -- private Object vtkObject; -- private int type = -1; -- private Integer id; -- private Integer localId; -- private String name; -- private Hashtable metadata; -- private boolean valide; AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/VtkObjectAdapter.java,33,9) ++ private Object vtkObject; ++ private int type = -1; ++ private Integer id; ++ private Integer localId; ++ private String name; ++ private Hashtable metadata; ++ private boolean valide; ++ private ArrayList<Integer> inputConnectivity; ++ private ArrayList<Integer> outputConnectivity; DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/VtkObjectAdapter.java,43,10) -- public VtkObjectAdapter(Object vtkObject, int type, String name, Integer id) { -- super(vtkObject, new JLabel(name)); -- new DragListener(this, getUI(), getUI()); -- this.vtkObject = vtkObject; -- this.type = type; -- this.name = name; -- this.id = id; -- this.metadata = new Hashtable(); -- valide = true; -- } AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/VtkObjectAdapter.java,43,20) ++ /** ++ * Main constructor. ++ * ++ * @param vtkObject ++ * @param type ++ * @param name ++ * @param id ++ */ ++ public VtkObjectAdapter(Object vtkObject, int type, String name, Integer id) { ++ super(vtkObject, new JLabel(name)); ++ new DragListener(this, getUI(), getUI()); ++ this.vtkObject = vtkObject; ++ this.type = type; ++ this.name = name; ++ this.id = id; ++ this.metadata = new Hashtable(); ++ valide = true; ++ inputConnectivity = new ArrayList<Integer>(); ++ outputConnectivity = new ArrayList<Integer>(); ++ } DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/VtkObjectAdapter.java,64,3) -- public Integer getId() { -- return id; -- } AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/VtkObjectAdapter.java,64,7) ++ /** ++ * return the Id of the current VtkObject. The Id is the reference in the ++ * pipeline topology. ++ */ ++ public Integer getId() { ++ return id; ++ } DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/VtkObjectAdapter.java,72,3) -- public int getType() { -- return type; -- } AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/VtkObjectAdapter.java,72,6) ++ /** ++ * Return the type (e.g data-set or filter) of the current object. ++ */ ++ public int getType() { ++ return type; ++ } DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/VtkObjectAdapter.java,79,3) -- public Object getVtkObject() { -- return vtkObject; -- } AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/VtkObjectAdapter.java,79,3) ++ public Object getVtkObject() { ++ return vtkObject; ++ } DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/VtkObjectAdapter.java,83,3) -- public void setId(Integer id) { -- this.id = id; -- } AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/VtkObjectAdapter.java,83,3) ++ public void setId(Integer id) { ++ this.id = id; ++ } DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/VtkObjectAdapter.java,87,3) -- public void setType(int i) { -- type = i; -- } AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/VtkObjectAdapter.java,87,3) ++ public void setType(int i) { ++ type = i; ++ } DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/VtkObjectAdapter.java,91,3) -- public void setVtkObject(Object object) { -- vtkObject = object; -- } AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/VtkObjectAdapter.java,91,3) ++ public void setVtkObject(Object object) { ++ vtkObject = object; ++ } DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/VtkObjectAdapter.java,95,3) -- public String toString() { -- return getName(); -- } AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/VtkObjectAdapter.java,95,3) ++ public String toString() { ++ return getName(); ++ } DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/VtkObjectAdapter.java,99,3) -- public Hashtable getMetaData() { -- return metadata; -- } AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/VtkObjectAdapter.java,99,3) ++ public Hashtable getMetaData() { ++ return metadata; ++ } DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/VtkObjectAdapter.java,103,3) -- public String getName() { -- return name; -- } AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/VtkObjectAdapter.java,103,3) ++ public String getName() { ++ return name; ++ } DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/VtkObjectAdapter.java,107,3) -- public void setName(String name) { -- this.name = name; -- } AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/VtkObjectAdapter.java,107,6) ++ /** ++ * Set the name of the current VtkObject. ++ */ ++ public void setName(String name) { ++ this.name = name; ++ } DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/VtkObjectAdapter.java,114,3) -- public boolean isValide() { -- return valide; -- } AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/VtkObjectAdapter.java,114,3) ++ public boolean isValide() { ++ return valide; ++ } DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/VtkObjectAdapter.java,118,3) -- public void setValide(boolean valide) { -- this.valide = valide; -- } AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/VtkObjectAdapter.java,118,3) ++ public void setValide(boolean valide) { ++ this.valide = valide; ++ } DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/VtkObjectAdapter.java,122,3) -- public Integer getLocalTypeId() { -- return localId; -- } AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/VtkObjectAdapter.java,122,3) ++ public Integer getLocalTypeId() { ++ return localId; ++ } DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/VtkObjectAdapter.java,126,3) -- public void setLocalTypeId(int localId) { -- this.localId = new Integer(localId); -- } AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/VtkObjectAdapter.java,126,107) ++ public void setLocalTypeId(int localId) { ++ this.localId = new Integer(localId); ++ } ++ ++ /** ++ * Add the VtkObject of Id vtkObjectId in input connectivity. ++ * ++ * @param vtkObjectId ++ */ ++ @Override ++ public void addInputConnectivtiy(int vtkObjectId) { ++ inputConnectivity.add(vtkObjectId); ++ } ++ ++ /** ++ * Add the VtkObject vtkObjectIn in the input connectivity list. ++ * ++ * @param vtkObjectIn ++ */ ++ @Override ++ public void addInputConnectivtiy(VtkObject vtkObjectIn) { ++ inputConnectivity.add(vtkObjectIn.getId()); ++ } ++ ++ /** ++ * ++ * ++ * @param VtkObjectId ++ * @return ++ */ ++ @Override ++ public ArrayList<Integer> getInputConnectivityList() { ++ return (inputConnectivity); ++ } ++ ++ /** ++ * return true if the VtkObject in input is in the input connectivity list. ++ */ ++ @Override ++ public boolean isInInputConnectivityInputList(VtkObject vtkObjectIn) { ++ return (inputConnectivity.contains(vtkObjectIn.getId())); ++ } ++ ++ /** ++ * return true if the VtkObject of Id vtkObjectId in input is in the input ++ * connectivity list. ++ */ ++ @Override ++ public boolean isInInputConnectivityInputList(int vtkObjectId) { ++ return (inputConnectivity.contains(vtkObjectId)); ++ } ++ ++ /** ++ * Add the VtkObject of Id vtkObjectId in output connectivity. ++ * ++ * @param vtkObjectId ++ */ ++ @Override ++ public void addOutputConnectivity(int vtkObjectId) { ++ outputConnectivity.add(vtkObjectId); ++ } ++ ++ /** ++ * Add the VtkObject vtkObjectIn in the output connectivity list. ++ * ++ * @param vtkObjectIn ++ */ ++ @Override ++ public void addOutputConnectivity(VtkObject vtkObjectIn) { ++ outputConnectivity.add(vtkObjectIn.getId()); ++ } ++ ++ /** ++ * @return return the output connectivity list. ++ */ ++ @Override ++ public ArrayList<Integer> getOutputConnectivityList() { ++ return (outputConnectivity); ++ } ++ ++ /** ++ * return true if the VtkObject in input is in the input connectivity list. ++ */ ++ @Override ++ public boolean inOutputConnectivityList(VtkObject vtkObjectIn) { ++ return (outputConnectivity.contains(vtkObjectIn.getId())); ++ } ++ ++ /** ++ * return true if the VtkObject of Id vtkObjectId in input is in the input ++ * connectivity list. ++ */ ++ @Override ++ public boolean inInputConnectivityList(int vtkObjectId) { ++ return (outputConnectivity.contains(vtkObjectId)); ++ } ++ ++ @Override ++ public void clearInputConnectivityList() { ++ inputConnectivity.clear(); ++ } ++ ++ @Override ++ public void clearOutputConnecvityLsit() { ++ outputConnectivity.clear(); ++ } ++ AddBlock(Plugins/CellCenter/src/com/artenum/cassandra/plugin/cellcenter/CellCenterControlUI.java,28,1) ++ import com.artenum.cassandra.plugin.PlugInControlUI; AddBlock(Plugins/CellCenter/src/com/artenum/cassandra/plugin/cellcenter/CellCenterControlUI.java,37,1) ++ import java.awt.event.ItemEvent; DelBlock(Plugins/CellCenter/src/com/artenum/cassandra/plugin/cellcenter/CellCenterControlUI.java,72,1) -- public class CellCenterControlUI extends JDialog implements ActionListener, ChangeListener { AddBlock(Plugins/CellCenter/src/com/artenum/cassandra/plugin/cellcenter/CellCenterControlUI.java,72,1) ++ public class CellCenterControlUI extends PlugInControlUI { AddBlock(Plugins/CellCenter/src/com/artenum/cassandra/plugin/cellcenter/CellCenterControlUI.java,225,5) ++ ++ public void itemStateChanged(ItemEvent arg0) { ++ // TODO Auto-generated method stub ++ ++ } AddBlock(Plugins/CellCenter/src/com/artenum/cassandra/plugin/cellcenter/CellCenterPlugin.java,44,1) ++ import com.artenum.cassandra.plugin.CassandraPlugInProperty; AddBlock(Plugins/CellCenter/src/com/artenum/cassandra/plugin/cellcenter/CellCenterPlugin.java,46,1) ++ import com.artenum.cassandra.plugin.PlugInControlUI; DelBlock(Plugins/CellCenter/src/com/artenum/cassandra/plugin/cellcenter/CellCenterPlugin.java,61,1) -- * @author Julien Forest AddBlock(Plugins/CellCenter/src/com/artenum/cassandra/plugin/cellcenter/CellCenterPlugin.java,61,2) ++ * @author Julien Forest, ARTENUM SARL ++ * DelBlock(Plugins/CellCenter/src/com/artenum/cassandra/plugin/cellcenter/CellCenterPlugin.java,83,1) -- private Filter filerImpl; AddBlock(Plugins/CellCenter/src/com/artenum/cassandra/plugin/cellcenter/CellCenterPlugin.java,83,1) ++ private Filter filterImpl; DelBlock(Plugins/CellCenter/src/com/artenum/cassandra/plugin/cellcenter/CellCenterPlugin.java,101,2) -- this.filerImpl = new FilterImpl(); -- filerImpl.addRemoveListener(this); AddBlock(Plugins/CellCenter/src/com/artenum/cassandra/plugin/cellcenter/CellCenterPlugin.java,101,2) ++ this.filterImpl = new FilterImpl(); ++ filterImpl.addRemoveListener(this); DelBlock(Plugins/CellCenter/src/com/artenum/cassandra/plugin/cellcenter/CellCenterPlugin.java,156,1) -- filter = pipelineManager.addFilter(filerImpl, "Cell Centers"); AddBlock(Plugins/CellCenter/src/com/artenum/cassandra/plugin/cellcenter/CellCenterPlugin.java,156,1) ++ filter = pipelineManager.addFilter(filterImpl, "Cell Centers"); DelBlock(Plugins/CellCenter/src/com/artenum/cassandra/plugin/cellcenter/CellCenterPlugin.java,165,3) -- -- // to see directly the control panel when we intanciate the plugin -- controlUI.setVisible(true); DelBlock(Plugins/CellCenter/src/com/artenum/cassandra/plugin/cellcenter/CellCenterPlugin.java,199,4) -- filerImpl.getInputDataSet().clear(); -- filerImpl.getInputDataSet().add(vtkDataSet); -- filerImpl.getOutputDataSet().clear(); -- filerImpl.getOutputDataSet().add(cellCenter.GetOutput()); AddBlock(Plugins/CellCenter/src/com/artenum/cassandra/plugin/cellcenter/CellCenterPlugin.java,199,4) ++ filterImpl.getInputDataSet().clear(); ++ filterImpl.getInputDataSet().add(vtkDataSet); ++ filterImpl.getOutputDataSet().clear(); ++ filterImpl.getOutputDataSet().add(cellCenter.GetOutput()); AddBlock(Plugins/CellCenter/src/com/artenum/cassandra/plugin/cellcenter/CellCenterPlugin.java,231,18) ++ ++ public Filter getInternalFilter() { ++ return filterImpl; ++ } ++ ++ public CassandraPlugInProperty getPlugInProperty() { ++ // TODO Auto-generated method stub ++ return null; ++ } ++ ++ public void updatePlugIn(CassandraPlugInProperty prop) { ++ // TODO Auto-generated method stub ++ ++ } ++ ++ public PlugInControlUI getControlUI() { ++ return controlUI; ++ } DelBlock(Plugins/CellCenter/src/com/artenum/cassandra/plugin/cellcenter/InstanciationManager.java,34,7) -- * Project ref : CASSANDRA project -- * Copyright and license : See relevant sections -- * Status : under development -- * Creation : 04/03/2005 -- * Modification : -- * -- * Description : AddBlock(Plugins/CellCenter/src/com/artenum/cassandra/plugin/cellcenter/InstanciationManager.java,34,6) ++ * Project ref : CASSANDRA project ++ * Copyright and license : See relevant sections ++ * Status : under development ++ * Creation : 04/03/2005 ++ * Modification : ++ * Description : DelBlock(Plugins/CellCenter/src/com/artenum/cassandra/plugin/cellcenter/InstanciationManager.java,41,1) -- * AddBlock(Plugins/CellCenter/src/com/artenum/cassandra/plugin/cellcenter/InstanciationManager.java,41,1) ++ * DelBlock(Plugins/CellCenter/src/com/artenum/cassandra/plugin/cellcenter/InstanciationManager.java,44,2) -- * Version number Author (name, e-mail) Corrections/Modifications -- * 0.1 Sebastien Jourdain, jourdain@artenum.com Creation AddBlock(Plugins/CellCenter/src/com/artenum/cassandra/plugin/cellcenter/InstanciationManager.java,44,10) ++ * ++ * Version number ++ * Author (name, e-mail) ++ * Corrections/Modifications ++ * ++ * ++ * 0.1 ++ * Sebastien Jourdain, jourdain@artenum.com ++ * Creation ++ * DelBlock(Plugins/CellCenter/src/com/artenum/cassandra/plugin/cellcenter/InstanciationManager.java,55,3) -- * -- * @author Sebastien Jourdain -- * @version 0.1 AddBlock(Plugins/CellCenter/src/com/artenum/cassandra/plugin/cellcenter/InstanciationManager.java,55,5) ++ * ++ * @author Sebastien Jourdain, ARTENUM SARL ++ * @author Julien Forest, ARTENUM SARL ++ * ++ * @version 1.2 DelBlock(Plugins/CellCenter/src/com/artenum/cassandra/plugin/cellcenter/InstanciationManager.java,76,1) -- // Register the plugin in the framework in order to access to the contextual popup menu of the plugin AddBlock(Plugins/CellCenter/src/com/artenum/cassandra/plugin/cellcenter/InstanciationManager.java,76,2) ++ // Register the plugin in the framework in order to access to the ++ // contextual popup menu of the plugin AddBlock(Plugins/CellCenter/src/com/artenum/cassandra/plugin/cellcenter/InstanciationManager.java,79,3) ++ ++ // to see the controler automatically ++ plugin.getControlUI().setVisible(true); DelBlock(Plugins/Clipping/build.xml,54,1) -- <javac srcdir="${src.dir}" destdir="${classes.build.dir}" optimize="yes"> AddBlock(Plugins/Clipping/build.xml,54,1) ++ <javac srcdir="${src.dir}" destdir="${classes.build.dir}" optimize="yes" debug="yes"> AddTxtFile(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClipingPlanePlugInProperty.java) AddBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlaneControlUI.java,14,1) ++ import com.artenum.cassandra.plugin.PlugInControlUI; DelBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlaneControlUI.java,61,1) -- * @author Sebastien Jourdain AddBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlaneControlUI.java,61,1) ++ * @author Sebastien Jourdain, ARTENUM SARL DelBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlaneControlUI.java,64,1) -- public class ClippingPlaneControlUI extends JDialog implements ActionListener, ChangeListener, ItemListener { AddBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlaneControlUI.java,64,1) ++ public class ClippingPlaneControlUI extends PlugInControlUI { AddBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,17,1) ++ import com.artenum.cassandra.plugin.CassandraPlugInProperty; AddBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,19,1) ++ import com.artenum.cassandra.plugin.PlugInControlUI; AddBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,36,1) ++ import java.util.HashMap; AddBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,38,1) ++ import javax.swing.JComponent; DelBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,44,7) -- * Project ref : CASSANDRA project -- * Copyright and license : See relevant sections -- * Status : under development -- * Creation : 04/03/2005 -- * Modification : -- * -- * Description : AddBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,44,6) ++ * Project ref : CASSANDRA project ++ * Copyright and license : See relevant sections ++ * Status : under development ++ * Creation : 04/03/2005 ++ * Modification : ++ * Description : DelBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,52,1) -- * AddBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,52,1) ++ * DelBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,55,2) -- * Version number Author (name, e-mail) Corrections/Modifications -- * 0.1 Sebastien Jourdain, jourdain@artenum.com Creation AddBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,55,10) ++ * ++ * Version number ++ * Author (name, e-mail) ++ * Corrections/Modifications ++ * ++ * ++ * 0.1 ++ * Sebastien Jourdain, jourdain@artenum.com ++ * Creation ++ * DelBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,66,3) -- * -- * @author Sebastien Jourdain -- * @version 0.1 AddBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,66,5) ++ * ++ * @author Sebastien Jourdain, Artenum SARL ++ * @author Julien Forest, Artenum SARL ++ * ++ * @version 0.5 DelBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,91,1) -- private Filter filerImpl; AddBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,91,2) ++ private vtkScalarBarActor scalBar; ++ private Filter filterImpl; DelBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,99,1) -- AddBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,99,1) ++ DelBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,103,3) -- * Main contructor and VTK pipeline definition. -- * @param pipelineManager is the central pipeline manager of Cassandra. -- * @param pluginManager is the central list of plugin instance, where a contextual menu access is given. AddBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,103,7) ++ * Main constructor and VTK pipeline definition. ++ * ++ * @param pipelineManager ++ * is the central pipeline manager of Cassandra. ++ * @param pluginManager ++ * is the central list of plugin instance, where a contextual ++ * menu access is given. AddBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,112,20) ++ initPlugIn(pipelineManager, pluginManager, owner); ++ initPipeline(); ++ } ++ ++ /** ++ * Contructor used in the pipeline importer ++ * ++ * @param pipelineManager ++ * @param pluginManager ++ * @param owner ++ * @param initPipeline ++ */ ++ public ClippingPlanePlugin(PipeLineManager pipelineManager, PluginManager pluginManager, Frame owner, boolean initPipeline) { ++ initPlugIn(pipelineManager, pluginManager, owner); ++ if (initPipeline) { ++ initPipeline(); ++ } ++ } ++ ++ public void initPlugIn(PipeLineManager pipelineManager, PluginManager pluginManager, Frame owner) { DelBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,136,2) -- this.filerImpl = new FilterImpl(); -- filerImpl.addRemoveListener(this); AddBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,137,5) ++ // Cassandra filter macro ++ this.filterImpl = new FilterImpl(); ++ filterImpl.addRemoveListener(this); ++ filterImpl.setRelatedPluginClass(this.getClass()); ++ DelBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,145,1) -- // Init contextual menu AddBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,145,1) ++ // Init contextual menu DelBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,149,4) -- public void actionPerformed(ActionEvent e) { -- controlUI.setVisible(true); -- } -- }); AddBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,149,4) ++ public void actionPerformed(ActionEvent e) { ++ controlUI.setVisible(true); ++ } ++ }); DelBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,157,4) -- public void actionPerformed(ActionEvent e) { -- remove(); -- } -- }); AddBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,157,4) ++ public void actionPerformed(ActionEvent e) { ++ remove(); ++ } ++ }); AddBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,162,2) ++ } ++ AddBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,165,3) ++ ++ public void initPipeline() { ++ AddBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,169,1) ++ if (plane == null){ AddBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,171,1) ++ } AddBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,175,1) ++ if (planeClip == null){ AddBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,177,1) ++ } AddBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,180,1) ++ if(cutMapper == null){ AddBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,182,1) ++ } DelBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,185,1) -- //we recover the common lookup table AddBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,185,1) ++ // we recover the common lookup table DelBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,187,4) -- LookupTable Table = new LookupTable(); -- Table.Build(); -- cutMapper.SetLookupTable(Table.GetLookupTable()); -- System.out.println("Color map =" + cutMapper.GetLookupTable().Print()); AddBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,187,4) ++ * LookupTable Table = new LookupTable(); Table.Build(); ++ * cutMapper.SetLookupTable(Table.GetLookupTable()); ++ * System.out.println("Color map =" + ++ * cutMapper.GetLookupTable().Print()); AddBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,192,1) ++ if(cutActor == null){ AddBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,194,1) ++ } AddBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,198,1) ++ if(lookupTable == null){ AddBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,200,1) ++ } DelBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,205,1) -- AddBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,205,1) ++ DelBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,207,1) -- vtkScalarBarActor scalBar = new vtkScalarBarActor(); AddBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,207,1) ++ scalBar = new vtkScalarBarActor(); DelBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,211,4) -- actor = pipelineManager.addActor(cutActor, "Clipping plane"); -- mapper = pipelineManager.addMapper(cutMapper, "Clipping plane"); -- dataset = pipelineManager.addDataSet(planeClip.GetOutput(), "Clipping plane"); -- filter = pipelineManager.addFilter(filerImpl, "Clipping plane"); AddBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,211,6) ++ actor = pipelineManager.addActor(cutActor, "Clipping plane Actor"); ++ mapper = pipelineManager.addMapper(cutMapper, "Clipping plane Mapper"); ++ dataset = pipelineManager.addDataSet(planeClip.GetOutput(), "Clipping Plane Output"); ++ filter = pipelineManager.addFilter(filterImpl, "Clipping Plane Filter"); ++ ++ // adding the vtk components to the pipeline DelBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,219,1) -- //pipelineManager.setActorVisible(pipelineManager.addScalarBar(scalBar, "Clipping plane"), true); AddBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,219,2) ++ // pipelineManager.setActorVisible(pipelineManager.addScalarBar(scalBar, ++ // "Clipping plane"), true); DelBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,227,1) -- AddBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,227,1) ++ DelBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,229,8) -- controlUI.setVisible(true); -- -- // just to update the position of the 3D widget if needed -- if( planWidget != null){ -- planWidget.SetNormal(plane.GetNormal()); -- planWidget.SetOrigin(plane.GetOrigin()); -- } -- AddBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,229,8) ++ // /controlUI.setVisible(true); Since 1.2, done in the Intanciation ++ // manager ++ ++ // just to update the position of the 3D widget if needed ++ if (planWidget != null) { ++ planWidget.SetNormal(plane.GetNormal()); ++ planWidget.SetOrigin(plane.GetOrigin()); ++ } AddBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,238,14) ++ ++ /** ++ * Set the internal component from an external pipeline like in the Jython script relading procedure. ++ * @param plane ++ * @param planeClip ++ * @param cutMapper ++ * @param cutActor ++ */ ++ public void setPipelineComponents(vtkPlane plane, vtkClipDataSet planeClip, vtkDataSetMapper cutMapper, vtkActor cutActor){ ++ this.plane = plane; ++ this.planeClip = planeClip; ++ this.cutMapper = cutMapper; ++ this.cutActor = cutActor; ++ } AddBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,253,2) ++ ++ AddBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,257,1) ++ * DelBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,287,1) -- //if ((nbUpdate++ == 0) && pipelineManager.getActorList().getData().contains(actor)) { AddBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,287,2) ++ // if ((nbUpdate++ == 0) && ++ // pipelineManager.getActorList().getData().contains(actor)) { DelBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,294,6) -- -- // Graph -- filerImpl.getInputDataSet().clear(); -- filerImpl.getInputDataSet().add(vtkDataSet); -- filerImpl.getOutputDataSet().clear(); -- filerImpl.getOutputDataSet().add(planeClip.GetOutput()); AddBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,294,10) ++ ++ // registration of internal elements of the filter ++ // useful for export of the detailed pipeline if needed ++ filterImpl.getInputDataSet().clear(); ++ filterImpl.getInputDataSet().add(vtkDataSet); ++ filterImpl.getOutputDataSet().clear(); ++ filterImpl.getOutputDataSet().add(planeClip.GetOutput()); ++ filterImpl.getAlgorithm().add(planeClip); ++ filterImpl.getVtkImplicitFunction().clear(); ++ filterImpl.getVtkImplicitFunction().add(plane); AddBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,305,1) ++ AddBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,319,4) ++ /** ++ * remove the VtkObjects related to this plug-in instance from the pipeline ++ * manager. ++ */ DelBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,332,1) -- * String printed in the plugin manager list AddBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,332,1) ++ * String printed in the plug-in manager list AddBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,337,1) ++ AddBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,340,1) ++ * DelBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,343,13) -- void show3DWidget(Boolean widgetFlag){ -- -- if ( widgetFlag){ -- if (planWidget == null){ -- init3DWidget(); -- } -- //planWidget.PlaceWidget(lastDataSet.GetBounds()); -- -- planWidget.UpdatePlacement(); -- planWidget.On(); -- } else{ -- planWidget.Off(); -- } AddBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,343,13) ++ void show3DWidget(boolean widgetFlag) { ++ ++ if (widgetFlag) { ++ if (planWidget == null) { ++ init3DWidget(); ++ } ++ // planWidget.PlaceWidget(lastDataSet.GetBounds()); ++ ++ planWidget.UpdatePlacement(); ++ planWidget.On(); ++ } else { ++ planWidget.Off(); ++ } DelBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,357,1) -- AddBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,357,1) ++ DelBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,359,1) -- * Initialise the 3D control widget. AddBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,359,1) ++ * Initialize the 3D control widget. DelBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,361,31) -- void init3DWidget(){ -- -- //System.out.println("initialisation of the widget"); -- planWidget = new vtkImplicitPlaneWidget(); -- planWidget.SetInteractor(pipelineManager.getCassandraView().getIren()); -- -- // to make the interaction ON and be able yto control the widget -- planWidget.EnabledOn(); -- pipelineManager.getCassandraView().deepValidateView(); //Don t ask me why, apparently needed, at least under MacOSX and -- //default swing LAF, to activate the widget interactor. -- -- // size the plan on the input data set. Should be done in first -- // to allow the plan orientation AFTER. -- planWidget.SetInput(lastDataSet); -- planWidget.SetPlaceFactor(1.2); -- planWidget.PlaceWidget(); -- // then we orient the plan in the cutting plane. -- planWidget.SetNormal(plane.GetNormal()); -- System.out.println(planWidget.GetNormal()[0]+" "+planWidget.GetNormal()[1]+" "+planWidget.GetNormal()[2]); -- -- // just to see something and not only the widget. -- planWidget.GetPlaneProperty().SetOpacity(0.3); -- -- // we add the local observer for interaction events, i.e the method name -- // in last argument of the current object. -- planWidget.AddObserver("InteractionEvent", this,"interactionCallBack"); -- -- // both not needed. -- //planWidget.AddObserver("CharEvent", this, "widgetCharEvent"); -- //planWidget.AddObserver("StartInteractionEvent", this, "startInteractionCallBack"); -- AddBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,361,35) ++ void init3DWidget() { ++ ++ planWidget = new vtkImplicitPlaneWidget(); ++ planWidget.SetInteractor(pipelineManager.getCassandraView().getIren()); ++ ++ // to make the interaction ON and be able to control the widget ++ planWidget.EnabledOn(); ++ pipelineManager.getCassandraView().deepValidateView(); // Don t ask me ++ // why, ++ // apparently ++ // needed, at ++ // least under ++ // MacOSX and ++ // default swing LAF, to activate the widget interactor. ++ ++ // size the plan on the input data set. Should be done in first ++ // to allow the plan orientation AFTER. ++ planWidget.SetInput(lastDataSet); ++ planWidget.SetPlaceFactor(1.2); ++ planWidget.PlaceWidget(); ++ // then we orient the plan in the cutting plane. ++ planWidget.SetNormal(plane.GetNormal()); ++ ++ // just to see something and not only the widget. ++ planWidget.GetPlaneProperty().SetOpacity(0.3); ++ ++ // we add the local observer for interaction events, i.e the method name ++ // in last argument of the current object. ++ planWidget.AddObserver("InteractionEvent", this, "interactionCallBack"); ++ ++ // both not needed. ++ // planWidget.AddObserver("CharEvent", this, "widgetCharEvent"); ++ // planWidget.AddObserver("StartInteractionEvent", this, ++ // "startInteractionCallBack"); ++ DelBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,397,4) -- -- private void widgetCharEvent(){ -- char code = Character.toLowerCase(pipelineManager.getCassandraView().getIren().GetKeyCode()); -- System.out.println("touch typed:"+code); DelBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,398,3) -- if (code == 'b'){ // FIXME -- planWidget.SetEnabled(1); -- } AddBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,398,7) ++ private void widgetCharEvent() { ++ char code = Character.toLowerCase(pipelineManager.getCassandraView().getIren().GetKeyCode()); ++ System.out.println("touch typed:" + code); ++ ++ if (code == 'b') { // FIXME ++ planWidget.SetEnabled(1); ++ } DelBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,406,4) -- -- // needed to initialise the interaction control on the widget. -- private void startInteractionCallBack(){ -- System.out.println("wiget interaction started"); AddBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,406,4) ++ ++ // needed to initialise the interaction control on the widget. ++ private void startInteractionCallBack() { ++ System.out.println("wiget interaction started"); DelBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,411,10) -- -- -- /** -- * -- */ -- private void interactionCallBack(){ -- plane.SetNormal(planWidget.GetNormal()); -- controlUI.setNormalFieldsValues(planWidget.GetNormal()); -- controlUI.setOrigineFieldsValues(planWidget.GetOrigin()); -- plane.SetOrigin(planWidget.GetOrigin()[0], planWidget.GetOrigin()[1], planWidget.GetOrigin()[2]); AddBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,411,9) ++ ++ /** ++ * Handle the 3D call-backs. ++ */ ++ private void interactionCallBack() { ++ plane.SetNormal(planWidget.GetNormal()); ++ controlUI.setNormalFieldsValues(planWidget.GetNormal()); ++ controlUI.setOrigineFieldsValues(planWidget.GetOrigin()); ++ plane.SetOrigin(planWidget.GetOrigin()[0], planWidget.GetOrigin()[1], planWidget.GetOrigin()[2]); AddBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/ClippingPlanePlugin.java,421,44) ++ ++ public Filter getInternalFilter() { ++ return filterImpl; ++ } ++ ++ public PlugInControlUI getControlUI() { ++ return controlUI; ++ } ++ ++ /** ++ * generic method of update of the current clipping using a CassandraPlugInProperty. This update the setting of the ++ * plug-in and call the updateClippingPlane method. ++ */ ++ public void updatePlugIn(CassandraPlugInProperty prop) { ++ try{ ++ this.updateClippingPlane( ((Double) prop.getProperty("cx")).doubleValue(), ((Double) prop.getProperty("cy")).doubleValue(), ((Double) prop.getProperty("cz")).doubleValue(), ++ ((Double)prop.getProperty("nx")).doubleValue(), ((Double)prop.getProperty("ny")).doubleValue(), ((Double)prop.getProperty("nz")).doubleValue(), ++ (vtkDataSet)prop.getProperty("vtkDataSet"), ((Boolean)prop.getProperty("insideOut")).booleanValue() ); ++ }catch (Exception e) { ++ System.out.println("Error, property not understood."); ++ } ++ } ++ ++ /** ++ * return the properties of the current plug-in ++ */ ++ public CassandraPlugInProperty getPlugInProperty() { ++ ++ ClipingPlanePlugInProperty prop = new ClipingPlanePlugInProperty(); ++ ++ prop.addPropety("cx", new Double(plane.GetOrigin()[0])); ++ prop.addPropety("cy", new Double(plane.GetOrigin()[1])); ++ prop.addPropety("cz", new Double(plane.GetOrigin()[2])); ++ ++ prop.addPropety("nx", new Double(plane.GetNormal()[0])); ++ prop.addPropety("ny", new Double(plane.GetNormal()[0])); ++ prop.addPropety("nz", new Double(plane.GetNormal()[0])); ++ ++ prop.addPropety("vtkDataSet", planeClip.GetInput()); ++ ++ prop.addPropety("insideOut", new Boolean( (planeClip.GetInsideOut() == 1) )); ++ ++ return prop; ++ } DelBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/InstanciationManager.java,19,1) -- * @author Sebastien AddBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/InstanciationManager.java,19,5) ++ * @author Sebastien Jourdain, ARTENUM SARL ++ * @author Julien Forest, ARTENUM SARL ++ * ++ * @version 1.2 ++ * AddBlock(Plugins/Clipping/src/com/artenum/cassandra/plugin/clipping/InstanciationManager.java,39,3) ++ ++ // to see the controler automatically ++ plugin.getControlUI().setVisible(true); AddBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlaneControlUI.java,28,1) ++ import com.artenum.cassandra.plugin.PlugInControlUI; DelBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlaneControlUI.java,66,1) -- * Status : under development AddBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlaneControlUI.java,66,1) ++ * Status : stable DelBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlaneControlUI.java,71,13) -- * -- * -- * -- * Version number -- * Author (name, e-mail) -- * Corrections/Modifications -- * -- * -- * 0.1 -- * Sebastien Jourdain, jourdain@artenum.com -- * Creation -- * -- * DelBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlaneControlUI.java,72,2) -- * @author Sebastien Jourdain -- * @version 0.1 AddBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlaneControlUI.java,72,5) ++ * ++ * @author Sebastien Jourdain, ARTENUM SARL ++ * @author Julien Forest, ARTENUM SARL ++ * ++ * @version 1.2 DelBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlaneControlUI.java,78,1) -- public class CuttingPlaneControlUI extends JDialog implements ActionListener, ChangeListener, ItemListener { AddBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlaneControlUI.java,78,1) ++ public class CuttingPlaneControlUI extends PlugInControlUI { DelBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlaneControlUI.java,278,3) -- normalX.setValue(normal[0]); -- normalY.setValue(normal[1]); -- normalZ.setValue(normal[2]); AddBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlaneControlUI.java,278,3) ++ normalX.setValue(new Double(normal[0])); ++ normalY.setValue(new Double(normal[1])); ++ normalZ.setValue(new Double(normal[2])); DelBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlaneControlUI.java,288,3) -- centerX.setValue(origine[0]); -- centerY.setValue(origine[1]); -- centerZ.setValue(origine[2]); AddBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlaneControlUI.java,288,3) ++ centerX.setValue(new Double(origine[0])); ++ centerY.setValue(new Double(origine[1])); ++ centerZ.setValue(new Double(origine[2])); AddBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlanePlugin.java,30,1) ++ import com.artenum.cassandra.plugin.CassandraPlugInProperty; AddBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlanePlugin.java,32,1) ++ import com.artenum.cassandra.plugin.PlugInControlUI; DelBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlanePlugin.java,94,1) -- private Filter filerImpl; AddBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlanePlugin.java,94,1) ++ private Filter filterImpl; DelBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlanePlugin.java,114,2) -- this.filerImpl = new FilterImpl(); -- filerImpl.addRemoveListener(this); AddBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlanePlugin.java,114,2) ++ this.filterImpl = new FilterImpl(); ++ filterImpl.addRemoveListener(this); DelBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlanePlugin.java,174,1) -- filter = pipelineManager.addFilter(filerImpl, "Cutting plane"); AddBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlanePlugin.java,174,1) ++ filter = pipelineManager.addFilter(filterImpl, "Cutting plane"); DelBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlanePlugin.java,224,4) -- filerImpl.getInputDataSet().clear(); -- filerImpl.getInputDataSet().add(vtkDataSetIn); -- filerImpl.getOutputDataSet().clear(); -- filerImpl.getOutputDataSet().add(planeCut.GetOutput()); AddBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlanePlugin.java,224,4) ++ filterImpl.getInputDataSet().clear(); ++ filterImpl.getInputDataSet().add(vtkDataSetIn); ++ filterImpl.getOutputDataSet().clear(); ++ filterImpl.getOutputDataSet().add(planeCut.GetOutput()); DelBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlanePlugin.java,268,1) -- void show3DWidget(Boolean widgetFlag){ AddBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlanePlugin.java,268,1) ++ void show3DWidget(boolean widgetFlag){ AddBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlanePlugin.java,343,8) ++ ++ public Filter getInternalFilter() { ++ return filterImpl; ++ } ++ ++ public CassandraPlugInProperty getPlugInProperty() { ++ // TODO Auto-generated method stub ++ return null; AddBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlanePlugin.java,352,10) ++ ++ public void updatePlugIn(CassandraPlugInProperty prop) { ++ // TODO Auto-generated method stub ++ ++ } ++ ++ public PlugInControlUI getControlUI() { ++ return controlUI; ++ } ++ } DelBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/InstanciationManager.java,34,7) -- * Project ref : CASSANDRA project -- * Copyright and license : See relevant sections -- * Status : under development -- * Creation : 04/03/2005 -- * Modification : -- * -- * Description : AddBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/InstanciationManager.java,34,6) ++ * Project ref : CASSANDRA project ++ * Copyright and license : See relevant sections ++ * Status : under development ++ * Creation : 04/03/2005 ++ * Modification : ++ * Description : DelBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/InstanciationManager.java,41,1) -- * AddBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/InstanciationManager.java,41,1) ++ * DelBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/InstanciationManager.java,44,2) -- * Version number Author (name, e-mail) Corrections/Modifications -- * 0.1 Sebastien Jourdain, jourdain@artenum.com Creation AddBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/InstanciationManager.java,44,10) ++ * ++ * Version number ++ * Author (name, e-mail) ++ * Corrections/Modifications ++ * ++ * ++ * 0.1 ++ * Sebastien Jourdain, jourdain@artenum.com ++ * Creation ++ * DelBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/InstanciationManager.java,55,3) -- * -- * @author Sebastien Jourdain -- * @version 0.1 AddBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/InstanciationManager.java,55,3) ++ * ++ * @author Sebastien Jourdain ++ * @version 0.1 DelBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/InstanciationManager.java,74,1) -- // Register the plugin in the framework in order to access to the contextual popup menu of the plugin AddBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/InstanciationManager.java,74,2) ++ // Register the plugin in the framework in order to access to the ++ // contextual popup menu of the plugin AddBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/InstanciationManager.java,77,3) ++ ++ // to see the controler automatically ++ plugin.getControlUI().setVisible(true); AddBlock(Plugins/Default/src/com/artenum/cassandra/plugin/defaults/CubeAxis.java,16,1) ++ import com.artenum.cassandra.plugin.CassandraPlugInProperty; AddBlock(Plugins/Default/src/com/artenum/cassandra/plugin/defaults/CubeAxis.java,18,1) ++ import com.artenum.cassandra.plugin.PlugInControlUI; DelBlock(Plugins/Default/src/com/artenum/cassandra/plugin/defaults/CubeAxis.java,47,1) -- * @author Sebastien AddBlock(Plugins/Default/src/com/artenum/cassandra/plugin/defaults/CubeAxis.java,47,5) ++ * @author Sebastien Jourdain, ARTENUM SARL ++ * @author Julien Forest, ARTENUM SARL ++ * ++ * @version 1.2 ++ * AddBlock(Plugins/Default/src/com/artenum/cassandra/plugin/defaults/CubeAxis.java,200,21) ++ ++ public Filter getInternalFilter() { ++ return filterImpl; ++ } ++ ++ public CassandraPlugInProperty getPlugInProperty() { ++ // TODO Auto-generated method stub ++ return null; ++ } ++ ++ public void updatePlugIn(CassandraPlugInProperty prop) { ++ // TODO Auto-generated method stub ++ ++ } ++ ++ /** ++ * return null, because no GUI defined. ++ */ ++ public PlugInControlUI getControlUI() { ++ return null; ++ } DelBlock(Plugins/DynamicDataset/src/com/artenum/cassandra/plugin/dynamic/dataset/DynamicDatasetControlUI.java,25,2) -- import com.artenum.cassandra.pipeline.PipeLineManager; -- DelBlock(Plugins/DynamicDataset/src/com/artenum/cassandra/plugin/dynamic/dataset/DynamicDatasetControlUI.java,29,2) -- import java.awt.event.ActionListener; -- AddBlock(Plugins/DynamicDataset/src/com/artenum/cassandra/plugin/dynamic/dataset/DynamicDatasetControlUI.java,29,1) ++ import java.awt.event.ItemEvent; DelBlock(Plugins/DynamicDataset/src/com/artenum/cassandra/plugin/dynamic/dataset/DynamicDatasetControlUI.java,31,1) -- DelBlock(Plugins/DynamicDataset/src/com/artenum/cassandra/plugin/dynamic/dataset/DynamicDatasetControlUI.java,43,1) -- import javax.swing.JDialog; DelBlock(Plugins/DynamicDataset/src/com/artenum/cassandra/plugin/dynamic/dataset/DynamicDatasetControlUI.java,52,1) -- import javax.swing.event.ChangeListener; AddBlock(Plugins/DynamicDataset/src/com/artenum/cassandra/plugin/dynamic/dataset/DynamicDatasetControlUI.java,54,3) ++ import com.artenum.cassandra.pipeline.PipeLineManager; ++ import com.artenum.cassandra.plugin.PlugInControlUI; ++ DelBlock(Plugins/DynamicDataset/src/com/artenum/cassandra/plugin/dynamic/dataset/DynamicDatasetControlUI.java,73,2) -- * @author Sebastien Jourdain -- * @version 0.1 AddBlock(Plugins/DynamicDataset/src/com/artenum/cassandra/plugin/dynamic/dataset/DynamicDatasetControlUI.java,73,4) ++ * @author Sebastien Jourdain, ARTENUM SARL ++ * @author Julien Forest, ARTENUM SARL ++ * ++ * @version 1.2 DelBlock(Plugins/DynamicDataset/src/com/artenum/cassandra/plugin/dynamic/dataset/DynamicDatasetControlUI.java,78,1) -- public class DynamicDatasetControlUI extends JDialog implements ActionListener, ChangeListener, Observer { AddBlock(Plugins/DynamicDataset/src/com/artenum/cassandra/plugin/dynamic/dataset/DynamicDatasetControlUI.java,78,1) ++ public class DynamicDatasetControlUI extends PlugInControlUI implements Observer { AddBlock(Plugins/DynamicDataset/src/com/artenum/cassandra/plugin/dynamic/dataset/DynamicDatasetControlUI.java,359,5) ++ ++ public void itemStateChanged(ItemEvent arg0) { ++ // TODO Auto-generated method stub ++ ++ } AddBlock(Plugins/DynamicDataset/src/com/artenum/cassandra/plugin/dynamic/dataset/DynamicDatasetPlugin.java,30,1) ++ import com.artenum.cassandra.plugin.CassandraPlugInProperty; AddBlock(Plugins/DynamicDataset/src/com/artenum/cassandra/plugin/dynamic/dataset/DynamicDatasetPlugin.java,32,1) ++ import com.artenum.cassandra.plugin.PlugInControlUI; DelBlock(Plugins/DynamicDataset/src/com/artenum/cassandra/plugin/dynamic/dataset/DynamicDatasetPlugin.java,73,2) -- * @author Sebastien Jourdain -- * @version 0.1 AddBlock(Plugins/DynamicDataset/src/com/artenum/cassandra/plugin/dynamic/dataset/DynamicDatasetPlugin.java,73,4) ++ * @author Sebastien Jourdain, ARTENUM SARL ++ * @author Julien Forest, ARTENUM SARL ++ * ++ * @version 1.2 DelBlock(Plugins/DynamicDataset/src/com/artenum/cassandra/plugin/dynamic/dataset/DynamicDatasetPlugin.java,94,1) -- private Filter filerImpl; AddBlock(Plugins/DynamicDataset/src/com/artenum/cassandra/plugin/dynamic/dataset/DynamicDatasetPlugin.java,94,1) ++ private Filter filterImpl; DelBlock(Plugins/DynamicDataset/src/com/artenum/cassandra/plugin/dynamic/dataset/DynamicDatasetPlugin.java,116,2) -- this.filerImpl = new FilterImpl(); -- filerImpl.addRemoveListener(this); AddBlock(Plugins/DynamicDataset/src/com/artenum/cassandra/plugin/dynamic/dataset/DynamicDatasetPlugin.java,116,2) ++ this.filterImpl = new FilterImpl(); ++ filterImpl.addRemoveListener(this); DelBlock(Plugins/DynamicDataset/src/com/artenum/cassandra/plugin/dynamic/dataset/DynamicDatasetPlugin.java,179,2) -- filter = pipelineManager.addFilter(filerImpl, "Dynamic dataset"); -- filerImpl.getOutputDataSet().add(dataSetVTK.GetOutput()); AddBlock(Plugins/DynamicDataset/src/com/artenum/cassandra/plugin/dynamic/dataset/DynamicDatasetPlugin.java,179,2) ++ filter = pipelineManager.addFilter(filterImpl, "Dynamic dataset"); ++ filterImpl.getOutputDataSet().add(dataSetVTK.GetOutput()); AddBlock(Plugins/DynamicDataset/src/com/artenum/cassandra/plugin/dynamic/dataset/DynamicDatasetPlugin.java,281,18) ++ ++ public Filter getInternalFilter() { ++ return filterImpl; ++ } ++ ++ public CassandraPlugInProperty getPlugInProperty() { ++ // TODO Auto-generated method stub ++ return null; ++ } ++ ++ public void updatePlugIn(CassandraPlugInProperty prop) { ++ // TODO Auto-generated method stub ++ ++ } ++ ++ public PlugInControlUI getControlUI() { ++ return controlUI; ++ } DelBlock(Plugins/DynamicDataset/src/com/artenum/cassandra/plugin/dynamic/dataset/InstanciationManager.java,49,2) -- * @author Sebastien Jourdain -- * @version 0.1 AddBlock(Plugins/DynamicDataset/src/com/artenum/cassandra/plugin/dynamic/dataset/InstanciationManager.java,49,4) ++ * @author Sebastien Jourdain, ARTENUM SARL ++ * @author Julien Forest, ARTENUM SARL ++ * ++ * @version 1.2 AddBlock(Plugins/GenericCutter/src/com/artenum/cassandra/plugin/cutter/CutterControlUI.java,14,1) ++ import com.artenum.cassandra.plugin.PlugInControlUI; AddBlock(Plugins/GenericCutter/src/com/artenum/cassandra/plugin/cutter/CutterControlUI.java,23,1) ++ import java.awt.event.ItemEvent; DelBlock(Plugins/GenericCutter/src/com/artenum/cassandra/plugin/cutter/CutterControlUI.java,61,1) -- public class CutterControlUI extends JDialog implements ActionListener, ChangeListener { AddBlock(Plugins/GenericCutter/src/com/artenum/cassandra/plugin/cutter/CutterControlUI.java,61,1) ++ public class CutterControlUI extends PlugInControlUI { DelBlock(Plugins/GenericCutter/src/com/artenum/cassandra/plugin/cutter/CutterControlUI.java,335,1) -- * Define the data model for the input combobox. AddBlock(Plugins/GenericCutter/src/com/artenum/cassandra/plugin/cutter/CutterControlUI.java,335,1) ++ * Define the data model for the input combo box. AddBlock(Plugins/GenericCutter/src/com/artenum/cassandra/plugin/cutter/CutterControlUI.java,369,5) ++ ++ public void itemStateChanged(ItemEvent arg0) { ++ // TODO Auto-generated method stub ++ ++ } AddBlock(Plugins/GenericCutter/src/com/artenum/cassandra/plugin/cutter/CutterPlugin.java,16,1) ++ import com.artenum.cassandra.plugin.CassandraPlugInProperty; AddBlock(Plugins/GenericCutter/src/com/artenum/cassandra/plugin/cutter/CutterPlugin.java,18,1) ++ import com.artenum.cassandra.plugin.PlugInControlUI; DelBlock(Plugins/GenericCutter/src/com/artenum/cassandra/plugin/cutter/CutterPlugin.java,59,2) -- * @author Sebastien Jourdain -- * @version 0.1 AddBlock(Plugins/GenericCutter/src/com/artenum/cassandra/plugin/cutter/CutterPlugin.java,59,4) ++ * @author Sebastien Jourdain, ARTENUM SARL ++ * @author Julien Forest, ARTENUM SARL ++ * ++ * @version 1.2 DelBlock(Plugins/GenericCutter/src/com/artenum/cassandra/plugin/cutter/CutterPlugin.java,92,1) -- private Filter filerImpl; AddBlock(Plugins/GenericCutter/src/com/artenum/cassandra/plugin/cutter/CutterPlugin.java,92,1) ++ private Filter filterImpl; DelBlock(Plugins/GenericCutter/src/com/artenum/cassandra/plugin/cutter/CutterPlugin.java,110,2) -- this.filerImpl = new FilterImpl(); -- filerImpl.addRemoveListener(this); AddBlock(Plugins/GenericCutter/src/com/artenum/cassandra/plugin/cutter/CutterPlugin.java,110,2) ++ this.filterImpl = new FilterImpl(); ++ filterImpl.addRemoveListener(this); DelBlock(Plugins/GenericCutter/src/com/artenum/cassandra/plugin/cutter/CutterPlugin.java,208,1) -- filter = pipelineManager.addFilter(filerImpl, "Cutter"); AddBlock(Plugins/GenericCutter/src/com/artenum/cassandra/plugin/cutter/CutterPlugin.java,208,1) ++ filter = pipelineManager.addFilter(filterImpl, "Cutter"); DelBlock(Plugins/GenericCutter/src/com/artenum/cassandra/plugin/cutter/CutterPlugin.java,274,4) -- filerImpl.getInputDataSet().clear(); -- filerImpl.getInputDataSet().add(vtkDataSet); -- filerImpl.getOutputDataSet().clear(); -- filerImpl.getOutputDataSet().add(cutter.GetOutput()); AddBlock(Plugins/GenericCutter/src/com/artenum/cassandra/plugin/cutter/CutterPlugin.java,274,4) ++ filterImpl.getInputDataSet().clear(); ++ filterImpl.getInputDataSet().add(vtkDataSet); ++ filterImpl.getOutputDataSet().clear(); ++ filterImpl.getOutputDataSet().add(cutter.GetOutput()); DelBlock(Plugins/GenericCutter/src/com/artenum/cassandra/plugin/cutter/CutterPlugin.java,311,4) -- filerImpl.getInputDataSet().clear(); -- filerImpl.getInputDataSet().add(vtkDataSet); -- filerImpl.getOutputDataSet().clear(); -- filerImpl.getOutputDataSet().add(cutter.GetOutput()); AddBlock(Plugins/GenericCutter/src/com/artenum/cassandra/plugin/cutter/CutterPlugin.java,311,4) ++ filterImpl.getInputDataSet().clear(); ++ filterImpl.getInputDataSet().add(vtkDataSet); ++ filterImpl.getOutputDataSet().clear(); ++ filterImpl.getOutputDataSet().add(cutter.GetOutput()); DelBlock(Plugins/GenericCutter/src/com/artenum/cassandra/plugin/cutter/CutterPlugin.java,351,4) -- filerImpl.getInputDataSet().clear(); -- filerImpl.getInputDataSet().add(vtkDataSet); -- filerImpl.getOutputDataSet().clear(); -- filerImpl.getOutputDataSet().add(cutter.GetOutput()); AddBlock(Plugins/GenericCutter/src/com/artenum/cassandra/plugin/cutter/CutterPlugin.java,351,4) ++ filterImpl.getInputDataSet().clear(); ++ filterImpl.getInputDataSet().add(vtkDataSet); ++ filterImpl.getOutputDataSet().clear(); ++ filterImpl.getOutputDataSet().add(cutter.GetOutput()); AddBlock(Plugins/GenericCutter/src/com/artenum/cassandra/plugin/cutter/CutterPlugin.java,383,18) ++ ++ public Filter getInternalFilter() { ++ return filterImpl; ++ } ++ ++ public CassandraPlugInProperty getPlugInProperty() { ++ // TODO Auto-generated method stub ++ return null; ++ } ++ ++ public void updatePlugIn(CassandraPlugInProperty prop) { ++ // TODO Auto-generated method stub ++ ++ } ++ ++ public PlugInControlUI getControlUI() { ++ return controlUI; ++ } DelBlock(Plugins/GenericCutter/src/com/artenum/cassandra/plugin/cutter/InstanciationManager.java,20,7) -- * Project ref : CASSANDRA project -- * Copyright and license : See relevant sections -- * Status : under development -- * Creation : 04/03/2005 -- * Modification : -- * -- * Description : AddBlock(Plugins/GenericCutter/src/com/artenum/cassandra/plugin/cutter/InstanciationManager.java,20,6) ++ * Project ref : CASSANDRA project ++ * Copyright and license : See relevant sections ++ * Status : under development ++ * Creation : 04/03/2005 ++ * Modification : ++ * Description : DelBlock(Plugins/GenericCutter/src/com/artenum/cassandra/plugin/cutter/InstanciationManager.java,27,1) -- * AddBlock(Plugins/GenericCutter/src/com/artenum/cassandra/plugin/cutter/InstanciationManager.java,27,1) ++ * DelBlock(Plugins/GenericCutter/src/com/artenum/cassandra/plugin/cutter/InstanciationManager.java,30,2) -- * Version number Author (name, e-mail) Corrections/Modifications -- * 0.1 Sebastien Jourdain, jourdain@artenum.com Creation AddBlock(Plugins/GenericCutter/src/com/artenum/cassandra/plugin/cutter/InstanciationManager.java,30,10) ++ * ++ * Version number ++ * Author (name, e-mail) ++ * Corrections/Modifications ++ * ++ * ++ * 0.1 ++ * Sebastien Jourdain, jourdain@artenum.com ++ * Creation ++ * DelBlock(Plugins/GenericCutter/src/com/artenum/cassandra/plugin/cutter/InstanciationManager.java,41,3) -- * -- * @author Sebastien Jourdain -- * @version 0.1 AddBlock(Plugins/GenericCutter/src/com/artenum/cassandra/plugin/cutter/InstanciationManager.java,41,5) ++ * ++ * @author Sebastien Jourdain, ARTENUM SARL ++ * @author Julien Forest, ARTENUM SARL ++ * ++ * @version 1.2 DelBlock(Plugins/GenericCutter/src/com/artenum/cassandra/plugin/cutter/InstanciationManager.java,62,1) -- // Register the plugin in the framework in order to access to the contextual popup menu of the plugin AddBlock(Plugins/GenericCutter/src/com/artenum/cassandra/plugin/cutter/InstanciationManager.java,62,2) ++ // Register the plugin in the framework in order to access to the ++ // contextual popup menu of the plugin AddBlock(Plugins/GenericCutter/src/com/artenum/cassandra/plugin/cutter/InstanciationManager.java,65,3) ++ ++ // to see the controler automatically ++ plugin.getControlUI().setVisible(true); DelBlock(Plugins/Glyph/src/com/artenum/cassandra/plugin/glyph/GlyphControlUI.java,25,6) -- import com.artenum.cassandra.pipeline.PipeLineManager; -- import com.artenum.cassandra.pipeline.VtkObject; -- import com.artenum.cassandra.pipeline.VtkObjectListModel; -- -- import vtk.vtkDataSet; -- DelBlock(Plugins/Glyph/src/com/artenum/cassandra/plugin/glyph/GlyphControlUI.java,27,1) -- import java.awt.GridLayout; DelBlock(Plugins/Glyph/src/com/artenum/cassandra/plugin/glyph/GlyphControlUI.java,28,1) -- import java.awt.event.ActionListener; AddBlock(Plugins/Glyph/src/com/artenum/cassandra/plugin/glyph/GlyphControlUI.java,28,1) ++ import java.awt.event.ItemEvent; DelBlock(Plugins/Glyph/src/com/artenum/cassandra/plugin/glyph/GlyphControlUI.java,30,2) -- import java.util.Hashtable; -- DelBlock(Plugins/Glyph/src/com/artenum/cassandra/plugin/glyph/GlyphControlUI.java,36,1) -- import javax.swing.JDialog; DelBlock(Plugins/Glyph/src/com/artenum/cassandra/plugin/glyph/GlyphControlUI.java,39,1) -- import javax.swing.JSlider; DelBlock(Plugins/Glyph/src/com/artenum/cassandra/plugin/glyph/GlyphControlUI.java,40,1) -- import javax.swing.event.ChangeListener; AddBlock(Plugins/Glyph/src/com/artenum/cassandra/plugin/glyph/GlyphControlUI.java,42,7) ++ import vtk.vtkDataSet; ++ ++ import com.artenum.cassandra.pipeline.PipeLineManager; ++ import com.artenum.cassandra.pipeline.VtkObject; ++ import com.artenum.cassandra.pipeline.VtkObjectListModel; ++ import com.artenum.cassandra.plugin.PlugInControlUI; ++ DelBlock(Plugins/Glyph/src/com/artenum/cassandra/plugin/glyph/GlyphControlUI.java,63,1) -- public class GlyphControlUI extends JDialog implements ActionListener, ChangeListener { AddBlock(Plugins/Glyph/src/com/artenum/cassandra/plugin/glyph/GlyphControlUI.java,63,1) ++ public class GlyphControlUI extends PlugInControlUI { AddBlock(Plugins/Glyph/src/com/artenum/cassandra/plugin/glyph/GlyphControlUI.java,212,5) ++ ++ public void itemStateChanged(ItemEvent arg0) { ++ // TODO Auto-generated method stub ++ ++ } AddBlock(Plugins/Glyph/src/com/artenum/cassandra/plugin/glyph/GlyphPlugin.java,51,1) ++ import com.artenum.cassandra.plugin.CassandraPlugInProperty; AddBlock(Plugins/Glyph/src/com/artenum/cassandra/plugin/glyph/GlyphPlugin.java,53,1) ++ import com.artenum.cassandra.plugin.PlugInControlUI; DelBlock(Plugins/Glyph/src/com/artenum/cassandra/plugin/glyph/GlyphPlugin.java,68,2) -- * @author Julien Forest -- * @version 0.1 AddBlock(Plugins/Glyph/src/com/artenum/cassandra/plugin/glyph/GlyphPlugin.java,68,2) ++ * @author Julien Forest, ARTENUM SARL ++ * @version 0.2 DelBlock(Plugins/Glyph/src/com/artenum/cassandra/plugin/glyph/GlyphPlugin.java,89,1) -- private Filter filerImpl; AddBlock(Plugins/Glyph/src/com/artenum/cassandra/plugin/glyph/GlyphPlugin.java,89,1) ++ private Filter filterImpl; DelBlock(Plugins/Glyph/src/com/artenum/cassandra/plugin/glyph/GlyphPlugin.java,113,2) -- this.filerImpl = new FilterImpl(); -- filerImpl.addRemoveListener(this); AddBlock(Plugins/Glyph/src/com/artenum/cassandra/plugin/glyph/GlyphPlugin.java,113,2) ++ this.filterImpl = new FilterImpl(); ++ filterImpl.addRemoveListener(this); DelBlock(Plugins/Glyph/src/com/artenum/cassandra/plugin/glyph/GlyphPlugin.java,190,1) -- filter = pipelineManager.addFilter(filerImpl, "Glyph"); AddBlock(Plugins/Glyph/src/com/artenum/cassandra/plugin/glyph/GlyphPlugin.java,190,1) ++ filter = pipelineManager.addFilter(filterImpl, "Glyph"); DelBlock(Plugins/Glyph/src/com/artenum/cassandra/plugin/glyph/GlyphPlugin.java,247,4) -- filerImpl.getInputDataSet().clear(); -- filerImpl.getInputDataSet().add(vtkDataSet); -- filerImpl.getOutputDataSet().clear(); -- filerImpl.getOutputDataSet().add(glyph.GetOutput()); AddBlock(Plugins/Glyph/src/com/artenum/cassandra/plugin/glyph/GlyphPlugin.java,247,4) ++ filterImpl.getInputDataSet().clear(); ++ filterImpl.getInputDataSet().add(vtkDataSet); ++ filterImpl.getOutputDataSet().clear(); ++ filterImpl.getOutputDataSet().add(glyph.GetOutput()); AddBlock(Plugins/Glyph/src/com/artenum/cassandra/plugin/glyph/GlyphPlugin.java,279,18) ++ ++ public Filter getInternalFilter() { ++ return filterImpl; ++ } ++ ++ public PlugInControlUI getControlUI() { ++ return controlUI; ++ } ++ ++ public CassandraPlugInProperty getPlugInProperty() { ++ // TODO Auto-generated method stub ++ return null; ++ } ++ ++ public void updatePlugIn(CassandraPlugInProperty prop) { ++ // TODO Auto-generated method stub ++ ++ } DelBlock(Plugins/Glyph/src/com/artenum/cassandra/plugin/glyph/InstanciationManager.java,34,7) -- * Project ref : CASSANDRA project -- * Copyright and license : See relevant sections -- * Status : under development -- * Creation : 04/03/2005 -- * Modification : -- * -- * Description : AddBlock(Plugins/Glyph/src/com/artenum/cassandra/plugin/glyph/InstanciationManager.java,34,6) ++ * Project ref : CASSANDRA project ++ * Copyright and license : See relevant sections ++ * Status : under development ++ * Creation : 04/03/2005 ++ * Modification : ++ * Description : DelBlock(Plugins/Glyph/src/com/artenum/cassandra/plugin/glyph/InstanciationManager.java,41,1) -- * AddBlock(Plugins/Glyph/src/com/artenum/cassandra/plugin/glyph/InstanciationManager.java,41,1) ++ * DelBlock(Plugins/Glyph/src/com/artenum/cassandra/plugin/glyph/InstanciationManager.java,44,2) -- * Version number Author (name, e-mail) Corrections/Modifications -- * 0.1 Sebastien Jourdain, jourdain@artenum.com Creation AddBlock(Plugins/Glyph/src/com/artenum/cassandra/plugin/glyph/InstanciationManager.java,44,10) ++ * ++ * Version number ++ * Author (name, e-mail) ++ * Corrections/Modifications ++ * ++ * ++ * 0.1 ++ * Sebastien Jourdain, jourdain@artenum.com ++ * Creation ++ * DelBlock(Plugins/Glyph/src/com/artenum/cassandra/plugin/glyph/InstanciationManager.java,55,3) -- * -- * @author Sebastien Jourdain -- * @version 0.1 AddBlock(Plugins/Glyph/src/com/artenum/cassandra/plugin/glyph/InstanciationManager.java,55,5) ++ * ++ * @author Sebastien Jourdain, ARTENUM SARL ++ * @author Julien Forest, ARTENUM SARL ++ * ++ * @version 1.2 DelBlock(Plugins/Glyph/src/com/artenum/cassandra/plugin/glyph/InstanciationManager.java,76,1) -- // Register the plugin in the framework in order to access to the contextual popup menu of the plugin AddBlock(Plugins/Glyph/src/com/artenum/cassandra/plugin/glyph/InstanciationManager.java,76,2) ++ // Register the plugin in the framework in order to access to the ++ // contextual popup menu of the plugin AddBlock(Plugins/Glyph/src/com/artenum/cassandra/plugin/glyph/InstanciationManager.java,79,3) ++ ++ // to see the controler automatically ++ plugin.getControlUI().setVisible(true); AddBlock(Plugins/Info2D/src/com/artenum/cassandra/plugin/info2d/Info2DControlUI.java,13,1) ++ import com.artenum.cassandra.plugin.PlugInControlUI; AddBlock(Plugins/Info2D/src/com/artenum/cassandra/plugin/info2d/Info2DControlUI.java,24,1) ++ import java.awt.event.ItemEvent; AddBlock(Plugins/Info2D/src/com/artenum/cassandra/plugin/info2d/Info2DControlUI.java,33,1) ++ import javax.swing.event.ChangeEvent; DelBlock(Plugins/Info2D/src/com/artenum/cassandra/plugin/info2d/Info2DControlUI.java,51,2) -- * @author Sebastien Jourdain -- * @version 0.1 AddBlock(Plugins/Info2D/src/com/artenum/cassandra/plugin/info2d/Info2DControlUI.java,51,4) ++ * @author Sebastien Jourdain, ARTENUM SARL ++ * @author Julien Forest, ARTENUM SARL ++ * ++ * @version 1.2 DelBlock(Plugins/Info2D/src/com/artenum/cassandra/plugin/info2d/Info2DControlUI.java,56,1) -- public class Info2DControlUI extends JDialog implements ActionListener { AddBlock(Plugins/Info2D/src/com/artenum/cassandra/plugin/info2d/Info2DControlUI.java,56,1) ++ public class Info2DControlUI extends PlugInControlUI { AddBlock(Plugins/Info2D/src/com/artenum/cassandra/plugin/info2d/Info2DControlUI.java,143,10) ++ ++ public void stateChanged(ChangeEvent arg0) { ++ // TODO Auto-generated method stub ++ ++ } ++ ++ public void itemStateChanged(ItemEvent arg0) { ++ // TODO Auto-generated method stub ++ ++ } AddBlock(Plugins/Info2D/src/com/artenum/cassandra/plugin/info2d/Infos2DPlugin.java,16,1) ++ import com.artenum.cassandra.plugin.CassandraPlugInProperty; AddBlock(Plugins/Info2D/src/com/artenum/cassandra/plugin/info2d/Infos2DPlugin.java,18,1) ++ import com.artenum.cassandra.plugin.PlugInControlUI; DelBlock(Plugins/Info2D/src/com/artenum/cassandra/plugin/info2d/Infos2DPlugin.java,50,2) -- * @author Sebastien Jourdain -- * @version 0.1 AddBlock(Plugins/Info2D/src/com/artenum/cassandra/plugin/info2d/Infos2DPlugin.java,50,4) ++ * @author Sebastien Jourdain ARTENUM SARL ++ * @author Julien Forest, ARTENUM SARL ++ * ++ * @version 1.2 DelBlock(Plugins/Info2D/src/com/artenum/cassandra/plugin/info2d/Infos2DPlugin.java,81,1) -- private Filter filerImpl; AddBlock(Plugins/Info2D/src/com/artenum/cassandra/plugin/info2d/Infos2DPlugin.java,81,1) ++ private Filter filterImpl; DelBlock(Plugins/Info2D/src/com/artenum/cassandra/plugin/info2d/Infos2DPlugin.java,85,1) -- filerImpl = new FilterImpl(); AddBlock(Plugins/Info2D/src/com/artenum/cassandra/plugin/info2d/Infos2DPlugin.java,85,1) ++ filterImpl = new FilterImpl(); DelBlock(Plugins/Info2D/src/com/artenum/cassandra/plugin/info2d/Infos2DPlugin.java,122,2) -- filerImpl.addRemoveListener(this); -- filerImpl.getOutputActor().add(actorVTK); AddBlock(Plugins/Info2D/src/com/artenum/cassandra/plugin/info2d/Infos2DPlugin.java,122,2) ++ filterImpl.addRemoveListener(this); ++ filterImpl.getOutputActor().add(actorVTK); DelBlock(Plugins/Info2D/src/com/artenum/cassandra/plugin/info2d/Infos2DPlugin.java,127,1) -- filter = pipelineManager.addFilter(filerImpl, "Info 2D"); AddBlock(Plugins/Info2D/src/com/artenum/cassandra/plugin/info2d/Infos2DPlugin.java,127,1) ++ filter = pipelineManager.addFilter(filterImpl, "Info 2D"); DelBlock(Plugins/Info2D/src/com/artenum/cassandra/plugin/info2d/Infos2DPlugin.java,136,2) -- filerImpl.getInputDataSet().clear(); -- filerImpl.getInputDataSet().add(inputDataSet); AddBlock(Plugins/Info2D/src/com/artenum/cassandra/plugin/info2d/Infos2DPlugin.java,136,2) ++ filterImpl.getInputDataSet().clear(); ++ filterImpl.getInputDataSet().add(inputDataSet); AddBlock(Plugins/Info2D/src/com/artenum/cassandra/plugin/info2d/Infos2DPlugin.java,211,18) ++ ++ public Filter getInternalFilter() { ++ return filterImpl; ++ } ++ ++ public PlugInControlUI getControlUI() { ++ return controlUI; ++ } ++ ++ public CassandraPlugInProperty getPlugInProperty() { ++ // TODO Auto-generated method stub ++ return null; ++ } ++ ++ public void updatePlugIn(CassandraPlugInProperty prop) { ++ // TODO Auto-generated method stub ++ ++ } DelBlock(Plugins/Info2D/src/com/artenum/cassandra/plugin/info2d/InstanciationManager.java,20,7) -- * Project ref : CASSANDRA project -- * Copyright and license : See relevant sections -- * Status : under development -- * Creation : 04/03/2005 -- * Modification : -- * -- * Description : AddBlock(Plugins/Info2D/src/com/artenum/cassandra/plugin/info2d/InstanciationManager.java,20,6) ++ * Project ref : CASSANDRA project ++ * Copyright and license : See relevant sections ++ * Status : under development ++ * Creation : 04/03/2005 ++ * Modification : ++ * Description : DelBlock(Plugins/Info2D/src/com/artenum/cassandra/plugin/info2d/InstanciationManager.java,27,1) -- * AddBlock(Plugins/Info2D/src/com/artenum/cassandra/plugin/info2d/InstanciationManager.java,27,1) ++ * DelBlock(Plugins/Info2D/src/com/artenum/cassandra/plugin/info2d/InstanciationManager.java,30,2) -- * Version number Author (name, e-mail) Corrections/Modifications -- * 0.1 Sebastien Jourdain, jourdain@artenum.com Creation AddBlock(Plugins/Info2D/src/com/artenum/cassandra/plugin/info2d/InstanciationManager.java,30,10) ++ * ++ * Version number ++ * Author (name, e-mail) ++ * Corrections/Modifications ++ * ++ * ++ * 0.1 ++ * Sebastien Jourdain, jourdain@artenum.com ++ * Creation ++ * DelBlock(Plugins/Info2D/src/com/artenum/cassandra/plugin/info2d/InstanciationManager.java,41,3) -- * -- * @author Sebastien Jourdain -- * @version 0.1 AddBlock(Plugins/Info2D/src/com/artenum/cassandra/plugin/info2d/InstanciationManager.java,41,4) ++ * ++ * @author Sebastien Jourdain, ARTENUM SARL ++ * @author Julien Forest ++ * @version 1.2 AddBlock(Plugins/Info2D/src/com/artenum/cassandra/plugin/info2d/InstanciationManager.java,60,3) ++ ++ // to see the controler automatically ++ plugin.getControlUI().setVisible(true); AddBlock(Plugins/IsoLevel/src/com/artenum/cassandra/plugin/isolevel/InstanciationManager.java,66,3) ++ ++ // to see the controler automatically ++ plugin.getControlUI().setVisible(true); AddBlock(Plugins/IsoLevel/src/com/artenum/cassandra/plugin/isolevel/IsoLevelControlUI.java,27,1) ++ import com.artenum.cassandra.plugin.PlugInControlUI; AddBlock(Plugins/IsoLevel/src/com/artenum/cassandra/plugin/isolevel/IsoLevelControlUI.java,39,1) ++ import java.awt.event.ItemEvent; DelBlock(Plugins/IsoLevel/src/com/artenum/cassandra/plugin/isolevel/IsoLevelControlUI.java,78,2) -- * @author Sebastien Jourdain -- * @version 0.1 AddBlock(Plugins/IsoLevel/src/com/artenum/cassandra/plugin/isolevel/IsoLevelControlUI.java,78,4) ++ * @author Sebastien Jourdain, ARTENUM SARL ++ * @author Julien Forest, ARTENM SARL ++ * ++ * @version 1.2 DelBlock(Plugins/IsoLevel/src/com/artenum/cassandra/plugin/isolevel/IsoLevelControlUI.java,83,1) -- public class IsoLevelControlUI extends JDialog implements ActionListener, ChangeListener { AddBlock(Plugins/IsoLevel/src/com/artenum/cassandra/plugin/isolevel/IsoLevelControlUI.java,83,1) ++ public class IsoLevelControlUI extends PlugInControlUI { AddBlock(Plugins/IsoLevel/src/com/artenum/cassandra/plugin/isolevel/IsoLevelControlUI.java,264,5) ++ ++ public void itemStateChanged(ItemEvent arg0) { ++ // TODO Auto-generated method stub ++ ++ } AddBlock(Plugins/IsoLevel/src/com/artenum/cassandra/plugin/isolevel/IsoLevelPlugin.java,30,1) ++ import com.artenum.cassandra.plugin.CassandraPlugInProperty; AddBlock(Plugins/IsoLevel/src/com/artenum/cassandra/plugin/isolevel/IsoLevelPlugin.java,32,1) ++ import com.artenum.cassandra.plugin.PlugInControlUI; DelBlock(Plugins/IsoLevel/src/com/artenum/cassandra/plugin/isolevel/IsoLevelPlugin.java,78,2) -- * @author Sebastien Jourdain -- * @version 0.1 AddBlock(Plugins/IsoLevel/src/com/artenum/cassandra/plugin/isolevel/IsoLevelPlugin.java,78,4) ++ * @author Sebastien Jourdain, ARTENUM SARL ++ * @author Julien Forest, ARTENUM SARL ++ * ++ * @version 1.2 DelBlock(Plugins/IsoLevel/src/com/artenum/cassandra/plugin/isolevel/IsoLevelPlugin.java,108,1) -- private Filter filerImpl; AddBlock(Plugins/IsoLevel/src/com/artenum/cassandra/plugin/isolevel/IsoLevelPlugin.java,108,1) ++ private Filter filterImpl; DelBlock(Plugins/IsoLevel/src/com/artenum/cassandra/plugin/isolevel/IsoLevelPlugin.java,114,1) -- filerImpl = new FilterImpl(); AddBlock(Plugins/IsoLevel/src/com/artenum/cassandra/plugin/isolevel/IsoLevelPlugin.java,114,1) ++ filterImpl = new FilterImpl(); DelBlock(Plugins/IsoLevel/src/com/artenum/cassandra/plugin/isolevel/IsoLevelPlugin.java,165,3) -- filerImpl.getOutputDataSet().add(contour.GetOutput()); -- filerImpl.getOutputDataSet().add(normals.GetOutput()); -- filerImpl.addRemoveListener(this); AddBlock(Plugins/IsoLevel/src/com/artenum/cassandra/plugin/isolevel/IsoLevelPlugin.java,165,3) ++ filterImpl.getOutputDataSet().add(contour.GetOutput()); ++ filterImpl.getOutputDataSet().add(normals.GetOutput()); ++ filterImpl.addRemoveListener(this); DelBlock(Plugins/IsoLevel/src/com/artenum/cassandra/plugin/isolevel/IsoLevelPlugin.java,185,1) -- filter = pipelineManager.addFilter(filerImpl, "IsoLevel"); AddBlock(Plugins/IsoLevel/src/com/artenum/cassandra/plugin/isolevel/IsoLevelPlugin.java,185,1) ++ filter = pipelineManager.addFilter(filterImpl, "IsoLevel"); DelBlock(Plugins/IsoLevel/src/com/artenum/cassandra/plugin/isolevel/IsoLevelPlugin.java,196,2) -- // to see directly the control panel when we intanciate the plugin -- controlUI.setVisible(true); DelBlock(Plugins/IsoLevel/src/com/artenum/cassandra/plugin/isolevel/IsoLevelPlugin.java,204,2) -- filerImpl.getInputDataSet().clear(); -- filerImpl.getInputDataSet().add(vtkDataSet); AddBlock(Plugins/IsoLevel/src/com/artenum/cassandra/plugin/isolevel/IsoLevelPlugin.java,204,2) ++ filterImpl.getInputDataSet().clear(); ++ filterImpl.getInputDataSet().add(vtkDataSet); AddBlock(Plugins/IsoLevel/src/com/artenum/cassandra/plugin/isolevel/IsoLevelPlugin.java,289,18) ++ ++ public Filter getInternalFilter() { ++ return filterImpl; ++ } ++ ++ public PlugInControlUI getControlUI() { ++ return controlUI; ++ } ++ ++ public CassandraPlugInProperty getPlugInProperty() { ++ // TODO Auto-generated method stub ++ return null; ++ } ++ ++ public void updatePlugIn(CassandraPlugInProperty prop) { ++ // TODO Auto-generated method stub ++ ++ } DelBlock(Plugins/IsoLevel/src/com/artenum/cassandra/plugin/isolevel/IsoLevelPluginIntegrator.java,35,7) -- * Project ref : CASSANDRA project -- * Copyright and license : See relevant sections -- * Status : under development -- * Creation : 04/03/2005 -- * Modification : -- * -- * Description : AddBlock(Plugins/IsoLevel/src/com/artenum/cassandra/plugin/isolevel/IsoLevelPluginIntegrator.java,35,6) ++ * Project ref : CASSANDRA project ++ * Copyright and license : See relevant sections ++ * Status : under development ++ * Creation : 04/03/2005 ++ * Modification : ++ * Description : DelBlock(Plugins/IsoLevel/src/com/artenum/cassandra/plugin/isolevel/IsoLevelPluginIntegrator.java,47,1) -- * AddBlock(Plugins/IsoLevel/src/com/artenum/cassandra/plugin/isolevel/IsoLevelPluginIntegrator.java,47,1) ++ * DelBlock(Plugins/IsoLevel/src/com/artenum/cassandra/plugin/isolevel/IsoLevelPluginIntegrator.java,50,2) -- * Version number Author (name, e-mail) Corrections/Modifications -- * 0.1 Sebastien Jourdain, jourdain@artenum.com Creation AddBlock(Plugins/IsoLevel/src/com/artenum/cassandra/plugin/isolevel/IsoLevelPluginIntegrator.java,50,10) ++ * ++ * Version number ++ * Author (name, e-mail) ++ * Corrections/Modifications ++ * ++ * ++ * 0.1 ++ * Sebastien Jourdain, jourdain@artenum.com ++ * Creation ++ * DelBlock(Plugins/IsoLevel/src/com/artenum/cassandra/plugin/isolevel/IsoLevelPluginIntegrator.java,61,3) -- * -- * @author Sebastien Jourdain -- * @version 0.1 AddBlock(Plugins/IsoLevel/src/com/artenum/cassandra/plugin/isolevel/IsoLevelPluginIntegrator.java,61,5) ++ * ++ * @author Sebastien Jourdain, ARTENUM SARL ++ * @author Julien Forest, ARTENUM SARL ++ * ++ * @version 1.2 DelBlock(Plugins/IsoLevel/src/com/artenum/cassandra/plugin/isolevel/IsoLevelPluginIntegrator.java,68,1) -- public IsoLevelPluginIntegrator() {} AddBlock(Plugins/IsoLevel/src/com/artenum/cassandra/plugin/isolevel/IsoLevelPluginIntegrator.java,68,2) ++ public IsoLevelPluginIntegrator() { ++ } DelBlock(Plugins/IsoLevel/src/com/artenum/cassandra/plugin/isolevel/IsoLevelPluginIntegrator.java,72,1) -- // Instantiate the graphical component to add in the defaul cassandra GUI. AddBlock(Plugins/IsoLevel/src/com/artenum/cassandra/plugin/isolevel/IsoLevelPluginIntegrator.java,72,2) ++ // Instantiate the graphical component to add in the defaul cassandra ++ // GUI. DelBlock(Plugins/IsoLevel/src/com/artenum/cassandra/plugin/isolevel/IsoLevelPluginIntegrator.java,79,1) -- // Add a listener to the menu for the Plugin instantiation AddBlock(Plugins/IsoLevel/src/com/artenum/cassandra/plugin/isolevel/IsoLevelPluginIntegrator.java,79,1) ++ // Add a listener to the menu for the Plugin instantiation AddBlock(Plugins/IsoLevel/src/com/artenum/cassandra/plugin/isolevel/IsoLevelPluginIntegrator.java,81,2) ++ ++ DelBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/InstanciationManager.java,20,7) -- * Project ref : CASSANDRA project -- * Copyright and license : See relevant sections -- * Status : under development -- * Creation : 04/03/2005 -- * Modification : -- * -- * Description : AddBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/InstanciationManager.java,20,6) ++ * Project ref : CASSANDRA project ++ * Copyright and license : See relevant sections ++ * Status : under development ++ * Creation : 04/03/2005 ++ * Modification : ++ * Description : DelBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/InstanciationManager.java,27,1) -- * AddBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/InstanciationManager.java,27,1) ++ * DelBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/InstanciationManager.java,30,2) -- * Version number Author (name, e-mail) Corrections/Modifications -- * 0.1 Julien Forest, j.forest@artenum.com Creation AddBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/InstanciationManager.java,30,10) ++ * ++ * Version number ++ * Author (name, e-mail) ++ * Corrections/Modifications ++ * ++ * ++ * 0.1 ++ * Julien Forest, j.forest@artenum.com ++ * Creation ++ * DelBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/InstanciationManager.java,41,3) -- * -- * @author Julien Forest -- * @version 0.1 AddBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/InstanciationManager.java,41,3) ++ * ++ * @author Julien Forest ++ * @version 0.1 AddBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/InstanciationManager.java,59,3) ++ ++ // to see the controler automatically ++ plugin.getControlUI().setVisible(true); AddBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLineControlUI.java,13,1) ++ import com.artenum.cassandra.plugin.PlugInControlUI; AddBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLineControlUI.java,46,1) ++ import javax.swing.event.ChangeEvent; DelBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLineControlUI.java,79,1) -- public class ProbingLineControlUI extends JDialog implements ActionListener, ItemListener { AddBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLineControlUI.java,79,1) ++ public class ProbingLineControlUI extends PlugInControlUI { DelBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLineControlUI.java,176,1) -- resolution.setValue(256); AddBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLineControlUI.java,176,1) ++ resolution.setValue(new Integer(256)); AddBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLineControlUI.java,344,5) ++ ++ public void stateChanged(ChangeEvent arg0) { ++ // TODO Auto-generated method stub ++ ++ } AddBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLinePlugin.java,38,1) ++ import com.artenum.cassandra.plugin.CassandraPlugInProperty; AddBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLinePlugin.java,40,1) ++ import com.artenum.cassandra.plugin.PlugInControlUI; DelBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLinePlugin.java,61,2) -- * @author Julien Forest -- * @version 0.1 AddBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLinePlugin.java,61,2) ++ * @author Julien Forest, ARTENUM SARL ++ * @version 1.2 DelBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLinePlugin.java,94,1) -- private Filter filerImpl; AddBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLinePlugin.java,94,1) ++ private Filter filterImpl; DelBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLinePlugin.java,101,1) -- filerImpl = new FilterImpl(); AddBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLinePlugin.java,101,1) ++ filterImpl = new FilterImpl(); DelBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLinePlugin.java,157,2) -- filerImpl.getOutputDataSet().add(probe.GetOutput()); -- filerImpl.addRemoveListener(this); AddBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLinePlugin.java,157,2) ++ filterImpl.getOutputDataSet().add(probe.GetOutput()); ++ filterImpl.addRemoveListener(this); DelBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLinePlugin.java,173,1) -- filter = pipelineManager.addFilter(filerImpl, "Prober"); AddBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLinePlugin.java,173,1) ++ filter = pipelineManager.addFilter(filterImpl, "Prober"); DelBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLinePlugin.java,181,2) -- // to see directly the control panel when we intanciate the plugin -- controlUI.setVisible(true); DelBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLinePlugin.java,206,2) -- filerImpl.getInputDataSet().clear(); -- filerImpl.getInputDataSet().add(inputDataSet); AddBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLinePlugin.java,206,2) ++ filterImpl.getInputDataSet().clear(); ++ filterImpl.getInputDataSet().add(inputDataSet); DelBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLinePlugin.java,361,1) -- * @param widgetFlag AddBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLinePlugin.java,361,1) ++ * @param b DelBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLinePlugin.java,363,1) -- void show3DWidget(Boolean widgetFlag){ AddBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLinePlugin.java,363,1) ++ void show3DWidget(boolean b){ DelBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLinePlugin.java,365,1) -- if ( widgetFlag){ AddBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLinePlugin.java,365,1) ++ if ( b){ AddBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLinePlugin.java,440,7) ++ ++ public Filter getInternalFilter() { ++ return filterImpl; ++ } ++ ++ public PlugInControlUI getControlUI() { ++ return controlUI; AddBlock(Plugins/ProbingLine/src/com/artenum/cassandra/plugin/probingline/ProbingLinePlugin.java,448,12) ++ ++ public CassandraPlugInProperty getPlugInProperty() { ++ // TODO Auto-generated method stub ++ return null; ++ } ++ ++ public void updatePlugIn(CassandraPlugInProperty prop) { ++ // TODO Auto-generated method stub ++ ++ } ++ ++ } DelBlock(Plugins/Threshold/src/com/artenum/cassandra/plugin/threshold/InstanciationManager.java,34,7) -- * Project ref : CASSANDRA project -- * Copyright and license : See relevant sections -- * Status : under development -- * Creation : 04/03/2005 -- * Modification : -- * -- * Description : AddBlock(Plugins/Threshold/src/com/artenum/cassandra/plugin/threshold/InstanciationManager.java,34,6) ++ * Project ref : CASSANDRA project ++ * Copyright and license : See relevant sections ++ * Status : under development ++ * Creation : 04/03/2005 ++ * Modification : ++ * Description : DelBlock(Plugins/Threshold/src/com/artenum/cassandra/plugin/threshold/InstanciationManager.java,41,1) -- * AddBlock(Plugins/Threshold/src/com/artenum/cassandra/plugin/threshold/InstanciationManager.java,41,1) ++ * DelBlock(Plugins/Threshold/src/com/artenum/cassandra/plugin/threshold/InstanciationManager.java,44,2) -- * Version number Author (name, e-mail) Corrections/Modifications -- * 0.1 Sebastien Jourdain, jourdain@artenum.com Creation AddBlock(Plugins/Threshold/src/com/artenum/cassandra/plugin/threshold/InstanciationManager.java,44,10) ++ * ++ * Version number ++ * Author (name, e-mail) ++ * Corrections/Modifications ++ * ++ * ++ * 0.1 ++ * Sebastien Jourdain, jourdain@artenum.com ++ * Creation ++ * DelBlock(Plugins/Threshold/src/com/artenum/cassandra/plugin/threshold/InstanciationManager.java,55,3) -- * -- * @author Sebastien Jourdain -- * @version 0.1 AddBlock(Plugins/Threshold/src/com/artenum/cassandra/plugin/threshold/InstanciationManager.java,55,5) ++ * ++ * @author Sebastien Jourdain, ARTENUM SARL ++ * @author Julien Forest, ARTENUM SARL ++ * ++ * @version 1.2 AddBlock(Plugins/Threshold/src/com/artenum/cassandra/plugin/threshold/InstanciationManager.java,75,3) ++ ++ // to see the controler automatically ++ plugin.getControlUI().setVisible(true); AddBlock(Plugins/Threshold/src/com/artenum/cassandra/plugin/threshold/ThresholdControlUI.java,27,1) ++ import com.artenum.cassandra.plugin.PlugInControlUI; AddBlock(Plugins/Threshold/src/com/artenum/cassandra/plugin/threshold/ThresholdControlUI.java,39,1) ++ import java.awt.event.ItemEvent; AddBlock(Plugins/Threshold/src/com/artenum/cassandra/plugin/threshold/ThresholdControlUI.java,54,1) ++ import javax.swing.event.ChangeEvent; DelBlock(Plugins/Threshold/src/com/artenum/cassandra/plugin/threshold/ThresholdControlUI.java,72,2) -- * @author Sebastien Jourdain -- * @version 0.1 AddBlock(Plugins/Threshold/src/com/artenum/cassandra/plugin/threshold/ThresholdControlUI.java,72,4) ++ * @author Sebastien Jourdain, ARTENUM SARL ++ * @author Julien Forest, ARTENUM SARL ++ * ++ * @version 1.2 DelBlock(Plugins/Threshold/src/com/artenum/cassandra/plugin/threshold/ThresholdControlUI.java,77,1) -- public class ThresholdControlUI extends JDialog implements ActionListener { AddBlock(Plugins/Threshold/src/com/artenum/cassandra/plugin/threshold/ThresholdControlUI.java,77,1) ++ public class ThresholdControlUI extends PlugInControlUI { AddBlock(Plugins/Threshold/src/com/artenum/cassandra/plugin/threshold/ThresholdControlUI.java,211,10) ++ ++ public void stateChanged(ChangeEvent arg0) { ++ // TODO Auto-generated method stub ++ ++ } ++ ++ public void itemStateChanged(ItemEvent arg0) { ++ // TODO Auto-generated method stub ++ ++ } AddBlock(Plugins/Threshold/src/com/artenum/cassandra/plugin/threshold/ThresholdPlugin.java,30,1) ++ import com.artenum.cassandra.plugin.CassandraPlugInProperty; AddBlock(Plugins/Threshold/src/com/artenum/cassandra/plugin/threshold/ThresholdPlugin.java,32,1) ++ import com.artenum.cassandra.plugin.PlugInControlUI; DelBlock(Plugins/Threshold/src/com/artenum/cassandra/plugin/threshold/ThresholdPlugin.java,67,2) -- * @author Sebastien Jourdain -- * @version 0.1 AddBlock(Plugins/Threshold/src/com/artenum/cassandra/plugin/threshold/ThresholdPlugin.java,67,6) ++ * @author Sebastien Jourdain, ARTENUM SARL ++ * @author Julien Forest, ARTENUM SARL ++ * @author Benoit Thiebault, ARTENUM SARL ++ * @author Jeremie Turbet, ARTENUM SARL ++ * ++ * @version 1.2 DelBlock(Plugins/Threshold/src/com/artenum/cassandra/plugin/threshold/ThresholdPlugin.java,100,1) -- private Filter filerImpl; AddBlock(Plugins/Threshold/src/com/artenum/cassandra/plugin/threshold/ThresholdPlugin.java,100,1) ++ private Filter filterImpl; DelBlock(Plugins/Threshold/src/com/artenum/cassandra/plugin/threshold/ThresholdPlugin.java,104,1) -- filerImpl = new FilterImpl(); AddBlock(Plugins/Threshold/src/com/artenum/cassandra/plugin/threshold/ThresholdPlugin.java,104,1) ++ filterImpl = new FilterImpl(); DelBlock(Plugins/Threshold/src/com/artenum/cassandra/plugin/threshold/ThresholdPlugin.java,155,2) -- filerImpl.getOutputDataSet().add(threshold.GetOutput()); -- filerImpl.addRemoveListener(this); AddBlock(Plugins/Threshold/src/com/artenum/cassandra/plugin/threshold/ThresholdPlugin.java,155,2) ++ filterImpl.getOutputDataSet().add(threshold.GetOutput()); ++ filterImpl.addRemoveListener(this); DelBlock(Plugins/Threshold/src/com/artenum/cassandra/plugin/threshold/ThresholdPlugin.java,162,1) -- filter = pipelineManager.addFilter(filerImpl, "Threshold"); AddBlock(Plugins/Threshold/src/com/artenum/cassandra/plugin/threshold/ThresholdPlugin.java,162,1) ++ filter = pipelineManager.addFilter(filterImpl, "Threshold"); DelBlock(Plugins/Threshold/src/com/artenum/cassandra/plugin/threshold/ThresholdPlugin.java,191,2) -- filerImpl.getInputDataSet().clear(); -- filerImpl.getInputDataSet().add(inputDataSet); AddBlock(Plugins/Threshold/src/com/artenum/cassandra/plugin/threshold/ThresholdPlugin.java,191,2) ++ filterImpl.getInputDataSet().clear(); ++ filterImpl.getInputDataSet().add(inputDataSet); AddBlock(Plugins/Threshold/src/com/artenum/cassandra/plugin/threshold/ThresholdPlugin.java,241,18) ++ ++ public Filter getInternalFilter() { ++ return filterImpl; ++ } ++ ++ public PlugInControlUI getControlUI() { ++ return controlUI; ++ } ++ ++ public CassandraPlugInProperty getPlugInProperty() { ++ // TODO Auto-generated method stub ++ return null; ++ } ++ ++ public void updatePlugIn(CassandraPlugInProperty prop) { ++ // TODO Auto-generated method stub ++ ++ } DelBlock(Plugins/WarpScalar/src/com/artenum/cassandra/plugin/warp/scalar/InstanciationManager.java,34,7) -- * Project ref : CASSANDRA project -- * Copyright and license : See relevant sections -- * Status : under development -- * Creation : 04/03/2005 -- * Modification : -- * -- * Description : AddBlock(Plugins/WarpScalar/src/com/artenum/cassandra/plugin/warp/scalar/InstanciationManager.java,34,6) ++ * Project ref : CASSANDRA project ++ * Copyright and license : See relevant sections ++ * Status : under development ++ * Creation : 04/03/2005 ++ * Modification : ++ * Description : DelBlock(Plugins/WarpScalar/src/com/artenum/cassandra/plugin/warp/scalar/InstanciationManager.java,41,1) -- * AddBlock(Plugins/WarpScalar/src/com/artenum/cassandra/plugin/warp/scalar/InstanciationManager.java,41,1) ++ * DelBlock(Plugins/WarpScalar/src/com/artenum/cassandra/plugin/warp/scalar/InstanciationManager.java,44,2) -- * Version number Author (name, e-mail) Corrections/Modifications -- * 0.1 Sebastien Jourdain, jourdain@artenum.com Creation AddBlock(Plugins/WarpScalar/src/com/artenum/cassandra/plugin/warp/scalar/InstanciationManager.java,44,10) ++ * ++ * Version number ++ * Author (name, e-mail) ++ * Corrections/Modifications ++ * ++ * ++ * 0.1 ++ * Sebastien Jourdain, jourdain@artenum.com ++ * Creation ++ * DelBlock(Plugins/WarpScalar/src/com/artenum/cassandra/plugin/warp/scalar/InstanciationManager.java,55,3) -- * -- * @author Sebastien Jourdain -- * @version 0.1 AddBlock(Plugins/WarpScalar/src/com/artenum/cassandra/plugin/warp/scalar/InstanciationManager.java,55,5) ++ * ++ * @author Sebastien Jourdain, ARTENUM SARL ++ * @author Julien Forest, ARTENUM SARL ++ * ++ * @version 1.2 DelBlock(Plugins/WarpScalar/src/com/artenum/cassandra/plugin/warp/scalar/InstanciationManager.java,76,1) -- // Register the plugin in the framework in order to access to the contextual popup menu of the plugin AddBlock(Plugins/WarpScalar/src/com/artenum/cassandra/plugin/warp/scalar/InstanciationManager.java,76,2) ++ // Register the plugin in the framework in order to access to the ++ // contextual popup menu of the plugin AddBlock(Plugins/WarpScalar/src/com/artenum/cassandra/plugin/warp/scalar/InstanciationManager.java,79,3) ++ ++ // to see the controler automatically ++ plugin.getControlUI().setVisible(true); AddBlock(Plugins/WarpScalar/src/com/artenum/cassandra/plugin/warp/scalar/WarpScalarControlUI.java,28,1) ++ import com.artenum.cassandra.plugin.PlugInControlUI; AddBlock(Plugins/WarpScalar/src/com/artenum/cassandra/plugin/warp/scalar/WarpScalarControlUI.java,37,1) ++ import java.awt.event.ItemEvent; DelBlock(Plugins/WarpScalar/src/com/artenum/cassandra/plugin/warp/scalar/WarpScalarControlUI.java,80,2) -- * @author Sebastien Jourdain -- * @version 0.1 AddBlock(Plugins/WarpScalar/src/com/artenum/cassandra/plugin/warp/scalar/WarpScalarControlUI.java,80,4) ++ * @author Sebastien Jourdain, ARTENUM SARL ++ * @author Julien Forest, ARTENUM SARL ++ * ++ * @version 1.2 DelBlock(Plugins/WarpScalar/src/com/artenum/cassandra/plugin/warp/scalar/WarpScalarControlUI.java,85,1) -- public class WarpScalarControlUI extends JDialog implements ActionListener, ChangeListener { AddBlock(Plugins/WarpScalar/src/com/artenum/cassandra/plugin/warp/scalar/WarpScalarControlUI.java,85,1) ++ public class WarpScalarControlUI extends PlugInControlUI { AddBlock(Plugins/WarpScalar/src/com/artenum/cassandra/plugin/warp/scalar/WarpScalarControlUI.java,263,5) ++ ++ public void itemStateChanged(ItemEvent arg0) { ++ // TODO Auto-generated method stub ++ ++ } AddBlock(Plugins/WarpScalar/src/com/artenum/cassandra/plugin/warp/scalar/WarpScalarPlugin.java,30,1) ++ import com.artenum.cassandra.plugin.CassandraPlugInProperty; AddBlock(Plugins/WarpScalar/src/com/artenum/cassandra/plugin/warp/scalar/WarpScalarPlugin.java,32,1) ++ import com.artenum.cassandra.plugin.PlugInControlUI; DelBlock(Plugins/WarpScalar/src/com/artenum/cassandra/plugin/warp/scalar/WarpScalarPlugin.java,78,2) -- * @author Sebastien Jourdain, Julien Forest, Benoit Thiebault, Jeremie Turbet -- * @version 1.0 AddBlock(Plugins/WarpScalar/src/com/artenum/cassandra/plugin/warp/scalar/WarpScalarPlugin.java,78,2) ++ * @author Sebastien Jourdain, Julien Forest, Benoit Thiebault, Jeremie Turbet, ARTENUM SARL ++ * @version 1.2 DelBlock(Plugins/WarpScalar/src/com/artenum/cassandra/plugin/warp/scalar/WarpScalarPlugin.java,97,1) -- private Filter filerImpl; AddBlock(Plugins/WarpScalar/src/com/artenum/cassandra/plugin/warp/scalar/WarpScalarPlugin.java,97,1) ++ private Filter filterImpl; DelBlock(Plugins/WarpScalar/src/com/artenum/cassandra/plugin/warp/scalar/WarpScalarPlugin.java,119,2) -- this.filerImpl = new FilterImpl(); -- filerImpl.addRemoveListener(this); AddBlock(Plugins/WarpScalar/src/com/artenum/cassandra/plugin/warp/scalar/WarpScalarPlugin.java,119,2) ++ this.filterImpl = new FilterImpl(); ++ filterImpl.addRemoveListener(this); DelBlock(Plugins/WarpScalar/src/com/artenum/cassandra/plugin/warp/scalar/WarpScalarPlugin.java,160,1) -- filter = pipelineManager.addFilter(filerImpl, localName); AddBlock(Plugins/WarpScalar/src/com/artenum/cassandra/plugin/warp/scalar/WarpScalarPlugin.java,160,1) ++ filter = pipelineManager.addFilter(filterImpl, localName); DelBlock(Plugins/WarpScalar/src/com/artenum/cassandra/plugin/warp/scalar/WarpScalarPlugin.java,166,4) -- actor.setValide(false); -- -- // to see directly the configuration panel at the filter instanciation -- controlUI.setVisible(true); DelBlock(Plugins/WarpScalar/src/com/artenum/cassandra/plugin/warp/scalar/WarpScalarPlugin.java,205,4) -- filerImpl.getInputDataSet().clear(); -- filerImpl.getInputDataSet().add(vtkDataSet); -- filerImpl.getOutputDataSet().clear(); -- filerImpl.getOutputDataSet().add(warp.GetOutput()); AddBlock(Plugins/WarpScalar/src/com/artenum/cassandra/plugin/warp/scalar/WarpScalarPlugin.java,205,4) ++ filterImpl.getInputDataSet().clear(); ++ filterImpl.getInputDataSet().add(vtkDataSet); ++ filterImpl.getOutputDataSet().clear(); ++ filterImpl.getOutputDataSet().add(warp.GetOutput()); AddBlock(Plugins/WarpScalar/src/com/artenum/cassandra/plugin/warp/scalar/WarpScalarPlugin.java,238,18) ++ ++ public Filter getInternalFilter() { ++ return filterImpl; ++ } ++ ++ public PlugInControlUI getControlUI() { ++ return controlUI; ++ } ++ ++ public CassandraPlugInProperty getPlugInProperty() { ++ // TODO Auto-generated method stub ++ return null; ++ } ++ ++ public void updatePlugIn(CassandraPlugInProperty prop) { ++ // TODO Auto-generated method stub ++ ++ } DelBlock(Plugins/X3DExporter/src/com/artenum/cassandra/plugin/X3DExporter/InstanciationManager.java,20,7) -- * Project ref : CASSANDRA project -- * Copyright and license : See relevant sections -- * Status : Stable -- * Creation : 24/09/2010 -- * Modification : -- * -- * Description : AddBlock(Plugins/X3DExporter/src/com/artenum/cassandra/plugin/X3DExporter/InstanciationManager.java,20,6) ++ * Project ref : CASSANDRA project ++ * Copyright and license : See relevant sections ++ * Status : Stable ++ * Creation : 24/09/2010 ++ * Modification : ++ * Description : DelBlock(Plugins/X3DExporter/src/com/artenum/cassandra/plugin/X3DExporter/InstanciationManager.java,27,1) -- * AddBlock(Plugins/X3DExporter/src/com/artenum/cassandra/plugin/X3DExporter/InstanciationManager.java,27,1) ++ * DelBlock(Plugins/X3DExporter/src/com/artenum/cassandra/plugin/X3DExporter/InstanciationManager.java,30,2) -- * Version number Author (name, e-mail) Corrections/Modifications -- * 0.1 Julien Forest, j.forest@artenum.com Creation AddBlock(Plugins/X3DExporter/src/com/artenum/cassandra/plugin/X3DExporter/InstanciationManager.java,30,10) ++ * ++ * Version number ++ * Author (name, e-mail) ++ * Corrections/Modifications ++ * ++ * ++ * 0.1 ++ * Julien Forest, j.forest@artenum.com ++ * Creation ++ * DelBlock(Plugins/X3DExporter/src/com/artenum/cassandra/plugin/X3DExporter/InstanciationManager.java,41,3) -- * -- * @author Julien Forest -- * @version 0.1 AddBlock(Plugins/X3DExporter/src/com/artenum/cassandra/plugin/X3DExporter/InstanciationManager.java,41,3) ++ * ++ * @author Julien Forest ++ * @version 0.1 DelBlock(Plugins/X3DExporter/src/com/artenum/cassandra/plugin/X3DExporter/InstanciationManager.java,51,1) -- * Instantiate the plugin and make the link with the key elements of the Cassandra framework. AddBlock(Plugins/X3DExporter/src/com/artenum/cassandra/plugin/X3DExporter/InstanciationManager.java,51,3) ++ * Instantiate the plugin and make the link with the key elements of the ++ * Cassandra framework. ++ * DelBlock(Plugins/X3DExporter/src/com/artenum/cassandra/plugin/X3DExporter/InstanciationManager.java,65,1) -- * perform the action (i.e when the exporter is selected in the menu). AddBlock(Plugins/X3DExporter/src/com/artenum/cassandra/plugin/X3DExporter/InstanciationManager.java,65,1) ++ * perform the action (i.e when the exporter is selected in the menu). AddBlock(Plugins/X3DExporter/src/com/artenum/cassandra/plugin/X3DExporter/InstanciationManager.java,70,3) ++ ++ // to see the controler automatically ++ //plugin.getControlUI().setVisible(true); //NO GUI AddBlock(Plugins/X3DExporter/src/com/artenum/cassandra/plugin/X3DExporter/X3DExporterPlugin.java,21,1) ++ import com.artenum.cassandra.pipeline.Filter; AddBlock(Plugins/X3DExporter/src/com/artenum/cassandra/plugin/X3DExporter/X3DExporterPlugin.java,23,1) ++ import com.artenum.cassandra.plugin.CassandraPlugInProperty; AddBlock(Plugins/X3DExporter/src/com/artenum/cassandra/plugin/X3DExporter/X3DExporterPlugin.java,25,1) ++ import com.artenum.cassandra.plugin.PlugInControlUI; DelBlock(Plugins/X3DExporter/src/com/artenum/cassandra/plugin/X3DExporter/X3DExporterPlugin.java,47,1) -- * @version 0.1 AddBlock(Plugins/X3DExporter/src/com/artenum/cassandra/plugin/X3DExporter/X3DExporterPlugin.java,47,1) ++ * @version 1.2 AddBlock(Plugins/X3DExporter/src/com/artenum/cassandra/plugin/X3DExporter/X3DExporterPlugin.java,54,2) ++ ++ private Filter filterImpl; AddBlock(Plugins/X3DExporter/src/com/artenum/cassandra/plugin/X3DExporter/X3DExporterPlugin.java,139,20) ++ public Filter getInternalFilter() { ++ return filterImpl; ++ } ++ ++ /** ++ * return null having no GUI control panel defined. ++ */ ++ public PlugInControlUI getControlUI() { ++ return null; ++ } ++ ++ public CassandraPlugInProperty getPlugInProperty() { ++ // TODO Auto-generated method stub ++ return null; ++ } ++ ++ public void updatePlugIn(CassandraPlugInProperty prop) { ++ // TODO Auto-generated method stub ++ ++ } UpdateBinaryFile(Renderer/CassandraRenderer-1.1.0-all-all-none-jvm1_6-stable/CassandraRenderer-1.1.0-all-all-none-jvm1_6-stable.jar) DelBlock(Renderer/CassandraRenderer-1.1.0-all-all-none-jvm1_6-stable/version.txt,9,2) -- Date of build: 20110309 -- Hour of build: 2245 AddBlock(Renderer/CassandraRenderer-1.1.0-all-all-none-jvm1_6-stable/version.txt,9,2) ++ Date of build: 20110331 ++ Hour of build: 1804 DelBlock(Renderer/CassandraRenderer-1.1.0-all-all-none-jvm1_6-stable/version.txt,12,1) -- Cassandra CORE branch development ticket: 3942 AddBlock(Renderer/CassandraRenderer-1.1.0-all-all-none-jvm1_6-stable/version.txt,12,1) ++ Cassandra CORE branch development ticket: 4203 AddTxtFile(test.sh) AddDir(tmpCrossDepDir) AddBinaryFile(tmpCrossDepDir/CorePipeline.jar) AddDir(tmpCrossDepDir/tmp) AddTxtFile(tmpCrossDepDir/tmp/build.xml) AddDir(tmpCrossDepDir/tmp/com) AddDir(tmpCrossDepDir/tmp/com/artenum) AddDir(tmpCrossDepDir/tmp/com/artenum/cassandra) AddDir(tmpCrossDepDir/tmp/com/artenum/cassandra/action) AddDir(tmpCrossDepDir/tmp/com/artenum/cassandra/action/menu) AddDir(tmpCrossDepDir/tmp/com/artenum/cassandra/launcher) AddDir(tmpCrossDepDir/tmp/com/artenum/cassandra/pipeline) AddDir(tmpCrossDepDir/tmp/com/artenum/cassandra/pipeline/graph) AddDir(tmpCrossDepDir/tmp/com/artenum/cassandra/pipeline/io) AddDir(tmpCrossDepDir/tmp/com/artenum/cassandra/plugin) AddDir(tmpCrossDepDir/tmp/com/artenum/cassandra/renderer) AddDir(tmpCrossDepDir/tmp/com/artenum/cassandra/renderer/vtk) AddDir(tmpCrossDepDir/tmp/com/artenum/cassandra/ui) AddDir(tmpCrossDepDir/tmp/com/artenum/cassandra/ui/dialog) AddDir(tmpCrossDepDir/tmp/com/artenum/cassandra/ui/popup) AddDir(tmpCrossDepDir/tmp/com/artenum/cassandra/util) Remove(Core/plugin/X3DExporterPlugin.jar) Remove(Core/plugin/WarpScalarPlugin.jar) Remove(Core/plugin/ThresholdPlugin.jar) Remove(Core/plugin/ProbingLinePlugin.jar) Remove(Core/plugin/IsoLevelPlugin.jar) Remove(Core/plugin/Glyph.jar) Remove(Core/plugin/DynamicDatasetPlugin.jar) Remove(Core/plugin/DefaultPlugin.jar) Remove(Core/plugin/CuttingPlanePlugin.jar) Remove(Core/plugin/CutterPlugin.jar) Remove(Core/plugin/ClippingPlugin.jar) Remove(Core/plugin/CellCenterPlugin.jar) Remove(Core/plugin/2DInfosPlugin.jar)
- Splitting of the rendering module and the pipeline one - full refactoring of the ant based compilation system - introduction of the Artenum Properties Editor - Plugin cleaning - updating of 3rd parties
DelBlock(build.xml,2,1) -- <project name="Cassandra Main" default="help"> AddBlock(build.xml,2,1) ++ <project name="Cassandra Main" default="help" basedir="."> AddBlock(build.xml,7,1) ++ <property name="cassandra.root" value="." /> DelBlock(build.xml,21,1) -- <echo message="-------------------------------------------> ${thirdpart.jar-file.renderer}"/> AddBlock(build.xml,21,6) ++ <path id="project.src.path"> ++ <pathelement location="${cassandra.core.home}/src" /> ++ <pathelement location="${cassandra.core.home}/src-launch" /> ++ <pathelement path="${cassandra.pipeline.home}/src/main/java" /> ++ <pathelement path="${cassandra.renderer.home}/src/main/java" /> ++ </path> DelBlock(build.xml,42,1) -- <target name="init" description="create needed directory"> AddBlock(build.xml,42,1) ++ <target name="init" description="create needed directories"> AddBlock(build.xml,48,3) ++ <echo message="${cassandra.pipeline.home}/src/main/java" /> ++ <echo message="${cassandra.renderer.home}/src/main/java" /> ++ DelBlock(build.xml,53,7) -- <javac destdir="${tmp.dependance.dir}/tmp" optimize="yes"> -- <src location="${cassandra.core.home}/src" /> -- <src location="${cassandra.core.home}/src-launch" /> -- <src location="${cassandra.pipeline.home}/src" /> -- <src location="${cassandra.renderer.home}/src" /> -- <classpath refid="project.class.path" /> -- </javac> AddBlock(build.xml,53,6) ++ ++ ++ <javac destdir="${tmp.dependance.dir}/tmp" optimize="yes" debug="yes" srcdir="${basedir}/CrossDepSrc" /> ++ ++ <ant antfile="build.xml" dir="${basedir}/CrossDepSrc" target="make" inheritall="false" inheritrefs="false" /> ++ DelBlock(build.xml,73,1) -- AddBlock(build.xml,73,1) ++ DelBlock(build.xml,75,6) -- <copy todir="${thirdpart.dir}"> -- <fileset dir="${cassandra.renderer.home}"> -- <include name="CassandraRenderer-1.1.0-all-all-none-jvm1_6-stable/*" /> -- </fileset> -- </copy> -- AddBlock(build.xml,75,6) ++ <copy todir="${thirdpart.dir}"> ++ <fileset dir="${cassandra.renderer.home}"> ++ <include name="CassandraRenderer-1.1.0-all-all-none-jvm1_6-stable/*" /> ++ </fileset> ++ </copy> ++ DelBlock(build.xml,90,1) -- AddBlock(build.xml,90,1) ++ DelBlock(build.xml,93,3) -- -- -- <target name="build-plugins" depends="build-depend"> AddBlock(build.xml,93,3) ++ ++ ++ <target name="build-plugins" depends="build-all"> AddBlock(config.properties,33,2) ++ ++ DelBlock(config.properties,39,1) -- cassandra.core.home=Core AddBlock(config.properties,39,1) ++ cassandra.core.home=${cassandra.root}/Core DelBlock(config.properties,45,1) -- cassandra.pipeline.home=Pipeline AddBlock(config.properties,45,1) ++ cassandra.pipeline.home=${cassandra.root}/Pipeline DelBlock(config.properties,50,1) -- cassandra.renderer.home=Renderer AddBlock(config.properties,50,1) ++ cassandra.renderer.home=${cassandra.root}/Renderer AddBlock(config.properties,53,5) ++ # plugins directory of the binary package # ++ ################################################################ ++ cassandra.plugin.binary.dir=${cassandra.root}/Core/plugin ++ ++ ################################################################ DelBlock(config.properties,59,1) -- # - The root directories # AddBlock(config.properties,59,1) ++ # - The directories of the vairous plugins # DelBlock(config.properties,61,13) -- cassandra.plugin.1=Plugins/Clipping -- cassandra.plugin.2=Plugins/CuttingPlane -- cassandra.plugin.3=Plugins/Default -- cassandra.plugin.4=Plugins/Info2D -- cassandra.plugin.5=Plugins/IsoLevel -- cassandra.plugin.6=Plugins/ProbingLine -- cassandra.plugin.7=Plugins/Threshold -- cassandra.plugin.8=Plugins/WarpScalar -- cassandra.plugin.9=Plugins/DynamicDataset -- cassandra.plugin.10=Plugins/GenericCutter -- cassandra.plugin.11=Plugins/CellCenter -- cassandra.plugin.12=Plugins/Glyph -- cassandra.plugin.13=Plugins/X3DExporter AddBlock(config.properties,61,13) ++ cassandra.plugin.1=${cassandra.root}/Plugins/Clipping ++ cassandra.plugin.2=${cassandra.root}/Plugins/CuttingPlane ++ cassandra.plugin.3=${cassandra.root}/Plugins/Default ++ cassandra.plugin.4=${cassandra.root}/Plugins/Info2D ++ cassandra.plugin.5=${cassandra.root}/Plugins/IsoLevel ++ cassandra.plugin.6=${cassandra.root}/Plugins/ProbingLine ++ cassandra.plugin.7=${cassandra.root}/Plugins/Threshold ++ cassandra.plugin.8=${cassandra.root}/Plugins/WarpScalar ++ cassandra.plugin.9=${cassandra.root}/Plugins/DynamicDataset ++ cassandra.plugin.10=${cassandra.root}/Plugins/GenericCutter ++ cassandra.plugin.11=${cassandra.root}/Plugins/CellCenter ++ cassandra.plugin.12=${cassandra.root}/Plugins/Glyph ++ cassandra.plugin.13=${cassandra.root}/Plugins/X3DExporter DelBlock(config.properties,79,1) -- thirdpart.dir=./thirdpart AddBlock(config.properties,79,1) ++ thirdpart.dir=${cassandra.root}/thirdpart DelBlock(config.properties,83,1) -- tmp.dependance.dir=./tmpCrossDepDir AddBlock(config.properties,83,1) ++ tmp.dependance.dir=${cassandra.root}/tmpCrossDepDir AddBlock(config.properties,97,4) ++ thirdpart.jar-file.pipeline=${thirdpart.dir}/CassandraPipelineManager-1.1/ArtenumPipeLineManager-1.1.jar ++ ++ thirdpart.jar-file.cassandra=${cassandra.root}/Cassandra-2.4.03/Cassandra.jar ++ AddTxtFile(config.properties.bak) DelBlock(Core/build.xml,1,1) -- <project name="Cassandra VTK Viewer" default="help" basedir="."> AddBlock(Core/build.xml,1,1) ++ <project name="Cassandra Viewer Core Module" default="help" basedir="."> DelBlock(Core/build.xml,21,1) -- <!-- deprecated with VTK version uper to 5.XXX AddBlock(Core/build.xml,21,1) ++ <!-- deprecated with VTK version uper to 5.XXX DelBlock(Core/build.xml,36,1) -- <pathelement location="${thirdpart.jar-file.renderer}" /> AddBlock(Core/build.xml,36,1) ++ <pathelement location="${thirdpart.jar-file.renderer}" /> DelBlock(Core/build.xml,38,1) -- <pathelement location="${tmp.jar-file.corePipeline}" /> AddBlock(Core/build.xml,38,1) ++ <pathelement location="${tmp.jar-file.corePipeline}" /> DelBlock(Core/build.xml,41,1) -- <echo message="" /> AddBlock(Core/build.xml,41,1) ++ <echo message="" /> DelBlock(Core/build.xml,70,1) -- <!-- DEPRECATED with VTK version upper to 5.xx AddBlock(Core/build.xml,70,1) ++ <!-- DEPRECATED with VTK version upper to 5.xx DelBlock(Core/build.xml,77,1) -- <copy todir="${classes.build.dir}/com/artenum/cassandra/ui/icons"> AddBlock(Core/build.xml,77,1) ++ <copy todir="${classes.build.dir}/com/artenum/cassandra/ui/icons"> DelBlock(Core/build.xml,79,1) -- <include name="*"/> AddBlock(Core/build.xml,79,1) ++ <include name="*" /> DelBlock(Core/build.xml,124,1) -- <include name="**/*.png" /> AddBlock(Core/build.xml,124,1) ++ <include name="**/*.png" /> DelBlock(Core/build.xml,208,1) -- <filterset> AddBlock(Core/build.xml,208,1) ++ <filterset> AddBlock(Core/build.xml,220,6) ++ ++ <copy todir="${binary-package.dir}"> ++ <fileset dir="${base.dir}"> ++ <include name="PropertiesEditor.sh" /> ++ </fileset> ++ </copy> DelBlock(Core/build.xml,227,2) -- -- <echo message="Set execution rights on scripts in ${binary-package.dir}" /> AddBlock(Core/build.xml,227,2) ++ ++ <echo message="Set execution rights on scripts in ${binary-package.dir}" /> DelBlock(Core/build.xml,235,1) -- AddBlock(Core/build.xml,235,1) ++ AddTxtFile(Core/config.properties.bak) AddBinaryFile(Core/plugin/2DInfosPlugin.jar) AddBinaryFile(Core/plugin/CellCenterPlugin.jar) AddBinaryFile(Core/plugin/ClippingPlugin.jar) AddBinaryFile(Core/plugin/CutterPlugin.jar) AddBinaryFile(Core/plugin/CuttingPlanePlugin.jar) AddBinaryFile(Core/plugin/DefaultPlugin.jar) AddBinaryFile(Core/plugin/DynamicDatasetPlugin.jar) AddBinaryFile(Core/plugin/Glyph.jar) AddBinaryFile(Core/plugin/IsoLevelPlugin.jar) AddBinaryFile(Core/plugin/ProbingLinePlugin.jar) AddBinaryFile(Core/plugin/ThresholdPlugin.jar) AddBinaryFile(Core/plugin/WarpScalarPlugin.jar) AddBinaryFile(Core/plugin/X3DExporterPlugin.jar) AddTxtFile(Core/PropertiesEditor.sh) AddDir(CrossDepSrc) AddTxtFile(CrossDepSrc/build.xml) DelBlock(Pipeline/build.xml,1,1) -- <project name="Cassandra VTK Viewer" default="help" basedir="."> AddBlock(Pipeline/build.xml,1,1) ++ <project name="Cassandra Pipeline Module" default="help" basedir="."> DelBlock(Pipeline/build.xml,13,1) -- <property name="src.dir" value="${base.dir}/src" /> AddBlock(Pipeline/build.xml,13,1) ++ <property name="src.dir" value="${base.dir}/src/main/java/" /> DelBlock(Plugins/CellCenter/build.xml,4,1) -- AddBlock(Plugins/CellCenter/build.xml,4,2) ++ ++ <property name="cassandra.root" value="../.." /> DelBlock(Plugins/CellCenter/build.xml,7,1) -- <property file="../config.properties" /> AddBlock(Plugins/CellCenter/build.xml,7,1) ++ <property file="../../config.properties" /> AddBlock(Plugins/CellCenter/build.xml,25,1) ++ <pathelement location="${thirdpart.jar-file.renderer}" /> DelBlock(Plugins/CellCenter/build.xml,43,1) -- <target name="compile" description="compile the source code" depends="init"> AddBlock(Plugins/CellCenter/build.xml,43,1) ++ <target name="make" description="compile the source code" depends="init"> DelBlock(Plugins/CellCenter/build.xml,49,1) -- <target name="jar" description="Build the jar file" depends="compile"> AddBlock(Plugins/CellCenter/build.xml,49,1) ++ <target name="jar" description="Build the jar file" depends="make"> DelBlock(Plugins/Clipping/build.xml,4,1) -- AddBlock(Plugins/Clipping/build.xml,4,3) ++ ++ <property name="cassandra.root" value="../.." /> ++ DelBlock(Plugins/Clipping/build.xml,8,1) -- <property file="../config.properties" /> AddBlock(Plugins/Clipping/build.xml,8,2) ++ ++ <property file="../../config.properties" /> AddBlock(Plugins/Clipping/build.xml,27,2) ++ <pathelement location="${thirdpart.jar-file.renderer}" /> ++ AddBlock(Plugins/Clipping/build.xml,30,2) ++ ++ <pathelement location="${tmp.dependance.dir}/tmp" /> AddBlock(Plugins/Clipping/build.xml,34,6) ++ <echo message="${thirdpart.jar-file.cassandra}" /> ++ <echo message="${thirdpart.jar-file.dedalegraph}" /> ++ <echo message="${thirdpart.jar-file.pipeline}" /> ++ <echo message="${thirdpart.jar-file.renderer}" /> ++ ++ DelBlock(Plugins/Clipping/build.xml,53,1) -- <target name="compile" description="compile the source code" depends="init"> AddBlock(Plugins/Clipping/build.xml,53,1) ++ <target name="make" description="compile the source code" depends="init"> DelBlock(Plugins/Clipping/build.xml,59,1) -- <target name="jar" description="Build the jar file" depends="compile"> AddBlock(Plugins/Clipping/build.xml,59,1) ++ <target name="jar" description="Build the jar file" depends="make"> DelBlock(Plugins/Clipping/build.xml,70,3) -- <target name="show-path" description="print the various paths" > -- <echo message="thirdpart.jar-file.pipeline= ${thirdpart.jar-file.pipeline}" /> -- </target> AddBlock(Plugins/Clipping/build.xml,70,3) ++ <target name="show-path" description="print the various paths"> ++ <echo message="thirdpart.jar-file.pipeline= ${thirdpart.jar-file.pipeline}" /> ++ </target> DelBlock(Plugins/Clipping/build.xml,106,19) -- -- <!-- -- <taskdef name="jalopy" classname="de.hunsicker.jalopy.plugin.ant.AntPlugin"> -- <classpath> -- <fileset dir="${jalopy.home}"> -- <include name="**/*.jar" /> -- </fileset> -- </classpath> -- </taskdef> -- -- <target name="format-src" description="Formate the source code..."> -- <jalopy fileformat="unix" convention="${jalopy.coding.convention}" history="file" historymethod="adler32" loglevel="info" threads="1" classpathref="project.class.path"> -- <fileset dir="${src.dir}"> -- <include name="**/*.java" /> -- </fileset> -- </jalopy> -- </target> -- --> -- DelBlock(Plugins/Clipping/build.xml,108,1) -- <echo message=" - Author: Sebastien Jourdain (Artenum)" /> AddBlock(Plugins/Clipping/build.xml,108,1) ++ <echo message=" - Author: Artenum's team (www.artenum.com)" /> AddBlock(Plugins/Clipping/build.xml,111,1) ++ <echo message=" - make : build the plug-in" /> AddBlock(Plugins/CuttingPlane/build.xml,5,1) ++ <property name="cassandra.root" value="../.." /> DelBlock(Plugins/CuttingPlane/build.xml,7,1) -- <property file="../config.properties" /> AddBlock(Plugins/CuttingPlane/build.xml,7,1) ++ <property file="../../config.properties" /> AddBlock(Plugins/CuttingPlane/build.xml,25,1) ++ <pathelement location="${thirdpart.jar-file.renderer}" /> AddBlock(Plugins/CuttingPlane/build.xml,27,2) ++ ++ <pathelement location="${tmp.dependance.dir}/tmp" /> AddBlock(Plugins/CuttingPlane/build.xml,31,5) ++ <echo message="${thirdpart.jar-file.cassandra}" /> ++ <echo message="${thirdpart.jar-file.dedalegraph}" /> ++ <echo message="${thirdpart.jar-file.pipeline}" /> ++ <echo message="${thirdpart.jar-file.renderer}" /> ++ DelBlock(Plugins/CuttingPlane/build.xml,50,1) -- <target name="compile" description="compile the source code" depends="init"> AddBlock(Plugins/CuttingPlane/build.xml,50,1) ++ <target name="make" description="compile the source code" depends="init"> DelBlock(Plugins/CuttingPlane/build.xml,56,1) -- <target name="jar" description="Build the jar file" depends="compile"> AddBlock(Plugins/CuttingPlane/build.xml,56,1) ++ <target name="jar" description="Build the jar file" depends="make"> DelBlock(Plugins/Default/build.xml,1,1) -- <project name="Generic Cutter" default="help" basedir="."> AddBlock(Plugins/Default/build.xml,1,1) ++ <project name="Default Plugin" default="help" basedir="."> AddBlock(Plugins/Default/build.xml,5,1) ++ <property name="cassandra.root" value="../.." /> DelBlock(Plugins/Default/build.xml,7,1) -- <property file="../config.properties" /> AddBlock(Plugins/Default/build.xml,7,1) ++ <property file="../../config.properties" /> AddBlock(Plugins/Default/build.xml,25,1) ++ <pathelement location="${thirdpart.jar-file.renderer}" /> AddBlock(Plugins/Default/build.xml,27,3) ++ ++ <pathelement location="${tmp.dependance.dir}/tmp" /> ++ AddBlock(Plugins/Default/build.xml,50,7) ++ <echo message="${thirdpart.jar-file.cassandra}" /> ++ <echo message="${thirdpart.jar-file.dedalegraph}" /> ++ <echo message="${thirdpart.jar-file.pipeline}" /> ++ <echo message="${thirdpart.jar-file.renderer}" /> ++ ++ ++ AddBlock(Plugins/Default/build.xml,66,1) ++ DelBlock(Plugins/Default/build.xml,72,1) -- <target name="compile" description="compile the source code" depends="init"> AddBlock(Plugins/Default/build.xml,72,1) ++ <target name="make" description="compile the source code" depends="init"> DelBlock(Plugins/Default/build.xml,78,1) -- <target name="jar" description="Build the jar file" depends="compile"> AddBlock(Plugins/Default/build.xml,78,1) ++ <target name="jar" description="Build the jar file" depends="make"> DelBlock(Plugins/Default/src/com/artenum/cassandra/plugin/defaults/ShowPickingInformation.java,27,1) -- import com.artenum.cassandra.vtk.PickingObserver; AddBlock(Plugins/Default/src/com/artenum/cassandra/plugin/defaults/ShowPickingInformation.java,27,1) ++ import com.artenum.cassandra.renderer.vtk.PickingObserver; AddDir(Plugins/Deprecated) AddTxtFile(Plugins/Deprecated/config.properties) AddTxtFile(Plugins/Deprecated/config.properties.linux) AddBlock(Plugins/DynamicDataset/build.xml,5,1) ++ <property name="cassandra.root" value="../.." /> DelBlock(Plugins/DynamicDataset/build.xml,7,1) -- <property file="../config.properties" /> AddBlock(Plugins/DynamicDataset/build.xml,7,1) ++ <property file="../../config.properties" /> AddBlock(Plugins/DynamicDataset/build.xml,25,1) ++ <pathelement location="${thirdpart.jar-file.vtk}" /> AddBlock(Plugins/DynamicDataset/build.xml,27,1) ++ <pathelement location="${thirdpart.jar-file.renderer}" /> DelBlock(Plugins/DynamicDataset/build.xml,44,1) -- <target name="compile" description="compile the source code" depends="init"> AddBlock(Plugins/DynamicDataset/build.xml,44,1) ++ <target name="make" description="compile the source code" depends="init"> DelBlock(Plugins/DynamicDataset/build.xml,50,1) -- <target name="jar" description="Build the jar file" depends="compile"> AddBlock(Plugins/DynamicDataset/build.xml,50,1) ++ <target name="jar" description="Build the jar file" depends="make"> AddBlock(Plugins/GenericCutter/build.xml,5,3) ++ <property name="cassandra.root" value="../.." /> ++ ++ DelBlock(Plugins/GenericCutter/build.xml,9,1) -- <property file="../config.properties" /> AddBlock(Plugins/GenericCutter/build.xml,10,3) ++ ++ <property file="../../config.properties" /> ++ AddBlock(Plugins/GenericCutter/build.xml,31,1) ++ <pathelement location="${thirdpart.jar-file.renderer}" /> DelBlock(Plugins/GenericCutter/build.xml,47,1) -- <target name="compile" description="compile the source code" depends="init"> AddBlock(Plugins/GenericCutter/build.xml,47,1) ++ <target name="make" description="compile the source code" depends="init"> DelBlock(Plugins/GenericCutter/build.xml,53,1) -- <target name="jar" description="Build the jar file" depends="compile"> AddBlock(Plugins/GenericCutter/build.xml,53,1) ++ <target name="jar" description="Build the jar file" depends="make"> AddBlock(Plugins/Glyph/build.xml,5,2) ++ <property name="cassandra.root" value="../.." /> ++ DelBlock(Plugins/Glyph/build.xml,8,1) -- <property file="../config.properties" /> AddBlock(Plugins/Glyph/build.xml,8,1) ++ <property file="../../config.properties" /> AddBlock(Plugins/Glyph/build.xml,26,2) ++ <pathelement location="${thirdpart.jar-file.renderer}" /> ++ DelBlock(Plugins/Glyph/build.xml,45,1) -- <target name="compile" description="compile the source code" depends="init"> AddBlock(Plugins/Glyph/build.xml,45,1) ++ <target name="make" description="compile the source code" depends="init"> DelBlock(Plugins/Glyph/build.xml,51,1) -- <target name="jar" description="Build the jar file" depends="compile"> AddBlock(Plugins/Glyph/build.xml,51,1) ++ <target name="jar" description="Build the jar file" depends="make"> AddBlock(Plugins/Info2D/build.xml,5,2) ++ <property name="cassandra.root" value="../.." /> ++ AddBlock(Plugins/Info2D/build.xml,9,1) ++ <property file="../../config.properties" /> AddBlock(Plugins/Info2D/build.xml,11,1) ++ AddBlock(Plugins/Info2D/build.xml,28,1) ++ <pathelement location="${thirdpart.jar-file.renderer}" /> DelBlock(Plugins/Info2D/build.xml,45,1) -- <target name="compile" description="compile the source code" depends="init"> AddBlock(Plugins/Info2D/build.xml,45,1) ++ <target name="make" description="compile the source code" depends="init"> DelBlock(Plugins/Info2D/build.xml,51,1) -- <target name="jar" description="Build the jar file" depends="compile"> AddBlock(Plugins/Info2D/build.xml,51,1) ++ <target name="jar" description="Build the jar file" depends="make"> AddBlock(Plugins/IsoLevel/build.xml,5,2) ++ <property name="cassandra.root" value="../.." /> ++ DelBlock(Plugins/IsoLevel/build.xml,8,1) -- <property file="../config.properties" /> AddBlock(Plugins/IsoLevel/build.xml,8,1) ++ <property file="../../config.properties" /> AddBlock(Plugins/IsoLevel/build.xml,26,1) ++ <pathelement location="${thirdpart.jar-file.renderer}" /> DelBlock(Plugins/IsoLevel/build.xml,43,1) -- <target name="compile" description="compile the source code" depends="init"> AddBlock(Plugins/IsoLevel/build.xml,43,1) ++ <target name="make" description="compile the source code" depends="init"> DelBlock(Plugins/IsoLevel/build.xml,49,1) -- <target name="jar" description="Build the jar file" depends="compile"> AddBlock(Plugins/IsoLevel/build.xml,49,1) ++ <target name="jar" description="Build the jar file" depends="make"> DelBlock(Plugins/ProbingLine/build.xml,5,2) -- <property file="config.properties" /> -- <property file="../config.properties" /> AddBlock(Plugins/ProbingLine/build.xml,5,3) ++ <property name="cassandra.root" value="../.." /> ++ <property file="./config.properties" /> ++ <property file="${cassandra.root}/config.properties" /> AddBlock(Plugins/ProbingLine/build.xml,25,1) ++ <pathelement location="${thirdpart.jar-file.renderer}" /> AddBlock(Plugins/ProbingLine/build.xml,31,2) ++ <echo message="${thirdpart.jar-file.jfreechart}" /> ++ DelBlock(Plugins/ProbingLine/build.xml,46,1) -- <target name="compile" description="compile the source code" depends="init"> AddBlock(Plugins/ProbingLine/build.xml,46,1) ++ <target name="make" description="compile the source code" depends="init"> DelBlock(Plugins/ProbingLine/build.xml,52,1) -- <target name="jar" description="Build the jar file" depends="compile"> AddBlock(Plugins/ProbingLine/build.xml,52,1) ++ <target name="jar" description="Build the jar file" depends="make"> AddTxtFile(Plugins/ProbingLine/config.properties) DelBlock(Plugins/ProbingLine/config.sample,36,1) -- cassandra.plugin.binary.dir=../../Core/plugin AddBlock(Plugins/ProbingLine/config.sample,36,1) ++ #cassandra.plugin.binary.dir=../../Core/plugin DelBlock(Plugins/ProbingLine/config.sample,43,2) -- jalopy.home=../../thirdpart/jalopy-ant-0.1-1.5rc3 -- jalopy.coding.convention=${basedir}/coding-conventions.xml AddBlock(Plugins/ProbingLine/config.sample,43,2) ++ #jalopy.home=../../thirdpart/jalopy-ant-0.1-1.5rc3 ++ #jalopy.coding.convention=${basedir}/coding-conventions.xml DelBlock(Plugins/ProbingLine/config.sample,50,1) -- thirdpart.jar-file.cassandra=../../thirdpart/Cassandra-2.1/Cassandra.jar AddBlock(Plugins/ProbingLine/config.sample,50,1) ++ #thirdpart.jar-file.cassandra=../../thirdpart/Cassandra-2.1/Cassandra.jar DelBlock(Plugins/ProbingLine/config.sample,56,1) -- thirdpart.jar-file.pipeline=../../thirdpart/CassandraPipelineManager-1.1/ArtenumPipeLineManager-1.1.jar AddBlock(Plugins/ProbingLine/config.sample,56,1) ++ #thirdpart.jar-file.pipeline=../../thirdpart/CassandraPipelineManager-1.1/ArtenumPipeLineManager-1.1.jar DelBlock(Plugins/ProbingLine/config.sample,62,1) -- thirdpart.jar-file.dedalegraph=../../thirdpart/DedaleGraph/DedaleGraph.jar AddBlock(Plugins/ProbingLine/config.sample,62,1) ++ #thirdpart.jar-file.dedalegraph=../../thirdpart/DedaleGraph/DedaleGraph.jar DelBlock(Plugins/ProbingLine/config.sample,68,2) -- thirdpart.jar-file.jfreechart=../../thirdpart/jfreechart-0.9.16/jfreechart-0.9.16.jar -- thirdpart.jar-file.jcommon=../../thirdpart/jfreechart-0.9.16/lib/jcommon-0.9.1.jar AddBlock(Plugins/ProbingLine/config.sample,68,2) ++ thirdpart.jar-file.jfreechart=${cassandra.root}/thirdpart/jfreechart-0.9.16/jfreechart-0.9.16.jar ++ thirdpart.jar-file.jcommon=${cassandra.root}/thirdpart/jfreechart-0.9.16/lib/jcommon-0.9.1.jar DelBlock(Plugins/ProbingLine/config.sample,78,3) -- vtk.root.dir=../../thirdpart/vtk42-native-win -- vtk.library.path=${vtk.root.dir} -- thirdpart.jar-file.vtk=${vtk.root.dir}/vtk.jar AddBlock(Plugins/ProbingLine/config.sample,78,3) ++ # vtk.root.dir=../../thirdpart/vtk42-native-win ++ # vtk.library.path=${vtk.root.dir} ++ # thirdpart.jar-file.vtk=${vtk.root.dir}/vtk.jar AddBlock(Plugins/Threshold/build.xml,5,1) ++ <property name="cassandra.root" value="../.." /> DelBlock(Plugins/Threshold/build.xml,7,1) -- <property file="../config.properties" /> AddBlock(Plugins/Threshold/build.xml,7,1) ++ <property file="../../config.properties" /> AddBlock(Plugins/Threshold/build.xml,25,1) ++ <pathelement location="${thirdpart.jar-file.renderer}" /> DelBlock(Plugins/Threshold/build.xml,42,1) -- <target name="compile" description="compile the source code" depends="init"> AddBlock(Plugins/Threshold/build.xml,42,1) ++ <target name="make" description="compile the source code" depends="init"> DelBlock(Plugins/Threshold/build.xml,48,1) -- <target name="jar" description="Build the jar file" depends="compile"> AddBlock(Plugins/Threshold/build.xml,48,1) ++ <target name="jar" description="Build the jar file" depends="make"> DelBlock(Plugins/WarpScalar/build.xml,1,1) -- <project name="Cutting plane" default="help" basedir="."> AddBlock(Plugins/WarpScalar/build.xml,1,1) ++ <project name="Warp Scalar Plugin" default="help" basedir="."> AddBlock(Plugins/WarpScalar/build.xml,5,1) ++ <property name="cassandra.root" value="../.." /> DelBlock(Plugins/WarpScalar/build.xml,7,1) -- <property file="../config.properties" /> AddBlock(Plugins/WarpScalar/build.xml,7,1) ++ <property file="${cassandra.root}/config.properties" /> AddBlock(Plugins/WarpScalar/build.xml,25,1) ++ <pathelement location="${thirdpart.jar-file.renderer}" /> DelBlock(Plugins/WarpScalar/build.xml,43,1) -- <target name="compile" description="compile the source code" depends="init"> AddBlock(Plugins/WarpScalar/build.xml,43,1) ++ <target name="make" description="compile the source code" depends="init"> DelBlock(Plugins/WarpScalar/build.xml,49,1) -- <target name="jar" description="Build the jar file" depends="compile"> AddBlock(Plugins/WarpScalar/build.xml,49,1) ++ <target name="jar" description="Build the jar file" depends="make"> AddBlock(Plugins/X3DExporter/build.xml,5,1) ++ <property name="cassandra.root" value="../.." /> DelBlock(Plugins/X3DExporter/build.xml,7,1) -- <property file="../config.properties" /> AddBlock(Plugins/X3DExporter/build.xml,7,1) ++ <property file="${cassandra.root}/config.properties" /> AddBlock(Plugins/X3DExporter/build.xml,25,1) ++ <pathelement location="${thirdpart.jar-file.renderer}" /> DelBlock(Plugins/X3DExporter/build.xml,61,1) -- <target name="compile" description="compile the source code" depends="init"> AddBlock(Plugins/X3DExporter/build.xml,61,1) ++ <target name="make" description="compile the source code" depends="init"> DelBlock(Plugins/X3DExporter/build.xml,67,1) -- <target name="jar" description="Build the jar file" depends="compile"> AddBlock(Plugins/X3DExporter/build.xml,67,1) ++ <target name="jar" description="Build the jar file" depends="make"> AddTxtFile(PropertiesEditor.sh) DelBlock(Renderer/build.xml,1,1) -- <project name="Cassandra 3D Renderer" default="help" basedir="."> AddBlock(Renderer/build.xml,1,1) ++ <project name="Cassandra Renderer Module" default="help" basedir="."> AddDir(Renderer/CassandraRenderer-1.1.0-all-all-none-jvm1_6-stable) AddBinaryFile(Renderer/CassandraRenderer-1.1.0-all-all-none-jvm1_6-stable/CassandraRenderer-1.1.0-all-all-none-jvm1_6-stable.jar) AddTxtFile(Renderer/CassandraRenderer-1.1.0-all-all-none-jvm1_6-stable/CHANGE.txt) AddTxtFile(Renderer/CassandraRenderer-1.1.0-all-all-none-jvm1_6-stable/INSTALL.txt) AddTxtFile(Renderer/CassandraRenderer-1.1.0-all-all-none-jvm1_6-stable/LICENSE.txt) AddTxtFile(Renderer/CassandraRenderer-1.1.0-all-all-none-jvm1_6-stable/README.txt) AddTxtFile(Renderer/CassandraRenderer-1.1.0-all-all-none-jvm1_6-stable/version.txt) Remove(tmpCrossDepDir/tmp/com/artenum/cassandra/util) Remove(tmpCrossDepDir/tmp/com/artenum/cassandra/ui/popup) Remove(tmpCrossDepDir/tmp/com/artenum/cassandra/ui/dialog) Remove(tmpCrossDepDir/tmp/com/artenum/cassandra/ui) Remove(tmpCrossDepDir/tmp/com/artenum/cassandra/renderer/vtk) Remove(tmpCrossDepDir/tmp/com/artenum/cassandra/renderer) Remove(tmpCrossDepDir/tmp/com/artenum/cassandra/plugin) Remove(tmpCrossDepDir/tmp/com/artenum/cassandra/pipeline/graph) Remove(tmpCrossDepDir/tmp/com/artenum/cassandra/pipeline) Remove(tmpCrossDepDir/tmp/com/artenum/cassandra/launcher) Remove(tmpCrossDepDir/tmp/com/artenum/cassandra/action/menu) Remove(tmpCrossDepDir/tmp/com/artenum/cassandra/action) Remove(tmpCrossDepDir/tmp/com/artenum/cassandra) Remove(tmpCrossDepDir/tmp/com/artenum) Remove(tmpCrossDepDir/tmp/com) Remove(tmpCrossDepDir/tmp) Remove(tmpCrossDepDir/CorePipeline.jar) Remove(tmpCrossDepDir) Remove(Plugins/config.properties.linux) Remove(Plugins/config.properties) Remove(Plugins/Clipping/${cassandra.plugin.binary.dir}) Remove(PatchCassandra/CassandraLauncher.jar) Remove(PatchCassandra/Cassandra.jar) Remove(PatchCassandra)
AddBlock(.ignore.so6,12,1) ++ tmpCrossDepDir$ DelBlock(build.xml,15,1) -- <pathelement location="${tmp.jar-file.corePipeline}" /> AddBlock(build.xml,16,2) ++ <pathelement location="${tmp.jar-file.corePipeline}" /> ++ <pathelement location="${thirdpart.jar-file.renderer}" /> AddBlock(build.xml,20,16) ++ <echo message="-------------------------------------------> ${thirdpart.jar-file.renderer}"/> ++ ++ <target name="help"> ++ <echo message="Cassandra Core project" /> ++ <echo message=" - Authors: Sebastien Jourdain (Artenum), Julien Forest (Artenum)" /> ++ <echo message="---------------------------------------" /> ++ <echo message="Ant task available:" /> ++ <echo message=" - build-depend : pre-build the component common to Cassandra and ArtenumPipeline" /> ++ <echo message=" - clean-all : remove all builded documents. (class, jar, javadoc)" /> ++ <echo message=" - build-all : compile CassandraCore/PipelineManager" /> ++ <echo message=" - build-plugins: compile the plugins " /> ++ <echo message=" - print-paths : print the configuration paths" /> ++ <echo message="---------------------------------------" /> ++ </target> ++ ++ AddBlock(build.xml,42,1) ++ AddBlock(build.xml,48,1) ++ <src location="${cassandra.renderer.home}/src" /> DelBlock(build.xml,58,12) -- <target name="help"> -- <echo message="Cassandra Core project" /> -- <echo message=" - Authors: Sebastien Jourdain (Artenum), Julien Forest (Artenum)" /> -- <echo message="---------------------------------------" /> -- <echo message="Ant task available:" /> -- <echo message=" - build-depend : build the component common to Cassandra and ArtenumPipeline" /> -- <echo message=" - clean-all : remove all builded documents. (class, jar, javadoc)" /> -- <echo message=" - build-all : compile CassandraCore/PipelineManager" /> -- <echo message=" - build-plugins: compile the plugins " /> -- <echo message=" - print-paths : print the configuration paths" /> -- <echo message="---------------------------------------" /> -- </target> AddBlock(build.xml,59,1) ++ DelBlock(build.xml,65,1) -- AddBlock(build.xml,65,8) ++ ++ <ant antfile="build.xml" dir="${cassandra.renderer.home}" target="build-release" inheritall="false" inheritrefs="false" /> ++ <copy todir="${thirdpart.dir}"> ++ <fileset dir="${cassandra.renderer.home}"> ++ <include name="CassandraRenderer-1.1.0-all-all-none-jvm1_6-stable/*" /> ++ </fileset> ++ </copy> ++ DelBlock(build.xml,75,9) -- -- <!-- -- <copy todir="${tmp.dependance.dir}"> -- <fileset dir="${basedir}"> -- <include name="Cassandra-*/**/*"/> -- </fileset> -- </copy> -- --> -- AddBlock(build.xml,82,1) ++ AddBlock(build.xml,85,2) ++ ++ DelBlock(build.xml,101,2) -- <echo message="Compiling ${cassandra.plugin.13}..." /> -- <ant antfile="build.xml" dir="${cassandra.plugin.13}" target="jar" inheritall="false" inheritrefs="false" /> AddBlock(build.xml,101,2) ++ <echo message="Compiling ${cassandra.plugin.13}..." /> ++ <ant antfile="build.xml" dir="${cassandra.plugin.13}" target="jar" inheritall="false" inheritrefs="false" /> DelBlock(build.xml,125,1) -- <ant antfile="build.xml" dir="${cassandra.plugin.13}" target="clean" inheritall="false" inheritrefs="false" /> AddBlock(build.xml,125,1) ++ <ant antfile="build.xml" dir="${cassandra.plugin.13}" target="clean" inheritall="false" inheritrefs="false" /> AddBlock(config.properties,46,5) ++ # Cassandra Rendering # ++ ################################################################ ++ cassandra.renderer.home=Renderer ++ ++ ################################################################ DelBlock(config.properties,76,1) -- tmp.dependance.dir=./tmpDepDir AddBlock(config.properties,76,1) ++ tmp.dependance.dir=./tmpCrossDepDir AddBlock(config.properties,88,1) ++ thirdpart.jar-file.renderer=${thirdpart.dir}/CassandraRenderer-1.1.0-all-all-none-jvm1_6-stable/CassandraRenderer-1.1.0-all-all-none-jvm1_6-stable.jar AddBlock(Core/build.xml,36,2) ++ <pathelement location="${thirdpart.jar-file.renderer}" /> ++ AddBlock(Core/build.xml,41,2) ++ <echo message="" /> ++ DelBlock(Core/build.xml,209,1) -- <filter token="CASSANDRA_CLASS_PATH" value="${thirdpart.jar-file.vtk};${thirdpart.jar-file.pipeline};${jar.name};${thirdpart.jar-file.arttk};${thirdpart.jar-file.dedalegraph};${thirdpart.jar-file.jyconsole};${thirdpart.jar-file.jython}" /> AddBlock(Core/build.xml,209,1) ++ <filter token="CASSANDRA_CLASS_PATH" value="${thirdpart.jar-file.vtk};${thirdpart.jar-file.renderer};${thirdpart.jar-file.pipeline};${jar.name};${thirdpart.jar-file.arttk};${thirdpart.jar-file.dedalegraph};${thirdpart.jar-file.jyconsole};${thirdpart.jar-file.jython}" /> AddBlock(Core/config.properties,74,2) ++ thirdpart.jar-file.renderer=${thirdpart.dir}/CassandraRenderer-1.1.0-all-all-none-jvm1_6-stable/CassandraRenderer-1.1.0-all-all-none-jvm1_6-stable.jar ++ DelBlock(Core/src/com/artenum/cassandra/Cassandra.java,41,1) -- import com.artenum.cassandra.vtk.CassandraView; AddBlock(Core/src/com/artenum/cassandra/Cassandra.java,41,1) ++ import com.artenum.cassandra.renderer.vtk.CassandraView; DelBlock(Core/src/com/artenum/cassandra/pipeline/PipeLineManager.java,25,1) -- import com.artenum.cassandra.vtk.CassandraView; AddBlock(Core/src/com/artenum/cassandra/pipeline/PipeLineManager.java,25,1) ++ import com.artenum.cassandra.renderer.vtk.CassandraView; DelBlock(Pipeline/config.properties,55,1) -- tmp.jar-file.corePipeline=${thirdpart.dir}/../tmpDepDir/CorePipeline.jar AddBlock(Pipeline/config.properties,56,2) ++ tmp.jar-file.corePipeline=${thirdpart.dir}/../tmpCrossDepDir/CorePipeline.jar ++ AddDir(Pipeline/src/main) AddDir(Pipeline/src/main/java) AddDir(Pipeline/src/main/java/com) AddDir(Pipeline/src/main/java/com/artenum) AddDir(Pipeline/src/main/java/com/artenum/cassandra) AddDir(Pipeline/src/main/java/com/artenum/cassandra/pipeline) AddTxtFile(Pipeline/src/main/java/com/artenum/cassandra/pipeline/CascadeRemoveManager.java) AddDir(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph) AddBinaryFile(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/.DS_Store) AddDir(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/icon) AddBinaryFile(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/icon/actor.png) AddBinaryFile(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/icon/actorEye.png) AddBinaryFile(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/icon/dataset.png) AddBinaryFile(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/icon/filter.png) AddBinaryFile(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/icon/linearLT.png) AddBinaryFile(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/icon/logLT.png) AddBinaryFile(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/icon/lookuptable.png) AddBinaryFile(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/icon/mapper.png) AddBinaryFile(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/icon/scalarBar.png) AddBinaryFile(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/icon/txtActor.png) AddBinaryFile(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/icon/txtActorEye.png) AddDir(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/icon34x43) AddBinaryFile(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/icon34x43/actor.png) AddBinaryFile(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/icon34x43/actorEye.png) AddBinaryFile(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/icon34x43/dataset.png) AddBinaryFile(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/icon34x43/filter.png) AddBinaryFile(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/icon34x43/linearLT.png) AddBinaryFile(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/icon34x43/logLT.png) AddBinaryFile(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/icon34x43/lookuptable.png) AddBinaryFile(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/icon34x43/mapper.png) AddBinaryFile(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/icon34x43/scalarBar.png) AddBinaryFile(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/icon34x43/txtActor.png) AddBinaryFile(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/icon34x43/txtActorEye.png) AddDir(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/iconOK) AddBinaryFile(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/iconOK/actor.png) AddBinaryFile(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/iconOK/actorEye.png) AddBinaryFile(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/iconOK/dataset.png) AddBinaryFile(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/iconOK/filter.png) AddBinaryFile(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/iconOK/linearLT.png) AddBinaryFile(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/iconOK/logLT.png) AddBinaryFile(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/iconOK/lookuptable.png) AddBinaryFile(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/iconOK/mapper.png) AddBinaryFile(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/iconOK/scalarBar.png) AddBinaryFile(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/iconOK/txtActor.png) AddBinaryFile(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/iconOK/txtActorEye.png) AddDir(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/iconRef) AddBinaryFile(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/iconRef/actor.png) AddBinaryFile(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/iconRef/actorEye.png) AddBinaryFile(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/iconRef/dataset.png) AddBinaryFile(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/iconRef/filter.png) AddBinaryFile(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/iconRef/linearLT.png) AddBinaryFile(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/iconRef/logLT.png) AddBinaryFile(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/iconRef/lookuptable.png) AddBinaryFile(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/iconRef/mapper.png) AddBinaryFile(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/iconRef/scalarBar.png) AddBinaryFile(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/iconRef/txtActor.png) AddBinaryFile(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/iconRef/txtActorEye.png) AddDir(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/image) AddBinaryFile(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/image/actor.png) AddBinaryFile(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/image/dataset.png) AddBinaryFile(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/image/eye.png) AddBinaryFile(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/image/filter.png) AddBinaryFile(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/image/lookupTableLinear.png) AddBinaryFile(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/image/lookupTableLog.png) AddBinaryFile(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/image/mapper.png) AddBinaryFile(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/image/scalarBar.png) AddBinaryFile(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/image/txtActor.png) AddTxtFile(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkObjectCellAdapter.java) AddTxtFile(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkObjectUI.java) AddTxtFile(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkObjectUI1.java) AddTxtFile(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkObjectUI2.java) AddTxtFile(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkPipeLineGraphModel.java) AddTxtFile(Pipeline/src/main/java/com/artenum/cassandra/pipeline/graph/VtkPipeLinePanel.java) AddTxtFile(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java) AddTxtFile(Pipeline/src/main/java/com/artenum/cassandra/pipeline/VtkObjectAdapter.java) AddDir(Pipeline/src/main/java/com/artenum/cassandra/util) AddTxtFile(Pipeline/src/main/java/com/artenum/cassandra/util/CuttingPlaneAnimation.java) AddTxtFile(Pipeline/src/main/java/com/artenum/cassandra/util/CuttingPlanePipeLine.java) AddTxtFile(Pipeline/src/main/java/com/artenum/cassandra/util/IsoLevelAnimation.java) AddTxtFile(Pipeline/src/main/java/com/artenum/cassandra/util/IsoLevelPipeLine.java) AddDir(Renderer) AddTxtFile(Renderer/BUILD.txt) AddTxtFile(Renderer/build.xml) AddTxtFile(Renderer/CHANGE.txt) AddXmlFile(Renderer/coding-conventions.xml) AddTxtFile(Renderer/config.properties) AddTxtFile(Renderer/config.properties.linux) AddTxtFile(Renderer/config.sample) AddTxtFile(Renderer/COPYRIGHT) AddTxtFile(Renderer/INSTALL.txt) AddTxtFile(Renderer/LICENSE.txt) AddTxtFile(Renderer/README.txt) AddDir(Renderer/src) AddDir(Renderer/src/main) AddDir(Renderer/src/main/java) AddDir(Renderer/src/main/java/com) AddDir(Renderer/src/main/java/com/artenum) AddDir(Renderer/src/main/java/com/artenum/cassandra) AddDir(Renderer/src/main/java/com/artenum/cassandra/renderer) AddDir(Renderer/src/main/java/com/artenum/cassandra/renderer/vtk) AddTxtFile(Renderer/src/main/java/com/artenum/cassandra/renderer/vtk/CassandraView.java) AddTxtFile(Renderer/src/main/java/com/artenum/cassandra/renderer/vtk/DefaultAxes.java) AddTxtFile(Renderer/src/main/java/com/artenum/cassandra/renderer/vtk/PickingObserver.java) AddTxtFile(Renderer/src/main/java/com/artenum/cassandra/renderer/vtk/VtkContextLoader.java) AddDir(Renderer/src/main/ressource) AddTxtFile(Renderer/targeted-platform.properties) AddTxtFile(Renderer/THIRDPART.txt) AddDir(tmpCrossDepDir) AddBinaryFile(tmpCrossDepDir/CorePipeline.jar) AddDir(tmpCrossDepDir/tmp) AddDir(tmpCrossDepDir/tmp/com) AddDir(tmpCrossDepDir/tmp/com/artenum) AddDir(tmpCrossDepDir/tmp/com/artenum/cassandra) AddDir(tmpCrossDepDir/tmp/com/artenum/cassandra/action) AddDir(tmpCrossDepDir/tmp/com/artenum/cassandra/action/menu) AddDir(tmpCrossDepDir/tmp/com/artenum/cassandra/launcher) AddDir(tmpCrossDepDir/tmp/com/artenum/cassandra/pipeline) AddDir(tmpCrossDepDir/tmp/com/artenum/cassandra/pipeline/graph) AddDir(tmpCrossDepDir/tmp/com/artenum/cassandra/plugin) AddDir(tmpCrossDepDir/tmp/com/artenum/cassandra/renderer) AddDir(tmpCrossDepDir/tmp/com/artenum/cassandra/renderer/vtk) AddDir(tmpCrossDepDir/tmp/com/artenum/cassandra/ui) AddDir(tmpCrossDepDir/tmp/com/artenum/cassandra/ui/dialog) AddDir(tmpCrossDepDir/tmp/com/artenum/cassandra/ui/popup) AddDir(tmpCrossDepDir/tmp/com/artenum/cassandra/util) Remove(Pipeline/src/com/artenum/cassandra/vtk/VtkContextLoader.java) Remove(Pipeline/src/com/artenum/cassandra/vtk/PickingObserver.java) Remove(Pipeline/src/com/artenum/cassandra/vtk/DefaultAxes.java) Remove(Pipeline/src/com/artenum/cassandra/vtk/CassandraView.java) Remove(Pipeline/src/com/artenum/cassandra/vtk) Remove(Pipeline/src/com/artenum/cassandra/util/IsoLevelPipeLine.java) Remove(Pipeline/src/com/artenum/cassandra/util/IsoLevelAnimation.java) Remove(Pipeline/src/com/artenum/cassandra/util/CuttingPlanePipeLine.java) Remove(Pipeline/src/com/artenum/cassandra/util/CuttingPlaneAnimation.java) Remove(Pipeline/src/com/artenum/cassandra/util) Remove(Pipeline/src/com/artenum/cassandra/pipeline/graph/image/txtActor.png) Remove(Pipeline/src/com/artenum/cassandra/pipeline/graph/image/scalarBar.png) Remove(Pipeline/src/com/artenum/cassandra/pipeline/graph/image/mapper.png) Remove(Pipeline/src/com/artenum/cassandra/pipeline/graph/image/lookupTableLog.png) Remove(Pipeline/src/com/artenum/cassandra/pipeline/graph/image/lookupTableLinear.png) Remove(Pipeline/src/com/artenum/cassandra/pipeline/graph/image/filter.png) Remove(Pipeline/src/com/artenum/cassandra/pipeline/graph/image/eye.png) Remove(Pipeline/src/com/artenum/cassandra/pipeline/graph/image/dataset.png) Remove(Pipeline/src/com/artenum/cassandra/pipeline/graph/image/actor.png) Remove(Pipeline/src/com/artenum/cassandra/pipeline/graph/image) Remove(Pipeline/src/com/artenum/cassandra/pipeline/graph/iconRef/txtActorEye.png) Remove(Pipeline/src/com/artenum/cassandra/pipeline/graph/iconRef/txtActor.png) Remove(Pipeline/src/com/artenum/cassandra/pipeline/graph/iconRef/scalarBar.png) Remove(Pipeline/src/com/artenum/cassandra/pipeline/graph/iconRef/mapper.png) Remove(Pipeline/src/com/artenum/cassandra/pipeline/graph/iconRef/lookuptable.png) Remove(Pipeline/src/com/artenum/cassandra/pipeline/graph/iconRef/logLT.png) Remove(Pipeline/src/com/artenum/cassandra/pipeline/graph/iconRef/linearLT.png) Remove(Pipeline/src/com/artenum/cassandra/pipeline/graph/iconRef/filter.png) Remove(Pipeline/src/com/artenum/cassandra/pipeline/graph/iconRef/dataset.png) Remove(Pipeline/src/com/artenum/cassandra/pipeline/graph/iconRef/actorEye.png) Remove(Pipeline/src/com/artenum/cassandra/pipeline/graph/iconRef/actor.png) Remove(Pipeline/src/com/artenum/cassandra/pipeline/graph/iconRef) Remove(Pipeline/src/com/artenum/cassandra/pipeline/graph/iconOK/txtActorEye.png) Remove(Pipeline/src/com/artenum/cassandra/pipeline/graph/iconOK/txtActor.png) Remove(Pipeline/src/com/artenum/cassandra/pipeline/graph/iconOK/scalarBar.png) Remove(Pipeline/src/com/artenum/cassandra/pipeline/graph/iconOK/mapper.png) Remove(Pipeline/src/com/artenum/cassandra/pipeline/graph/iconOK/lookuptable.png) Remove(Pipeline/src/com/artenum/cassandra/pipeline/graph/iconOK/logLT.png) Remove(Pipeline/src/com/artenum/cassandra/pipeline/graph/iconOK/linearLT.png) Remove(Pipeline/src/com/artenum/cassandra/pipeline/graph/iconOK/filter.png) Remove(Pipeline/src/com/artenum/cassandra/pipeline/graph/iconOK/dataset.png) Remove(Pipeline/src/com/artenum/cassandra/pipeline/graph/iconOK/actorEye.png) Remove(Pipeline/src/com/artenum/cassandra/pipeline/graph/iconOK/actor.png) Remove(Pipeline/src/com/artenum/cassandra/pipeline/graph/iconOK) Remove(Pipeline/src/com/artenum/cassandra/pipeline/graph/icon34x43/txtActorEye.png) Remove(Pipeline/src/com/artenum/cassandra/pipeline/graph/icon34x43/txtActor.png) Remove(Pipeline/src/com/artenum/cassandra/pipeline/graph/icon34x43/scalarBar.png) Remove(Pipeline/src/com/artenum/cassandra/pipeline/graph/icon34x43/mapper.png) Remove(Pipeline/src/com/artenum/cassandra/pipeline/graph/icon34x43/lookuptable.png) Remove(Pipeline/src/com/artenum/cassandra/pipeline/graph/icon34x43/logLT.png) Remove(Pipeline/src/com/artenum/cassandra/pipeline/graph/icon34x43/linearLT.png) Remove(Pipeline/src/com/artenum/cassandra/pipeline/graph/icon34x43/filter.png) Remove(Pipeline/src/com/artenum/cassandra/pipeline/graph/icon34x43/dataset.png) Remove(Pipeline/src/com/artenum/cassandra/pipeline/graph/icon34x43/actorEye.png) Remove(Pipeline/src/com/artenum/cassandra/pipeline/graph/icon34x43/actor.png) Remove(Pipeline/src/com/artenum/cassandra/pipeline/graph/icon34x43) Remove(Pipeline/src/com/artenum/cassandra/pipeline/graph/icon/txtActorEye.png) Remove(Pipeline/src/com/artenum/cassandra/pipeline/graph/icon/txtActor.png) Remove(Pipeline/src/com/artenum/cassandra/pipeline/graph/icon/scalarBar.png) Remove(Pipeline/src/com/artenum/cassandra/pipeline/graph/icon/mapper.png) Remove(Pipeline/src/com/artenum/cassandra/pipeline/graph/icon/lookuptable.png) Remove(Pipeline/src/com/artenum/cassandra/pipeline/graph/icon/logLT.png) Remove(Pipeline/src/com/artenum/cassandra/pipeline/graph/icon/linearLT.png) Remove(Pipeline/src/com/artenum/cassandra/pipeline/graph/icon/filter.png) Remove(Pipeline/src/com/artenum/cassandra/pipeline/graph/icon/dataset.png) Remove(Pipeline/src/com/artenum/cassandra/pipeline/graph/icon/actorEye.png) Remove(Pipeline/src/com/artenum/cassandra/pipeline/graph/icon/actor.png) Remove(Pipeline/src/com/artenum/cassandra/pipeline/graph/icon) Remove(Pipeline/src/com/artenum/cassandra/pipeline/graph/VtkPipeLinePanel.java) Remove(Pipeline/src/com/artenum/cassandra/pipeline/graph/VtkPipeLineGraphModel.java) Remove(Pipeline/src/com/artenum/cassandra/pipeline/graph/VtkObjectUI2.java) Remove(Pipeline/src/com/artenum/cassandra/pipeline/graph/VtkObjectUI1.java) Remove(Pipeline/src/com/artenum/cassandra/pipeline/graph/VtkObjectUI.java) Remove(Pipeline/src/com/artenum/cassandra/pipeline/graph/VtkObjectCellAdapter.java) Remove(Pipeline/src/com/artenum/cassandra/pipeline/graph/.DS_Store) Remove(Pipeline/src/com/artenum/cassandra/pipeline/graph) Remove(Pipeline/src/com/artenum/cassandra/pipeline/VtkObjectAdapter.java) Remove(Pipeline/src/com/artenum/cassandra/pipeline/SimplePipeLineManager.java) Remove(Pipeline/src/com/artenum/cassandra/pipeline/CascadeRemoveManager.java) Remove(Pipeline/src/com/artenum/cassandra/pipeline) Remove(Pipeline/src/com/artenum/cassandra) Remove(Pipeline/src/com/artenum) Remove(Pipeline/src/com)