You can subscribe to this list here.
2009 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(144) |
Jul
(5) |
Aug
(23) |
Sep
(3) |
Oct
(8) |
Nov
(6) |
Dec
(3) |
---|---|---|---|---|---|---|---|---|---|---|---|---|
2010 |
Jan
(4) |
Feb
|
Mar
(34) |
Apr
(1) |
May
(10) |
Jun
(12) |
Jul
(17) |
Aug
(28) |
Sep
(2) |
Oct
|
Nov
(2) |
Dec
(3) |
2011 |
Jan
(4) |
Feb
(7) |
Mar
(5) |
Apr
(1) |
May
|
Jun
(15) |
Jul
(1) |
Aug
(7) |
Sep
(9) |
Oct
(3) |
Nov
|
Dec
(1) |
2012 |
Jan
(1) |
Feb
(13) |
Mar
(6) |
Apr
|
May
(1) |
Jun
|
Jul
(1) |
Aug
(9) |
Sep
(7) |
Oct
(2) |
Nov
|
Dec
|
2013 |
Jan
(1) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
From: <kon...@us...> - 2009-06-16 15:04:25
|
Revision: 79 http://mevislabmodules.svn.sourceforge.net/mevislabmodules/?rev=79&view=rev Author: konrad79 Date: 2009-06-16 15:04:06 +0000 (Tue, 16 Jun 2009) Log Message: ----------- METK: commit the whole bunch of METK modules :-) Added Paths: ----------- trunk/Community/METK/Modules/ML/ trunk/Community/METK/Modules/ML/Animation/ trunk/Community/METK/Modules/ML/Animation/AnimationParserTest/ trunk/Community/METK/Modules/ML/Animation/AnimationParserTest/HighLevelParser.cpp trunk/Community/METK/Modules/ML/Animation/AnimationScripter-Help/ trunk/Community/METK/Modules/ML/Animation/AnimationScripter-Help/LaTex/ trunk/Community/METK/Modules/ML/Animation/AnimationScripter-Help/LaTex/20051214-clipplane_bw.eps trunk/Community/METK/Modules/ML/Animation/AnimationScripter-Help/LaTex/kScript-Help.pdf trunk/Community/METK/Modules/ML/Animation/AnimationScripter-Help/LaTex/kScript-Help.tex trunk/Community/METK/Modules/ML/Animation/AnimationScripter-Help/LaTex/kScript.tcp trunk/Community/METK/Modules/ML/Animation/AnimationScripter-Help/img/ trunk/Community/METK/Modules/ML/Animation/AnimationScripter-Help/img/animation-gui-1.png trunk/Community/METK/Modules/ML/Animation/AnimationScripter-Help/img/medicalplayer-net.png trunk/Community/METK/Modules/ML/Animation/AnimationScripter-Help/img/opencase.png trunk/Community/METK/Modules/ML/Animation/AnimationScripter-Help/img/visualization.png trunk/Community/METK/Modules/ML/Animation/AnimationScripter-Help/index.htm trunk/Community/METK/Modules/ML/Animation/AnimationScripter-Help/master.css trunk/Community/METK/Modules/ML/Animation/Examples/ trunk/Community/METK/Modules/ML/Animation/Examples/DebugCameraPath.mlab trunk/Community/METK/Modules/ML/Animation/Examples/SimpleVideo.mlab trunk/Community/METK/Modules/ML/Animation/Modules/ trunk/Community/METK/Modules/ML/Animation/Modules/Box2/ trunk/Community/METK/Modules/ML/Animation/Modules/Box2/Box2.def trunk/Community/METK/Modules/ML/Animation/Modules/Box2/Box2.mlab trunk/Community/METK/Modules/ML/Animation/Modules/Box2/Box2.script trunk/Community/METK/Modules/ML/Animation/Modules/Cinema/ trunk/Community/METK/Modules/ML/Animation/Modules/Cinema/Cinema.def trunk/Community/METK/Modules/ML/Animation/Modules/Cinema/Cinema.mlab trunk/Community/METK/Modules/ML/Animation/Modules/Cinema/Cinema.py trunk/Community/METK/Modules/ML/Animation/Modules/Cinema/Cinema.script trunk/Community/METK/Modules/ML/Animation/Modules/Cinema/ENTLogo.png trunk/Community/METK/Modules/ML/Animation/Modules/Cinema/LiverLogo.png trunk/Community/METK/Modules/ML/Animation/Modules/Cinema/down.png trunk/Community/METK/Modules/ML/Animation/Modules/Cinema/folder.png trunk/Community/METK/Modules/ML/Animation/Modules/Cinema/up.png trunk/Community/METK/Modules/ML/Animation/Modules/DebugCameraPath/ trunk/Community/METK/Modules/ML/Animation/Modules/DebugCameraPath/DebugCameraPath.def trunk/Community/METK/Modules/ML/Animation/Modules/DebugCameraPath/DebugCameraPath.mlab trunk/Community/METK/Modules/ML/Animation/Modules/DebugCameraPath/DebugCameraPath.py trunk/Community/METK/Modules/ML/Animation/Modules/DebugCameraPath/DebugCameraPath.script trunk/Community/METK/Modules/ML/Animation/Modules/METKObjXMLWriter/ trunk/Community/METK/Modules/ML/Animation/Modules/METKObjXMLWriter/METKObjXMLWriter.def trunk/Community/METK/Modules/ML/Animation/Modules/PathApp/ trunk/Community/METK/Modules/ML/Animation/Modules/PathApp/PathApp.def trunk/Community/METK/Modules/ML/Animation/Modules/PathApp/PathApp.mlab trunk/Community/METK/Modules/ML/Animation/Modules/PathApp/PathApp.py trunk/Community/METK/Modules/ML/Animation/Modules/PathApp/PathApp.script trunk/Community/METK/Modules/ML/Animation/Modules/UMDAnimation2/ trunk/Community/METK/Modules/ML/Animation/Modules/UMDAnimation2/UMDAnimation2.def trunk/Community/METK/Modules/ML/Animation/Modules/UMDAnimation2/UMDAnimation2.py trunk/Community/METK/Modules/ML/Animation/Modules/UMDAnimation2/UMDAnimation2.script trunk/Community/METK/Modules/ML/Animation/Modules/UMDAnimation2/html/ trunk/Community/METK/Modules/ML/Animation/Modules/UMDAnimation2/html/UMDAnimation2.html trunk/Community/METK/Modules/ML/Animation/Modules/UMDAnimation2/img/ trunk/Community/METK/Modules/ML/Animation/Modules/UMDAnimation2/img/script-execute-48x48.png trunk/Community/METK/Modules/ML/Animation/Modules/UMDAnimation2/img/script-location-48x48.png trunk/Community/METK/Modules/ML/Animation/Modules/UMDAnimation2/img/verlauf-01.png trunk/Community/METK/Modules/ML/Animation/Modules/UMDCampath/ trunk/Community/METK/Modules/ML/Animation/Modules/UMDCampath/CampathTest.mlab trunk/Community/METK/Modules/ML/Animation/Modules/UMDCampath/Dokumentation.txt trunk/Community/METK/Modules/ML/Animation/Modules/UMDCampath/UMDCampath.def trunk/Community/METK/Modules/ML/Animation/Modules/UMDCampath/UMDCampath.mlab trunk/Community/METK/Modules/ML/Animation/Modules/UMDCampath/UMDCampath.py trunk/Community/METK/Modules/ML/Animation/Modules/UMDCampath/UMDCampath.script trunk/Community/METK/Modules/ML/Animation/Modules/UMDCampath/eingangsszene.txt trunk/Community/METK/Modules/ML/Animation/Modules/UMDCampath/test-short.txt trunk/Community/METK/Modules/ML/Animation/Modules/UMDCampath/testscript.txt trunk/Community/METK/Modules/ML/Animation/ParserTest/ trunk/Community/METK/Modules/ML/Animation/ParserTest/ParserTest.cpp trunk/Community/METK/Modules/ML/Animation/Scripts/ trunk/Community/METK/Modules/ML/Animation/Scripts/Celle_WS/ trunk/Community/METK/Modules/ML/Animation/Scripts/Celle_WS/HighLevel-01.txt trunk/Community/METK/Modules/ML/Animation/Scripts/Celle_WS/HighLevel-Commands.xml trunk/Community/METK/Modules/ML/Animation/Scripts/Celle_WS/ObjectNames.xml trunk/Community/METK/Modules/ML/Animation/Scripts/Celle_WS/TempHL.txt trunk/Community/METK/Modules/ML/Animation/Scripts/ENT/ trunk/Community/METK/Modules/ML/Animation/Scripts/ENT/20070307-Leipzig-a.txt trunk/Community/METK/Modules/ML/Animation/Scripts/ENT/20070307-Leipzig-b.txt trunk/Community/METK/Modules/ML/Animation/Scripts/ENT/20070307-Leipzig-c.txt trunk/Community/METK/Modules/ML/Animation/Scripts/ENT/HighLevel-01.txt trunk/Community/METK/Modules/ML/Animation/Scripts/ENT/HighLevel-01_nurCam.txt trunk/Community/METK/Modules/ML/Animation/Scripts/ENT/HighLevel-Commands-empty.xml trunk/Community/METK/Modules/ML/Animation/Scripts/ENT/HighLevel-Commands.xml trunk/Community/METK/Modules/ML/Animation/Scripts/ENT/NPR-01.txt trunk/Community/METK/Modules/ML/Animation/Scripts/ENT/NPR-02.txt trunk/Community/METK/Modules/ML/Animation/Scripts/ENT/NSP_LK1.txt trunk/Community/METK/Modules/ML/Animation/Scripts/ENT/NSP_LK2.txt trunk/Community/METK/Modules/ML/Animation/Scripts/ENT/NSP_LNgt1cm.txt trunk/Community/METK/Modules/ML/Animation/Scripts/ENT/NSP_LNgt2cm.txt trunk/Community/METK/Modules/ML/Animation/Scripts/ENT/NSP_Tumor.txt trunk/Community/METK/Modules/ML/Animation/Scripts/ENT/NSP_TumorEmph.txt trunk/Community/METK/Modules/ML/Animation/Scripts/ENT/ObjectNames-Temp.xml trunk/Community/METK/Modules/ML/Animation/Scripts/ENT/ObjectNames.xml trunk/Community/METK/Modules/ML/Animation/Scripts/ENT/ObjectNames_static.xml trunk/Community/METK/Modules/ML/Animation/Scripts/ENT/SELECT-default.txt trunk/Community/METK/Modules/ML/Animation/Scripts/ENT/SystemInstructions-01.txt trunk/Community/METK/Modules/ML/Animation/Scripts/ENT/SystemInstructions-02.txt trunk/Community/METK/Modules/ML/Animation/Scripts/ENT/SystemInstructions-03.txt trunk/Community/METK/Modules/ML/Animation/Scripts/ENT/SystemInstructions.txt trunk/Community/METK/Modules/ML/Animation/Scripts/ENT/TempHL.txt trunk/Community/METK/Modules/ML/Animation/Scripts/ENT/TempHL_Transfer.txt trunk/Community/METK/Modules/ML/Animation/Scripts/ENT/emphasizeLK.txt trunk/Community/METK/Modules/ML/Animation/Scripts/ENT/emphasizeLK_movie.txt trunk/Community/METK/Modules/ML/Animation/Scripts/ENT/emphasizeLK_movie2.txt trunk/Community/METK/Modules/ML/Animation/Scripts/ENT/emphasizeMuscle.txt trunk/Community/METK/Modules/ML/Animation/Scripts/ENT/init-script.txt trunk/Community/METK/Modules/ML/Animation/Scripts/ENT/lk-view.txt trunk/Community/METK/Modules/ML/Animation/Scripts/ENT/miccai-1.txt trunk/Community/METK/Modules/ML/Animation/Scripts/ENT/miccai-2.txt trunk/Community/METK/Modules/ML/Animation/Scripts/ENT/miccai-3.txt trunk/Community/METK/Modules/ML/Animation/Scripts/ENT/miccai-3_new.txt trunk/Community/METK/Modules/ML/Animation/Scripts/ENT/miccai-hals31-A.txt trunk/Community/METK/Modules/ML/Animation/Scripts/ENT/miccai-hals31.txt trunk/Community/METK/Modules/ML/Animation/Scripts/ENT/miccai-lk-class.txt trunk/Community/METK/Modules/ML/Animation/Scripts/ENT/rotation.txt trunk/Community/METK/Modules/ML/Animation/Scripts/HighLevel-Commands-empty.xml trunk/Community/METK/Modules/ML/Animation/Scripts/Liver/ trunk/Community/METK/Modules/ML/Animation/Scripts/Liver/HighLevel-01.txt trunk/Community/METK/Modules/ML/Animation/Scripts/Liver/HighLevel-Commands-empty.xml trunk/Community/METK/Modules/ML/Animation/Scripts/Liver/HighLevel-Commands.xml trunk/Community/METK/Modules/ML/Animation/Scripts/Liver/MICCAI-Segments1.txt trunk/Community/METK/Modules/ML/Animation/Scripts/Liver/MICCAI-Segments2.txt trunk/Community/METK/Modules/ML/Animation/Scripts/Liver/MICCAI-Segments3.txt trunk/Community/METK/Modules/ML/Animation/Scripts/Liver/MICCAI-Segments4.txt trunk/Community/METK/Modules/ML/Animation/Scripts/Liver/MICCAI-Tumor.txt trunk/Community/METK/Modules/ML/Animation/Scripts/Liver/MICCAI-init.txt trunk/Community/METK/Modules/ML/Animation/Scripts/Liver/ObjectNames-Temp.xml trunk/Community/METK/Modules/ML/Animation/Scripts/Liver/SELECT-default.txt trunk/Community/METK/Modules/ML/Animation/Scripts/Liver/TempHL.txt trunk/Community/METK/Modules/ML/Animation/Scripts/Liver/init-script.txt trunk/Community/METK/Modules/ML/Animation/Scripts/Liver/tumor-emph.txt trunk/Community/METK/Modules/ML/Animation/Scripts/ObjectNames-Temp.xml trunk/Community/METK/Modules/ML/Animation/Scripts/UMDCampath/ trunk/Community/METK/Modules/ML/Animation/Scripts/UMDCampath/CampathVPTest.txt trunk/Community/METK/Modules/ML/Animation/Scripts/UMDCampath/EingangsszeneLinear.txt trunk/Community/METK/Modules/ML/Animation/Scripts/UMDCampath/EingangsszeneParable.txt trunk/Community/METK/Modules/ML/Animation/Scripts/UMDCampath/EingangsszeneParableRectangle.txt trunk/Community/METK/Modules/ML/Animation/Scripts/UMDCampath/EingangsszeneRectangle.txt trunk/Community/METK/Modules/ML/Animation/Scripts/UMDCampath/Pfadvarianten120Grad.txt trunk/Community/METK/Modules/ML/Animation/Scripts/UMDCampath/PfadvariantenUeberlappend.txt trunk/Community/METK/Modules/ML/Animation/Scripts/UMDCampath/UMDCampathTest.txt trunk/Community/METK/Modules/ML/Animation/Scripts/UMDCampath/test-short.txt trunk/Community/METK/Modules/ML/Animation/Scripts/UMDCampath/testscript.txt trunk/Community/METK/Modules/ML/Animation/Scripts/XML-Knechtmann/ trunk/Community/METK/Modules/ML/Animation/Scripts/XML-Knechtmann/HighLevel-01.txt trunk/Community/METK/Modules/ML/Animation/Scripts/XML-Knechtmann/HighLevel-Commands.xml trunk/Community/METK/Modules/ML/Animation/Scripts/XML-Knechtmann/ObjectNames.xml trunk/Community/METK/Modules/ML/Animation/Scripts/XML-Knechtmann/TempHL.txt trunk/Community/METK/Modules/ML/Animation/Scripts/clustering.txt trunk/Community/METK/Modules/ML/Animation/konrad-changes.txt trunk/Community/METK/Modules/ML/Labeling/ trunk/Community/METK/Modules/ML/Labeling/Label3DDemo/ trunk/Community/METK/Modules/ML/Labeling/Label3DDemo/Label3DDemo.def trunk/Community/METK/Modules/ML/Labeling/Label3DDemo/Label3DDemo.mlab trunk/Community/METK/Modules/ML/Labeling/Label3DDemo/Label3DDemo.py trunk/Community/METK/Modules/ML/Labeling/Label3DDemo/Label3DDemo.script trunk/Community/METK/Modules/ML/Labeling/METKLabels/ trunk/Community/METK/Modules/ML/Labeling/METKLabels/METKLabels.def trunk/Community/METK/Modules/ML/Labeling/UMDLabelModul/ trunk/Community/METK/Modules/ML/Labeling/UMDLabelModul/SoLabelModul.py trunk/Community/METK/Modules/ML/Labeling/UMDLabelModul/SoLabelModul.script trunk/Community/METK/Modules/ML/Labeling/UMDLabelModul/UMDLabelModul.def trunk/Community/METK/Modules/ML/Labeling/UMDTextModul/ trunk/Community/METK/Modules/ML/Labeling/UMDTextModul/Fonts/ trunk/Community/METK/Modules/ML/Labeling/UMDTextModul/Fonts/arial.ttf trunk/Community/METK/Modules/ML/Labeling/UMDTextModul/Fonts/arialbd.ttf trunk/Community/METK/Modules/ML/Labeling/UMDTextModul/Fonts/arialbi.ttf trunk/Community/METK/Modules/ML/Labeling/UMDTextModul/Fonts/ariali.ttf trunk/Community/METK/Modules/ML/Labeling/UMDTextModul/SoTextModul.js trunk/Community/METK/Modules/ML/Labeling/UMDTextModul/SoTextModulExample.mlab trunk/Community/METK/Modules/ML/Labeling/UMDTextModul/UMDTextModul.def trunk/Community/METK/Modules/ML/Labeling/examples/ trunk/Community/METK/Modules/ML/Labeling/examples/3DLabel-AufrufStack.doc trunk/Community/METK/Modules/ML/Labeling/examples/Hals12_Labeling2.xml trunk/Community/METK/Modules/ML/Labeling/examples/Labeling3D-Konrad-02.mlab trunk/Community/METK/Modules/ML/Labeling/examples/Labelingdemo-Marcus.mlab trunk/Community/METK/Modules/ML/METK/ trunk/Community/METK/Modules/ML/METK/METK2DLabeling/ trunk/Community/METK/Modules/ML/METK/METK2DLabeling/Label2DDemonstrator/ trunk/Community/METK/Modules/ML/METK/METK2DLabeling/Label2DDemonstrator/Label2DDemonstrator.def trunk/Community/METK/Modules/ML/METK/METK2DLabeling/Label2DDemonstrator/Label2DDemonstrator.mlab trunk/Community/METK/Modules/ML/METK/METK2DLabeling/Label2DDemonstrator/Label2DDemonstrator.py trunk/Community/METK/Modules/ML/METK/METK2DLabeling/Label2DDemonstrator/Label2DDemonstrator.script trunk/Community/METK/Modules/ML/METK/METK2DLabeling/METK2DLabeling.def trunk/Community/METK/Modules/ML/METK/METK2DLabeling/networks/ trunk/Community/METK/Modules/ML/METK/METK2DLabeling/networks/2DLabeling-Test-01.mlab trunk/Community/METK/Modules/ML/METK/METKLiftChart/ trunk/Community/METK/Modules/ML/METK/METKLiftChart/METKLiftChart.def trunk/Community/METK/Modules/ML/METK/METKMessaging/ trunk/Community/METK/Modules/ML/METK/METKMessaging/METKMessaging.def trunk/Community/METK/Modules/ML/METK/METKMessaging/html/ trunk/Community/METK/Modules/ML/METK/METKMessaging/html/METKMessaging.html trunk/Community/METK/Modules/ML/METK/METKPicking/ trunk/Community/METK/Modules/ML/METK/METKPicking/METKPicking.def trunk/Community/METK/Modules/ML/METK/METKPicking/METKPicking.py trunk/Community/METK/Modules/ML/METK/METKPicking/METKPicking.script trunk/Community/METK/Modules/ML/METK/METKSurfaceDistance/ trunk/Community/METK/Modules/ML/METK/METKSurfaceDistance/METKSurfaceDistance.def trunk/Community/METK/Modules/ML/METK/METKSurfaceDistance/html/ trunk/Community/METK/Modules/ML/METK/METKSurfaceDistance/html/METKSurfaceDistance3D.html trunk/Community/METK/Modules/ML/METK/METKUndo/ trunk/Community/METK/Modules/ML/METK/METKUndo/METKUndo.def trunk/Community/METK/Modules/ML/METK/networks/ trunk/Community/METK/Modules/ML/METK/networks/Broadcasting.mlab trunk/Community/METK/Modules/ML/METK/networks/METKLiftChart.mlab trunk/Community/METK/Modules/ML/METK/networks/SenderReceiver.mlab trunk/Community/METK/Modules/ML/MLkAviWriter/ trunk/Community/METK/Modules/ML/MLkAviWriter/MLkAviWriter.def trunk/Community/METK/Modules/ML/MLkAviWriter/html/ trunk/Community/METK/Modules/ML/MLkAviWriter/html/kAviWriter.html trunk/Community/METK/Modules/ML/MLkAviWriter/networks/ trunk/Community/METK/Modules/ML/MLkAviWriter/networks/mlkAviWriterExample.mlab trunk/Community/METK/Modules/ML/UMDBoundingBox2/ trunk/Community/METK/Modules/ML/UMDBoundingBox2/UMDBoundingBox2.def trunk/Community/METK/Modules/ML/UMDBoundingBoxCalculator2/ trunk/Community/METK/Modules/ML/UMDBoundingBoxCalculator2/UMDBoundingBoxCalculator2.def trunk/Community/METK/Modules/ML/UMDCodedSegmentation/ trunk/Community/METK/Modules/ML/UMDCodedSegmentation/UMDCodedSegmentation.def trunk/Community/METK/Modules/ML/UMDInventorPointer/ trunk/Community/METK/Modules/ML/UMDInventorPointer/Example/ trunk/Community/METK/Modules/ML/UMDInventorPointer/Example/Beam.mlab trunk/Community/METK/Modules/ML/UMDInventorPointer/UMDInventorPointer.def trunk/Community/METK/Modules/ML/UMDMLInventorDemo/ trunk/Community/METK/Modules/ML/UMDMLInventorDemo/UMDMLInventorDemo.def trunk/Community/METK/Modules/ML/UMDMLInventorDemo/networks/ trunk/Community/METK/Modules/ML/UMDMLInventorDemo/networks/MLInventorDemoExample.mlab trunk/Community/METK/Modules/ML/UMDObjDemo/ trunk/Community/METK/Modules/ML/UMDObjDemo/UMDObjDemo.def trunk/Community/METK/Modules/ML/UMDObjDemo/html/ trunk/Community/METK/Modules/ML/UMDObjDemo/html/UMDObjDemo.html trunk/Community/METK/Modules/ML/UMDObjDemo/networks/ trunk/Community/METK/Modules/ML/UMDObjDemo/networks/UMDObjDemoExample.mlab trunk/Community/METK/Modules/ML/UMDRegionDistanceTransformation/ trunk/Community/METK/Modules/ML/UMDRegionDistanceTransformation/UMDRegionDistanceTransformation.def trunk/Community/METK/Modules/ML/UMDSoSceneWriterMD/ trunk/Community/METK/Modules/ML/UMDSoSceneWriterMD/UMDSoSceneWriterMD.def trunk/Community/METK/Modules/ML/Viewpoint/ trunk/Community/METK/Modules/ML/Viewpoint/METKAutoFading/ trunk/Community/METK/Modules/ML/Viewpoint/METKAutoFading/METKAutoFading.def trunk/Community/METK/Modules/ML/Viewpoint/METKAutoFading/METKAutoFading.script trunk/Community/METK/Modules/ML/Viewpoint/METKCalcCamPath/ trunk/Community/METK/Modules/ML/Viewpoint/METKCalcCamPath/METKCalcCamPath.def trunk/Community/METK/Modules/ML/Viewpoint/METKCalcCamPath/networks/ trunk/Community/METK/Modules/ML/Viewpoint/METKCalcCamPath/networks/METKCalcCamPathExamplae.mlab trunk/Community/METK/Modules/ML/Viewpoint/METKCalcCamPos/ trunk/Community/METK/Modules/ML/Viewpoint/METKCalcCamPos/METKCalcCamPos.def trunk/Community/METK/Modules/ML/Viewpoint/METKCalcCamPos/METKCalcCamPos.script trunk/Community/METK/Modules/ML/Viewpoint/METKCreateIntraOPDummy/ trunk/Community/METK/Modules/ML/Viewpoint/METKCreateIntraOPDummy/METKCreateIntraOPDummy.def trunk/Community/METK/Modules/ML/Viewpoint/METKIntraOPViewpoint/ trunk/Community/METK/Modules/ML/Viewpoint/METKIntraOPViewpoint/METKIntraOPViewpoint.def trunk/Community/METK/Modules/ML/Viewpoint/METKKeystates/ trunk/Community/METK/Modules/ML/Viewpoint/METKKeystates/KeystateDefinitions.py trunk/Community/METK/Modules/ML/Viewpoint/METKKeystates/KeystatesGUIDummy.mlab trunk/Community/METK/Modules/ML/Viewpoint/METKKeystates/KeystatesGUIDummy.py trunk/Community/METK/Modules/ML/Viewpoint/METKKeystates/KeystatesGUIDummy.script trunk/Community/METK/Modules/ML/Viewpoint/METKKeystates/METKKeystateVis.mlab trunk/Community/METK/Modules/ML/Viewpoint/METKKeystates/METKKeystateVis.py trunk/Community/METK/Modules/ML/Viewpoint/METKKeystates/METKKeystateVis.script trunk/Community/METK/Modules/ML/Viewpoint/METKKeystates/METKKeystates.def trunk/Community/METK/Modules/ML/Viewpoint/METKKeystates/METKKeystates.script trunk/Community/METK/Modules/ML/Viewpoint/METKKeystates/images/ trunk/Community/METK/Modules/ML/Viewpoint/METKKeystates/images/Camera.png trunk/Community/METK/Modules/ML/Viewpoint/METKKeystates/images/DefaultView.png trunk/Community/METK/Modules/ML/Viewpoint/METKKeystates/images/Extension.png trunk/Community/METK/Modules/ML/Viewpoint/METKKeystates/images/Help.png trunk/Community/METK/Modules/ML/Viewpoint/METKKeystates/images/IconAxial.png trunk/Community/METK/Modules/ML/Viewpoint/METKKeystates/images/IconCoronal.png trunk/Community/METK/Modules/ML/Viewpoint/METKKeystates/images/IconSagittal.png trunk/Community/METK/Modules/ML/Viewpoint/METKKeystates/images/MinDist.png trunk/Community/METK/Modules/ML/Viewpoint/METKKeystates/images/OrthoView.png trunk/Community/METK/Modules/ML/Viewpoint/METKKeystates/images/UserDist.png trunk/Community/METK/Modules/ML/Viewpoint/METKShowClusteredObjects/ trunk/Community/METK/Modules/ML/Viewpoint/METKShowClusteredObjects/METKShowClusteredObjects.def trunk/Community/METK/Modules/ML/Viewpoint/METKShowClusteredObjects/networks/ trunk/Community/METK/Modules/ML/Viewpoint/METKShowClusteredObjects/networks/METKShowClusteredObjectsExample.mlab trunk/Community/METK/Modules/ML/Viewpoint/METKToSolverConnection/ trunk/Community/METK/Modules/ML/Viewpoint/METKToSolverConnection/METKToSolverConnection.def trunk/Community/METK/Modules/ML/Viewpoint/Notizen zur Nutzung der Viepoint Selection.doc trunk/Community/METK/Modules/ML/Viewpoint/UMDVisDataViewer/ trunk/Community/METK/Modules/ML/Viewpoint/UMDVisDataViewer/UMDVisDataViewer.def trunk/Community/METK/Modules/ML/Viewpoint/UMDVisibilitySolver/ trunk/Community/METK/Modules/ML/Viewpoint/UMDVisibilitySolver/UMDVisibilitySolver.def trunk/Community/METK/Modules/ML/Viewpoint/networks/ trunk/Community/METK/Modules/ML/Viewpoint/networks/createCamData.mlab trunk/Community/METK/Modules/ML/Viewpoint/networks/createVisData.mlab trunk/Community/METK/Modules/ML/Viewpoint/vpBasic/ trunk/Community/METK/Modules/Macros/ trunk/Community/METK/Modules/Macros/Arrow2/ trunk/Community/METK/Modules/Macros/Arrow2/Arrow2.def trunk/Community/METK/Modules/Macros/Arrow2/Arrow2.mlab trunk/Community/METK/Modules/Macros/Arrow2/Arrow2.py trunk/Community/METK/Modules/Macros/Arrow2/Arrow2.script trunk/Community/METK/Modules/Macros/BackgroundMacro2/ trunk/Community/METK/Modules/Macros/BackgroundMacro2/BackgroundMacro2.def trunk/Community/METK/Modules/Macros/BackgroundMacro2/BackgroundMacro2.mlab trunk/Community/METK/Modules/Macros/BackgroundMacro2/BackgroundMacro2.script trunk/Community/METK/Modules/Macros/BackgroundMacro2/networks/ trunk/Community/METK/Modules/Macros/BackgroundMacro2/networks/BackgroundMacro2Example.mlab trunk/Community/METK/Modules/Macros/CaseScanner/ trunk/Community/METK/Modules/Macros/CaseScanner/CaseScanner.def trunk/Community/METK/Modules/Macros/CaseScanner/CaseScanner.mlab trunk/Community/METK/Modules/Macros/CaseScanner/CaseScanner.py trunk/Community/METK/Modules/Macros/CaseScanner/CaseScanner.script trunk/Community/METK/Modules/Macros/GUIClasses/ trunk/Community/METK/Modules/Macros/GUIClasses/Examples/ trunk/Community/METK/Modules/Macros/GUIClasses/Examples/Button-01.png trunk/Community/METK/Modules/Macros/GUIClasses/Examples/Button-02.png trunk/Community/METK/Modules/Macros/GUIClasses/Examples/Button1-disabled.png trunk/Community/METK/Modules/Macros/GUIClasses/Examples/Button1-down.png trunk/Community/METK/Modules/Macros/GUIClasses/Examples/Button1-normal.png trunk/Community/METK/Modules/Macros/GUIClasses/Examples/Button1-over.png trunk/Community/METK/Modules/Macros/GUIClasses/Examples/Button2-disabled.png trunk/Community/METK/Modules/Macros/GUIClasses/Examples/Button2-down.png trunk/Community/METK/Modules/Macros/GUIClasses/Examples/Button2-normal.png trunk/Community/METK/Modules/Macros/GUIClasses/Examples/Button2-over.png trunk/Community/METK/Modules/Macros/GUIClasses/Examples/kButtonExample.def trunk/Community/METK/Modules/Macros/GUIClasses/Examples/kButtonExample.py trunk/Community/METK/Modules/Macros/GUIClasses/Examples/kButtonExample.script trunk/Community/METK/Modules/Macros/GUIClasses/kButton.py trunk/Community/METK/Modules/Macros/GenerateIVFile/ trunk/Community/METK/Modules/Macros/GenerateIVFile/GenerateIVFile.def trunk/Community/METK/Modules/Macros/GenerateIVFile/GenerateIVFile.mlab trunk/Community/METK/Modules/Macros/GenerateIVFile/GenerateIVFile.py trunk/Community/METK/Modules/Macros/GenerateIVFile/GenerateIVFile.script trunk/Community/METK/Modules/Macros/GenerateIVFile/GenerateIVFileDir.def trunk/Community/METK/Modules/Macros/GenerateIVFile/GenerateIVFileDir.mlab trunk/Community/METK/Modules/Macros/GenerateIVFile/GenerateIVFileDir.py trunk/Community/METK/Modules/Macros/GenerateIVFile/GenerateIVFileDir.script trunk/Community/METK/Modules/Macros/GlobalStyle/ trunk/Community/METK/Modules/Macros/GlobalStyle/GlobalStyle.def trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/ trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/CaseBuilding/ trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/CaseBuilding/METKAddImage.mlab trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/CaseBuilding/METKAddImage.py trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/CaseBuilding/METKAddImage.script trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/CaseBuilding/METKAddROI.mlab trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/CaseBuilding/METKAddROI.py trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/CaseBuilding/METKAddROI.script trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/CaseBuilding/METKAddStructure.mlab trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/CaseBuilding/METKAddStructure.py trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/CaseBuilding/METKAddStructure.script trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/CaseBuilding/METKCaseBuilder.mlab trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/CaseBuilding/METKCaseBuilder.py trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/CaseBuilding/METKCaseBuilder.script trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/CaseBuilding/METKCaseBuilding.def trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/CaseBuilding/StructureFieldContainer.script trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/CorrlNet_Definitions.py trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/ExampleNetworks/ trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/ExampleNetworks/01-LoadCase.mlab trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/ExampleNetworks/02-Animation.mlab trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/ExampleNetworks/FlatIsoExample.mlab trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/ExampleNetworks/LiftChart.mlab trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/ExampleNetworks/LogFileAndDebug.mlab trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/ExampleNetworks/METKBookmark3D.mlab trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/ExampleNetworks/METKBrowser.mlab trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/ExampleNetworks/METKCaseBuilding.mlab trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/ExampleNetworks/METKCollections.mlab trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/ExampleNetworks/METKImageDisplay.mlab trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/ExampleNetworks/METKLoadSegMask.mlab trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/ExampleNetworks/METKObjBrowser.mlab trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/ExampleNetworks/METKRenderModes.mlab trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/ExampleNetworks/METKSurfaceDistance.mlab trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/ExampleNetworks/PatientAndCaseObject.mlab trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/ExampleNetworks/PickingAndCSO.mlab trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/ExampleNetworks/SimpleMETKApp.def trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/ExampleNetworks/SimpleMETKApp.mlab trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/ExampleNetworks/SimpleMETKApp.script trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/ExampleNetworks/SimpleMETKApp02.def trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/ExampleNetworks/SimpleMETKApp02.mlab trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/ExampleNetworks/SimpleMETKApp02.script trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/ExampleNetworks/VisibilityExample.mlab trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/ExampleNetworks/VolumeRendering.mlab trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METK-Example.mlab trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METK-Example.py trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METK-Example.script trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METK.def trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKCSO.mlab trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKCSO.py trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKCSO.script trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKCamera/ trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKCamera/METKCamera.def trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKCamera/METKGenerateCamData.mlab trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKCamera/METKGenerateCamData.py trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKCamera/METKGenerateCamData.script trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKCamera/examples/ trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKCamera/examples/METKGenerateCamData-Example.mlab trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKCaseObject.mlab trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKCaseObject.py trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKCaseObject.script trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKClipping.def trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKClipping.mlab trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKClipping.py trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKClipping.script trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKCollections/ trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKCollections/METKCollections.def trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKCollections/METKCollections.mlab trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKCollections/METKCollections.py trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKCollections/METKCollections.script trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKDebug/ trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKDebug/METKDebug.def trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKDebug/METKDebug.mlab trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKDebug/METKDebug.py trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKDebug/METKDebug.script trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKDebug/METKLogFile.mlab trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKDebug/METKLogFile.py trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKDebug/METKLogFile.script trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKDemonstrator/ trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKDemonstrator/METKDemonstrator.def trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKDemonstrator/METKDemonstrator.mlab trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKDemonstrator/METKDemonstrator.py trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKDemonstrator/METKDemonstrator.script trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKDemonstrator/doc/ trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKDemonstrator/doc/METKDemonstrator.tex trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKDemonstrator/img/ trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKDemonstrator/img/Button-Standard-123x38.psd trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKDemonstrator/img/Button-Standard-160x38.psd trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKDemonstrator/img/bg1.png trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKDemonstrator/img/bt_addcol-d.png trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKDemonstrator/img/bt_addcol-n.png trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKDemonstrator/img/bt_addcol-o.png trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKDemonstrator/img/bt_addcol-p.png trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKDemonstrator/img/bt_browse-d.png trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKDemonstrator/img/bt_browse-n.png trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKDemonstrator/img/bt_browse-o.png trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKDemonstrator/img/bt_browse-p.png trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKDemonstrator/img/bt_collections-d.png trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKDemonstrator/img/bt_collections-n.png trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKDemonstrator/img/bt_collections-o.png trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKDemonstrator/img/bt_collections-p.png trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKDemonstrator/img/bt_cso-d.png trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKDemonstrator/img/bt_cso-n.png trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKDemonstrator/img/bt_cso-o.png trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKDemonstrator/img/bt_cso-p.png trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKDemonstrator/img/bt_demo-d.png trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKDemonstrator/img/bt_demo-n.png trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKDemonstrator/img/bt_demo-o.png trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKDemonstrator/img/bt_demo-p.png trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKDemonstrator/img/bt_exit-d.png trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKDemonstrator/img/bt_exit-n.png trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKDemonstrator/img/bt_exit-o.png trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKDemonstrator/img/bt_exit-p.png trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKDemonstrator/img/bt_hierarchy-d.png trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKDemonstrator/img/bt_hierarchy-n.png trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKDemonstrator/img/bt_hierarchy-o.png trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKDemonstrator/img/bt_hierarchy-p.png trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKDemonstrator/img/bt_sgb-d.png trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKDemonstrator/img/bt_sgb-n.png trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKDemonstrator/img/bt_sgb-o.png trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKDemonstrator/img/bt_sgb-p.png trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKDemonstrator/img/corner_bl.png trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKDemonstrator/img/corner_br.png trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKDemonstrator/img/corner_tl.png trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKDemonstrator/img/corner_tr.png trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKDemonstrator/img/help_small.png trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKDemonstrator/img/title.png trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKGUI/ trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKGUI/METKBookmark3D.mlab trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKGUI/METKBookmark3D.py trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKGUI/METKBookmark3D.script trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKGUI/METKExplorer.def trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKGUI/METKExplorer.mlab trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKGUI/METKExplorer.py trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKGUI/METKExplorer.script trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKGUI/METKGUI.def trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKGUI/METKHierarchyBrowser.mlab trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKGUI/METKHierarchyBrowser.py trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKGUI/METKHierarchyBrowser.script trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKGUI/METKInfoWin.mlab trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKGUI/METKInfoWin.py trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKGUI/METKInfoWin.script trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKGUI/METKObjBrowser.mlab trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKGUI/METKObjBrowser.py trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKGUI/METKObjBrowser.script trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKGUI/METKSingleObjInfo.mlab trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKGUI/METKSingleObjInfo.py trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKGUI/METKSingleObjInfo.script trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKGUI/METKStructureGroupBrowser.mlab trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKGUI/METKStructureGroupBrowser.py trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKGUI/METKStructureGroupBrowser.script trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKGUI/METKVesselExplorer.def trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKGUI/METKVesselExplorer.mlab trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKGUI/METKVesselExplorer.py trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKGUI/METKVesselExplorer.script trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKImageDisplay/ trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKImageDisplay/BitImage.mlab trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKImageDisplay/BitImage.script trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKImageDisplay/METKBitImage.mlab trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKImageDisplay/METKBitImage.py trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKImageDisplay/METKBitImage.script trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKImageDisplay/METKCodedSegmentation.mlab trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKImageDisplay/METKCodedSegmentation.py trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKImageDisplay/METKCodedSegmentation.script trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKImageDisplay/METKDistanceTransform.mlab trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKImageDisplay/METKDistanceTransform.py trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKImageDisplay/METKDistanceTransform.script trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKImageDisplay/METKImageDisplay.def trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKImageDisplay/METKImageDisplay.py trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKImageDisplay/METKImageInfo.mlab trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKImageDisplay/METKImageInfo.py trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKImageDisplay/METKImageInfo.script trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKImageDisplay/METKOverlay2D.mlab trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKImageDisplay/METKOverlay2D.py trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKImageDisplay/METKOverlay2D.script trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKImageDisplay/METKROISelect.mlab trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKImageDisplay/METKROISelect.py trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKImageDisplay/METKROISelect.script trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKImageDisplay/METKVolViz.mlab trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKImageDisplay/METKVolViz.py trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKImageDisplay/METKVolViz.script trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKInstaller.def trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKInstaller.mlab trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKInstaller.script trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKLoadSegMask.mlab trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKLoadSegMask.py trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKLoadSegMask.script trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKMeasurement/ trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKMeasurement/METKMeasures.def trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKMeasurement/METKMeasures.mlab trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKMeasurement/METKMeasures.py trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKMeasurement/METKMeasures.script trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKMeasurement/html/ trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKMeasurement/html/METKMeasures.html trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKMeasurement/networks/ trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKMeasurement/networks/METKMeasures.mlab trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKOpen/ trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKOpen/ConvertXML.mlab trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKOpen/ConvertXML.py trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKOpen/ConvertXML.script trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKOpen/HepaXMLConverter.mlab trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKOpen/HepaXMLConverter.py trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKOpen/HepaXMLConverter.script trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKOpen/METKCaseOptimizer.py trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKOpen/METKCaseOptimizer.script trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKOpen/METKConvertFiles.mlab trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKOpen/METKConvertFiles.py trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKOpen/METKConvertFiles.script trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKOpen/METKGenerateVesselIV.def trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKOpen/METKGenerateVesselIV.mlab trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKOpen/METKGenerateVesselIV.py trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKOpen/METKGenerateVesselIV.script trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKOpen/METKInventorObject.mlab trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKOpen/METKInventorObject.py trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKOpen/METKInventorObject.script trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKOpen/METKManager.mlab trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKOpen/METKManager.py trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKOpen/METKManager.script trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKOpen/METKOpen.def trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKOpen/METKPackFiles.mlab trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKOpen/METKPackFiles.py trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKOpen/METKPackFiles.script trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKOpen/METKSaveCase.mlab trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKOpen/METKSaveCase.py trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKOpen/METKSaveCase.script trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKOpen/NeckVisionXMLConverter.mlab trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKOpen/NeckVisionXMLConverter.py trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKOpen/NeckVisionXMLConverter.script trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKOpen/StandardXMLConverter.mlab trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKOpen/StandardXMLConverter.py trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKOpen/StandardXMLConverter.script trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKOpen/empty.iv trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKPatientObject.mlab trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKPatientObject.py trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKPatientObject.script trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKRenderModes/ trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKRenderModes/IsoSurfaceContainer.mlab trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKRenderModes/IsoSurfaceContainer.py trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKRenderModes/IsoSurfaceContainer.script trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKRenderModes/METKIsoSurface.mlab trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKRenderModes/METKIsoSurface.py trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKRenderModes/METKIsoSurface.script trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKRenderModes/METKNPRShading.mlab trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKRenderModes/METKNPRShading.py trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKRenderModes/METKNPRShading.script trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKRenderModes/METKRenderModes.def trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKRenderModes/METKSilhouette.mlab trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKRenderModes/METKSilhouette.py trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKRenderModes/METKSilhouette.script trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKRenderModes/METKStippling.mlab trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKRenderModes/METKStippling.py trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKRenderModes/METKStippling.script trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKRenderModes/METKTexturing.mlab trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKRenderModes/METKTexturing.py trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKRenderModes/METKTexturing.script trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKRenderModes/NPRShadingContainer.mlab trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKRenderModes/NPRShadingContainer.py trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKRenderModes/NPRShadingContainer.script trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKRenderModes/NPRShadingParameter.py trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKRenderModes/SilhouetteContainer.mlab trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKRenderModes/SilhouetteContainer.py trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKRenderModes/SilhouetteContainer.script trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKRenderModes/StipplingContainer.mlab trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKRenderModes/StipplingContainer.py trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKRenderModes/StipplingContainer.script trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKRenderModes/TextureContainer.mlab trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKRenderModes/TextureContainer.py trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKRenderModes/TextureContainer.script trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKRenderModes/textures/ trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKRenderModes/textures/TAM256x256.rgb trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKRenderModes/textures/TAM256x256_alpha.rgb trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKSafetyMargin.def trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKSafetyMargin.mlab trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKSafetyMargin.py trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKSafetyMargin.script trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKSceneOptimization/ trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKSceneOptimization/AutomaskingDemonstrator.def trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKSceneOptimization/AutomaskingDemonstrator.mlab trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKSceneOptimization/AutomaskingDemonstrator.py trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKSceneOptimization/AutomaskingDemonstrator.script trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKSceneOptimization/ExampleNetworkCorrelations.mlab trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKSceneOptimization/METKAutoMasking.def trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKSceneOptimization/METKAutoMasking.py trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKSceneOptimization/METKAutoMasking.script trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKSceneOptimization/METKCorrelationNetwork.def trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKSceneOptimization/METKCorrelationNetwork.mlab trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKSceneOptimization/METKCorrelationNetwork.py trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKSceneOptimization/METKCorrelationNetwork.script trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKSceneOptimization/METKCorrelations.def trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKSceneOptimization/METKCorrelations.mlab trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKSceneOptimization/METKCorrelations.py trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKSceneOptimization/METKCorrelations.script trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKSceneOptimization/METKautoMasking.mlab trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKSceneOptimization/demonstrator-network.mlab trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKScript/ trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKScript/METKScriptBuilder.def trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKScript/METKScriptBuilder.mlab trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKScript/METKScriptBuilder.py trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKScript/METKScriptBuilder.script trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKScript/METKScriptBunch.def trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKScript/METKScriptBunch.mlab trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKScript/METKScriptBunch.py trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKScript/METKScriptBunch.script trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKScript/METKScriptInit.def trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKScript/METKScriptInit.mlab trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKScript/METKScriptInit.py trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKScript/METKScriptInit.script trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKScript/METKScriptTrigger.def trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKScript/METKScriptTrigger.mlab trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKScript/METKScriptTrigger.py trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKScript/METKScriptTrigger.script trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKScript/img/ trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKScript/img/verlauf-01.png trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKStatus.mlab trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKStatus.py trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKStatus.script trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKStructureDetails.mlab trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKStructureDetails.py trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKStructureDetails.script trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKSurfaceDistance/ trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKSurfaceDistance/METKSurfaceDistance2D.def trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKSurfaceDistance/METKSurfaceDistance2D.mlab trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKSurfaceDistance/METKSurfaceDistance2D.py trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKSurfaceDistance/METKSurfaceDistance2D.script trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKTestCenter.mlab trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKTestCenter.py trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKTestCenter.script trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKViewer/ trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKViewer/METKViewer.def trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKViewer/METKViewer2D.mlab trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKViewer/METKViewer2D.py trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKViewer/METKViewer2D.script trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKViewer/METKViewer3D.mlab trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKViewer/METKViewer3D.py trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/METKViewer/METKViewer3D.script trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/NeckSurgery.py trunk/Community/METK/Modules/Macros/MedicalExplorationToolkit/VisDefinitions.py trunk/Community/METK/Modules/Macros/Queue/ trunk/Community/METK/Modules/Macros/Queue/Queue.def trunk/Community/METK/Modules/Macros/Queue/Queue.py trunk/Community/METK/Modules/Macros/Queue/Queue.script trunk/Community/METK/Modules/Macros/SoCoordSystem/ trunk/Community/METK/Modules/Macros/SoCoordSystem/SoCoordExampleNetwork.mlab trunk/Community/METK/Modules/Macros/SoCoordSystem/SoCoordSystem.def trunk/Community/METK/Modules/Macros/SoCoordSystem/SoCoordSystem.mlab trunk/Community/METK/Modules/Macros/SoCoordSystem/SoCoordSystem.script trunk/Community/METK/Modules/Macros/SoHatching/ trunk/Community/METK/Modules/Macros/SoHatching/SoHatching.def trunk/Community/METK/Modules/Macros/SoHatching/SoHatching.mlab trunk/Community/METK/Modules/Macros/SoHatching/SoHatching.script trunk/Community/METK/Modules/Macros/SoHatching/SoHatchingExample.mlab trunk/Community/METK/Modules/Macros/SoHatching/SoHatchingTextureCombined_bw.bmp trunk/Community/METK/Modules/Macros/Sphere2/ trunk/Community/METK/Modules/Macros/Sphere2/Sphere2.def trunk/Community/METK/Modules/Macros/Sphere2/Sphere2.mlab trunk/Community/METK/Modules/Macros/Sphere2/Sphere2.py trunk/Community/METK/Modules/Macros/Sphere2/Sphere2.script trunk/Community/METK/Modules/Macros/StraightLine/ trunk/Community/METK/Modules/Macros/StraightLine/StraightLine.def trunk/Community/METK/Modules/Macros/StraightLine/StraightLine.mlab trunk/Community/METK/Modules/Macros/StraightLine/StraightLine.py trunk/Community/METK/Modules/Macros/StraightLine/StraightLine.script trunk/Community/METK/Modules/Macros/UMDAnonymizer/ trunk/Community/METK/Modules/Macros/UMDAnonymizer/UMDAnonymizer.def trunk/Community/METK/Modules/Macros/UMDAnonymizer/UMDAnonymizer.mlab trunk/Community/METK/Modules/Macros/UMDAnonymizer/UMDAnonymizer.py trunk/Community/METK/Modules/Macros/UMDAnonymizer/UMDAnonymizer.script trunk/Community/METK/Modules/Macros/UMDBoundingBoxCalculator/ trunk/Community/METK/Modules/Macros/UMDBoundingBoxCalculator/UMDBoundingBoxCalculator.def trunk/Community/METK/Modules/Macros/UMDBoundingBoxCalculator/UMDBoundingBoxCalculator.mlab trunk/Community/METK/Modules/Macros/UMDBoundingBoxCalculator/UMDBoundingBoxCalculator.py trunk/Community/METK/Modules/Macros/UMDBoundingBoxCalculator/UMDBoundingBoxCalculator.script trunk/Community/METK/Modules/Macros/UMDBoundingBoxWrapper2/ trunk/Community/METK/Modules/Macros/UMDBoundingBoxWrapper2/UMDBoundingBoxWrapper2.def trunk/Community/METK/Modules/Macros/UMDBoundingBoxWrapper2/UMDBoundingBoxWrapper2.js trunk/Community/METK/Modules/Macros/UMDBoundingBoxWrapper2/UMDBoundingBoxWrapper2.mlab trunk/Community/METK/Modules/Macros/UMDBoundingBoxWrapper2... [truncated message content] |
From: <kon...@us...> - 2009-06-16 14:10:33
|
Revision: 78 http://mevislabmodules.svn.sourceforge.net/mevislabmodules/?rev=78&view=rev Author: konrad79 Date: 2009-06-16 14:05:45 +0000 (Tue, 16 Jun 2009) Log Message: ----------- METK: common module linux compatibility Modified Paths: -------------- trunk/Community/METK/Sources/common/ObjMgrCommunicator.h trunk/Community/METK/Sources/common/StrList.h trunk/Community/METK/Sources/common/XMLParser.h trunk/Community/METK/Sources/common/image_basic.h trunk/Community/METK/Sources/common/kBasics.h trunk/Community/METK/Sources/common/kCamera.h trunk/Community/METK/Sources/common/kDebug.h trunk/Community/METK/Sources/common/kSphere.h Modified: trunk/Community/METK/Sources/common/ObjMgrCommunicator.h =================================================================== --- trunk/Community/METK/Sources/common/ObjMgrCommunicator.h 2009-06-16 13:41:30 UTC (rev 77) +++ trunk/Community/METK/Sources/common/ObjMgrCommunicator.h 2009-06-16 14:05:45 UTC (rev 78) @@ -22,7 +22,7 @@ #define __COMMON_IMPORTEXPORT __declspec(dllexport) #endif #else -#define MLIMAGEUTILITIES_EXPORT +#define __COMMON_IMPORTEXPORT #endif // ML includes Modified: trunk/Community/METK/Sources/common/StrList.h =================================================================== --- trunk/Community/METK/Sources/common/StrList.h 2009-06-16 13:41:30 UTC (rev 77) +++ trunk/Community/METK/Sources/common/StrList.h 2009-06-16 14:05:45 UTC (rev 78) @@ -10,7 +10,7 @@ #define __COMMON_IMPORTEXPORT __declspec(dllexport) #endif #else -#define MLIMAGEUTILITIES_EXPORT +#define __COMMON_IMPORTEXPORT #endif # include <string> Modified: trunk/Community/METK/Sources/common/XMLParser.h =================================================================== --- trunk/Community/METK/Sources/common/XMLParser.h 2009-06-16 13:41:30 UTC (rev 77) +++ trunk/Community/METK/Sources/common/XMLParser.h 2009-06-16 14:05:45 UTC (rev 78) @@ -11,7 +11,7 @@ #define __COMMON_IMPORTEXPORT __declspec(dllexport) #endif #else -#define MLIMAGEUTILITIES_EXPORT +#define __COMMON_IMPORTEXPORT #endif #include <xercesc/util/PlatformUtils.hpp> Modified: trunk/Community/METK/Sources/common/image_basic.h =================================================================== --- trunk/Community/METK/Sources/common/image_basic.h 2009-06-16 13:41:30 UTC (rev 77) +++ trunk/Community/METK/Sources/common/image_basic.h 2009-06-16 14:05:45 UTC (rev 78) @@ -9,7 +9,7 @@ #define __COMMON_IMPORTEXPORT __declspec(dllexport) #endif #else -#define MLIMAGEUTILITIES_EXPORT +#define __COMMON_IMPORTEXPORT #endif #define NOMINMAX Modified: trunk/Community/METK/Sources/common/kBasics.h =================================================================== --- trunk/Community/METK/Sources/common/kBasics.h 2009-06-16 13:41:30 UTC (rev 77) +++ trunk/Community/METK/Sources/common/kBasics.h 2009-06-16 14:05:45 UTC (rev 78) @@ -21,7 +21,7 @@ #define __COMMON_IMPORTEXPORT __declspec(dllexport) #endif #else -#define MLIMAGEUTILITIES_EXPORT +#define __COMMON_IMPORTEXPORT #endif Modified: trunk/Community/METK/Sources/common/kCamera.h =================================================================== --- trunk/Community/METK/Sources/common/kCamera.h 2009-06-16 13:41:30 UTC (rev 77) +++ trunk/Community/METK/Sources/common/kCamera.h 2009-06-16 14:05:45 UTC (rev 78) @@ -21,7 +21,7 @@ #define __COMMON_IMPORTEXPORT __declspec(dllexport) #endif #else -#define MLIMAGEUTILITIES_EXPORT +#define __COMMON_IMPORTEXPORT #endif #include <iostream> Modified: trunk/Community/METK/Sources/common/kDebug.h =================================================================== --- trunk/Community/METK/Sources/common/kDebug.h 2009-06-16 13:41:30 UTC (rev 77) +++ trunk/Community/METK/Sources/common/kDebug.h 2009-06-16 14:05:45 UTC (rev 78) @@ -20,7 +20,7 @@ #define __COMMON_IMPORTEXPORT __declspec(dllexport) #endif #else -#define MLIMAGEUTILITIES_EXPORT +#define __COMMON_IMPORTEXPORT #endif Modified: trunk/Community/METK/Sources/common/kSphere.h =================================================================== --- trunk/Community/METK/Sources/common/kSphere.h 2009-06-16 13:41:30 UTC (rev 77) +++ trunk/Community/METK/Sources/common/kSphere.h 2009-06-16 14:05:45 UTC (rev 78) @@ -21,7 +21,7 @@ #define __COMMON_IMPORTEXPORT __declspec(dllexport) #endif #else -#define MLIMAGEUTILITIES_EXPORT +#define __COMMON_IMPORTEXPORT #endif This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wol...@us...> - 2009-06-16 14:04:29
|
Revision: 77 http://mevislabmodules.svn.sourceforge.net/mevislabmodules/?rev=77&view=rev Author: wolfspindler Date: 2009-06-16 13:41:30 +0000 (Tue, 16 Jun 2009) Log Message: ----------- ENH: -Once again :-):Renamed .pri file back to maintain compatibility to sources from Magdeburg without changes. -It will only be necessary to adapt package group in Package.def, all other .pro and .pri can remain unchanged. Added Paths: ----------- trunk/Community/METK/Configuration/UMD_METK.pri Removed Paths: ------------- trunk/Community/METK/Configuration/Community_METK.pri Deleted: trunk/Community/METK/Configuration/Community_METK.pri =================================================================== --- trunk/Community/METK/Configuration/Community_METK.pri 2009-06-16 13:20:18 UTC (rev 76) +++ trunk/Community/METK/Configuration/Community_METK.pri 2009-06-16 13:41:30 UTC (rev 77) @@ -1,131 +0,0 @@ -isEmpty(UMD_METK_PRI_INCLUDED) { - message ( loading UMD_METK.pri ) -} -# **InsertLicense** code -# ----------------------------------------------------------------------------- -# UMD_METK prifile -# -# \file UMD_METK.pri -# \author Konrad -# \date 2009-04-24 -# -# The Medical Explortation Toolkit (www.metk.net) -# -# ----------------------------------------------------------------------------- - -# include guard against multiple inclusion -isEmpty(UMD_METK_PRI_INCLUDED) { - -UMD_METK_PRI_INCLUDED = 1 - -# -- System ------------------------------------------------------------- - -include( $(MLAB_MeVis_Foundation)/Configuration/SystemInit.pri ) - -# -- Define local PACKAGE variables ------------------------------------- - -PACKAGE_ROOT = $$(MLAB_UMD_METK) -PACKAGE_SOURCES = "$$(MLAB_UMD_METK)"/Sources - -# Add package library path -LIBS += -L"$${PACKAGE_ROOT}"/lib - -# -- Projects ------------------------------------------------------------- - -# NOTE: Add projects below to make them available to other projects via the CONFIG mechanism - -# You can use this example template for typical projects: -#MLMyProject { -# CONFIG_FOUND += MLMyProject -# INCLUDEPATH += $${PACKAGE_SOURCES}/ML/MLMyProject -# win32:LIBS += MLMyProject$${d}.lib -# unix:LIBS += -lMLMyProject$${d} -#} - - - - -# -- ML Projects ------------------------------------------------------------- - -MLkAviWriter { - CONFIG_FOUND += MLkAviWriter - INCLUDEPATH += $${PACKAGE_SOURCES}/ML/kAviWriter - win32:LIBS += MLkAviWriter$${d}.lib - unix:LIBS += -lMLkAviWriter$${d} -} - - -UMDAnimation2 { - CONFIG_FOUND += UMDAnimation2 - INCLUDEPATH += $${PACKAGE_SOURCES}/ML/Animation - win32:LIBS += Animation$${d}.lib - unix:LIBS += -lAnimation$${d} -} - -METKMessaging { - CONFIG_FOUND += METKMessaging - INCLUDEPATH += $${PACKAGE_SOURCES}/ML/METKMessaging - win32:LIBS += METKMessaging$${d}.lib - unix:LIBS += -lMETKMessaging$${d} -} - -METK2DLabeling { - CONFIG_FOUND += METK2DLabeling - INCLUDEPATH += $${PACKAGE_SOURCES}/ML/METK2DLabeling - win32:LIBS += METK2DLabeling$${d}.lib - unix:LIBS += -lMETK2DLabeling$${d} -} - - - -# -- Inventor Projects ------------------------------------------------------- - -UMDQHull3D { - CONFIG_FOUND += UMDQHull3D - INCLUDEPATH += $${PACKAGE_SOURCES}/Inventor/SoQHull3D - win32:LIBS += UMDQHull3D$${d}.lib - unix:LIBS += -lUMDQHull3D$${d} -} - -UMDSoMeasurement { - CONFIG_FOUND += UMDSoMeasurement - INCLUDEPATH += $${PACKAGE_SOURCES}/Inventor/UMDSoMeasurement - win32:LIBS += UMDSoMeasurement$${d}.lib - unix:LIBS += -lUMDSoMeasurement$${d} -} - -UMDmnOffscreenRenderer { - CONFIG_FOUND += UMDmnOffscreenRenderer - INCLUDEPATH += $${PACKAGE_SOURCES}/Inventor/UMDmnOffscreenRenderer - win32:LIBS += UMDmnOffscreenRenderer$${d}.lib - unix:LIBS += -lUMDmnOffscreenRenderer$${d} -} - -UMDStraightLine { - CONFIG_FOUND += UMDStraightLine - INCLUDEPATH += $${PACKAGE_SOURCES}/Inventor/UMDStraightLine - win32:LIBS += UMDStraightLine$${d}.lib - unix:LIBS += -lUMDStraightLine$${d} -} - - - -# -- Shared Projects --------------------------------------------------------- - -common { - CONFIG_FOUND += common - INCLUDEPATH += $${PACKAGE_SOURCES}/common - win32:LIBS += common$${d}.lib - unix:LIBS += -lcommon$${d} -} - - -METK { - CONFIG_FOUND += METK - INCLUDEPATH += $${PACKAGE_SOURCES}/ML -} - -# End of projects ------------------------------------------------------------ - -} - Copied: trunk/Community/METK/Configuration/UMD_METK.pri (from rev 76, trunk/Community/METK/Configuration/Community_METK.pri) =================================================================== --- trunk/Community/METK/Configuration/UMD_METK.pri (rev 0) +++ trunk/Community/METK/Configuration/UMD_METK.pri 2009-06-16 13:41:30 UTC (rev 77) @@ -0,0 +1,131 @@ +isEmpty(UMD_METK_PRI_INCLUDED) { + message ( loading UMD_METK.pri ) +} +# **InsertLicense** code +# ----------------------------------------------------------------------------- +# UMD_METK prifile +# +# \file UMD_METK.pri +# \author Konrad +# \date 2009-04-24 +# +# The Medical Explortation Toolkit (www.metk.net) +# +# ----------------------------------------------------------------------------- + +# include guard against multiple inclusion +isEmpty(UMD_METK_PRI_INCLUDED) { + +UMD_METK_PRI_INCLUDED = 1 + +# -- System ------------------------------------------------------------- + +include( $(MLAB_MeVis_Foundation)/Configuration/SystemInit.pri ) + +# -- Define local PACKAGE variables ------------------------------------- + +PACKAGE_ROOT = $$(MLAB_UMD_METK) +PACKAGE_SOURCES = "$$(MLAB_UMD_METK)"/Sources + +# Add package library path +LIBS += -L"$${PACKAGE_ROOT}"/lib + +# -- Projects ------------------------------------------------------------- + +# NOTE: Add projects below to make them available to other projects via the CONFIG mechanism + +# You can use this example template for typical projects: +#MLMyProject { +# CONFIG_FOUND += MLMyProject +# INCLUDEPATH += $${PACKAGE_SOURCES}/ML/MLMyProject +# win32:LIBS += MLMyProject$${d}.lib +# unix:LIBS += -lMLMyProject$${d} +#} + + + + +# -- ML Projects ------------------------------------------------------------- + +MLkAviWriter { + CONFIG_FOUND += MLkAviWriter + INCLUDEPATH += $${PACKAGE_SOURCES}/ML/kAviWriter + win32:LIBS += MLkAviWriter$${d}.lib + unix:LIBS += -lMLkAviWriter$${d} +} + + +UMDAnimation2 { + CONFIG_FOUND += UMDAnimation2 + INCLUDEPATH += $${PACKAGE_SOURCES}/ML/Animation + win32:LIBS += Animation$${d}.lib + unix:LIBS += -lAnimation$${d} +} + +METKMessaging { + CONFIG_FOUND += METKMessaging + INCLUDEPATH += $${PACKAGE_SOURCES}/ML/METKMessaging + win32:LIBS += METKMessaging$${d}.lib + unix:LIBS += -lMETKMessaging$${d} +} + +METK2DLabeling { + CONFIG_FOUND += METK2DLabeling + INCLUDEPATH += $${PACKAGE_SOURCES}/ML/METK2DLabeling + win32:LIBS += METK2DLabeling$${d}.lib + unix:LIBS += -lMETK2DLabeling$${d} +} + + + +# -- Inventor Projects ------------------------------------------------------- + +UMDQHull3D { + CONFIG_FOUND += UMDQHull3D + INCLUDEPATH += $${PACKAGE_SOURCES}/Inventor/SoQHull3D + win32:LIBS += UMDQHull3D$${d}.lib + unix:LIBS += -lUMDQHull3D$${d} +} + +UMDSoMeasurement { + CONFIG_FOUND += UMDSoMeasurement + INCLUDEPATH += $${PACKAGE_SOURCES}/Inventor/UMDSoMeasurement + win32:LIBS += UMDSoMeasurement$${d}.lib + unix:LIBS += -lUMDSoMeasurement$${d} +} + +UMDmnOffscreenRenderer { + CONFIG_FOUND += UMDmnOffscreenRenderer + INCLUDEPATH += $${PACKAGE_SOURCES}/Inventor/UMDmnOffscreenRenderer + win32:LIBS += UMDmnOffscreenRenderer$${d}.lib + unix:LIBS += -lUMDmnOffscreenRenderer$${d} +} + +UMDStraightLine { + CONFIG_FOUND += UMDStraightLine + INCLUDEPATH += $${PACKAGE_SOURCES}/Inventor/UMDStraightLine + win32:LIBS += UMDStraightLine$${d}.lib + unix:LIBS += -lUMDStraightLine$${d} +} + + + +# -- Shared Projects --------------------------------------------------------- + +common { + CONFIG_FOUND += common + INCLUDEPATH += $${PACKAGE_SOURCES}/common + win32:LIBS += common$${d}.lib + unix:LIBS += -lcommon$${d} +} + + +METK { + CONFIG_FOUND += METK + INCLUDEPATH += $${PACKAGE_SOURCES}/ML +} + +# End of projects ------------------------------------------------------------ + +} + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wol...@us...> - 2009-06-16 13:22:33
|
Revision: 72 http://mevislabmodules.svn.sourceforge.net/mevislabmodules/?rev=72&view=rev Author: wolfspindler Date: 2009-06-16 12:40:56 +0000 (Tue, 16 Jun 2009) Log Message: ----------- ENH: -Renamed .pri file back to maintain compatibility to sources from Magdeburg without changes. Added Paths: ----------- trunk/Community/METK/Configuration/UMD_METK.pri Removed Paths: ------------- trunk/Community/METK/Configuration/Community_METK.pri Deleted: trunk/Community/METK/Configuration/Community_METK.pri =================================================================== --- trunk/Community/METK/Configuration/Community_METK.pri 2009-06-16 08:52:47 UTC (rev 71) +++ trunk/Community/METK/Configuration/Community_METK.pri 2009-06-16 12:40:56 UTC (rev 72) @@ -1,131 +0,0 @@ -isEmpty(UMD_METK_PRI_INCLUDED) { - message ( loading UMD_METK.pri ) -} -# **InsertLicense** code -# ----------------------------------------------------------------------------- -# UMD_METK prifile -# -# \file UMD_METK.pri -# \author Konrad -# \date 2009-04-24 -# -# The Medical Explortation Toolkit (www.metk.net) -# -# ----------------------------------------------------------------------------- - -# include guard against multiple inclusion -isEmpty(UMD_METK_PRI_INCLUDED) { - -UMD_METK_PRI_INCLUDED = 1 - -# -- System ------------------------------------------------------------- - -include( $(MLAB_MeVis_Foundation)/Configuration/SystemInit.pri ) - -# -- Define local PACKAGE variables ------------------------------------- - -PACKAGE_ROOT = $$(MLAB_UMD_METK) -PACKAGE_SOURCES = "$$(MLAB_UMD_METK)"/Sources - -# Add package library path -LIBS += -L"$${PACKAGE_ROOT}"/lib - -# -- Projects ------------------------------------------------------------- - -# NOTE: Add projects below to make them available to other projects via the CONFIG mechanism - -# You can use this example template for typical projects: -#MLMyProject { -# CONFIG_FOUND += MLMyProject -# INCLUDEPATH += $${PACKAGE_SOURCES}/ML/MLMyProject -# win32:LIBS += MLMyProject$${d}.lib -# unix:LIBS += -lMLMyProject$${d} -#} - - - - -# -- ML Projects ------------------------------------------------------------- - -MLkAviWriter { - CONFIG_FOUND += MLkAviWriter - INCLUDEPATH += $${PACKAGE_SOURCES}/ML/kAviWriter - win32:LIBS += MLkAviWriter$${d}.lib - unix:LIBS += -lMLkAviWriter$${d} -} - - -UMDAnimation2 { - CONFIG_FOUND += UMDAnimation2 - INCLUDEPATH += $${PACKAGE_SOURCES}/ML/Animation - win32:LIBS += Animation$${d}.lib - unix:LIBS += -lAnimation$${d} -} - -METKMessaging { - CONFIG_FOUND += METKMessaging - INCLUDEPATH += $${PACKAGE_SOURCES}/ML/METKMessaging - win32:LIBS += METKMessaging$${d}.lib - unix:LIBS += -lMETKMessaging$${d} -} - -METK2DLabeling { - CONFIG_FOUND += METK2DLabeling - INCLUDEPATH += $${PACKAGE_SOURCES}/ML/METK2DLabeling - win32:LIBS += METK2DLabeling$${d}.lib - unix:LIBS += -lMETK2DLabeling$${d} -} - - - -# -- Inventor Projects ------------------------------------------------------- - -UMDQHull3D { - CONFIG_FOUND += UMDQHull3D - INCLUDEPATH += $${PACKAGE_SOURCES}/Inventor/SoQHull3D - win32:LIBS += UMDQHull3D$${d}.lib - unix:LIBS += -lUMDQHull3D$${d} -} - -UMDSoMeasurement { - CONFIG_FOUND += UMDSoMeasurement - INCLUDEPATH += $${PACKAGE_SOURCES}/Inventor/UMDSoMeasurement - win32:LIBS += UMDSoMeasurement$${d}.lib - unix:LIBS += -lUMDSoMeasurement$${d} -} - -UMDmnOffscreenRenderer { - CONFIG_FOUND += UMDmnOffscreenRenderer - INCLUDEPATH += $${PACKAGE_SOURCES}/Inventor/UMDmnOffscreenRenderer - win32:LIBS += UMDmnOffscreenRenderer$${d}.lib - unix:LIBS += -lUMDmnOffscreenRenderer$${d} -} - -UMDStraightLine { - CONFIG_FOUND += UMDStraightLine - INCLUDEPATH += $${PACKAGE_SOURCES}/Inventor/UMDStraightLine - win32:LIBS += UMDStraightLine$${d}.lib - unix:LIBS += -lUMDStraightLine$${d} -} - - - -# -- Shared Projects --------------------------------------------------------- - -common { - CONFIG_FOUND += common - INCLUDEPATH += $${PACKAGE_SOURCES}/common - win32:LIBS += common$${d}.lib - unix:LIBS += -lcommon$${d} -} - - -METK { - CONFIG_FOUND += METK - INCLUDEPATH += $${PACKAGE_SOURCES}/ML -} - -# End of projects ------------------------------------------------------------ - -} - Copied: trunk/Community/METK/Configuration/UMD_METK.pri (from rev 71, trunk/Community/METK/Configuration/Community_METK.pri) =================================================================== --- trunk/Community/METK/Configuration/UMD_METK.pri (rev 0) +++ trunk/Community/METK/Configuration/UMD_METK.pri 2009-06-16 12:40:56 UTC (rev 72) @@ -0,0 +1,131 @@ +isEmpty(UMD_METK_PRI_INCLUDED) { + message ( loading UMD_METK.pri ) +} +# **InsertLicense** code +# ----------------------------------------------------------------------------- +# UMD_METK prifile +# +# \file UMD_METK.pri +# \author Konrad +# \date 2009-04-24 +# +# The Medical Explortation Toolkit (www.metk.net) +# +# ----------------------------------------------------------------------------- + +# include guard against multiple inclusion +isEmpty(UMD_METK_PRI_INCLUDED) { + +UMD_METK_PRI_INCLUDED = 1 + +# -- System ------------------------------------------------------------- + +include( $(MLAB_MeVis_Foundation)/Configuration/SystemInit.pri ) + +# -- Define local PACKAGE variables ------------------------------------- + +PACKAGE_ROOT = $$(MLAB_UMD_METK) +PACKAGE_SOURCES = "$$(MLAB_UMD_METK)"/Sources + +# Add package library path +LIBS += -L"$${PACKAGE_ROOT}"/lib + +# -- Projects ------------------------------------------------------------- + +# NOTE: Add projects below to make them available to other projects via the CONFIG mechanism + +# You can use this example template for typical projects: +#MLMyProject { +# CONFIG_FOUND += MLMyProject +# INCLUDEPATH += $${PACKAGE_SOURCES}/ML/MLMyProject +# win32:LIBS += MLMyProject$${d}.lib +# unix:LIBS += -lMLMyProject$${d} +#} + + + + +# -- ML Projects ------------------------------------------------------------- + +MLkAviWriter { + CONFIG_FOUND += MLkAviWriter + INCLUDEPATH += $${PACKAGE_SOURCES}/ML/kAviWriter + win32:LIBS += MLkAviWriter$${d}.lib + unix:LIBS += -lMLkAviWriter$${d} +} + + +UMDAnimation2 { + CONFIG_FOUND += UMDAnimation2 + INCLUDEPATH += $${PACKAGE_SOURCES}/ML/Animation + win32:LIBS += Animation$${d}.lib + unix:LIBS += -lAnimation$${d} +} + +METKMessaging { + CONFIG_FOUND += METKMessaging + INCLUDEPATH += $${PACKAGE_SOURCES}/ML/METKMessaging + win32:LIBS += METKMessaging$${d}.lib + unix:LIBS += -lMETKMessaging$${d} +} + +METK2DLabeling { + CONFIG_FOUND += METK2DLabeling + INCLUDEPATH += $${PACKAGE_SOURCES}/ML/METK2DLabeling + win32:LIBS += METK2DLabeling$${d}.lib + unix:LIBS += -lMETK2DLabeling$${d} +} + + + +# -- Inventor Projects ------------------------------------------------------- + +UMDQHull3D { + CONFIG_FOUND += UMDQHull3D + INCLUDEPATH += $${PACKAGE_SOURCES}/Inventor/SoQHull3D + win32:LIBS += UMDQHull3D$${d}.lib + unix:LIBS += -lUMDQHull3D$${d} +} + +UMDSoMeasurement { + CONFIG_FOUND += UMDSoMeasurement + INCLUDEPATH += $${PACKAGE_SOURCES}/Inventor/UMDSoMeasurement + win32:LIBS += UMDSoMeasurement$${d}.lib + unix:LIBS += -lUMDSoMeasurement$${d} +} + +UMDmnOffscreenRenderer { + CONFIG_FOUND += UMDmnOffscreenRenderer + INCLUDEPATH += $${PACKAGE_SOURCES}/Inventor/UMDmnOffscreenRenderer + win32:LIBS += UMDmnOffscreenRenderer$${d}.lib + unix:LIBS += -lUMDmnOffscreenRenderer$${d} +} + +UMDStraightLine { + CONFIG_FOUND += UMDStraightLine + INCLUDEPATH += $${PACKAGE_SOURCES}/Inventor/UMDStraightLine + win32:LIBS += UMDStraightLine$${d}.lib + unix:LIBS += -lUMDStraightLine$${d} +} + + + +# -- Shared Projects --------------------------------------------------------- + +common { + CONFIG_FOUND += common + INCLUDEPATH += $${PACKAGE_SOURCES}/common + win32:LIBS += common$${d}.lib + unix:LIBS += -lcommon$${d} +} + + +METK { + CONFIG_FOUND += METK + INCLUDEPATH += $${PACKAGE_SOURCES}/ML +} + +# End of projects ------------------------------------------------------------ + +} + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <kon...@us...> - 2009-06-16 13:20:20
|
Revision: 76 http://mevislabmodules.svn.sourceforge.net/mevislabmodules/?rev=76&view=rev Author: konrad79 Date: 2009-06-16 13:20:18 +0000 (Tue, 16 Jun 2009) Log Message: ----------- METK: add image Added Paths: ----------- trunk/Community/METK/Modules/Inventor/UMDVisLogo/lst.png Added: trunk/Community/METK/Modules/Inventor/UMDVisLogo/lst.png =================================================================== (Binary files differ) Property changes on: trunk/Community/METK/Modules/Inventor/UMDVisLogo/lst.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <kon...@us...> - 2009-06-16 13:16:11
|
Revision: 75 http://mevislabmodules.svn.sourceforge.net/mevislabmodules/?rev=75&view=rev Author: konrad79 Date: 2009-06-16 13:16:09 +0000 (Tue, 16 Jun 2009) Log Message: ----------- METK: rename .pri file for new package belonging (community instead of UMD) Added Paths: ----------- trunk/Community/METK/Configuration/Community_METK.pri Removed Paths: ------------- trunk/Community/METK/Configuration/UMD_METK.pri Copied: trunk/Community/METK/Configuration/Community_METK.pri (from rev 73, trunk/Community/METK/Configuration/UMD_METK.pri) =================================================================== --- trunk/Community/METK/Configuration/Community_METK.pri (rev 0) +++ trunk/Community/METK/Configuration/Community_METK.pri 2009-06-16 13:16:09 UTC (rev 75) @@ -0,0 +1,131 @@ +isEmpty(UMD_METK_PRI_INCLUDED) { + message ( loading UMD_METK.pri ) +} +# **InsertLicense** code +# ----------------------------------------------------------------------------- +# UMD_METK prifile +# +# \file UMD_METK.pri +# \author Konrad +# \date 2009-04-24 +# +# The Medical Explortation Toolkit (www.metk.net) +# +# ----------------------------------------------------------------------------- + +# include guard against multiple inclusion +isEmpty(UMD_METK_PRI_INCLUDED) { + +UMD_METK_PRI_INCLUDED = 1 + +# -- System ------------------------------------------------------------- + +include( $(MLAB_MeVis_Foundation)/Configuration/SystemInit.pri ) + +# -- Define local PACKAGE variables ------------------------------------- + +PACKAGE_ROOT = $$(MLAB_UMD_METK) +PACKAGE_SOURCES = "$$(MLAB_UMD_METK)"/Sources + +# Add package library path +LIBS += -L"$${PACKAGE_ROOT}"/lib + +# -- Projects ------------------------------------------------------------- + +# NOTE: Add projects below to make them available to other projects via the CONFIG mechanism + +# You can use this example template for typical projects: +#MLMyProject { +# CONFIG_FOUND += MLMyProject +# INCLUDEPATH += $${PACKAGE_SOURCES}/ML/MLMyProject +# win32:LIBS += MLMyProject$${d}.lib +# unix:LIBS += -lMLMyProject$${d} +#} + + + + +# -- ML Projects ------------------------------------------------------------- + +MLkAviWriter { + CONFIG_FOUND += MLkAviWriter + INCLUDEPATH += $${PACKAGE_SOURCES}/ML/kAviWriter + win32:LIBS += MLkAviWriter$${d}.lib + unix:LIBS += -lMLkAviWriter$${d} +} + + +UMDAnimation2 { + CONFIG_FOUND += UMDAnimation2 + INCLUDEPATH += $${PACKAGE_SOURCES}/ML/Animation + win32:LIBS += Animation$${d}.lib + unix:LIBS += -lAnimation$${d} +} + +METKMessaging { + CONFIG_FOUND += METKMessaging + INCLUDEPATH += $${PACKAGE_SOURCES}/ML/METKMessaging + win32:LIBS += METKMessaging$${d}.lib + unix:LIBS += -lMETKMessaging$${d} +} + +METK2DLabeling { + CONFIG_FOUND += METK2DLabeling + INCLUDEPATH += $${PACKAGE_SOURCES}/ML/METK2DLabeling + win32:LIBS += METK2DLabeling$${d}.lib + unix:LIBS += -lMETK2DLabeling$${d} +} + + + +# -- Inventor Projects ------------------------------------------------------- + +UMDQHull3D { + CONFIG_FOUND += UMDQHull3D + INCLUDEPATH += $${PACKAGE_SOURCES}/Inventor/SoQHull3D + win32:LIBS += UMDQHull3D$${d}.lib + unix:LIBS += -lUMDQHull3D$${d} +} + +UMDSoMeasurement { + CONFIG_FOUND += UMDSoMeasurement + INCLUDEPATH += $${PACKAGE_SOURCES}/Inventor/UMDSoMeasurement + win32:LIBS += UMDSoMeasurement$${d}.lib + unix:LIBS += -lUMDSoMeasurement$${d} +} + +UMDmnOffscreenRenderer { + CONFIG_FOUND += UMDmnOffscreenRenderer + INCLUDEPATH += $${PACKAGE_SOURCES}/Inventor/UMDmnOffscreenRenderer + win32:LIBS += UMDmnOffscreenRenderer$${d}.lib + unix:LIBS += -lUMDmnOffscreenRenderer$${d} +} + +UMDStraightLine { + CONFIG_FOUND += UMDStraightLine + INCLUDEPATH += $${PACKAGE_SOURCES}/Inventor/UMDStraightLine + win32:LIBS += UMDStraightLine$${d}.lib + unix:LIBS += -lUMDStraightLine$${d} +} + + + +# -- Shared Projects --------------------------------------------------------- + +common { + CONFIG_FOUND += common + INCLUDEPATH += $${PACKAGE_SOURCES}/common + win32:LIBS += common$${d}.lib + unix:LIBS += -lcommon$${d} +} + + +METK { + CONFIG_FOUND += METK + INCLUDEPATH += $${PACKAGE_SOURCES}/ML +} + +# End of projects ------------------------------------------------------------ + +} + Deleted: trunk/Community/METK/Configuration/UMD_METK.pri =================================================================== --- trunk/Community/METK/Configuration/UMD_METK.pri 2009-06-16 13:13:56 UTC (rev 74) +++ trunk/Community/METK/Configuration/UMD_METK.pri 2009-06-16 13:16:09 UTC (rev 75) @@ -1,131 +0,0 @@ -isEmpty(UMD_METK_PRI_INCLUDED) { - message ( loading UMD_METK.pri ) -} -# **InsertLicense** code -# ----------------------------------------------------------------------------- -# UMD_METK prifile -# -# \file UMD_METK.pri -# \author Konrad -# \date 2009-04-24 -# -# The Medical Explortation Toolkit (www.metk.net) -# -# ----------------------------------------------------------------------------- - -# include guard against multiple inclusion -isEmpty(UMD_METK_PRI_INCLUDED) { - -UMD_METK_PRI_INCLUDED = 1 - -# -- System ------------------------------------------------------------- - -include( $(MLAB_MeVis_Foundation)/Configuration/SystemInit.pri ) - -# -- Define local PACKAGE variables ------------------------------------- - -PACKAGE_ROOT = $$(MLAB_UMD_METK) -PACKAGE_SOURCES = "$$(MLAB_UMD_METK)"/Sources - -# Add package library path -LIBS += -L"$${PACKAGE_ROOT}"/lib - -# -- Projects ------------------------------------------------------------- - -# NOTE: Add projects below to make them available to other projects via the CONFIG mechanism - -# You can use this example template for typical projects: -#MLMyProject { -# CONFIG_FOUND += MLMyProject -# INCLUDEPATH += $${PACKAGE_SOURCES}/ML/MLMyProject -# win32:LIBS += MLMyProject$${d}.lib -# unix:LIBS += -lMLMyProject$${d} -#} - - - - -# -- ML Projects ------------------------------------------------------------- - -MLkAviWriter { - CONFIG_FOUND += MLkAviWriter - INCLUDEPATH += $${PACKAGE_SOURCES}/ML/kAviWriter - win32:LIBS += MLkAviWriter$${d}.lib - unix:LIBS += -lMLkAviWriter$${d} -} - - -UMDAnimation2 { - CONFIG_FOUND += UMDAnimation2 - INCLUDEPATH += $${PACKAGE_SOURCES}/ML/Animation - win32:LIBS += Animation$${d}.lib - unix:LIBS += -lAnimation$${d} -} - -METKMessaging { - CONFIG_FOUND += METKMessaging - INCLUDEPATH += $${PACKAGE_SOURCES}/ML/METKMessaging - win32:LIBS += METKMessaging$${d}.lib - unix:LIBS += -lMETKMessaging$${d} -} - -METK2DLabeling { - CONFIG_FOUND += METK2DLabeling - INCLUDEPATH += $${PACKAGE_SOURCES}/ML/METK2DLabeling - win32:LIBS += METK2DLabeling$${d}.lib - unix:LIBS += -lMETK2DLabeling$${d} -} - - - -# -- Inventor Projects ------------------------------------------------------- - -UMDQHull3D { - CONFIG_FOUND += UMDQHull3D - INCLUDEPATH += $${PACKAGE_SOURCES}/Inventor/SoQHull3D - win32:LIBS += UMDQHull3D$${d}.lib - unix:LIBS += -lUMDQHull3D$${d} -} - -UMDSoMeasurement { - CONFIG_FOUND += UMDSoMeasurement - INCLUDEPATH += $${PACKAGE_SOURCES}/Inventor/UMDSoMeasurement - win32:LIBS += UMDSoMeasurement$${d}.lib - unix:LIBS += -lUMDSoMeasurement$${d} -} - -UMDmnOffscreenRenderer { - CONFIG_FOUND += UMDmnOffscreenRenderer - INCLUDEPATH += $${PACKAGE_SOURCES}/Inventor/UMDmnOffscreenRenderer - win32:LIBS += UMDmnOffscreenRenderer$${d}.lib - unix:LIBS += -lUMDmnOffscreenRenderer$${d} -} - -UMDStraightLine { - CONFIG_FOUND += UMDStraightLine - INCLUDEPATH += $${PACKAGE_SOURCES}/Inventor/UMDStraightLine - win32:LIBS += UMDStraightLine$${d}.lib - unix:LIBS += -lUMDStraightLine$${d} -} - - - -# -- Shared Projects --------------------------------------------------------- - -common { - CONFIG_FOUND += common - INCLUDEPATH += $${PACKAGE_SOURCES}/common - win32:LIBS += common$${d}.lib - unix:LIBS += -lcommon$${d} -} - - -METK { - CONFIG_FOUND += METK - INCLUDEPATH += $${PACKAGE_SOURCES}/ML -} - -# End of projects ------------------------------------------------------------ - -} - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <kon...@us...> - 2009-06-16 13:13:57
|
Revision: 74 http://mevislabmodules.svn.sourceforge.net/mevislabmodules/?rev=74&view=rev Author: konrad79 Date: 2009-06-16 13:13:56 +0000 (Tue, 16 Jun 2009) Log Message: ----------- METK: adapt some files for linux compatibility Modified Paths: -------------- trunk/Community/METK/Sources/common/ObjMgrCommunicator.h trunk/Community/METK/Sources/common/StrList.h trunk/Community/METK/Sources/common/XMLParser.h trunk/Community/METK/Sources/common/image_basic.h trunk/Community/METK/Sources/common/kBasics.h trunk/Community/METK/Sources/common/kCamera.h trunk/Community/METK/Sources/common/kDebug.h trunk/Community/METK/Sources/common/kSphere.h Modified: trunk/Community/METK/Sources/common/ObjMgrCommunicator.h =================================================================== --- trunk/Community/METK/Sources/common/ObjMgrCommunicator.h 2009-06-16 12:54:17 UTC (rev 73) +++ trunk/Community/METK/Sources/common/ObjMgrCommunicator.h 2009-06-16 13:13:56 UTC (rev 74) @@ -15,11 +15,15 @@ #pragma warning(disable:4251) +#ifdef WIN32 #ifndef common_EXPORTS #define __COMMON_IMPORTEXPORT __declspec(dllimport) #else #define __COMMON_IMPORTEXPORT __declspec(dllexport) #endif +#else +#define MLIMAGEUTILITIES_EXPORT +#endif // ML includes #ifndef __mlOperatorIncludes_H Modified: trunk/Community/METK/Sources/common/StrList.h =================================================================== --- trunk/Community/METK/Sources/common/StrList.h 2009-06-16 12:54:17 UTC (rev 73) +++ trunk/Community/METK/Sources/common/StrList.h 2009-06-16 13:13:56 UTC (rev 74) @@ -3,11 +3,15 @@ #pragma warning(disable:4251) +#ifdef WIN32 #ifndef common_EXPORTS #define __COMMON_IMPORTEXPORT __declspec(dllimport) #else #define __COMMON_IMPORTEXPORT __declspec(dllexport) #endif +#else +#define MLIMAGEUTILITIES_EXPORT +#endif # include <string> # include <list> Modified: trunk/Community/METK/Sources/common/XMLParser.h =================================================================== --- trunk/Community/METK/Sources/common/XMLParser.h 2009-06-16 12:54:17 UTC (rev 73) +++ trunk/Community/METK/Sources/common/XMLParser.h 2009-06-16 13:13:56 UTC (rev 74) @@ -4,11 +4,15 @@ #define _XMLParser_ #pragma warning(disable:4251) +#ifdef WIN32 #ifndef common_EXPORTS #define __COMMON_IMPORTEXPORT __declspec(dllimport) #else #define __COMMON_IMPORTEXPORT __declspec(dllexport) #endif +#else +#define MLIMAGEUTILITIES_EXPORT +#endif #include <xercesc/util/PlatformUtils.hpp> #include <xercesc/parsers/AbstractDOMParser.hpp> Modified: trunk/Community/METK/Sources/common/image_basic.h =================================================================== --- trunk/Community/METK/Sources/common/image_basic.h 2009-06-16 12:54:17 UTC (rev 73) +++ trunk/Community/METK/Sources/common/image_basic.h 2009-06-16 13:13:56 UTC (rev 74) @@ -2,11 +2,15 @@ // image_basic is a base class for image handling #pragma warning(disable:4251) +#ifdef WIN32 #ifndef common_EXPORTS #define __COMMON_IMPORTEXPORT __declspec(dllimport) #else #define __COMMON_IMPORTEXPORT __declspec(dllexport) #endif +#else +#define MLIMAGEUTILITIES_EXPORT +#endif #define NOMINMAX #undef min Modified: trunk/Community/METK/Sources/common/kBasics.h =================================================================== --- trunk/Community/METK/Sources/common/kBasics.h 2009-06-16 12:54:17 UTC (rev 73) +++ trunk/Community/METK/Sources/common/kBasics.h 2009-06-16 13:13:56 UTC (rev 74) @@ -4,7 +4,7 @@ // \author Konrad M\xFChler // \date 2005-07-05 // -// +// */ //---------------------------------------------------------------------------------- @@ -15,21 +15,21 @@ #pragma warning(disable:4251) #ifdef WIN32 - #ifndef common_EXPORTS - #define __COMMON_IMPORTEXPORT __declspec(dllimport) - #else - #define __COMMON_IMPORTEXPORT __declspec(dllexport) - #endif +#ifndef common_EXPORTS +#define __COMMON_IMPORTEXPORT __declspec(dllimport) #else - #define MLIMAGEUTILITIES_EXPORT +#define __COMMON_IMPORTEXPORT __declspec(dllexport) #endif +#else +#define MLIMAGEUTILITIES_EXPORT +#endif #include <iostream> #include <fstream> -#include <iomanip> +#include <iomanip> #include <string> -#include <sstream> +#include <sstream> #pragma warning(disable:4786) #include <list> #include <vector> @@ -44,101 +44,101 @@ using namespace std; -//! kBasics contains all often used functions, i.e. for convertions. +//! kBasics contains all often used functions, i.e. for convertions. namespace kBasics { - struct optionstruct{ - string name; - int count; - char shortname; - optionstruct(string n,int c,char s):name(n),count(c),shortname(s){} - optionstruct():name(""),count(0),shortname(' '){} - }; - const double PI = 3.1415926535897932384626433832795028841972; + struct optionstruct{ + string name; + int count; + char shortname; + optionstruct(string n,int c,char s):name(n),count(c),shortname(s){} + optionstruct():name(""),count(0),shortname(' '){} + }; + const double PI = 3.1415926535897932384626433832795028841972; - const char QUOTATION_SINGLE = '\''; - const char QUOTATION_DOUBLE = '\"'; + const char QUOTATION_SINGLE = '\''; + const char QUOTATION_DOUBLE = '\"'; - struct POINT { - int x,y; - POINT() : x(-1), y(-1) {} // default constructor - POINT(int x_, int y_) : x(x_), y(y_) {} // constructor - }; + struct POINT { + int x,y; + POINT() : x(-1), y(-1) {} // default constructor + POINT(int x_, int y_) : x(x_), y(y_) {} // constructor + }; - struct POINTF { - float x,y; - POINTF() : x(-1), y(-1) {} // default constructor - POINTF(float x_, float y_) : x(x_), y(y_) {} // constructor - }; + struct POINTF { + float x,y; + POINTF() : x(-1), y(-1) {} // default constructor + POINTF(float x_, float y_) : x(x_), y(y_) {} // constructor + }; - struct LINE { - POINT p1,p2; - }; + struct LINE { + POINT p1,p2; + }; - struct LINEF { - POINTF p1,p2; - }; + struct LINEF { + POINTF p1,p2; + }; - struct BOX { - POINT corner1,corner2,corner3,corner4; - }; + struct BOX { + POINT corner1,corner2,corner3,corner4; + }; - //-------------------------------------------------------- - //Functions - //-------------------------------------------------------- - __COMMON_IMPORTEXPORT void split(const string toSplit,const char delimiter, const int max_size, vector<string>* strVector); - __COMMON_IMPORTEXPORT void splitQuotated(const string toSplit, const char delimiter, const char quotationmark, vector<string>* strVector); - __COMMON_IMPORTEXPORT const string CharToString(const char* value); - __COMMON_IMPORTEXPORT const int StringToInt(const string value); - __COMMON_IMPORTEXPORT const string IntToString(const int value); - __COMMON_IMPORTEXPORT float StringToFloat(const string value); - __COMMON_IMPORTEXPORT const string FloatToString(const float value); - __COMMON_IMPORTEXPORT double StringToDouble(const string value); - __COMMON_IMPORTEXPORT const string DoubleToString(const double value); - __COMMON_IMPORTEXPORT const string BoolToString(const bool value); - __COMMON_IMPORTEXPORT const bool StringToBool(const string value); - __COMMON_IMPORTEXPORT const string eraseStrPart(const string toDelete, string orgString); - __COMMON_IMPORTEXPORT const string replaceString(string s, const string value, const string replacement); - __COMMON_IMPORTEXPORT const string replaceString(string s, const char value, const string replacement); - __COMMON_IMPORTEXPORT const string trimString(string s, char c=' '); - //__COMMON_IMPORTEXPORT const string trimStringLFCR(string s); - __COMMON_IMPORTEXPORT const string trimQuotatedStr(string value, const char quotationmark); - __COMMON_IMPORTEXPORT const string getPath(const string value, const char slash); - __COMMON_IMPORTEXPORT const string getFilename(const string value, const char slash); - __COMMON_IMPORTEXPORT const string Vec3fToString(const SbVec3f value,const char delimiter); - __COMMON_IMPORTEXPORT const string Vec3fToString(const SbVec3f value); - __COMMON_IMPORTEXPORT const SbVec3f StringToVec3f(const string value, const char delimiter); - __COMMON_IMPORTEXPORT const string SbRotationToString(const SbRotation value); - __COMMON_IMPORTEXPORT const string toUp(string value); //toUppercase - __COMMON_IMPORTEXPORT const double maxDiff(const SbVec3f value1, const SbVec3f value2); - __COMMON_IMPORTEXPORT const double maxDiff(const SbVec4f value1, const SbVec4f value2); - __COMMON_IMPORTEXPORT const bool fileExists(const char* fileName); - __COMMON_IMPORTEXPORT const string leadingZero(int number, int totalLength); - __COMMON_IMPORTEXPORT const SbVec3f RGB_to_HSV( SbVec3f RGB ); - __COMMON_IMPORTEXPORT SbVec3f HSV_to_RGB( SbVec3f HSV ); - __COMMON_IMPORTEXPORT char getOptions(vector<string>& in,const list<optionstruct>& options,string& value); + //-------------------------------------------------------- + //Functions + //-------------------------------------------------------- + __COMMON_IMPORTEXPORT void split(const string toSplit,const char delimiter, const int max_size, vector<string>* strVector); + __COMMON_IMPORTEXPORT void splitQuotated(const string toSplit, const char delimiter, const char quotationmark, vector<string>* strVector); + __COMMON_IMPORTEXPORT const string CharToString(const char* value); + __COMMON_IMPORTEXPORT const int StringToInt(const string value); + __COMMON_IMPORTEXPORT const string IntToString(const int value); + __COMMON_IMPORTEXPORT float StringToFloat(const string value); + __COMMON_IMPORTEXPORT const string FloatToString(const float value); + __COMMON_IMPORTEXPORT double StringToDouble(const string value); + __COMMON_IMPORTEXPORT const string DoubleToString(const double value); + __COMMON_IMPORTEXPORT const string BoolToString(const bool value); + __COMMON_IMPORTEXPORT const bool StringToBool(const string value); + __COMMON_IMPORTEXPORT const string eraseStrPart(const string toDelete, string orgString); + __COMMON_IMPORTEXPORT const string replaceString(string s, const string value, const string replacement); + __COMMON_IMPORTEXPORT const string replaceString(string s, const char value, const string replacement); + __COMMON_IMPORTEXPORT const string trimString(string s, char c=' '); + //__COMMON_IMPORTEXPORT const string trimStringLFCR(string s); + __COMMON_IMPORTEXPORT const string trimQuotatedStr(string value, const char quotationmark); + __COMMON_IMPORTEXPORT const string getPath(const string value, const char slash); + __COMMON_IMPORTEXPORT const string getFilename(const string value, const char slash); + __COMMON_IMPORTEXPORT const string Vec3fToString(const SbVec3f value,const char delimiter); + __COMMON_IMPORTEXPORT const string Vec3fToString(const SbVec3f value); + __COMMON_IMPORTEXPORT const SbVec3f StringToVec3f(const string value, const char delimiter); + __COMMON_IMPORTEXPORT const string SbRotationToString(const SbRotation value); + __COMMON_IMPORTEXPORT const string toUp(string value); //toUppercase + __COMMON_IMPORTEXPORT const double maxDiff(const SbVec3f value1, const SbVec3f value2); + __COMMON_IMPORTEXPORT const double maxDiff(const SbVec4f value1, const SbVec4f value2); + __COMMON_IMPORTEXPORT const bool fileExists(const char* fileName); + __COMMON_IMPORTEXPORT const string leadingZero(int number, int totalLength); + __COMMON_IMPORTEXPORT const SbVec3f RGB_to_HSV( SbVec3f RGB ); + __COMMON_IMPORTEXPORT SbVec3f HSV_to_RGB( SbVec3f HSV ); + __COMMON_IMPORTEXPORT char getOptions(vector<string>& in,const list<optionstruct>& options,string& value); - template <typename T> - __COMMON_IMPORTEXPORT const short Signum(T value); - __COMMON_IMPORTEXPORT const int round(float value); + template <typename T> + __COMMON_IMPORTEXPORT const short Signum(T value); + __COMMON_IMPORTEXPORT const int round(float value); - __COMMON_IMPORTEXPORT void DebugTest(string debugStr, short level); + __COMMON_IMPORTEXPORT void DebugTest(string debugStr, short level); - __COMMON_IMPORTEXPORT void initRand(); - __COMMON_IMPORTEXPORT int random( int a, int e); + __COMMON_IMPORTEXPORT void initRand(); + __COMMON_IMPORTEXPORT int random( int a, int e); - __COMMON_IMPORTEXPORT void quickSort(double* values, int start, int end); + __COMMON_IMPORTEXPORT void quickSort(double* values, int start, int end); - __COMMON_IMPORTEXPORT double getCurrentTime(); + __COMMON_IMPORTEXPORT double getCurrentTime(); - __COMMON_IMPORTEXPORT bool lineIntersection(POINT p1, POINT p2, POINT p3, POINT p4, POINT &intersectionPoint); - __COMMON_IMPORTEXPORT bool boxIntersection(POINT r1_corner1, POINT r1_corner2, POINT r2_corner1, POINT r2_corner2, BOX &intersectionBox); - __COMMON_IMPORTEXPORT bool pointInBox(POINTF p1, POINT corner1, POINT corner2); + __COMMON_IMPORTEXPORT bool lineIntersection(POINT p1, POINT p2, POINT p3, POINT p4, POINT &intersectionPoint); + __COMMON_IMPORTEXPORT bool boxIntersection(POINT r1_corner1, POINT r1_corner2, POINT r2_corner1, POINT r2_corner2, BOX &intersectionBox); + __COMMON_IMPORTEXPORT bool pointInBox(POINTF p1, POINT corner1, POINT corner2); } Modified: trunk/Community/METK/Sources/common/kCamera.h =================================================================== --- trunk/Community/METK/Sources/common/kCamera.h 2009-06-16 12:54:17 UTC (rev 73) +++ trunk/Community/METK/Sources/common/kCamera.h 2009-06-16 13:13:56 UTC (rev 74) @@ -14,11 +14,15 @@ #pragma warning(disable:4251) +#ifdef WIN32 #ifndef common_EXPORTS #define __COMMON_IMPORTEXPORT __declspec(dllimport) #else #define __COMMON_IMPORTEXPORT __declspec(dllexport) #endif +#else +#define MLIMAGEUTILITIES_EXPORT +#endif #include <iostream> #include <iomanip> Modified: trunk/Community/METK/Sources/common/kDebug.h =================================================================== --- trunk/Community/METK/Sources/common/kDebug.h 2009-06-16 12:54:17 UTC (rev 73) +++ trunk/Community/METK/Sources/common/kDebug.h 2009-06-16 13:13:56 UTC (rev 74) @@ -13,12 +13,17 @@ #ifndef __kDebug_H #define __kDebug_H +#ifdef WIN32 #ifndef common_EXPORTS #define __COMMON_IMPORTEXPORT __declspec(dllimport) #else #define __COMMON_IMPORTEXPORT __declspec(dllexport) #endif +#else +#define MLIMAGEUTILITIES_EXPORT +#endif + #include <string> #include <iostream> #include "mlDebug.h" Modified: trunk/Community/METK/Sources/common/kSphere.h =================================================================== --- trunk/Community/METK/Sources/common/kSphere.h 2009-06-16 12:54:17 UTC (rev 73) +++ trunk/Community/METK/Sources/common/kSphere.h 2009-06-16 13:13:56 UTC (rev 74) @@ -14,13 +14,18 @@ #pragma warning(disable:4251) +#ifdef WIN32 #ifndef common_EXPORTS #define __COMMON_IMPORTEXPORT __declspec(dllimport) #else #define __COMMON_IMPORTEXPORT __declspec(dllexport) #endif +#else +#define MLIMAGEUTILITIES_EXPORT +#endif + #include <string> #include <list> #include "kBasics.h" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wol...@us...> - 2009-06-16 12:54:39
|
Revision: 73 http://mevislabmodules.svn.sourceforge.net/mevislabmodules/?rev=73&view=rev Author: wolfspindler Date: 2009-06-16 12:54:17 +0000 (Tue, 16 Jun 2009) Log Message: ----------- BUG: -Incorrect include fixed to make project run independently. Modified Paths: -------------- trunk/Community/METK/Sources/Inventor/UMDVisLogo/SoVisLogo.cpp Property Changed: ---------------- trunk/Community/METK/Sources/Inventor/UMDVisLogo/ Property changes on: trunk/Community/METK/Sources/Inventor/UMDVisLogo ___________________________________________________________________ Added: svn:ignore + UMDVisLogo.sln UMDVisLogo.suo UMDVisLogo.vcproj UMDVisLogo.vcproj.lapsus-win.wolf.user Modified: trunk/Community/METK/Sources/Inventor/UMDVisLogo/SoVisLogo.cpp =================================================================== --- trunk/Community/METK/Sources/Inventor/UMDVisLogo/SoVisLogo.cpp 2009-06-16 12:40:56 UTC (rev 72) +++ trunk/Community/METK/Sources/Inventor/UMDVisLogo/SoVisLogo.cpp 2009-06-16 12:54:17 UTC (rev 73) @@ -25,7 +25,7 @@ // TODO: include more inventor things here #include "XVLeaveScope.h" -#include <GL/glaux.h> +#include <GL/glew.h> #pragma warning( disable : 4611 ) #include "png.h" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wol...@us...> - 2009-06-16 08:52:49
|
Revision: 71 http://mevislabmodules.svn.sourceforge.net/mevislabmodules/?rev=71&view=rev Author: wolfspindler Date: 2009-06-16 08:52:47 +0000 (Tue, 16 Jun 2009) Log Message: ----------- BUG: -Missing check for Platforms added when defining export symbols. Modified Paths: -------------- trunk/Community/METK/Sources/common/kBasics.h Modified: trunk/Community/METK/Sources/common/kBasics.h =================================================================== --- trunk/Community/METK/Sources/common/kBasics.h 2009-06-16 08:39:57 UTC (rev 70) +++ trunk/Community/METK/Sources/common/kBasics.h 2009-06-16 08:52:47 UTC (rev 71) @@ -4,7 +4,7 @@ // \author Konrad M\xFChler // \date 2005-07-05 // -// +// */ //---------------------------------------------------------------------------------- @@ -13,17 +13,23 @@ #pragma warning(disable:4251) -#ifndef common_EXPORTS -#define __COMMON_IMPORTEXPORT __declspec(dllimport) + +#ifdef WIN32 + #ifndef common_EXPORTS + #define __COMMON_IMPORTEXPORT __declspec(dllimport) + #else + #define __COMMON_IMPORTEXPORT __declspec(dllexport) + #endif #else -#define __COMMON_IMPORTEXPORT __declspec(dllexport) + #define MLIMAGEUTILITIES_EXPORT #endif + #include <iostream> #include <fstream> -#include <iomanip> +#include <iomanip> #include <string> -#include <sstream> +#include <sstream> #pragma warning(disable:4786) #include <list> #include <vector> @@ -38,101 +44,101 @@ using namespace std; -//! kBasics contains all often used functions, i.e. for convertions. +//! kBasics contains all often used functions, i.e. for convertions. namespace kBasics { - struct optionstruct{ - string name; - int count; - char shortname; - optionstruct(string n,int c,char s):name(n),count(c),shortname(s){} - optionstruct():name(""),count(0),shortname(' '){} - }; - const double PI = 3.1415926535897932384626433832795028841972; + struct optionstruct{ + string name; + int count; + char shortname; + optionstruct(string n,int c,char s):name(n),count(c),shortname(s){} + optionstruct():name(""),count(0),shortname(' '){} + }; + const double PI = 3.1415926535897932384626433832795028841972; - const char QUOTATION_SINGLE = '\''; - const char QUOTATION_DOUBLE = '\"'; + const char QUOTATION_SINGLE = '\''; + const char QUOTATION_DOUBLE = '\"'; - struct POINT { - int x,y; - POINT() : x(-1), y(-1) {} // default constructor - POINT(int x_, int y_) : x(x_), y(y_) {} // constructor - }; + struct POINT { + int x,y; + POINT() : x(-1), y(-1) {} // default constructor + POINT(int x_, int y_) : x(x_), y(y_) {} // constructor + }; - struct POINTF { - float x,y; - POINTF() : x(-1), y(-1) {} // default constructor - POINTF(float x_, float y_) : x(x_), y(y_) {} // constructor - }; + struct POINTF { + float x,y; + POINTF() : x(-1), y(-1) {} // default constructor + POINTF(float x_, float y_) : x(x_), y(y_) {} // constructor + }; - struct LINE { - POINT p1,p2; - }; + struct LINE { + POINT p1,p2; + }; - struct LINEF { - POINTF p1,p2; - }; + struct LINEF { + POINTF p1,p2; + }; - struct BOX { - POINT corner1,corner2,corner3,corner4; - }; + struct BOX { + POINT corner1,corner2,corner3,corner4; + }; - //-------------------------------------------------------- - //Functions - //-------------------------------------------------------- - __COMMON_IMPORTEXPORT void split(const string toSplit,const char delimiter, const int max_size, vector<string>* strVector); - __COMMON_IMPORTEXPORT void splitQuotated(const string toSplit, const char delimiter, const char quotationmark, vector<string>* strVector); - __COMMON_IMPORTEXPORT const string CharToString(const char* value); - __COMMON_IMPORTEXPORT const int StringToInt(const string value); - __COMMON_IMPORTEXPORT const string IntToString(const int value); - __COMMON_IMPORTEXPORT float StringToFloat(const string value); - __COMMON_IMPORTEXPORT const string FloatToString(const float value); - __COMMON_IMPORTEXPORT double StringToDouble(const string value); - __COMMON_IMPORTEXPORT const string DoubleToString(const double value); - __COMMON_IMPORTEXPORT const string BoolToString(const bool value); - __COMMON_IMPORTEXPORT const bool StringToBool(const string value); - __COMMON_IMPORTEXPORT const string eraseStrPart(const string toDelete, string orgString); - __COMMON_IMPORTEXPORT const string replaceString(string s, const string value, const string replacement); - __COMMON_IMPORTEXPORT const string replaceString(string s, const char value, const string replacement); - __COMMON_IMPORTEXPORT const string trimString(string s, char c=' '); - //__COMMON_IMPORTEXPORT const string trimStringLFCR(string s); - __COMMON_IMPORTEXPORT const string trimQuotatedStr(string value, const char quotationmark); - __COMMON_IMPORTEXPORT const string getPath(const string value, const char slash); - __COMMON_IMPORTEXPORT const string getFilename(const string value, const char slash); - __COMMON_IMPORTEXPORT const string Vec3fToString(const SbVec3f value,const char delimiter); - __COMMON_IMPORTEXPORT const string Vec3fToString(const SbVec3f value); - __COMMON_IMPORTEXPORT const SbVec3f StringToVec3f(const string value, const char delimiter); - __COMMON_IMPORTEXPORT const string SbRotationToString(const SbRotation value); - __COMMON_IMPORTEXPORT const string toUp(string value); //toUppercase - __COMMON_IMPORTEXPORT const double maxDiff(const SbVec3f value1, const SbVec3f value2); - __COMMON_IMPORTEXPORT const double maxDiff(const SbVec4f value1, const SbVec4f value2); - __COMMON_IMPORTEXPORT const bool fileExists(const char* fileName); - __COMMON_IMPORTEXPORT const string leadingZero(int number, int totalLength); - __COMMON_IMPORTEXPORT const SbVec3f RGB_to_HSV( SbVec3f RGB ); - __COMMON_IMPORTEXPORT SbVec3f HSV_to_RGB( SbVec3f HSV ); - __COMMON_IMPORTEXPORT char getOptions(vector<string>& in,const list<optionstruct>& options,string& value); + //-------------------------------------------------------- + //Functions + //-------------------------------------------------------- + __COMMON_IMPORTEXPORT void split(const string toSplit,const char delimiter, const int max_size, vector<string>* strVector); + __COMMON_IMPORTEXPORT void splitQuotated(const string toSplit, const char delimiter, const char quotationmark, vector<string>* strVector); + __COMMON_IMPORTEXPORT const string CharToString(const char* value); + __COMMON_IMPORTEXPORT const int StringToInt(const string value); + __COMMON_IMPORTEXPORT const string IntToString(const int value); + __COMMON_IMPORTEXPORT float StringToFloat(const string value); + __COMMON_IMPORTEXPORT const string FloatToString(const float value); + __COMMON_IMPORTEXPORT double StringToDouble(const string value); + __COMMON_IMPORTEXPORT const string DoubleToString(const double value); + __COMMON_IMPORTEXPORT const string BoolToString(const bool value); + __COMMON_IMPORTEXPORT const bool StringToBool(const string value); + __COMMON_IMPORTEXPORT const string eraseStrPart(const string toDelete, string orgString); + __COMMON_IMPORTEXPORT const string replaceString(string s, const string value, const string replacement); + __COMMON_IMPORTEXPORT const string replaceString(string s, const char value, const string replacement); + __COMMON_IMPORTEXPORT const string trimString(string s, char c=' '); + //__COMMON_IMPORTEXPORT const string trimStringLFCR(string s); + __COMMON_IMPORTEXPORT const string trimQuotatedStr(string value, const char quotationmark); + __COMMON_IMPORTEXPORT const string getPath(const string value, const char slash); + __COMMON_IMPORTEXPORT const string getFilename(const string value, const char slash); + __COMMON_IMPORTEXPORT const string Vec3fToString(const SbVec3f value,const char delimiter); + __COMMON_IMPORTEXPORT const string Vec3fToString(const SbVec3f value); + __COMMON_IMPORTEXPORT const SbVec3f StringToVec3f(const string value, const char delimiter); + __COMMON_IMPORTEXPORT const string SbRotationToString(const SbRotation value); + __COMMON_IMPORTEXPORT const string toUp(string value); //toUppercase + __COMMON_IMPORTEXPORT const double maxDiff(const SbVec3f value1, const SbVec3f value2); + __COMMON_IMPORTEXPORT const double maxDiff(const SbVec4f value1, const SbVec4f value2); + __COMMON_IMPORTEXPORT const bool fileExists(const char* fileName); + __COMMON_IMPORTEXPORT const string leadingZero(int number, int totalLength); + __COMMON_IMPORTEXPORT const SbVec3f RGB_to_HSV( SbVec3f RGB ); + __COMMON_IMPORTEXPORT SbVec3f HSV_to_RGB( SbVec3f HSV ); + __COMMON_IMPORTEXPORT char getOptions(vector<string>& in,const list<optionstruct>& options,string& value); - template <typename T> - __COMMON_IMPORTEXPORT const short Signum(T value); - __COMMON_IMPORTEXPORT const int round(float value); + template <typename T> + __COMMON_IMPORTEXPORT const short Signum(T value); + __COMMON_IMPORTEXPORT const int round(float value); - __COMMON_IMPORTEXPORT void DebugTest(string debugStr, short level); + __COMMON_IMPORTEXPORT void DebugTest(string debugStr, short level); - __COMMON_IMPORTEXPORT void initRand(); - __COMMON_IMPORTEXPORT int random( int a, int e); + __COMMON_IMPORTEXPORT void initRand(); + __COMMON_IMPORTEXPORT int random( int a, int e); - __COMMON_IMPORTEXPORT void quickSort(double* values, int start, int end); + __COMMON_IMPORTEXPORT void quickSort(double* values, int start, int end); - __COMMON_IMPORTEXPORT double getCurrentTime(); + __COMMON_IMPORTEXPORT double getCurrentTime(); - __COMMON_IMPORTEXPORT bool lineIntersection(POINT p1, POINT p2, POINT p3, POINT p4, POINT &intersectionPoint); - __COMMON_IMPORTEXPORT bool boxIntersection(POINT r1_corner1, POINT r1_corner2, POINT r2_corner1, POINT r2_corner2, BOX &intersectionBox); - __COMMON_IMPORTEXPORT bool pointInBox(POINTF p1, POINT corner1, POINT corner2); + __COMMON_IMPORTEXPORT bool lineIntersection(POINT p1, POINT p2, POINT p3, POINT p4, POINT &intersectionPoint); + __COMMON_IMPORTEXPORT bool boxIntersection(POINT r1_corner1, POINT r1_corner2, POINT r2_corner1, POINT r2_corner2, BOX &intersectionBox); + __COMMON_IMPORTEXPORT bool pointInBox(POINTF p1, POINT corner1, POINT corner2); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wol...@us...> - 2009-06-16 08:40:04
|
Revision: 70 http://mevislabmodules.svn.sourceforge.net/mevislabmodules/?rev=70&view=rev Author: wolfspindler Date: 2009-06-16 08:39:57 +0000 (Tue, 16 Jun 2009) Log Message: ----------- BUG: -Package .pri file name fixed from UMD to Community. This is necessary to make the build system detect METK as group of the Community build correctly. Removed Paths: ------------- trunk/Community/METK/Configuration/UMD_METK.pri Deleted: trunk/Community/METK/Configuration/UMD_METK.pri =================================================================== --- trunk/Community/METK/Configuration/UMD_METK.pri 2009-06-16 08:39:23 UTC (rev 69) +++ trunk/Community/METK/Configuration/UMD_METK.pri 2009-06-16 08:39:57 UTC (rev 70) @@ -1,131 +0,0 @@ -isEmpty(UMD_METK_PRI_INCLUDED) { - message ( loading UMD_METK.pri ) -} -# **InsertLicense** code -# ----------------------------------------------------------------------------- -# UMD_METK prifile -# -# \file UMD_METK.pri -# \author Konrad -# \date 2009-04-24 -# -# The Medical Explortation Toolkit (www.metk.net) -# -# ----------------------------------------------------------------------------- - -# include guard against multiple inclusion -isEmpty(UMD_METK_PRI_INCLUDED) { - -UMD_METK_PRI_INCLUDED = 1 - -# -- System ------------------------------------------------------------- - -include( $(MLAB_MeVis_Foundation)/Configuration/SystemInit.pri ) - -# -- Define local PACKAGE variables ------------------------------------- - -PACKAGE_ROOT = $$(MLAB_UMD_METK) -PACKAGE_SOURCES = "$$(MLAB_UMD_METK)"/Sources - -# Add package library path -LIBS += -L"$${PACKAGE_ROOT}"/lib - -# -- Projects ------------------------------------------------------------- - -# NOTE: Add projects below to make them available to other projects via the CONFIG mechanism - -# You can use this example template for typical projects: -#MLMyProject { -# CONFIG_FOUND += MLMyProject -# INCLUDEPATH += $${PACKAGE_SOURCES}/ML/MLMyProject -# win32:LIBS += MLMyProject$${d}.lib -# unix:LIBS += -lMLMyProject$${d} -#} - - - - -# -- ML Projects ------------------------------------------------------------- - -MLkAviWriter { - CONFIG_FOUND += MLkAviWriter - INCLUDEPATH += $${PACKAGE_SOURCES}/ML/kAviWriter - win32:LIBS += MLkAviWriter$${d}.lib - unix:LIBS += -lMLkAviWriter$${d} -} - - -UMDAnimation2 { - CONFIG_FOUND += UMDAnimation2 - INCLUDEPATH += $${PACKAGE_SOURCES}/ML/Animation - win32:LIBS += Animation$${d}.lib - unix:LIBS += -lAnimation$${d} -} - -METKMessaging { - CONFIG_FOUND += METKMessaging - INCLUDEPATH += $${PACKAGE_SOURCES}/ML/METKMessaging - win32:LIBS += METKMessaging$${d}.lib - unix:LIBS += -lMETKMessaging$${d} -} - -METK2DLabeling { - CONFIG_FOUND += METK2DLabeling - INCLUDEPATH += $${PACKAGE_SOURCES}/ML/METK2DLabeling - win32:LIBS += METK2DLabeling$${d}.lib - unix:LIBS += -lMETK2DLabeling$${d} -} - - - -# -- Inventor Projects ------------------------------------------------------- - -UMDQHull3D { - CONFIG_FOUND += UMDQHull3D - INCLUDEPATH += $${PACKAGE_SOURCES}/Inventor/SoQHull3D - win32:LIBS += UMDQHull3D$${d}.lib - unix:LIBS += -lUMDQHull3D$${d} -} - -UMDSoMeasurement { - CONFIG_FOUND += UMDSoMeasurement - INCLUDEPATH += $${PACKAGE_SOURCES}/Inventor/UMDSoMeasurement - win32:LIBS += UMDSoMeasurement$${d}.lib - unix:LIBS += -lUMDSoMeasurement$${d} -} - -UMDmnOffscreenRenderer { - CONFIG_FOUND += UMDmnOffscreenRenderer - INCLUDEPATH += $${PACKAGE_SOURCES}/Inventor/UMDmnOffscreenRenderer - win32:LIBS += UMDmnOffscreenRenderer$${d}.lib - unix:LIBS += -lUMDmnOffscreenRenderer$${d} -} - -UMDStraightLine { - CONFIG_FOUND += UMDStraightLine - INCLUDEPATH += $${PACKAGE_SOURCES}/Inventor/UMDStraightLine - win32:LIBS += UMDStraightLine$${d}.lib - unix:LIBS += -lUMDStraightLine$${d} -} - - - -# -- Shared Projects --------------------------------------------------------- - -common { - CONFIG_FOUND += common - INCLUDEPATH += $${PACKAGE_SOURCES}/common - win32:LIBS += common$${d}.lib - unix:LIBS += -lcommon$${d} -} - - -METK { - CONFIG_FOUND += METK - INCLUDEPATH += $${PACKAGE_SOURCES}/ML -} - -# End of projects ------------------------------------------------------------ - -} - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wol...@us...> - 2009-06-16 08:39:26
|
Revision: 69 http://mevislabmodules.svn.sourceforge.net/mevislabmodules/?rev=69&view=rev Author: wolfspindler Date: 2009-06-16 08:39:23 +0000 (Tue, 16 Jun 2009) Log Message: ----------- BUG: -Package .pri file name fixed from UMD to Community. This is necessary to make the build system detect METK as group of the Community build correctly. Added Paths: ----------- trunk/Community/METK/Configuration/Community_METK.pri Copied: trunk/Community/METK/Configuration/Community_METK.pri (from rev 67, trunk/Community/METK/Configuration/UMD_METK.pri) =================================================================== --- trunk/Community/METK/Configuration/Community_METK.pri (rev 0) +++ trunk/Community/METK/Configuration/Community_METK.pri 2009-06-16 08:39:23 UTC (rev 69) @@ -0,0 +1,131 @@ +isEmpty(UMD_METK_PRI_INCLUDED) { + message ( loading UMD_METK.pri ) +} +# **InsertLicense** code +# ----------------------------------------------------------------------------- +# UMD_METK prifile +# +# \file UMD_METK.pri +# \author Konrad +# \date 2009-04-24 +# +# The Medical Explortation Toolkit (www.metk.net) +# +# ----------------------------------------------------------------------------- + +# include guard against multiple inclusion +isEmpty(UMD_METK_PRI_INCLUDED) { + +UMD_METK_PRI_INCLUDED = 1 + +# -- System ------------------------------------------------------------- + +include( $(MLAB_MeVis_Foundation)/Configuration/SystemInit.pri ) + +# -- Define local PACKAGE variables ------------------------------------- + +PACKAGE_ROOT = $$(MLAB_UMD_METK) +PACKAGE_SOURCES = "$$(MLAB_UMD_METK)"/Sources + +# Add package library path +LIBS += -L"$${PACKAGE_ROOT}"/lib + +# -- Projects ------------------------------------------------------------- + +# NOTE: Add projects below to make them available to other projects via the CONFIG mechanism + +# You can use this example template for typical projects: +#MLMyProject { +# CONFIG_FOUND += MLMyProject +# INCLUDEPATH += $${PACKAGE_SOURCES}/ML/MLMyProject +# win32:LIBS += MLMyProject$${d}.lib +# unix:LIBS += -lMLMyProject$${d} +#} + + + + +# -- ML Projects ------------------------------------------------------------- + +MLkAviWriter { + CONFIG_FOUND += MLkAviWriter + INCLUDEPATH += $${PACKAGE_SOURCES}/ML/kAviWriter + win32:LIBS += MLkAviWriter$${d}.lib + unix:LIBS += -lMLkAviWriter$${d} +} + + +UMDAnimation2 { + CONFIG_FOUND += UMDAnimation2 + INCLUDEPATH += $${PACKAGE_SOURCES}/ML/Animation + win32:LIBS += Animation$${d}.lib + unix:LIBS += -lAnimation$${d} +} + +METKMessaging { + CONFIG_FOUND += METKMessaging + INCLUDEPATH += $${PACKAGE_SOURCES}/ML/METKMessaging + win32:LIBS += METKMessaging$${d}.lib + unix:LIBS += -lMETKMessaging$${d} +} + +METK2DLabeling { + CONFIG_FOUND += METK2DLabeling + INCLUDEPATH += $${PACKAGE_SOURCES}/ML/METK2DLabeling + win32:LIBS += METK2DLabeling$${d}.lib + unix:LIBS += -lMETK2DLabeling$${d} +} + + + +# -- Inventor Projects ------------------------------------------------------- + +UMDQHull3D { + CONFIG_FOUND += UMDQHull3D + INCLUDEPATH += $${PACKAGE_SOURCES}/Inventor/SoQHull3D + win32:LIBS += UMDQHull3D$${d}.lib + unix:LIBS += -lUMDQHull3D$${d} +} + +UMDSoMeasurement { + CONFIG_FOUND += UMDSoMeasurement + INCLUDEPATH += $${PACKAGE_SOURCES}/Inventor/UMDSoMeasurement + win32:LIBS += UMDSoMeasurement$${d}.lib + unix:LIBS += -lUMDSoMeasurement$${d} +} + +UMDmnOffscreenRenderer { + CONFIG_FOUND += UMDmnOffscreenRenderer + INCLUDEPATH += $${PACKAGE_SOURCES}/Inventor/UMDmnOffscreenRenderer + win32:LIBS += UMDmnOffscreenRenderer$${d}.lib + unix:LIBS += -lUMDmnOffscreenRenderer$${d} +} + +UMDStraightLine { + CONFIG_FOUND += UMDStraightLine + INCLUDEPATH += $${PACKAGE_SOURCES}/Inventor/UMDStraightLine + win32:LIBS += UMDStraightLine$${d}.lib + unix:LIBS += -lUMDStraightLine$${d} +} + + + +# -- Shared Projects --------------------------------------------------------- + +common { + CONFIG_FOUND += common + INCLUDEPATH += $${PACKAGE_SOURCES}/common + win32:LIBS += common$${d}.lib + unix:LIBS += -lcommon$${d} +} + + +METK { + CONFIG_FOUND += METK + INCLUDEPATH += $${PACKAGE_SOURCES}/ML +} + +# End of projects ------------------------------------------------------------ + +} + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wol...@us...> - 2009-06-16 08:35:16
|
Revision: 68 http://mevislabmodules.svn.sourceforge.net/mevislabmodules/?rev=68&view=rev Author: wolfspindler Date: 2009-06-16 08:32:46 +0000 (Tue, 16 Jun 2009) Log Message: ----------- BUG: -Package group fixed from UMD to Community. This is necessary to make the build system detect METK as group of the Community build. Modified Paths: -------------- trunk/Community/METK/Package.def Modified: trunk/Community/METK/Package.def =================================================================== --- trunk/Community/METK/Package.def 2009-06-16 06:53:16 UTC (rev 67) +++ trunk/Community/METK/Package.def 2009-06-16 08:32:46 UTC (rev 68) @@ -1,6 +1,6 @@ Package { - packageGroup = "UMD" + packageGroup = "Community" packageName = "METK" owner = "Konrad" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <kon...@us...> - 2009-06-16 06:53:22
|
Revision: 67 http://mevislabmodules.svn.sourceforge.net/mevislabmodules/?rev=67&view=rev Author: konrad79 Date: 2009-06-16 06:53:16 +0000 (Tue, 16 Jun 2009) Log Message: ----------- METK: first submission for testing (Modules) Added Paths: ----------- trunk/Community/METK/Modules/ trunk/Community/METK/Modules/Inventor/ trunk/Community/METK/Modules/Inventor/UMDVisLogo/ trunk/Community/METK/Modules/Inventor/UMDVisLogo/UMDVisLogo.def trunk/Community/METK/Modules/Inventor/UMDVisLogo/UMDVisLogo.py trunk/Community/METK/Modules/Inventor/UMDVisLogo/UMDVisLogo.script trunk/Community/METK/Modules/Inventor/UMDVisLogo/neck.png trunk/Community/METK/Modules/Inventor/UMDVisLogo/otto.png trunk/Community/METK/Modules/Inventor/UMDVisLogo/otto2.png trunk/Community/METK/Modules/Inventor/UMDVisLogo/png-format.txt trunk/Community/METK/Modules/Inventor/UMDVisLogo/vislogo.png trunk/Community/METK/Modules/common/ Added: trunk/Community/METK/Modules/Inventor/UMDVisLogo/UMDVisLogo.def =================================================================== --- trunk/Community/METK/Modules/Inventor/UMDVisLogo/UMDVisLogo.def (rev 0) +++ trunk/Community/METK/Modules/Inventor/UMDVisLogo/UMDVisLogo.def 2009-06-16 06:53:16 UTC (rev 67) @@ -0,0 +1,26 @@ +//---------------------------------------------------------------------------------- +//! UMDVisLogo module definitions +/*! +// \file UMDVisLogo.def +// \author Konrad M\xFChler +// \date 2007-06-12 +*/ +//---------------------------------------------------------------------------------- + + +InventorModule SoVisLogo { + DLL = "UMDVisLogo" + + genre = "" + author = "Konrad M\xFChler" + status = "stable" + comment = "Logo of VIS group for 3D viewer" + keywords = "" + seeAlso = "" + projectSource = "$(UserProjectsPath)/sources/Inventor/UMDVisLogo" + externalDefinition = "$(LOCAL)/UMDVisLogo.script" + Description { + } + +} // InventorModule SoVisLogo + Added: trunk/Community/METK/Modules/Inventor/UMDVisLogo/UMDVisLogo.py =================================================================== --- trunk/Community/METK/Modules/Inventor/UMDVisLogo/UMDVisLogo.py (rev 0) +++ trunk/Community/METK/Modules/Inventor/UMDVisLogo/UMDVisLogo.py 2009-06-16 06:53:16 UTC (rev 67) @@ -0,0 +1,16 @@ +from os import * +from os.path import * +from urlparse import * +from string import * +from ObjMgr import * #for MLABFileDialog + + +# Global class instances +_cls_info = None + + +def init(): + # set default local path + ctx.field("fldLocalPath").value = ctx.field("modulePathTemp").value + #ctx.field("fldFilename").touch() + return \ No newline at end of file Added: trunk/Community/METK/Modules/Inventor/UMDVisLogo/UMDVisLogo.script =================================================================== --- trunk/Community/METK/Modules/Inventor/UMDVisLogo/UMDVisLogo.script (rev 0) +++ trunk/Community/METK/Modules/Inventor/UMDVisLogo/UMDVisLogo.script 2009-06-16 06:53:16 UTC (rev 67) @@ -0,0 +1,30 @@ +Interface { + Inputs { + } + Outputs { + } + Parameters { + Field modulePathTemp { type=string value="$(LOCAL)" persistent=False } + //Field fldFilename { type=string value="vislogo.png" } + } +} + + +Commands { + + // Add the local's parent path to the import path, so that Python looks for local packages + importPath = "$(LOCAL)/.." + + // Include local functions + source = "$(LOCAL)/UMDVisLogo.py" + + // Call init() to initalize the script + initCommand = init +} + + +Description { + Field modulePath { + persistent=False + } +} \ No newline at end of file Added: trunk/Community/METK/Modules/Inventor/UMDVisLogo/neck.png =================================================================== (Binary files differ) Property changes on: trunk/Community/METK/Modules/Inventor/UMDVisLogo/neck.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/Community/METK/Modules/Inventor/UMDVisLogo/otto.png =================================================================== (Binary files differ) Property changes on: trunk/Community/METK/Modules/Inventor/UMDVisLogo/otto.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/Community/METK/Modules/Inventor/UMDVisLogo/otto2.png =================================================================== (Binary files differ) Property changes on: trunk/Community/METK/Modules/Inventor/UMDVisLogo/otto2.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/Community/METK/Modules/Inventor/UMDVisLogo/png-format.txt =================================================================== --- trunk/Community/METK/Modules/Inventor/UMDVisLogo/png-format.txt (rev 0) +++ trunk/Community/METK/Modules/Inventor/UMDVisLogo/png-format.txt 2009-06-16 06:53:16 UTC (rev 67) @@ -0,0 +1,2 @@ +Das PNG nicht mit Photoshop erstellen! +Sondern mir PaintShopPro und dort nicht 16Mio Farben sondenr eine Palette und eine einzige Farbe als transparente Farbe w\xE4hlen. \ No newline at end of file Added: trunk/Community/METK/Modules/Inventor/UMDVisLogo/vislogo.png =================================================================== (Binary files differ) Property changes on: trunk/Community/METK/Modules/Inventor/UMDVisLogo/vislogo.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <kon...@us...> - 2009-06-16 06:51:29
|
Revision: 66 http://mevislabmodules.svn.sourceforge.net/mevislabmodules/?rev=66&view=rev Author: konrad79 Date: 2009-06-16 06:51:26 +0000 (Tue, 16 Jun 2009) Log Message: ----------- METK: first submission for testing (Documentation) Added Paths: ----------- trunk/Community/METK/Documentation/ trunk/Community/METK/Documentation/Publish/ trunk/Community/METK/Documentation/Publish/ModuleReference/ trunk/Community/METK/Documentation/Publish/ModuleReference/author-detail.html trunk/Community/METK/Documentation/Publish/ModuleReference/author.html trunk/Community/METK/Documentation/Publish/ModuleReference/detail.png trunk/Community/METK/Documentation/Publish/ModuleReference/dll-detail.html trunk/Community/METK/Documentation/Publish/ModuleReference/dll.html trunk/Community/METK/Documentation/Publish/ModuleReference/file-detail.html trunk/Community/METK/Documentation/Publish/ModuleReference/file.html trunk/Community/METK/Documentation/Publish/ModuleReference/fileopen.png trunk/Community/METK/Documentation/Publish/ModuleReference/genre-detail.html trunk/Community/METK/Documentation/Publish/ModuleReference/genre.html trunk/Community/METK/Documentation/Publish/ModuleReference/index.html trunk/Community/METK/Documentation/Publish/ModuleReference/keyword-detail.html trunk/Community/METK/Documentation/Publish/ModuleReference/keyword.html trunk/Community/METK/Documentation/Publish/ModuleReference/mevislab.png trunk/Community/METK/Documentation/Publish/ModuleReference/name-detail.html trunk/Community/METK/Documentation/Publish/ModuleReference/name.html trunk/Community/METK/Documentation/Publish/ModuleReference/nodoc.html trunk/Community/METK/Documentation/Publish/ModuleReference/simple.png trunk/Community/METK/Documentation/Publish/ModuleReference/status-detail.html trunk/Community/METK/Documentation/Publish/ModuleReference/status.html trunk/Community/METK/Documentation/Sources/ Added: trunk/Community/METK/Documentation/Publish/ModuleReference/author-detail.html =================================================================== --- trunk/Community/METK/Documentation/Publish/ModuleReference/author-detail.html (rev 0) +++ trunk/Community/METK/Documentation/Publish/ModuleReference/author-detail.html 2009-06-16 06:51:26 UTC (rev 66) @@ -0,0 +1,31 @@ +<html> +<head> +<title>UMD METK Package Reference</title> +</head> <meta http-equiv='content-type' content='text/html; charset=utf-8'> +<body bgcolor=#FFFFFF text=#000000 link=#AA5522 vlink=#772200 alink=#000000> + +<img src="mevislab.png"> +<h1>UMD METK Package Reference</h1> + +<p> +<b><a href="index.html"><font face="Arial">Main Page</font></b></a> > +<b><font face="Arial">Authors detailed</font></b></p> +</p> +<hr> + +<h2>Authors</h2> +<table border="2"><tr><td>Module</td><td>All Authors</td><td>Type</td> <td>Status</td><td>Genre</td><td>DLL</td><td>Distrib</td><td>Comment</td></tr> +</table> + +<hr> + +<table border="0"> +<tr> + <td>Build date:</td> + <td>Fr Apr 24 10:23:36 2009</td> +</tr> +</table> + +</body> +</html> + Added: trunk/Community/METK/Documentation/Publish/ModuleReference/author.html =================================================================== --- trunk/Community/METK/Documentation/Publish/ModuleReference/author.html (rev 0) +++ trunk/Community/METK/Documentation/Publish/ModuleReference/author.html 2009-06-16 06:51:26 UTC (rev 66) @@ -0,0 +1,31 @@ +<html> +<head> +<title>UMD METK Package Reference</title> +</head> <meta http-equiv='content-type' content='text/html; charset=utf-8'> +<body bgcolor=#FFFFFF text=#000000 link=#AA5522 vlink=#772200 alink=#000000> + +<img src="mevislab.png"> +<h1>UMD METK Package Reference</h1> + +<p> +<b><a href="index.html"><font face="Arial">Main Page</font></b></a> > +<b><font face="Arial">Authors simple</font></b></p> +</p> +<hr> + +<h2>Authors</h2> +<table border="0"> +</table> + +<hr> + +<table border="0"> +<tr> + <td>Build date:</td> + <td>Fr Apr 24 10:23:36 2009</td> +</tr> +</table> + +</body> +</html> + Added: trunk/Community/METK/Documentation/Publish/ModuleReference/detail.png =================================================================== (Binary files differ) Property changes on: trunk/Community/METK/Documentation/Publish/ModuleReference/detail.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/Community/METK/Documentation/Publish/ModuleReference/dll-detail.html =================================================================== --- trunk/Community/METK/Documentation/Publish/ModuleReference/dll-detail.html (rev 0) +++ trunk/Community/METK/Documentation/Publish/ModuleReference/dll-detail.html 2009-06-16 06:51:26 UTC (rev 66) @@ -0,0 +1,31 @@ +<html> +<head> +<title>UMD METK Package Reference</title> +</head> <meta http-equiv='content-type' content='text/html; charset=utf-8'> +<body bgcolor=#FFFFFF text=#000000 link=#AA5522 vlink=#772200 alink=#000000> + +<img src="mevislab.png"> +<h1>UMD METK Package Reference</h1> + +<p> +<b><a href="index.html"><font face="Arial">Main Page</font></b></a> > +<b><font face="Arial">Dlls detailed</font></b></p> +</p> +<hr> + +<h2>Dlls</h2> +<table border="2"><tr><td>Module</td><td>All Authors</td><td>Type</td> <td>Status</td><td>Genre</td><td>DLL</td><td>Comment</td></tr> +</table> + +<hr> + +<table border="0"> +<tr> + <td>Build date:</td> + <td>Fr Apr 24 10:23:36 2009</td> +</tr> +</table> + +</body> +</html> + Added: trunk/Community/METK/Documentation/Publish/ModuleReference/dll.html =================================================================== --- trunk/Community/METK/Documentation/Publish/ModuleReference/dll.html (rev 0) +++ trunk/Community/METK/Documentation/Publish/ModuleReference/dll.html 2009-06-16 06:51:26 UTC (rev 66) @@ -0,0 +1,31 @@ +<html> +<head> +<title>UMD METK Package Reference</title> +</head> <meta http-equiv='content-type' content='text/html; charset=utf-8'> +<body bgcolor=#FFFFFF text=#000000 link=#AA5522 vlink=#772200 alink=#000000> + +<img src="mevislab.png"> +<h1>UMD METK Package Reference</h1> + +<p> +<b><a href="index.html"><font face="Arial">Main Page</font></b></a> > +<b><font face="Arial">Dlls simple</font></b></p> +</p> +<hr> + +<h2>Dlls</h2> +<table border="0"> +</table> + +<hr> + +<table border="0"> +<tr> + <td>Build date:</td> + <td>Fr Apr 24 10:23:36 2009</td> +</tr> +</table> + +</body> +</html> + Added: trunk/Community/METK/Documentation/Publish/ModuleReference/file-detail.html =================================================================== --- trunk/Community/METK/Documentation/Publish/ModuleReference/file-detail.html (rev 0) +++ trunk/Community/METK/Documentation/Publish/ModuleReference/file-detail.html 2009-06-16 06:51:26 UTC (rev 66) @@ -0,0 +1,31 @@ +<html> +<head> +<title>UMD METK Package Reference</title> +</head> <meta http-equiv='content-type' content='text/html; charset=utf-8'> +<body bgcolor=#FFFFFF text=#000000 link=#AA5522 vlink=#772200 alink=#000000> + +<img src="mevislab.png"> +<h1>UMD METK Package Reference</h1> + +<p> +<b><a href="index.html"><font face="Arial">Main Page</font></b></a> > +<b><font face="Arial">Files detailed</font></b></p> +</p> +<hr> + +<h2>Files</h2> +<table border="2"><tr><td>Module</td><td>All Authors</td><td>Type</td> <td>Status</td><td>Genre</td><td>DLL</td><td>Comment</td></tr> +</table> + +<hr> + +<table border="0"> +<tr> + <td>Build date:</td> + <td>Fr Apr 24 10:23:36 2009</td> +</tr> +</table> + +</body> +</html> + Added: trunk/Community/METK/Documentation/Publish/ModuleReference/file.html =================================================================== --- trunk/Community/METK/Documentation/Publish/ModuleReference/file.html (rev 0) +++ trunk/Community/METK/Documentation/Publish/ModuleReference/file.html 2009-06-16 06:51:26 UTC (rev 66) @@ -0,0 +1,31 @@ +<html> +<head> +<title>UMD METK Package Reference</title> +</head> <meta http-equiv='content-type' content='text/html; charset=utf-8'> +<body bgcolor=#FFFFFF text=#000000 link=#AA5522 vlink=#772200 alink=#000000> + +<img src="mevislab.png"> +<h1>UMD METK Package Reference</h1> + +<p> +<b><a href="index.html"><font face="Arial">Main Page</font></b></a> > +<b><font face="Arial">Files simple</font></b></p> +</p> +<hr> + +<h2>Files</h2> +<table border="0"> +</table> + +<hr> + +<table border="0"> +<tr> + <td>Build date:</td> + <td>Fr Apr 24 10:23:36 2009</td> +</tr> +</table> + +</body> +</html> + Added: trunk/Community/METK/Documentation/Publish/ModuleReference/fileopen.png =================================================================== (Binary files differ) Property changes on: trunk/Community/METK/Documentation/Publish/ModuleReference/fileopen.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/Community/METK/Documentation/Publish/ModuleReference/genre-detail.html =================================================================== --- trunk/Community/METK/Documentation/Publish/ModuleReference/genre-detail.html (rev 0) +++ trunk/Community/METK/Documentation/Publish/ModuleReference/genre-detail.html 2009-06-16 06:51:26 UTC (rev 66) @@ -0,0 +1,29 @@ +<html> +<head> +<title>UMD METK Package Reference</title> +</head> <meta http-equiv='content-type' content='text/html; charset=utf-8'> +<body bgcolor=#FFFFFF text=#000000 link=#AA5522 vlink=#772200 alink=#000000> + +<img src="mevislab.png"> +<h1>UMD METK Package Reference</h1> + +<p> +<b><a href="index.html"><font face="Arial">Main Page</font></b></a> > +<b><font face="Arial">Genres detailed</font></b></p> +</p> +<hr> + +<h2>Genres</h2> + +<hr> + +<table border="0"> +<tr> + <td>Build date:</td> + <td>Fr Apr 24 10:23:36 2009</td> +</tr> +</table> + +</body> +</html> + Added: trunk/Community/METK/Documentation/Publish/ModuleReference/genre.html =================================================================== --- trunk/Community/METK/Documentation/Publish/ModuleReference/genre.html (rev 0) +++ trunk/Community/METK/Documentation/Publish/ModuleReference/genre.html 2009-06-16 06:51:26 UTC (rev 66) @@ -0,0 +1,29 @@ +<html> +<head> +<title>UMD METK Package Reference</title> +</head> <meta http-equiv='content-type' content='text/html; charset=utf-8'> +<body bgcolor=#FFFFFF text=#000000 link=#AA5522 vlink=#772200 alink=#000000> + +<img src="mevislab.png"> +<h1>UMD METK Package Reference</h1> + +<p> +<b><a href="index.html"><font face="Arial">Main Page</font></b></a> > +<b><font face="Arial">Genres simple</font></b></p> +</p> +<hr> + +<h2>Genres</h2> + +<hr> + +<table border="0"> +<tr> + <td>Build date:</td> + <td>Fr Apr 24 10:23:36 2009</td> +</tr> +</table> + +</body> +</html> + Added: trunk/Community/METK/Documentation/Publish/ModuleReference/index.html =================================================================== --- trunk/Community/METK/Documentation/Publish/ModuleReference/index.html (rev 0) +++ trunk/Community/METK/Documentation/Publish/ModuleReference/index.html 2009-06-16 06:51:26 UTC (rev 66) @@ -0,0 +1,73 @@ +<html> +<head> +<title>UMD METK Package Reference</title> +</head> <meta http-equiv='content-type' content='text/html; charset=utf-8'> +<body bgcolor=#FFFFFF text=#000000 link=#AA5522 vlink=#772200 alink=#000000> + +<img src="mevislab.png"> +<h1>UMD METK Package Reference</h1> + +<p> +<b><font face="Arial">Main Page</font></b></p> +</p> +<hr> + + +<h2><a name="index">Sorting categories:</a></h2> +<table border="0"> + +<tr> + <td><a href="author.html"><b>Author</b></a></td> + <td><a href="author-detail.html"><img src="detail.png" border=0 alt="Detailed Authors List"></a></td> + <td>[0]</td> +</tr> + +<tr> + <td><a href="dll.html"><b>DLL</b></a></td> + <td><a href="dll-detail.html"><img src="detail.png" border=0 alt="Detailed DLL List"></a></td> + <td>[0]</td> +</tr> + +<tr> + <td><a href="file.html"><b>File</b></a></td> + <td><a href="file-detail.html"><img src="detail.png" border=0 alt="Detailed Files List"></a></td> + <td>[0]</td> +</tr> + +<tr> + <td><a href="genre.html"><b>Genre</b></a></td> + <td><a href="genre-detail.html"><img src="detail.png" border=0 alt="Detailed Genres List"></a></td> + <td>[0]</td> +</tr> + +<tr> + <td><a href="keyword.html"><b>Keywords</b></a></td> + <td><a href="keyword-detail.html"><img src="detail.png" border=0 alt="Detailed Keywords List"></a></td> + <td>[0]</td> +</tr> + +<tr> + <td><a href="name.html"><b>Name</b></a></td> + <td><a href="name-detail.html"><img src="detail.png" border=0 alt="Detailed Names List"></a></td> + <td>[0]</td> +</tr> + +<tr> + <td><a href="status.html"><b>Status</b></a></td> + <td><a href="status-detail.html"><img src="detail.png" border=0 alt="Detailed Status List"></a></td> + <td>[0]</td> +</tr> +</table> +<hr> + + +<table border="0"> +<tr> + <td>Build date:</td> + <td>Fr Apr 24 10:23:36 2009</td> +</tr> +</table> + +</body> +</html> + Added: trunk/Community/METK/Documentation/Publish/ModuleReference/keyword-detail.html =================================================================== --- trunk/Community/METK/Documentation/Publish/ModuleReference/keyword-detail.html (rev 0) +++ trunk/Community/METK/Documentation/Publish/ModuleReference/keyword-detail.html 2009-06-16 06:51:26 UTC (rev 66) @@ -0,0 +1,31 @@ +<html> +<head> +<title>UMD METK Package Reference</title> +</head> <meta http-equiv='content-type' content='text/html; charset=utf-8'> +<body bgcolor=#FFFFFF text=#000000 link=#AA5522 vlink=#772200 alink=#000000> + +<img src="mevislab.png"> +<h1>UMD METK Package Reference</h1> + +<p> +<b><a href="index.html"><font face="Arial">Main Page</font></b></a> > +<b><font face="Arial">Keywords detailed</font></b></p> +</p> +<hr> + +<h2>Keywords</h2> +<table border="2"><tr><td>Module</td><td>All Authors</td><td>Type</td> <td>Status</td><td>Genre</td><td>DLL</td><td>Comment</td></tr> +</table> + +<hr> + +<table border="0"> +<tr> + <td>Build date:</td> + <td>Fr Apr 24 10:23:36 2009</td> +</tr> +</table> + +</body> +</html> + Added: trunk/Community/METK/Documentation/Publish/ModuleReference/keyword.html =================================================================== --- trunk/Community/METK/Documentation/Publish/ModuleReference/keyword.html (rev 0) +++ trunk/Community/METK/Documentation/Publish/ModuleReference/keyword.html 2009-06-16 06:51:26 UTC (rev 66) @@ -0,0 +1,31 @@ +<html> +<head> +<title>UMD METK Package Reference</title> +</head> <meta http-equiv='content-type' content='text/html; charset=utf-8'> +<body bgcolor=#FFFFFF text=#000000 link=#AA5522 vlink=#772200 alink=#000000> + +<img src="mevislab.png"> +<h1>UMD METK Package Reference</h1> + +<p> +<b><a href="index.html"><font face="Arial">Main Page</font></b></a> > +<b><font face="Arial">Keywords simple</font></b></p> +</p> +<hr> + +<h2>Keywords</h2> +<table border="0"> +</table> + +<hr> + +<table border="0"> +<tr> + <td>Build date:</td> + <td>Fr Apr 24 10:23:36 2009</td> +</tr> +</table> + +</body> +</html> + Added: trunk/Community/METK/Documentation/Publish/ModuleReference/mevislab.png =================================================================== (Binary files differ) Property changes on: trunk/Community/METK/Documentation/Publish/ModuleReference/mevislab.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/Community/METK/Documentation/Publish/ModuleReference/name-detail.html =================================================================== --- trunk/Community/METK/Documentation/Publish/ModuleReference/name-detail.html (rev 0) +++ trunk/Community/METK/Documentation/Publish/ModuleReference/name-detail.html 2009-06-16 06:51:26 UTC (rev 66) @@ -0,0 +1,31 @@ +<html> +<head> +<title>UMD METK Package Reference</title> +</head> <meta http-equiv='content-type' content='text/html; charset=utf-8'> +<body bgcolor=#FFFFFF text=#000000 link=#AA5522 vlink=#772200 alink=#000000> + +<img src="mevislab.png"> +<h1>UMD METK Package Reference</h1> + +<p> +<b><a href="index.html"><font face="Arial">Main Page</font></b></a> > +<b><font face="Arial">Names detailed</font></b></p> +</p> +<hr> + +<h2>Names</h2> +<table border="2"><tr><td></td><td>Module</td><td>All Authors</td><td>Type</td> <td>Status</td><td>Genre</td><td>DLL</td><td>Comment</td></tr> +</table> + +<hr> + +<table border="0"> +<tr> + <td>Build date:</td> + <td>Fr Apr 24 10:23:36 2009</td> +</tr> +</table> + +</body> +</html> + Added: trunk/Community/METK/Documentation/Publish/ModuleReference/name.html =================================================================== --- trunk/Community/METK/Documentation/Publish/ModuleReference/name.html (rev 0) +++ trunk/Community/METK/Documentation/Publish/ModuleReference/name.html 2009-06-16 06:51:26 UTC (rev 66) @@ -0,0 +1,31 @@ +<html> +<head> +<title>UMD METK Package Reference</title> +</head> <meta http-equiv='content-type' content='text/html; charset=utf-8'> +<body bgcolor=#FFFFFF text=#000000 link=#AA5522 vlink=#772200 alink=#000000> + +<img src="mevislab.png"> +<h1>UMD METK Package Reference</h1> + +<p> +<b><a href="index.html"><font face="Arial">Main Page</font></b></a> > +<b><font face="Arial">Names simple</font></b></p> +</p> +<hr> + +<h2>Names</h2> +<table border="0"> +</table> + +<hr> + +<table border="0"> +<tr> + <td>Build date:</td> + <td>Fr Apr 24 10:23:36 2009</td> +</tr> +</table> + +</body> +</html> + Added: trunk/Community/METK/Documentation/Publish/ModuleReference/nodoc.html =================================================================== --- trunk/Community/METK/Documentation/Publish/ModuleReference/nodoc.html (rev 0) +++ trunk/Community/METK/Documentation/Publish/ModuleReference/nodoc.html 2009-06-16 06:51:26 UTC (rev 66) @@ -0,0 +1,10 @@ +<html> +<head> +<title>No Documentation</title> +</head> <meta http-equiv='content-type' content='text/html; charset=utf-8'> +<body bgcolor=#FFFFFF text=#000000 link=#AA5522 vlink=#772200 alink=#000000> + +No documentation available + +</body> +</html> Added: trunk/Community/METK/Documentation/Publish/ModuleReference/simple.png =================================================================== (Binary files differ) Property changes on: trunk/Community/METK/Documentation/Publish/ModuleReference/simple.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/Community/METK/Documentation/Publish/ModuleReference/status-detail.html =================================================================== --- trunk/Community/METK/Documentation/Publish/ModuleReference/status-detail.html (rev 0) +++ trunk/Community/METK/Documentation/Publish/ModuleReference/status-detail.html 2009-06-16 06:51:26 UTC (rev 66) @@ -0,0 +1,31 @@ +<html> +<head> +<title>UMD METK Package Reference</title> +</head> <meta http-equiv='content-type' content='text/html; charset=utf-8'> +<body bgcolor=#FFFFFF text=#000000 link=#AA5522 vlink=#772200 alink=#000000> + +<img src="mevislab.png"> +<h1>UMD METK Package Reference</h1> + +<p> +<b><a href="index.html"><font face="Arial">Main Page</font></b></a> > +<b><font face="Arial">Status detailed</font></b></p> +</p> +<hr> + +<h2>Status</h2> +<table border="2"><tr><td>Module</td><td>All Authors</td><td>Type</td> <td>Status</td><td>Genre</td><td>DLL</td><td>Comment</td></tr> +</table> + +<hr> + +<table border="0"> +<tr> + <td>Build date:</td> + <td>Fr Apr 24 10:23:36 2009</td> +</tr> +</table> + +</body> +</html> + Added: trunk/Community/METK/Documentation/Publish/ModuleReference/status.html =================================================================== --- trunk/Community/METK/Documentation/Publish/ModuleReference/status.html (rev 0) +++ trunk/Community/METK/Documentation/Publish/ModuleReference/status.html 2009-06-16 06:51:26 UTC (rev 66) @@ -0,0 +1,31 @@ +<html> +<head> +<title>UMD METK Package Reference</title> +</head> <meta http-equiv='content-type' content='text/html; charset=utf-8'> +<body bgcolor=#FFFFFF text=#000000 link=#AA5522 vlink=#772200 alink=#000000> + +<img src="mevislab.png"> +<h1>UMD METK Package Reference</h1> + +<p> +<b><a href="index.html"><font face="Arial">Main Page</font></b></a> > +<b><font face="Arial">Status simple</font></b></p> +</p> +<hr> + +<h2>Status</h2> +<table border="0"> +</table> + +<hr> + +<table border="0"> +<tr> + <td>Build date:</td> + <td>Fr Apr 24 10:23:36 2009</td> +</tr> +</table> + +</body> +</html> + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <kon...@us...> - 2009-06-16 06:50:49
|
Revision: 65 http://mevislabmodules.svn.sourceforge.net/mevislabmodules/?rev=65&view=rev Author: konrad79 Date: 2009-06-16 06:50:44 +0000 (Tue, 16 Jun 2009) Log Message: ----------- METK: first submission for testing (sources) Added Paths: ----------- trunk/Community/METK/Sources/ trunk/Community/METK/Sources/Inventor/ trunk/Community/METK/Sources/Inventor/UMDVisLogo/ trunk/Community/METK/Sources/Inventor/UMDVisLogo/SoVisLogo.cpp trunk/Community/METK/Sources/Inventor/UMDVisLogo/SoVisLogo.h trunk/Community/METK/Sources/Inventor/UMDVisLogo/UMDVisLogo.bat trunk/Community/METK/Sources/Inventor/UMDVisLogo/UMDVisLogo.pro trunk/Community/METK/Sources/Inventor/UMDVisLogo/UMDVisLogoInit.cpp trunk/Community/METK/Sources/Inventor/UMDVisLogo/UMDVisLogoInit.h trunk/Community/METK/Sources/Inventor/UMDVisLogo/UMDVisLogoSystem.h trunk/Community/METK/Sources/common/ trunk/Community/METK/Sources/common/HashTable.h trunk/Community/METK/Sources/common/ObjMgrCommunicator.cpp trunk/Community/METK/Sources/common/ObjMgrCommunicator.h trunk/Community/METK/Sources/common/StdAfx.cpp trunk/Community/METK/Sources/common/StdAfx.h trunk/Community/METK/Sources/common/StrList.h trunk/Community/METK/Sources/common/XMLParser.cpp trunk/Community/METK/Sources/common/XMLParser.h trunk/Community/METK/Sources/common/common.bat trunk/Community/METK/Sources/common/common.pro trunk/Community/METK/Sources/common/image_basic.cpp trunk/Community/METK/Sources/common/image_basic.h trunk/Community/METK/Sources/common/kBasics.cpp trunk/Community/METK/Sources/common/kBasics.h trunk/Community/METK/Sources/common/kCamera.cpp trunk/Community/METK/Sources/common/kCamera.h trunk/Community/METK/Sources/common/kDebug.cpp trunk/Community/METK/Sources/common/kDebug.h trunk/Community/METK/Sources/common/kSphere.cpp trunk/Community/METK/Sources/common/kSphere.h trunk/Community/METK/Sources/common/matrix.h Added: trunk/Community/METK/Sources/Inventor/UMDVisLogo/SoVisLogo.cpp =================================================================== --- trunk/Community/METK/Sources/Inventor/UMDVisLogo/SoVisLogo.cpp (rev 0) +++ trunk/Community/METK/Sources/Inventor/UMDVisLogo/SoVisLogo.cpp 2009-06-16 06:50:44 UTC (rev 65) @@ -0,0 +1,408 @@ +//---------------------------------------------------------------------------------- +//! The Inventor module class SoVisLogo +/*! +// \file SoVisLogo.cpp +// \author Konrad M\xFChler +// \date 2007-06-12 +// +// +*/ +//---------------------------------------------------------------------------------- + +// Local includes +#include "SoVisLogo.h" + +// Wrap inventor includes into XVEnterScope and XVLeaveScope to avoid +// collisions between OpenInventor and Windows headers. +#include "XVEnterScope.h" +#if defined(SGI_VERSION) && SGI_VERSION >= 20200 +# include <Inventor/SoTrace.h> +#endif +#ifndef SO_TRACE_IN +# define SO_TRACE_IN(__classAndMethod___) +#endif +#include <Inventor/actions/SoGLRenderAction.h> +// TODO: include more inventor things here +#include "XVLeaveScope.h" + +#include <GL/glaux.h> +#pragma warning( disable : 4611 ) +#include "png.h" + +SO_NODE_SOURCE(SoVisLogo) + + +// -------------------------------------------------------------------------- +//! Initializes this class. Called on dll initialization. +// -------------------------------------------------------------------------- +void SoVisLogo::initClass() +{ + SO_NODE_INIT_CLASS(SoVisLogo, SoShape, "Shape"); +} + +// -------------------------------------------------------------------------- +//! Constructor, creates fields +// -------------------------------------------------------------------------- +SoVisLogo::SoVisLogo() +{ + SO_TRACE_IN("SoVisLogo::SoVisLogo") + + // Execute inventor internal stuff for node construction. + SO_NODE_CONSTRUCTOR(SoVisLogo); + + SO_NODE_ADD_FIELD(fldLocalPath, ("")); + + SO_NODE_ADD_FIELD(fldFilename, (vislogo)); + SO_NODE_DEFINE_ENUM_VALUE(logoNames, vislogo); + SO_NODE_DEFINE_ENUM_VALUE(logoNames, otto); + SO_NODE_DEFINE_ENUM_VALUE(logoNames, otto2); + SO_NODE_DEFINE_ENUM_VALUE(logoNames, lst); + SO_NODE_DEFINE_ENUM_VALUE(logoNames, neck); + SO_NODE_SET_SF_ENUM_TYPE(fldFilename, logoNames); + + SO_NODE_ADD_FIELD(fldCorner, (topright)); + SO_NODE_DEFINE_ENUM_VALUE(corners, topright); + SO_NODE_DEFINE_ENUM_VALUE(corners, topleft); + SO_NODE_DEFINE_ENUM_VALUE(corners, bottomright); + SO_NODE_DEFINE_ENUM_VALUE(corners, bottomleft); + SO_NODE_SET_SF_ENUM_TYPE(fldCorner, corners); + + + // Create a sensor calling _nodeChangedCB if any field changes. Use a priority 0 + // sensor to be sure that changes are not delayed or collected. + _nodeSensor = new SoNodeSensor(SoVisLogo::nodeChangedCB, this); + _nodeSensor->setPriority(0); + _nodeSensor->attach(this); + + filenameSensor = new SoFieldSensor(filenameChangedCB, this); + filenameSensor->setPriority(0); + filenameSensor->attach(&fldLocalPath); + localPathSensor = new SoFieldSensor(filenameChangedCB, this); + localPathSensor->setPriority(0); + localPathSensor->attach(&fldFilename); +} + +// -------------------------------------------------------------------------- +//! Protected destructor to cleans up internally created nodes and node sensor. +// -------------------------------------------------------------------------- +SoVisLogo::~SoVisLogo() +{ + SO_TRACE_IN("SoVisLogo::~SoVisLogo") + // Remove the node sensor. + if (_nodeSensor){ delete _nodeSensor; _nodeSensor = NULL; } +} + +//----------------------------------------------------------------------------- +// Called by nodeSensor when any field in node changes. Only redirect the call +// of this static function to the nodeChanged method. +//----------------------------------------------------------------------------- +void SoVisLogo::nodeChangedCB(void *data, SoSensor* sens) +{ + SO_TRACE_IN("SoVisLogo::nodeChangedCB") + + ((SoVisLogo*) data)->nodeChanged((SoNodeSensor*)sens); +} + +//----------------------------------------------------------------------------- +//! Called on any change on the node, field might by also NULL +//----------------------------------------------------------------------------- +void SoVisLogo::nodeChanged(SoNodeSensor* /*sensor*/) +{ + SO_TRACE_IN("SoVisLogo::nodeChanged") + + // Get the field which caused the notification. + //SoField* field = sensor->getTriggerField(); + + // Handle changed fields here +} + + +//! called whenever the scene is rendered +void SoVisLogo::GLRender(SoGLRenderAction *action) +{ + SO_TRACE_IN("SoVisLogo::GLRender") + + // Save the current transformation and attribute state of OpenGL. + glMatrixMode (GL_PROJECTION); + glPushMatrix(); + glMatrixMode (GL_MODELVIEW); + glPushMatrix(); + glPushAttrib(GL_ALL_ATTRIB_BITS); + glDisable(GL_LIGHTING); + + SoState * state = action->getState(); + const SbViewportRegion & vp = SoViewportRegionElement::get(state); + + glDisable(GL_DEPTH_TEST); + + glMatrixMode (GL_MODELVIEW); + glLoadIdentity(); //Einheitsmatrix + glMatrixMode(GL_PROJECTION); //"2D"-Modus + glLoadIdentity(); //Einheitsmatrix + + if (load_result!=NULL && png_image!=NULL) + { + glEnable(GL_TEXTURE_2D); + glEnable(GL_BLEND); + //glBlendFunc(GL_SRC_ALPHA,GL_ONE_MINUS_SRC_ALPHA); + + GLuint textureID; + glGenTextures( 1, &textureID ); + glBindTexture( GL_TEXTURE_2D, textureID ); + glPixelStorei(GL_UNPACK_ALIGNMENT, 1); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); + glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); + glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, img_width, img_height, 0, GL_RGBA, GL_UNSIGNED_BYTE, png_image); + + glBegin(GL_POLYGON); + float border = 10.0; + float scale = 1.0; + if (fldCorner.getValue()==bottomleft) + { + glTexCoord2f(0.0, 0.0);glVertex2f(-1.0f + 2.0f*(float)border/(float)vp.getWindowSize()[0], -1.0f + 2.0f*(float)border/(float)vp.getWindowSize()[1]); + glTexCoord2f(1.0, 0.0);glVertex2f(-1.0f + 2.0f*(float)(img_width*scale+border)/(float)vp.getWindowSize()[0], -1.0f + 2.0f*(float)border/(float)vp.getWindowSize()[1]); + glTexCoord2f(1.0, 1.0);glVertex2f(-1.0f + 2.0f*(float)(img_width*scale+border)/(float)vp.getWindowSize()[0], -1.0f+2.0f*(float)(img_height*scale+border)/(float)vp.getWindowSize()[1]); + glTexCoord2f(0.0, 1.0);glVertex2f(-1.0f + 2.0f*(float)border/(float)vp.getWindowSize()[0],-1.0f + 2.0f*(float)(img_height*scale+border)/(float)vp.getWindowSize()[1]); + } + else if (fldCorner.getValue()==bottomright) + { + glTexCoord2f(0.0, 0.0);glVertex2f(1.0f - 2.0f*(float)(img_width*scale+border)/(float)vp.getWindowSize()[0], -1.0f + 2.0f*(float)border/(float)vp.getWindowSize()[1]); + glTexCoord2f(1.0, 0.0);glVertex2f(1.0f - (float)(border)/(float)vp.getWindowSize()[0], -1.0f + 2.0f*(float)border/(float)vp.getWindowSize()[1]); + glTexCoord2f(1.0, 1.0);glVertex2f(1.0f - (float)(border)/(float)vp.getWindowSize()[0], -1.0f + 2.0f*(float)(img_height*scale+border)/(float)vp.getWindowSize()[1]); + glTexCoord2f(0.0, 1.0);glVertex2f(1.0f - 2.0f*(float)(img_width*scale+border)/(float)vp.getWindowSize()[0],-1.0f + 2.0f*(float)(img_height*scale+border)/(float)vp.getWindowSize()[1]); + } + else if (fldCorner.getValue()==topright) + { + glTexCoord2f(0.0, 0.0);glVertex2f(1.0f - 2.0f*(float)(img_width*scale+border)/(float)vp.getWindowSize()[0], 1.0f - 2.0f*(float)(img_height*scale+border)/(float)vp.getWindowSize()[1]); + glTexCoord2f(1.0, 0.0);glVertex2f(1.0f - (float)(border)/(float)vp.getWindowSize()[0], 1.0f - 2.0f*(float)(img_height*scale+border)/(float)vp.getWindowSize()[1]); + glTexCoord2f(1.0, 1.0);glVertex2f(1.0f - (float)(border)/(float)vp.getWindowSize()[0], 1.0f - 2.0f*(float)(border)/(float)vp.getWindowSize()[1]); + glTexCoord2f(0.0, 1.0);glVertex2f(1.0f - 2.0f*(float)(img_width*scale+border)/(float)vp.getWindowSize()[0], 1.0f - 2.0f*(float)border/(float)vp.getWindowSize()[1]); + } + else if (fldCorner.getValue()==topleft) + { + glTexCoord2f(0.0, 0.0);glVertex2f(-1.0f + 2.0f*(float)border/(float)vp.getWindowSize()[0], 1.0f - 2.0f*(float)(img_height*scale+border)/(float)vp.getWindowSize()[1]); + glTexCoord2f(1.0, 0.0);glVertex2f(-1.0f + 2.0f*(float)(img_width*scale+border)/(float)vp.getWindowSize()[0], 1.0f - 2.0f*(float)(img_height*scale+border)/(float)vp.getWindowSize()[1]); + glTexCoord2f(1.0, 1.0);glVertex2f(-1.0f + 2.0f*(float)(img_width*scale+border)/(float)vp.getWindowSize()[0], 1.0f - 2.0f*(float)(border)/(float)vp.getWindowSize()[1]); + glTexCoord2f(0.0, 1.0);glVertex2f(-1.0f + 2.0f*(float)border/(float)vp.getWindowSize()[0], 1.0f - 2.0f*(float)border/(float)vp.getWindowSize()[1]); + } + //std::cout << "img_w:" << img_width << " windowSize[0]" << vp.getWindowSize()[0] << std::endl; + //std::cout << "x:" << -1.0f+2.0f*(float)img_width/(float)vp.getWindowSize()[0] << " y:" << -1.0f+2.0f*(float)img_height/(float)vp.getWindowSize()[1] << std::endl; + glEnd(); + glEnable(GL_DEPTH_TEST); + glDisable(GL_TEXTURE_2D); + } + //else std::cout << "result!=NULL oder image!=NULL" << std::endl; + + glFlush(); + + // Restore the transformation and attribute state of OpenGL. + glPopAttrib(); + glMatrixMode (GL_MODELVIEW); + glPopMatrix(); + glMatrixMode (GL_PROJECTION); + glPopMatrix(); + glMatrixMode (GL_MODELVIEW); +} + +//! called when an SoEvent is passed through the scene +void SoVisLogo::handleEvent(SoHandleEventAction* /*action*/) +{ + SO_TRACE_IN("SoVisLogo::handleEvent") + // TODO +} + +//! called when a scene bounding box is computed +void SoVisLogo::computeBBox(SoAction* /*action*/, SbBox3f& /*box*/, SbVec3f& /*center*/) +{ + SO_TRACE_IN("SoVisLogo::computeBBox") + // TODO +} + +//! called by the generate primitives action +void SoVisLogo::generatePrimitives(SoAction* /*action*/) +{ + SO_TRACE_IN("SoVisLogo::generatePrimitives") + // TODO +} + +//! called by the ray pick action +void SoVisLogo::rayPick(SoRayPickAction* /*action*/) +{ + SO_TRACE_IN("SoVisLogo::rayPick") + // TODO +} + + + +int SoVisLogo::pngLoad(const char *file, unsigned long &pwidth, unsigned long &pheight, char* &image_data_ptr) +{ + FILE *infile; /* PNG file pointer */ + png_structp png_ptr; /* internally used by libpng */ + png_infop info_ptr; /* user requested transforms */ + + char *image_data; /* raw png image data */ + char sig[8]; /* PNG signature array */ + + int bit_depth; + int color_type; + + unsigned long width; /* PNG image width in pixels */ + unsigned long height; /* PNG image height in pixels */ + unsigned int rowbytes; /* raw bytes at row n in image */ + + image_data = NULL; + png_bytepp row_pointers = NULL; + + /* Open the file. */ + infile = fopen(file, "rb"); + if (!infile) return 0; + + /* + * 13.3 readpng_init() + */ + + /* Check for the 8-byte signature */ + fread(sig, 1, 8, infile); + + if (!png_check_sig((unsigned char *) sig, 8)) { + fclose(infile); + return 0; + } + + /* + * Set up the PNG structs + */ + png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL); + if (!png_ptr) { + fclose(infile); + return 4; /* out of memory */ + } + + info_ptr = png_create_info_struct(png_ptr); + if (!info_ptr) { + png_destroy_read_struct(&png_ptr, (png_infopp) NULL, (png_infopp) NULL); + fclose(infile); + return 4; /* out of memory */ + } + + + /* + * block to handle libpng errors, + * then check whether the PNG file had a bKGD chunk + */ + if (setjmp(png_jmpbuf(png_ptr))) { + png_destroy_read_struct(&png_ptr, &info_ptr, NULL); + fclose(infile); + return 0; + } + + /* + * takes our file stream pointer (infile) and + * stores it in the png_ptr struct for later use. + */ + /* png_ptr->io_ptr = (png_voidp)infile;*/ + png_init_io(png_ptr, infile); + + /* + * lets libpng know that we already checked the 8 + * signature bytes, so it should not expect to find + * them at the current file pointer location + */ + png_set_sig_bytes(png_ptr, 8); + + /* Read the image info.*/ + + /* + * reads and processes not only the PNG file's IHDR chunk + * but also any other chunks up to the first IDAT + * (i.e., everything before the image data). + */ + + /* read all the info up to the image data */ + png_read_info(png_ptr, info_ptr); + + png_get_IHDR(png_ptr, info_ptr, &width, &height, &bit_depth, + &color_type, NULL, NULL, NULL); + + pwidth = width; + pheight = height; + + /* Set up some transforms. */ + if (color_type & PNG_COLOR_MASK_ALPHA) { +// std::cout << "ALPHA1" << std::endl; + png_set_strip_alpha(png_ptr); + } + if (bit_depth > 8) { + png_set_strip_16(png_ptr); +// std::cout << "RGB>8" << std::endl; + } + if (color_type == PNG_COLOR_TYPE_GRAY || + color_type == PNG_COLOR_TYPE_GRAY_ALPHA) { + png_set_gray_to_rgb(png_ptr); +// std::cout << "GRAY" << std::endl; + } + if (color_type == PNG_COLOR_TYPE_PALETTE) { + png_set_palette_to_rgb(png_ptr); +// std::cout << "PALETTE" << std::endl; + } + + /* Update the png info struct.*/ + png_read_update_info(png_ptr, info_ptr); + + /* Rowsize in bytes. */ + rowbytes = png_get_rowbytes(png_ptr, info_ptr); + + + /* Allocate the image_data buffer. */ + if ((image_data = (char *) malloc(rowbytes * height))==NULL) { + png_destroy_read_struct(&png_ptr, &info_ptr, NULL); + return 4; + } + + if ((row_pointers = (png_bytepp)malloc(height*sizeof(png_bytep))) == NULL) { + png_destroy_read_struct(&png_ptr, &info_ptr, NULL); + free(image_data); + image_data = NULL; + return 4; + } + + /* set the individual row_pointers to point at the correct offsets */ + unsigned int i; + for (i = 0; i < height; ++i) + row_pointers[height - 1 - i] = (png_byte * ) image_data + i*rowbytes; + + /* now we can go ahead and just read the whole image */ + png_read_image(png_ptr, row_pointers); + + /* and we're done! (png_read_end() can be omitted if no processing of + * post-IDAT text/time/etc. is desired) */ + + /* Clean up. */ + free(row_pointers); + + /* Clean up. */ + png_destroy_read_struct(&png_ptr, &info_ptr, NULL); + fclose(infile); + + image_data_ptr = image_data; + + return 1; +} + + +void SoVisLogo::filenameChangedCB(void *data, SoSensor* ) +{ + std::string logoNamesStr[5] = {"vislogo.png", "otto.png", "otto2.png", "lst.png", "neck.png"}; + SoVisLogo *myself = (SoVisLogo *)data; + if (myself->fldFilename.getValue()>=5) return; + std::string filename = std::string(myself->fldLocalPath.getValue().getString())+"/"+logoNamesStr[myself->fldFilename.getValue()]; + //std::cout << filename << std::endl; + myself->load_result = myself->pngLoad(filename.c_str(), myself->img_width, myself->img_height, myself->png_image); +} + + +void SoVisLogo::activateAttachments() +{ + fldFilename.touch(); +} \ No newline at end of file Added: trunk/Community/METK/Sources/Inventor/UMDVisLogo/SoVisLogo.h =================================================================== --- trunk/Community/METK/Sources/Inventor/UMDVisLogo/SoVisLogo.h (rev 0) +++ trunk/Community/METK/Sources/Inventor/UMDVisLogo/SoVisLogo.h 2009-06-16 06:50:44 UTC (rev 65) @@ -0,0 +1,101 @@ +//---------------------------------------------------------------------------------- +//! The Inventor module class SoVisLogo derived from SoShape +/*! +// \file SoVisLogo.h +// \author Konrad M\xFChler +// \date 2007-06-12 +// +// +*/ +//---------------------------------------------------------------------------------- + +#ifndef __SOVISLOGO_H__ +#define __SOVISLOGO_H__ + + +// Local includes +#include "UMDVisLogoSystem.h" + +// Wrap inventor includes into XVEnterScope and XVLeaveScope to avoid +// collisions between OpenInventor and Windows headers. +#include "XVEnterScope.h" +#include <Inventor/nodes/SoSubNode.h> +#include <Inventor/nodes/SoShape.h> + +#include <Inventor/elements/SoViewportRegionElement.h> + +// include used fields +#include <Inventor/fields/SoSFString.h> +#include <Inventor/fields/SoSFEnum.h> +#include <Inventor/sensors/SoNodeSensor.h> +#include <Inventor/sensors/SoFieldSensor.h> +#include "XVLeaveScope.h" + +//! +class UMDVISLOGO_EXPORT SoVisLogo : public SoShape +{ + //! Implements the runtime type system interface of this new node. + SO_NODE_HEADER(SoVisLogo); + +public: + //! Constructor + SoVisLogo(); + + //! Initializes this class (called on dll initialization). + static void initClass(); + + //@{! Fields + + SoSFString fldLocalPath; + SoSFEnum fldFilename; + SoSFEnum fldCorner; + + //@} + + //! called whenever the scene is rendered + virtual void GLRender(SoGLRenderAction *action); + //! called when an SoEvent is passed through the scene + virtual void handleEvent(SoHandleEventAction *action); + //! called when a scene bounding box is computed + virtual void computeBBox(SoAction * action, SbBox3f &box, SbVec3f ¢er); + //! called by the generate primitives action + virtual void generatePrimitives(SoAction *action); + //! called by the ray pick action + virtual void rayPick(SoRayPickAction *action); + +protected: + //! Protected destructor + virtual ~SoVisLogo(); + + //! Sensor to detect changes in node's fields. + SoNodeSensor* _nodeSensor; + + //! Called by \c _nodeSensor when any field in node changes. + //! Only redirects the call of this static function to the + //! class method \c nodeChanged. + static void nodeChangedCB(void *data, SoSensor* sens); + + //! Called by the static function \c _nodeChangedCB to notify node changes. + void nodeChanged(SoNodeSensor* sensor); + + SoFieldSensor* filenameSensor; + SoFieldSensor* localPathSensor; + static void filenameChangedCB(void *, SoSensor *); + + enum logoNames {vislogo, otto, otto2, lst, neck}; //Defintion der Filenames in filenameChangedCB + enum corners {topleft, topright, bottomleft, bottomright}; + +private: + + unsigned long load_result, img_width, img_height; + char* png_image; + char *filename; + + int pngLoad(const char *file, unsigned long &pwidth, unsigned long &pheight, char* &image_data_ptr); + + void activateAttachments(); +}; + +#endif // __SOVISLOGO_H + + Added: trunk/Community/METK/Sources/Inventor/UMDVisLogo/UMDVisLogo.bat =================================================================== --- trunk/Community/METK/Sources/Inventor/UMDVisLogo/UMDVisLogo.bat (rev 0) +++ trunk/Community/METK/Sources/Inventor/UMDVisLogo/UMDVisLogo.bat 2009-06-16 06:50:44 UTC (rev 65) @@ -0,0 +1 @@ +"%MLAB_ROOT%\MeVis\Foundation\BuildTools\Scripts\createProject.bat" UMDVisLogo \ No newline at end of file Added: trunk/Community/METK/Sources/Inventor/UMDVisLogo/UMDVisLogo.pro =================================================================== --- trunk/Community/METK/Sources/Inventor/UMDVisLogo/UMDVisLogo.pro (rev 0) +++ trunk/Community/METK/Sources/Inventor/UMDVisLogo/UMDVisLogo.pro 2009-06-16 06:50:44 UTC (rev 65) @@ -0,0 +1,41 @@ +# ----------------------------------------------------------------------------- +# UMDVisLogo project profile +# +# \file UMDVisLogo.pro +# \author Konrad M\xFChler +# \date 2007-06-12 +# ----------------------------------------------------------------------------- + +TEMPLATE = lib + +TARGET = UMDVisLogo + +DESTDIR = ../../../lib +DLLDESTDIR = ../../../lib + + +# add used packages here (see stdPackages.pro for packages): +CONFIG += dll inventor MLOpenGL png + +MLAB_PACKAGES += UMD_METK \ + MeVisLab_Standard + + +# set high warn level (warn 4 on MSCV) +WARN = HIGH + +# DONT REMOVE THE FOLLOWING LINE: +include ($(MLAB_MeVis_Foundation)/Configuration/IncludePackages.pri) + + +DEFINES += UMDVISLOGO_EXPORTS + +HEADERS += \ + UMDVisLogoInit.h \ + UMDVisLogoSystem.h \ + SoVisLogo.h \ + +SOURCES += \ + UMDVisLogoInit.cpp \ + SoVisLogo.cpp \ + Added: trunk/Community/METK/Sources/Inventor/UMDVisLogo/UMDVisLogoInit.cpp =================================================================== --- trunk/Community/METK/Sources/Inventor/UMDVisLogo/UMDVisLogoInit.cpp (rev 0) +++ trunk/Community/METK/Sources/Inventor/UMDVisLogo/UMDVisLogoInit.cpp 2009-06-16 06:50:44 UTC (rev 65) @@ -0,0 +1,26 @@ +//---------------------------------------------------------------------------------- +//! Dynamic library and runtime type system initialization +/*! +// \file UMDVisLogoInit.cpp +// \author Konrad M\xFChler +// \date 2007-06-12 +*/ +//---------------------------------------------------------------------------------- + +// Local includes +#include "UMDVisLogoSystem.h" +#include <XVBasics.h> +#include "SoVisLogo.h" + + +// Called on initialization time of this dll. Register all new stuff. +void UMDVisLogoInit() +{ + // Register the class in the inventor runtime type system. + SoVisLogo::initClass(); +}; + +// Macro implementing the platform independent dll initialization +XV_INIT_LIBRARY(UMDVisLogoInit) + + Added: trunk/Community/METK/Sources/Inventor/UMDVisLogo/UMDVisLogoInit.h =================================================================== --- trunk/Community/METK/Sources/Inventor/UMDVisLogo/UMDVisLogoInit.h (rev 0) +++ trunk/Community/METK/Sources/Inventor/UMDVisLogo/UMDVisLogoInit.h 2009-06-16 06:50:44 UTC (rev 65) @@ -0,0 +1,18 @@ +//---------------------------------------------------------------------------------- +//! Dynamic library and runtime type system initialization +/*! +// \file UMDVisLogoInit.h +// \author Konrad M\xFChler +// \date 2007-06-12 +*/ +//---------------------------------------------------------------------------------- + + +#ifndef __UMDVISLOGOINIT_H__ +#define __UMDVISLOGOINIT_H__ + +void UMDVisLogoInit(); + +#endif +// __UMDVISLOGOINIT_H__ + Added: trunk/Community/METK/Sources/Inventor/UMDVisLogo/UMDVisLogoSystem.h =================================================================== --- trunk/Community/METK/Sources/Inventor/UMDVisLogo/UMDVisLogoSystem.h (rev 0) +++ trunk/Community/METK/Sources/Inventor/UMDVisLogo/UMDVisLogoSystem.h 2009-06-16 06:50:44 UTC (rev 65) @@ -0,0 +1,35 @@ +//---------------------------------------------------------------------------------- +//! Project global and OS specific declarations +/*! +// \file UMDVisLogoSystem.h +// \author Konrad M\xFChler +// \date 2007-06-12 +*/ +//---------------------------------------------------------------------------------- + + +#ifndef __UMDVISLOGOSYSTEM_H__ +#define __UMDVISLOGOSYSTEM_H__ + +// include MeVis OpenGL headers first (includes GL/glew.h) +#include <mlOpenGL.h> + +// DLL export macro definition +#ifdef WIN32 +#ifdef UMDVISLOGO_EXPORTS +// Use the UMDVISLOGO_EXPORT macro to export classes and functions +#define UMDVISLOGO_EXPORT __declspec(dllexport) +#else +// If included by external modules, exported symbols are declared as import symbols +#define UMDVISLOGO_EXPORT __declspec(dllimport) +#endif + +#else +// No export declarations are necessary for non-Windows systems +#define UMDVISLOGO_EXPORT +#endif + + +#endif +// __UMDVISLOGOSYSTEM_H__ + Added: trunk/Community/METK/Sources/common/HashTable.h =================================================================== --- trunk/Community/METK/Sources/common/HashTable.h (rev 0) +++ trunk/Community/METK/Sources/common/HashTable.h 2009-06-16 06:50:44 UTC (rev 65) @@ -0,0 +1,135 @@ +//---------------------------------------------------------------------------------- +/*! +// \file HashTable.h +// \author HashTable, Copyright (c) 1998 by Michael Neumann +// \author (Konrad M\xFChler) +// \date 03.06.1998, implemented by Michael Neumann +// \date 2005-07-05 +// +*/ +//---------------------------------------------------------------------------------- + + +# ifndef __HASHTABLE_HEADER__ +# define __HASHTABLE_HEADER__ + + +#include <string> +#include <list> + +#pragma warning (disable : 4706) + +template<class attrType> +class HashTable { +public: + + struct R + { + R() {} + R(const std::string& s, const attrType& a) : str(s), attr(a) {} + std::string str; + attrType attr; + bool operator <(const R& r) {return r.str < str;} + bool operator ==(const R& r) {return r.str == str;} + }; + + + HashTable(int sz=2017) // sz should be a prime + { + table = new list<R>[size=sz]; + if(!table) throw MemoryException(); + } + + + ~HashTable() + { + delete[] table; + } + + + bool insert(const std::string& str, const attrType& attr) + { + + int i=hash(str); + list<R>::iterator b = table[i].begin(); + while( b != table[i].end() ) + { + if( (*b).str == str ) return false; + ++b; + } + table[i].push_front(R(str,attr)); + return true; + } + + + bool remove(const std::string& str) + { + int i=hash(str); + list<R>::iterator b = table[i].begin(); + while( b != table[i].end() ) + { + if( (*b).str == str ) + { + table[i].erase(b); + return true; + } + ++b; + } + return false; + } + + + attrType* find(const std::string& str) + { + int i=hash(str); + list<R>::iterator b = table[i].begin(); + while( b != table[i].end() ) + { + if( (*b).str == str ) return &(*b).attr; + ++b; + } + return 0; + } + + + list<R> *getTable() + { + return table; + } + + + int getSize() + { + return size; + } + + class MemoryException {}; + + + +private: + + int size; + list<R> *table; + + + int hash(const std::string& str) + { + unsigned h=0, g; + for(size_t i=0;i<str.length();++i) + { + h = (h << 4)+ str[i]; + if(g=h&0xf0000000) + { + h ^= g>>24; + h ^= g; + } + } + return h%size; // size is table-size + } + +}; + +#pragma warning ( default : 4706) + +#endif \ No newline at end of file Added: trunk/Community/METK/Sources/common/ObjMgrCommunicator.cpp =================================================================== --- trunk/Community/METK/Sources/common/ObjMgrCommunicator.cpp (rev 0) +++ trunk/Community/METK/Sources/common/ObjMgrCommunicator.cpp 2009-06-16 06:50:44 UTC (rev 65) @@ -0,0 +1,251 @@ +// Local includes +#include "ObjMgrCommunicator.h" + +ML_START_NAMESPACE + +//! Implements code for the runtime type system of the ML +ML_CLASS_SOURCE(ObjMgrCommunicator,ObjMgrClient); + + +ObjMgrCommunicator::ObjMgrCommunicator(void) : inherited(0,0,ObjMgrClient::EVENTS_NONE) +{ + +} + + +void ObjMgrCommunicator::handleObjMgrNotification() +{ + omEventContainer myEventList = getEventContainer(); + + //Durchiterieren der EventList + omEventContainer::const_iterator iter; + for ( iter = myEventList.begin();iter!=myEventList.end(); iter++) + { + ObjMgrEvent myEvent = (*iter); + + //if (myEvent.objectID==fldAnimationViewerName->getStringValue() && myEvent.layerID==LAY_VIEWER_PROPERTIES && myEvent.infoID==INF_VIEWER_PROPERTIES_VIEWERSTATUS) + } + clearEventContainer(); +} + +//!Set the value of an attribute in the ObjMgr-DB - no Notification will be send +void ObjMgrCommunicator::setObjAttribute(const string ObjID, const string LayerID, const string InfoID, void* value, const string omInfoType, const bool createIfNotExists, const bool persistent, const bool ignoreType) +{ + // Get writable access to object container + bool attrCreated = false; + omObjectContainer* oc = getObjContainer(); + if(oc == NULL) + { + kDebug::Debug("ObjContainer not found!",kDebug::DL_LOW); + } + else + { + if (!(*oc).exists(ObjID) && !createIfNotExists) + { + kDebug::Debug("invalidObject "+ObjID,kDebug::DL_LOW); + } + else + { + omObject& obj = (*oc)[ObjID]; + + + omAttribute& attr = obj.getAttribute(LayerID,InfoID); + + if (!obj.hasAttribute(LayerID,InfoID) && createIfNotExists) + { + attr.createDataType(omInfoType); + attrCreated = true; + } + if (obj.hasAttribute(LayerID,InfoID)) + { + if (string(attr.getDataType()->getName())!=omInfoType && !ignoreType) + { + obj.removeAttribute(LayerID,InfoID); + attr.createDataType(omInfoType); + attrCreated = true; + } + } + + attr.flags().markPersistent(persistent); + + //Diese Sache mit den void*-Pointern zur Verallgemeinerung wird uns irgendwann mal m\xE4chtig um die Ohren fliegen ... + if (omInfoType == omINFOTYPE_STRING) + { + obj[LayerID][InfoID].setStringValue(*((string *)value)); + } + else if (omInfoType == omINFOTYPE_DOUBLE) + { + const double oldV = obj[LayerID][InfoID]; + const double newV = *((double *)value); + if (fabs(oldV-newV)>=0.000001f || attrCreated) + obj[LayerID][InfoID] = *((double *)value); + } + else if (omInfoType == omINFOTYPE_INT32) + { + const double oldV = obj[LayerID][InfoID]; + const double newV = *((int *)value); + if (fabs(oldV-newV)>=0 || attrCreated) + obj[LayerID][InfoID] = *((int *)value); + } + else if (omInfoType == omINFOTYPE_VEC3) + { + const vec3 tempVec3 = *(vec3*)value; + const SbVec3f oldV = SbVec3f(double(((vec3)obj[LayerID][InfoID])[0]),double(((vec3)obj[LayerID][InfoID])[1]),double(((vec3)obj[LayerID][InfoID])[2])); + const SbVec3f newV = SbVec3f(double(tempVec3[0]),double(tempVec3[1]),double(tempVec3[2])); + + if(kBasics::maxDiff(oldV,newV)>=0.000001f || attrCreated) + { + obj[LayerID][InfoID] = tempVec3; + } + } + else if (omInfoType == omINFOTYPE_VEC4) + { + const vec4 tempVec4 = *(vec4*)value; + const SbVec4f oldV = SbVec4f(((vec4)obj[LayerID][InfoID])[0],((vec4)obj[LayerID][InfoID])[1],((vec4)obj[LayerID][InfoID])[2],((vec4)obj[LayerID][InfoID])[3]); + const SbVec4f newV = SbVec4f(tempVec4[0],tempVec4[1],tempVec4[2],tempVec4[3]); + + if (kBasics::maxDiff(oldV,newV)>=0.000001f || attrCreated) + obj[LayerID][InfoID] = tempVec4; + } + else if (omInfoType == omINFOTYPE_BOOL) + { + const bool oldV = obj[LayerID][InfoID]; + if (oldV!=*(bool *)value || attrCreated) + obj[LayerID][InfoID] = *(bool *)value; + } + else if (omInfoType == omINFOTYPE_MESSAGE) + { + obj[LayerID][InfoID] = *((omMessage *)value); + } + } + + } +} + + +bool ObjMgrCommunicator::getObjAttribute(const string ObjID, const string LayerID, const string InfoID, omAttribute& attr) +{ + const omObjectContainer *oc= getConstObjContainer(); + if(oc == NULL) + { + kDebug::Debug("ObjContainer not found!",kDebug::DL_LOW); + } + else + { + if (!(*oc).exists(ObjID)) + { + kDebug::Debug("invalidObject",kDebug::DL_LOW); + } + else + { + // Get read-only access to object with given ID. + const omObject &obj= (*oc)[ObjID]; + if (obj.hasAttribute(LayerID,InfoID)) + { + attr = obj.getAttribute(LayerID,InfoID); + return true; + } + } + } + return false; +} + + + +bool ObjMgrCommunicator::getObjAttributeVec3f(const string ObjID, const string LayerID, const string InfoID, SbVec3f& vec3f) +{ + omAttribute attr; + if (getObjAttribute(ObjID,LayerID,InfoID, attr)) + { + vector<string> VecSplit; + kBasics::split(attr.getStringValue(),' ',3,&VecSplit); + + if (VecSplit.size()!=3) + { + kDebug::Debug("WrongSplitSize: " + kBasics::IntToString(VecSplit.size()),kDebug::DL_HIGH); + return false; + } + + vec3f.setValue(kBasics::StringToFloat(VecSplit[0]),kBasics::StringToFloat(VecSplit[1]),kBasics::StringToFloat(VecSplit[2])); + return true; + } + return false; +} + + + +bool ObjMgrCommunicator::getObjAttributeVec4f(const string ObjID, const string LayerID, const string InfoID, SbVec4f& vec4f) +{ + omAttribute attr; + if (getObjAttribute(ObjID,LayerID,InfoID, attr)) + { + vector<string> VecSplit; + kBasics::split(attr.getStringValue(),' ',4,&VecSplit); + + if (VecSplit.size()!=4) + { + kDebug::Debug("WrongSplitSize: " + kBasics::IntToString(VecSplit.size()),kDebug::DL_HIGH); + return false; + } + + vec4f.setValue(kBasics::StringToFloat(VecSplit[0]),kBasics::StringToFloat(VecSplit[1]),kBasics::StringToFloat(VecSplit[2]),kBasics::StringToFloat(VecSplit[3])); + return true; + } + return false; +} + + + +bool ObjMgrCommunicator::getObjAttributeString(const string ObjID, const string LayerID, const string InfoID, string& value) +{ + omAttribute attr; + if (getObjAttribute(ObjID,LayerID,InfoID, attr)) + { + value = attr.getStringValue(); + return true; + } + return false; +} + + + +bool ObjMgrCommunicator::getObjAttributeFloat(const string ObjID, const string LayerID, const string InfoID, float& value) +{ + omAttribute attr; + if (getObjAttribute(ObjID,LayerID,InfoID, attr)) + { + value = kBasics::StringToFloat(attr.getStringValue()); + return true; + } + return false; +} + + + +bool ObjMgrCommunicator::getObjAttributeInt(const string ObjID, const string LayerID, const string InfoID, int& value) +{ + omAttribute attr; + if (getObjAttribute(ObjID,LayerID,InfoID, attr)) + { + value = kBasics::StringToInt(attr.getStringValue()); + return true; + } + return false; +} + + + +bool ObjMgrCommunicator::getObjAttributeBool(const string ObjID, const string LayerID, const string InfoID, bool& value) +{ + omAttribute attr; + value = false; + if (getObjAttribute(ObjID,LayerID,InfoID, attr)) + { + value = kBasics::StringToBool(attr.getStringValue()); + return true; + } + return false; +} + + +ML_END_NAMESPACE Added: trunk/Community/METK/Sources/common/ObjMgrCommunicator.h =================================================================== --- trunk/Community/METK/Sources/common/ObjMgrCommunicator.h (rev 0) +++ trunk/Community/METK/Sources/common/ObjMgrCommunicator.h 2009-06-16 06:50:44 UTC (rev 65) @@ -0,0 +1,72 @@ +//---------------------------------------------------------------------------------- +//! Class to handle communication with ObjMgr via get and set functions +/*! +// \file ObjMgrCommunicator.h +// \author Konrad M\xFChler +// \date 2006-11-02 +// +// +*/ +//---------------------------------------------------------------------------------- + + +#ifndef __ObjMgrCommunicator_H +#define __ObjMgrCommunicator_H + + +#pragma warning(disable:4251) +#ifndef common_EXPORTS +#define __COMMON_IMPORTEXPORT __declspec(dllimport) +#else +#define __COMMON_IMPORTEXPORT __declspec(dllexport) +#endif + +// ML includes +#ifndef __mlOperatorIncludes_H +#include "mlOperatorIncludes.h" +#endif + +#include "XVEnterScope.h" +#include <Inventor/nodes/SoCube.h> +#include <Inventor/nodes/SoPerspectiveCamera.h> +#include <Inventor/sensors/SoTimerSensor.h> +#include <Inventor/sensors/SoNodeSensor.h> +#include "XVLeaveScope.h" + +#include <ObjMgr/mlObjMgrClient.h> + +#include "kBasics.h" +#include "kDebug.h" + +ML_START_NAMESPACE + +class __COMMON_IMPORTEXPORT ObjMgrCommunicator : public ObjMgrClient +{ +public: + + ObjMgrCommunicator (void); + + virtual void handleObjMgrNotification(); + + void setObjAttribute(const string ObjID, const string LayerID, const string InfoID, void* value, const string omInfoType, const bool createIfNotExists, const bool persistent, const bool ignoreType=false); + bool getObjAttribute(const string ObjID, const string LayerID, const string InfoID, omAttribute& attr); + bool getObjAttributeVec3f(const string ObjID, const string LayerID, const string InfoID, SbVec3f& vec3f); + bool getObjAttributeVec4f(const string ObjID, const string LayerID, const string InfoID, SbVec4f& vec4f); + bool getObjAttributeString(const string ObjID, const string LayerID, const string InfoID, string& value); + bool getObjAttributeFloat(const string ObjID, const string LayerID, const string InfoID, float& value); + bool getObjAttributeInt(const string ObjID, const string LayerID, const string InfoID, int& value); + bool getObjAttributeBool(const string ObjID, const string LayerID, const string InfoID, bool& value); + +private: + + typedef ObjMgrClient inherited; + + ML_CLASS_HEADER(ObjMgrCommunicator) + +}; + + +ML_END_NAMESPACE + + +#endif // __ObjMgrCommunicator_H \ No newline at end of file Added: trunk/Community/METK/Sources/common/StdAfx.cpp =================================================================== --- trunk/Community/METK/Sources/common/StdAfx.cpp (rev 0) +++ trunk/Community/METK/Sources/common/StdAfx.cpp 2009-06-16 06:50:44 UTC (rev 65) @@ -0,0 +1,8 @@ +// stdafx.cpp : Quelltextdatei, die nur die Standard-Includes einbindet +// AnimationParserDLL.pch ist die vorkompilierte Header-Datei +// stdafx.obj enth\xE4lt die vorkompilierte Typinformation + +#include "stdafx.h" + +// ZU ERLEDIGEN: Verweis auf alle zus\xE4tzlichen Header-Dateien, die Sie in STDAFX.H +// und nicht in dieser Datei ben\xF6tigen Added: trunk/Community/METK/Sources/common/StdAfx.h =================================================================== --- trunk/Community/METK/Sources/common/StdAfx.h (rev 0) +++ trunk/Community/METK/Sources/common/StdAfx.h 2009-06-16 06:50:44 UTC (rev 65) @@ -0,0 +1,24 @@ +// stdafx.h : Include-Datei f\xFCr Standard-System-Include-Dateien, +// oder projektspezifische Include-Dateien, die h\xE4ufig benutzt, aber +// in unregelm\xE4\xDFigen Abst\xE4nden ge\xE4ndert werden. +// + +#if !defined(AFX_STDAFX_H__B4C4A995_C8B1_40C7_9A03_30372D9ACD0A__INCLUDED_) +#define AFX_STDAFX_H__B4C4A995_C8B1_40C7_9A03_30372D9ACD0A__INCLUDED_ + +#if _MSC_VER > 1000 +#pragma once +#endif // _MSC_VER > 1000 + + +// F\xFCgen Sie hier Ihre Header-Dateien ein +#define WIN32_LEAN_AND_MEAN // Selten benutzte Teile der Windows-Header nicht einbinden + +#include <windows.h> + +// ZU ERLEDIGEN: Verweisen Sie hier auf zus\xE4tzliche Header-Dateien, die Ihr Programm ben\xF6tigt + +//{{AFX_INSERT_LOCATION}} +// Microsoft Visual C++ f\xFCgt zus\xE4tzliche Deklarationen unmittelbar vor der vorherigen Zeile ein. + +#endif // !defined(AFX_STDAFX_H__B4C4A995_C8B1_40C7_9A03_30372D9ACD0A__INCLUDED_) Added: trunk/Community/METK/Sources/common/StrList.h =================================================================== --- trunk/Community/METK/Sources/common/StrList.h (rev 0) +++ trunk/Community/METK/Sources/common/StrList.h 2009-06-16 06:50:44 UTC (rev 65) @@ -0,0 +1,63 @@ +# ifndef __STRLIST_HEADER__ +# define __STRLIST_HEADER__ + + +#pragma warning(disable:4251) +#ifndef common_EXPORTS +#define __COMMON_IMPORTEXPORT __declspec(dllimport) +#else +#define __COMMON_IMPORTEXPORT __declspec(dllexport) +#endif + +# include <string> +# include <list> + +using namespace std; + +class __COMMON_IMPORTEXPORT StrList +{ + +public: + + StrList() + { + } + + + ~StrList() + { + } + + + + void add(string value) + { + stringList.push_back(value); + } + + void remove(string value) + { + list<string>::iterator iter; + for (iter = stringList.begin(); iter!=stringList.end(); iter++) + { + if ((string)(*iter) == value) + { + stringList.erase(iter); + return; + } + } + } + + int getSize() + { + return stringList.size(); + } + + +private: + list<string> stringList; + +}; + +#endif + Added: trunk/Community/METK/Sources/common/XMLParser.cpp =================================================================== --- trunk/Community/METK/Sources/common/XMLParser.cpp (rev 0) +++ trunk/Community/METK/Sources/common/XMLParser.cpp 2009-06-16 06:50:44 UTC (rev 65) @@ -0,0 +1,264 @@ +#include "stdafx.h" +#include "XMLParser.h" + + +XMLParserErrorHandler::XMLParserErrorHandler() : fSawErrors(false) +{ +} + +XMLParserErrorHandler::~XMLParserErrorHandler() +{ +} + + +bool XMLParserErrorHandler::getSawErrors() const +{ + return fSawErrors; +} + + +bool XMLParserErrorHandler::handleError(const DOMError& domError) +{ + fSawErrors = true; + if (domError.getSeverity() == DOMError::DOM_SEVERITY_WARNING) + std::cerr << "\nWarning at file "; + else if (domError.getSeverity() == DOMError::DOM_SEVERITY_ERROR) + std::cerr << "\nError at file "; + else + std::cerr << "\nFatal Error at file "; + + std::cerr << domError.getLocation()->getURI() + << ", line " << domError.getLocation()->getLineNumber() + << ", char " << domError.getLocation()->getColumnNumber() + << "\n Message: " << domError.getMessage() << std::endl; + + return true; +} + + +void XMLParserErrorHandler::resetErrors() +{ + fSawErrors = false; +} + + +int XMLParser::parseXMLFile(const char* XMLFileName) +{ + bool errorOccurred = false; + + // Initialize the XML4C system + try + { + XMLPlatformUtils::Initialize(); + } + catch (const XMLException& toCatch) + { + std::cerr << "Error during initialization! :\n" << toCatch.getMessage() << std::endl; + return 1; + } + + + // Instantiate the DOM parser. + static const XMLCh gLS[] = { chLatin_L, chLatin_S, chNull }; + + impl = DOMImplementationRegistry::getDOMImplementation(gLS); + parser = ((DOMImplementationLS*)impl)->createDOMBuilder(DOMImplementationLS::MODE_SYNCHRONOUS, 0); + + + parser->setFeature(XMLUni::fgDOMNamespaces, false); + parser->setFeature(XMLUni::fgXercesSchema, false); + parser->setFeature(XMLUni::fgXercesSchemaFullChecking, false); + + // enable datatype normalization - default is off + parser->setFeature(XMLUni::fgDOMDatatypeNormalization, true); + + // And create our error handler and install it + XMLParserErrorHandler errorHandler; + parser->setErrorHandler(&errorHandler); + + + bool more = true; + std::ifstream file_input; + + file_input.open(XMLFileName); + + if (file_input.fail()) + { + std::cerr <<"Cannot open the file: " << XMLFileName << std::endl; + return 2; + } + + while (more) + { + char fURI[1000]; + //initialize the array to zeros + memset(fURI,0,sizeof(fURI)); + + more = false; + + //reset error count first + errorHandler.resetErrors(); + + try + { + // reset document pool + parser->resetDocumentPool(); + + + xml_doc = parser->parseURI(XMLFileName); + + } + catch (const XMLException& toCatch) + { + std::cerr << "\nError during parsing: '" << XMLFileName << "'\n" + << "Exception message is: \n" << toCatch.getMessage() << "\n" << std::endl; + errorOccurred = true; + continue; + } + catch (const DOMException& toCatch) + { + const unsigned int maxChars = 2047; + XMLCh errText[maxChars + 1]; + + std::cerr << "\nDOM Error during parsing: '" << XMLFileName << "'\n" + << "DOMException code is: " << toCatch.code << std::endl; + + if (DOMImplementation::loadDOMExceptionMsg(toCatch.code, errText, maxChars)) + std::cerr << "Message is: " << errText << std::endl; + + errorOccurred = true; + continue; + } + catch (...) + { + std::cerr << "\nUnexpected exception during parsing: '" << XMLFileName << "'\n"; + errorOccurred = true; + continue; + } + + + // Extract the DOM tree, get the list of all the elements and report the length as the count of elements. + if (errorHandler.getSawErrors()) + { + std::cerr << "\nErrors occurred, no output available\n" << std::endl; + errorOccurred = true; + } + else + { + //unsigned int elementCount = 0; + if (xml_doc) + { + rootNode =(DOMNode*)xml_doc->getDocumentElement(); + } + } + } + + file_input.close(); + + if (errorOccurred) return 4; + else return 0; +} + + + +int XMLParser::parseXMLString(const std::string* xmlString) +{ + bool errorOccurred = false; + + // Initialize the XML4C system + try + { + XMLPlatformUtils::Initialize(); + } + catch (const XMLException& toCatch) + { + std::cerr << "Error during initialization! :\n" << toCatch.getMessage() << std::endl; + return 1; + } + + + // Instantiate the DOM parser. + static const XMLCh gLS[] = { chLatin_L, chLatin_S, chNull }; + + impl = DOMImplementationRegistry::getDOMImplementation(gLS); + //parser = ((DOMImplementationLS*)impl)->createDOMBuilder(DOMImplementationLS::MODE_SYNCHRONOUS, 0); + +/* + MemBufInputSource *isource = new MemBufInputSource( (const XMLByte*)xmlString->c_str(), strlen(xmlString->c_str()), "XMLBuffer", false); + if (isource == NULL) return; + + XercesDOMParser* parser = new XercesDOMParser; + parser->parse(*isource); + DOMImplementation* impl = DOMImplementationRegistry::getDOMImplementation(XMLString::transcode("Range")); + DOMDocument* doc = 0; + + try + { + doc = parser->getDocument(); + } + + */ + + MemBufInputSource *isource = new MemBufInputSource( (const XMLByte*)xmlString->c_str(), strlen(xmlString->c_str()), "XMLBuffer", false); + if (isource == NULL) return 5; + XercesDOMParser* parser2 = new XercesDOMParser; + + + //bool more = true; + + try + { + // reset document pool + parser2->resetDocumentPool(); + parser2->parse(*isource); + xml_doc = parser2->getDocument(); + + if (xml_doc==NULL) std::cout << "xml_doc==NULL!!!!" << std::endl; + DOMElement* root = 0; + root = xml_doc->getDocumentElement(); + } + catch (const XMLException& toCatch) + { + std::cerr << "\nError during parsing a xmlString\n" + << "Exception message is: \n" << toCatch.getMessage() << "\n" << std::endl; + errorOccurred = true; + } + catch (const DOMException& toCatch) + { + const unsigned int maxChars = 2047; + XMLCh errText[maxChars + 1]; + + std::cerr << "\nDOM Error during parsing a xmlString\n" + << "DOMException code is: " << toCatch.code << std::endl; + + if (DOMImplementation::loadDOMExceptionMsg(toCatch.code, errText, maxChars)) + std::cerr << "Message is: " << errText << std::endl; + + errorOccurred = true; + } + catch (...) + { + std::cerr << "\nUnexpected exception during parsing a xmlString\n"; + errorOccurred = true; + } + + // Extract the DOM tree, get the list of all the elements and report the length as the count of elements. + //unsigned int elementCount = 0; + if (xml_doc) + { + rootNode =(DOMNode*)xml_doc->getDocumentElement(); + } + + if (errorOccurred) return 4; + return 0; +} + + +XMLParser::~XMLParser() +{ + // Delete the parser itself. Must be done prior to calling Terminate, below. + parser->release(); + + // And call the termination method + XMLPlatformUtils::Terminate(); +} \ No newline at end of file Added: trunk/Community/METK/Sources/common/XMLParser.h =================================================================== --- trunk/Community/METK/Sources/common/XMLParser.h (rev 0) +++ trunk/Community/METK/Sources/common/XMLParser.h 2009-06-16 06:50:44 UTC (rev 65) @@ -0,0 +1,79 @@ +//XMLParser.h + +#ifndef _XMLParser_ +#define _XMLParser_ + +#pragma warning(disable:4251) +#ifndef common_EXPORTS +#define __COMMON_IMPORTEXPORT __declspec(dllimport) +#else +#define __COMMON_IMPORTEXPORT __declspec(dllexport) +#endif + +#include <xercesc/util/PlatformUtils.hpp> +#include <xercesc/parsers/AbstractDOMParser.hpp> +#include <xercesc/dom/DOMImplementation.hpp> +#include <xercesc/dom/DOMImplementationLS.hpp> +#include <xercesc/dom/DOMImplementationRegistry.hpp> +#include <xercesc/dom/DOMBuilder.hpp> +#include <xercesc/dom/DOMException.hpp> +#include <xercesc/dom/DOMDocument.hpp> +#include <xercesc/dom/DOMNodeList.hpp> +#include <xercesc/dom/DOMError.hpp> +#include <xercesc/dom/DOMLocator.hpp> +#include <xercesc/dom/DOMNamedNodeMap.hpp> +#include <xercesc/dom/DOMAttr.hpp> +#include <xercesc/dom/DOMErrorHandler.hpp> +#include <xercesc/util/XMLString.hpp> +#include <xercesc/framework/MemBufInputSource.hpp> +#include <xercesc/parsers/XercesDOMParser.hpp> + +#include <iostream> +#include <fstream> +#include <string> + +XERCES_CPP_NAMESPACE_USE + + +// Simple error handler deriviative to install on parser +class __COMMON_IMPORTEXPORT XMLParserErrorHandler : public DOMErrorHandler +{ +public: + XMLParserErrorHandler(); + ~XMLParserErrorHandler(); + + bool getSawErrors() const; + bool handleError(const DOMError& domError); + void resetErrors(); + +private : + XMLParserErrorHandler(const XMLParserErrorHandler&); + void operator=(const XMLParserErrorHandler&); + bool fSawErrors; //This is set if we get any errors +}; + + + +class __COMMON_IMPORTEXPORT XMLParser +{ +private: + DOMImplementation *impl; + DOMBuilder *parser; + XERCES_CPP_NAMESPACE::DOMDocument* xml_doc; + DOMNode* rootNode; + +public: + XMLParser() { } + ~XMLParser(); + + + DOMNode* getRootNode() { return rootNode; } + + int parseXMLFile(const char*); + int parseXMLString(const std::string* xmlString); + + int XMLParser::countChildElements(DOMNode *n); +}; + + +#endif // _XMLParser_ \ No newline at end of file Added: trunk/Community/METK/Sources/common/common.bat =================================================================== --- trunk/Community/METK/Sources/common/common.bat (rev 0) +++ trunk/Community/METK/Sources/common/common.bat 2009-06-16 06:50:44 UTC (rev 65) @@ -0,0 +1,3 @@ +"%MLAB_ROOT%\MeVis\Foundation\BuildTools\Scripts\createProject.bat" common + + Added: trunk/Community/METK/Sources/common/common.pro =================================================================== --- trunk/Community/METK/Sources/common/common.pro (rev 0) +++ trunk/Community/METK/Sources/common/common.pro 2009-06-16 06:50:44 UTC (rev 65) @@ -0,0 +1,49 @@ +# --------- common profile ------------------- +# +# Platform independent project and build file for +# project common. +# + +TEMPLATE = lib + +TARGET = common + +DESTDIR = ../../lib +DLLDESTDIR = ../../lib + +# add used packages here (see stdPackages.pro for packages): +CONFIG += dll inventor xerces ML MLObjMgr +MLAB_PACKAGES += MeVisLab_Standard + +# set high warn level (warn 4 on MSCV) +WARN = HIGH + +# DONT REMOVE THE FOLLOWING LINE: +include ($(MLAB_MeVis_Foundation)/Configuration/IncludePackages.pri) + + +DEFINES += common_EXPORTS + +HEADERS += \ + HashTable.h \ + kBasics.h \ + kCamera.h \ + #kObjMgrAttr.h \ + StdAfx.h \ + StrList.h \ + XMLParser.h \ + kSphere.h \ + kDebug.h \ + ObjMgrCommunicator.h \ + matrix.h \ + image_basic.h + +SOURCES += \ + kBasics.cpp \ + kCamera.cpp \ + StdAfx.cpp \ + XMLParser.cpp \ + kSphere.cpp \ + kDebug.cpp \ + ObjMgrCommunicator.cpp \ + image_basic.cpp \ No newline at end of file Added: trunk/Community/METK/Sources/common/image_basic.cpp =================================================================== --- trunk/Community/METK/Sources/common/image_basic.cpp (rev 0) +++ trunk/Community/METK/Sources/common/image_basic.cpp 2009-06-16 06:50:44 UTC (rev 65) @@ -0,0 +1,1782 @@ + +#include <cmath> +#include "image_basic.h" + +#define TIFF_LITTLE_ENDIAN 1 +#define TIFF_BIG_ENDIAN 0 + +#define TIFF_SHORT 3 +#define TIFF_LONG 4 +#define TIFF_RATIONAL 5 +using namespace std; + +image_basic::image_basic() +{ + color_mode = GRAY_8BPP; + width = 0; + height = 0; + // data.free(); +} +image_basic::image_basic(unsigned int size_x, unsigned int size_y, int set_color_mode) +{ + width = size_x; + height = size_y; + data.resize(width * height); + color_mode = set_color_mode; +} +image_basic::image_basic(const rect_range &range, int set_color_mode) +{ + width = abs(range.x2 - range.x1 + 1); + height = abs(range.y2 - range.y1 + 1); + data.resize(width * height); + color_mode = set_color_mode; +} +void image_basic::initialize(unsigned int size_x, unsigned int size_y, int set_color_mode) +{ + width = size_x; + height = size_y; + data.resize(width * height); + erase(); + if(set_color_mode != NULL) + color_mode = set_color_mode; +} +void image_basic::initialize(const rect_range &range, int set_color_mode) +{ + width = abs(range.x2 - range.x1 + 1); + height = abs(range.y2 - range.y1 + 1); + data.resize(width * height); + erase(); + if(set_color_mode != NULL) + color_mode = set_color_mode; +} +void image_basic::erase(void) +{ + data = 0; +} +int image_basic::empty(void) +{ + if(width == 0 || height == 0) + return 1; + else + return 0; +} +image_basic::~image_basic() +{ + //data.free(); +} +int image_basic::file_read(const std::string &filename) +{ + ifstream file; + unsigned char buffer[4]; + + file.open(filename.c_str() , ios_base::in | ios_base::binary); + if(file.fail()){ + cerr << "[image_basic::file_read] Error opening " << filename << endl; + return -1; + } + file.read((char*)buffer, 4); + if(file.fail()){ + cerr << "[image_basic::file_read] Error reading " << filename << endl; + return -1; + } + file.close(); + + if((buffer[0] == 0x49 && buffer[1] == 0x49) || (buffer[0] == 0x4d && buffer[1] == 0x4d)){ + if(file_read_tiff(filename)) + return -1; + } else if(buffer[0] == 'B' && buffer[1] == 'M'){ + if(file_read_bitmap(filename)) + return -1; + } else if(buffer[0] == 'P' && buffer[1] == '5'){ + if(file_read_pgm(filename)) + return -1; + } else { + cerr << "[image_basic::file_read] " << filename << " format is not supported" << endl; + return -1; + } + + return 0; +} +int image_basic::file_read_pgm(const std::string &filename) +{ + ifstream file; + unsigned char buffer[256]; + int flag, position_begin, position_end, value[3], x, y, offset_row; + std::string line; + + file.open(filename.c_str() , ios_base::in | ios_base::binary); + if(file.fail()){ + cerr << "[image_basic::file_read_pgm] Error opening " << filename << endl; + return -1; + } + file.getline((char *)buffer, 256); + if(file.fail()){ + cerr << "[image_basic::file_read_pgm] Error reading " << filename << endl; + return -1; + } + if(buffer[0] != 'P' || buffer[1] != '5'){ + cerr << "[image_basic::file_read_pgm] "<< filename << "is not a raw pgm file"<< endl; + return -1; + } + cout << "[image_basic::file_read_pgm] " << filename << "... "; + flag = 0; + position_begin = 2; + while(flag != 3){ + if(buffer[position_begin] == '\0' || buffer[0] == '#'){ + file.getline((char*)buffer, 256); + if(file.fail()){ + cerr << "[image_basic::file_read_pgm] Error reading " << filename << endl; + return -1; + } + position_begin = 0; + continue; + } + for( ; (isdigit(buffer[position_begin]) == 0) && position_begin < 256 ; position_begin++) + if(buffer[position_begin] == '\0') + continue; + for(position_end = position_begin; isdigit(buffer[position_end]) && position_end < 256; position_end++) + ; + value[flag] = atoi((const char*)&buffer[position_begin]); + flag++; + position_begin = position_end; + } + + width = value[0]; + height = value[1]; + if(value[2] < 0 || value[2] > 255){ + cerr << "[image_basic::file_read_pgm] Maximum value of " << filename << "should be 0-255" << endl; + return -1; + } + data.resize(width * height); + color_mode = GRAY_8BPP; + for(y = height - 1; y >= 0; y--){ + offset_row = y * width; + for(x = 0; (unsigned int)x < width; x++){ + file.read((char *)buffer, 1); + data[offset_row + x] = (int)buffer[0]; + } + } + if(file.fail()){ + cerr << "[image_basic::file_read_pgm] Error reading " << filename << endl; + return -1; + } + cout << width << "*" << height << " 8bpp" << endl; + + return 0; +} +inline unsigned short image_basic::byte_short(unsigned char *buffer, bool endian) +{ + if(endian) // == TIFF_LITTLE_ENDIAN + return ((short)buffer[1] << 8) | (short)buffer[0]; + else + return ((short)buffer[0] << 8) | (short)buffer[1]; +} +inline unsigned long image_basic::byte_long(unsigned char *buffer, bool endian) +{ + if(endian) // == TIFF_LITTLE_ENDIAN + return ((long)buffer[3] << 24) | ((long)buffer[2] << 16) | ((long)buffer[1] << 8) | (long)buffer[0]; + else + return ((long)buffer[0] << 24) | ((long)buffer[1] << 16) | ((long)buffer[2] << 8) | (long)buffer[3]; +} +int image_basic::file_read_tiff(const std::string &filename) +{ + ifstream file; + unsigned long ifd_offset, parameter_offset, height_strip = 0; + unsigned char buffer[12]; + unsigned short ifd_tag, ifd_count, strip_count = 0; + valarray<unsigned long> strip_offset; + int i, j, x, y, y_strip, offset_row; + bool endian; + + file.open(filename.c_str() , ios_base::in | ios_base::binary); + if(file.fail()){ + cerr << "[image_basic::file_read_tiff] Error opening " << filename << endl; + return -1; + } + + file.seekg(0, ios_base::beg); + file.read((char*)buffer, 4); + if(file.fail()){ + cerr << "[image_basic::file_read_tiff] Error reading " << filename << endl; + return -1; + } + + if(buffer[0] == 0x49 && buffer[1] == 0x49){ + endian = TIFF_LITTLE_ENDIAN; + cout << "[image_basic::file_read_tiff] " << filename << "(little endian)..." << endl; + } else if(buffer[0] == 0x4d && buffer[1] == 0x4d){ + endian = TIFF_BIG_ENDIAN; + cout << "[image_basic::file_read_tiff] " << filename << "(big endian)..." << endl; + } else { + cerr << "[image_basic::file_read_tiff] " << filename << " is not a TIFF file" << endl; + return -1; + } + if(byte_short(&buffer[2], endian) != 0x002a){ + cerr << "[image_basic::file_read_tiff] " << filename << " is not a TIFF file" << endl; + return -1; + } + file.read((char*)buffer, 4); + ifd_offset = byte_long(buffer, endian); + file.seekg(ifd_offset, ios_base::beg); + file.read((char*)buffer, 2); + ifd_count = byte_short(buffer, endian); + for(j = 0; j < ifd_count; j++){ + file.seekg(ifd_offset + 2 + j * 12, ios_base::beg); + file.read((char*)buffer, 12); + ifd_tag = byte_short(buffer, endian); + switch(ifd_tag){ + case 0x0100: // TIFF image width + if(byte_long(&buffer[4], endian) != 1){ + cerr << "[image_basic::file_read_tiff] Number of width paramerter should be 1" << endl; + return -1; + } + switch(byte_short(&buffer[2], endian)){ + case TIFF_SHORT: + width = byte_short(&buffer[8], endian); + break; + case TIFF_LONG: + width = byte_long(&buffer[8], endian); + break; + default: + cerr << "[image_basic::file_read_tiff] Width should be either long or short integer" << endl; + return -1; + } + // cout << "width " << width << endl; + break; + + case 0x0101: // TIFF image height + if(byte_long(&buffer[4], endian) != 1){ + cerr << "[image_basic::file_read_tiff] Number of height paramerter should be 1" << endl; + return -1; + } + switch(byte_short(&buffer[2], endian)){ + case TIFF_SHORT: + height = byte_short(&buffer[8], endian); + break; + case TIFF_LONG: + height = byte_long(&buffer[8], endian); + break; + default: + cerr << "[image_basic::file_read_tiff] Height should be either long or short integer" << endl; + return -1; + } + // cout << "height " << height << endl; + break; + case 0x0102: // TIFF image BPP + if(byte_short(&buffer[2], endian) != TIFF_SHORT){ + cerr << "[image_basic::file_read_tiff] BPP should be s... [truncated message content] |
From: <kon...@us...> - 2009-06-16 06:50:01
|
Revision: 64 http://mevislabmodules.svn.sourceforge.net/mevislabmodules/?rev=64&view=rev Author: konrad79 Date: 2009-06-16 06:49:58 +0000 (Tue, 16 Jun 2009) Log Message: ----------- Added Paths: ----------- trunk/Community/METK/ trunk/Community/METK/Configuration/ trunk/Community/METK/Configuration/UMD_METK.pri trunk/Community/METK/Package.def Added: trunk/Community/METK/Configuration/UMD_METK.pri =================================================================== --- trunk/Community/METK/Configuration/UMD_METK.pri (rev 0) +++ trunk/Community/METK/Configuration/UMD_METK.pri 2009-06-16 06:49:58 UTC (rev 64) @@ -0,0 +1,131 @@ +isEmpty(UMD_METK_PRI_INCLUDED) { + message ( loading UMD_METK.pri ) +} +# **InsertLicense** code +# ----------------------------------------------------------------------------- +# UMD_METK prifile +# +# \file UMD_METK.pri +# \author Konrad +# \date 2009-04-24 +# +# The Medical Explortation Toolkit (www.metk.net) +# +# ----------------------------------------------------------------------------- + +# include guard against multiple inclusion +isEmpty(UMD_METK_PRI_INCLUDED) { + +UMD_METK_PRI_INCLUDED = 1 + +# -- System ------------------------------------------------------------- + +include( $(MLAB_MeVis_Foundation)/Configuration/SystemInit.pri ) + +# -- Define local PACKAGE variables ------------------------------------- + +PACKAGE_ROOT = $$(MLAB_UMD_METK) +PACKAGE_SOURCES = "$$(MLAB_UMD_METK)"/Sources + +# Add package library path +LIBS += -L"$${PACKAGE_ROOT}"/lib + +# -- Projects ------------------------------------------------------------- + +# NOTE: Add projects below to make them available to other projects via the CONFIG mechanism + +# You can use this example template for typical projects: +#MLMyProject { +# CONFIG_FOUND += MLMyProject +# INCLUDEPATH += $${PACKAGE_SOURCES}/ML/MLMyProject +# win32:LIBS += MLMyProject$${d}.lib +# unix:LIBS += -lMLMyProject$${d} +#} + + + + +# -- ML Projects ------------------------------------------------------------- + +MLkAviWriter { + CONFIG_FOUND += MLkAviWriter + INCLUDEPATH += $${PACKAGE_SOURCES}/ML/kAviWriter + win32:LIBS += MLkAviWriter$${d}.lib + unix:LIBS += -lMLkAviWriter$${d} +} + + +UMDAnimation2 { + CONFIG_FOUND += UMDAnimation2 + INCLUDEPATH += $${PACKAGE_SOURCES}/ML/Animation + win32:LIBS += Animation$${d}.lib + unix:LIBS += -lAnimation$${d} +} + +METKMessaging { + CONFIG_FOUND += METKMessaging + INCLUDEPATH += $${PACKAGE_SOURCES}/ML/METKMessaging + win32:LIBS += METKMessaging$${d}.lib + unix:LIBS += -lMETKMessaging$${d} +} + +METK2DLabeling { + CONFIG_FOUND += METK2DLabeling + INCLUDEPATH += $${PACKAGE_SOURCES}/ML/METK2DLabeling + win32:LIBS += METK2DLabeling$${d}.lib + unix:LIBS += -lMETK2DLabeling$${d} +} + + + +# -- Inventor Projects ------------------------------------------------------- + +UMDQHull3D { + CONFIG_FOUND += UMDQHull3D + INCLUDEPATH += $${PACKAGE_SOURCES}/Inventor/SoQHull3D + win32:LIBS += UMDQHull3D$${d}.lib + unix:LIBS += -lUMDQHull3D$${d} +} + +UMDSoMeasurement { + CONFIG_FOUND += UMDSoMeasurement + INCLUDEPATH += $${PACKAGE_SOURCES}/Inventor/UMDSoMeasurement + win32:LIBS += UMDSoMeasurement$${d}.lib + unix:LIBS += -lUMDSoMeasurement$${d} +} + +UMDmnOffscreenRenderer { + CONFIG_FOUND += UMDmnOffscreenRenderer + INCLUDEPATH += $${PACKAGE_SOURCES}/Inventor/UMDmnOffscreenRenderer + win32:LIBS += UMDmnOffscreenRenderer$${d}.lib + unix:LIBS += -lUMDmnOffscreenRenderer$${d} +} + +UMDStraightLine { + CONFIG_FOUND += UMDStraightLine + INCLUDEPATH += $${PACKAGE_SOURCES}/Inventor/UMDStraightLine + win32:LIBS += UMDStraightLine$${d}.lib + unix:LIBS += -lUMDStraightLine$${d} +} + + + +# -- Shared Projects --------------------------------------------------------- + +common { + CONFIG_FOUND += common + INCLUDEPATH += $${PACKAGE_SOURCES}/common + win32:LIBS += common$${d}.lib + unix:LIBS += -lcommon$${d} +} + + +METK { + CONFIG_FOUND += METK + INCLUDEPATH += $${PACKAGE_SOURCES}/ML +} + +# End of projects ------------------------------------------------------------ + +} + Added: trunk/Community/METK/Package.def =================================================================== --- trunk/Community/METK/Package.def (rev 0) +++ trunk/Community/METK/Package.def 2009-06-16 06:49:58 UTC (rev 64) @@ -0,0 +1,9 @@ + +Package { + packageGroup = "UMD" + packageName = "METK" + + owner = "Konrad" + description = "The Medical Explortation Toolkit (www.metk.net)" +} + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wol...@us...> - 2009-06-12 15:44:10
|
Revision: 63 http://mevislabmodules.svn.sourceforge.net/mevislabmodules/?rev=63&view=rev Author: wolfspindler Date: 2009-06-12 15:44:01 +0000 (Fri, 12 Jun 2009) Log Message: ----------- BUG: -Backward slashes replaced by forward slashes to try to fix a compile problem on Linux. Let's see whether it works.. Modified Paths: -------------- trunk/Community/General/Sources/ML/MLWEMCommunityModules/MLWEMCommunityModules.pro Modified: trunk/Community/General/Sources/ML/MLWEMCommunityModules/MLWEMCommunityModules.pro =================================================================== --- trunk/Community/General/Sources/ML/MLWEMCommunityModules/MLWEMCommunityModules.pro 2009-06-12 15:38:30 UTC (rev 62) +++ trunk/Community/General/Sources/ML/MLWEMCommunityModules/MLWEMCommunityModules.pro 2009-06-12 15:44:01 UTC (rev 63) @@ -32,12 +32,12 @@ HEADERS += \ MLWEMCommunityModulesInit.h \ MLWEMCommunityModulesSystem.h \ - WEMPlane\WEMMarchingCubes.h \ - WEMPlane\WEMPlane.h + WEMPlane/WEMMarchingCubes.h \ + WEMPlane/WEMPlane.h SOURCES += \ MLWEMCommunityModulesInit.cpp \ - WEMPlane\WEMPlane.cpp + WEMPlane/WEMPlane.cpp RELATEDFILES += \ ../../../Modules/ML/MLWEMCommunityModules/MLWEMCommunityModules.def This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wol...@us...> - 2009-06-12 15:38:37
|
Revision: 62 http://mevislabmodules.svn.sourceforge.net/mevislabmodules/?rev=62&view=rev Author: wolfspindler Date: 2009-06-12 15:38:30 +0000 (Fri, 12 Jun 2009) Log Message: ----------- BUG: -Unused Package MathUtils removed to avoid link problems. -Line endings unified. Modified Paths: -------------- trunk/Community/General/Sources/ML/MLWEMCommunityModules/MLWEMCommunityModules.pro trunk/Community/General/Sources/ML/MLWEMCommunityModules/WEMPlane/WEMPlane.h Property Changed: ---------------- trunk/Community/General/Sources/ML/MLWEMCommunityModules/ Property changes on: trunk/Community/General/Sources/ML/MLWEMCommunityModules ___________________________________________________________________ Added: svn:ignore + MLWEMCommunityModules.sln MLWEMCommunityModules.suo MLWEMCommunityModules.vcproj MLWEMCommunityModules.vcproj.lapsus-win.wolf.user Modified: trunk/Community/General/Sources/ML/MLWEMCommunityModules/MLWEMCommunityModules.pro =================================================================== --- trunk/Community/General/Sources/ML/MLWEMCommunityModules/MLWEMCommunityModules.pro 2009-06-12 15:13:45 UTC (rev 61) +++ trunk/Community/General/Sources/ML/MLWEMCommunityModules/MLWEMCommunityModules.pro 2009-06-12 15:38:30 UTC (rev 62) @@ -17,7 +17,7 @@ # add dependencies of this project here -CONFIG += dll ML MLBase MLTools MathUtils newmat MLWEM boost +CONFIG += dll ML MLBase MLTools newmat MLWEM boost MLAB_PACKAGES += MeVisLab_Standard Modified: trunk/Community/General/Sources/ML/MLWEMCommunityModules/WEMPlane/WEMPlane.h =================================================================== --- trunk/Community/General/Sources/ML/MLWEMCommunityModules/WEMPlane/WEMPlane.h 2009-06-12 15:13:45 UTC (rev 61) +++ trunk/Community/General/Sources/ML/MLWEMCommunityModules/WEMPlane/WEMPlane.h 2009-06-12 15:38:30 UTC (rev 62) @@ -16,8 +16,8 @@ #ifndef __MLWEMPLANE_H__ #define __MLWEMPLANE_H__ - -#include "../MLWEMCommunityModulesSystem.h" + +#include "../MLWEMCommunityModulesSystem.h" #include "mlOperatorIncludes.h" #include <WEMBase/WEMModuleBase/WEMProcessor.h> @@ -59,4 +59,4 @@ ML_END_NAMESPACE -#endif +#endif This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wol...@us...> - 2009-06-12 15:13:48
|
Revision: 61 http://mevislabmodules.svn.sourceforge.net/mevislabmodules/?rev=61&view=rev Author: wolfspindler Date: 2009-06-12 15:13:45 +0000 (Fri, 12 Jun 2009) Log Message: ----------- BUG: Extra qualification inside of class removed to fix compilation error on Linux. Modified Paths: -------------- trunk/Community/General/Sources/ML/MLImageUtilities/AnalyzeHeader/AnalyzeHeader.h Modified: trunk/Community/General/Sources/ML/MLImageUtilities/AnalyzeHeader/AnalyzeHeader.h =================================================================== --- trunk/Community/General/Sources/ML/MLImageUtilities/AnalyzeHeader/AnalyzeHeader.h 2009-06-12 15:05:24 UTC (rev 60) +++ trunk/Community/General/Sources/ML/MLImageUtilities/AnalyzeHeader/AnalyzeHeader.h 2009-06-12 15:13:45 UTC (rev 61) @@ -1,53 +1,53 @@ - -/* - This program is written by: - - Bart De Dobbelaer - - Laboratory for Medical Imaging Research - Radiologie/ESAT PSI - Universitair Ziekenhuis Gasthuisberg - Herestraat 49 - B-3000 Leuven - Belgium - - Email: Bar...@uz... -*/ - -//////////////////////////////////////////////////////////////////////// - -#ifndef __mlAnalyzeHeader_H__ -#define __mlAnalyzeHeader_H__ - -#include "../MLImageUtilitiesSystem.h" -#include "mlOperatorIncludes.h" - -ML_START_NAMESPACE - -//////////////////////////////////////////////////////////////////////// - -class MLIMAGEUTILITIES_EXPORT AnalyzeHeader : public BaseOp { -public: - AnalyzeHeader(); - virtual void handleNotification (Field *field); - virtual void activateAttachments(); -private: - StringField *_filenameFld; - - - FloatField *_funused1Fld; - FloatField *_funused2Fld; - FloatField *_funused3Fld; - - - void AnalyzeHeader::swap(void *s,int bytes); - bool AnalyzeHeader::checkEndianness(); - - ML_BASEOP_CLASS_HEADER(AnalyzeHeader) -}; - -//////////////////////////////////////////////////////////////////////// - -ML_END_NAMESPACE - -#endif + +/* + This program is written by: + + Bart De Dobbelaer + + Laboratory for Medical Imaging Research + Radiologie/ESAT PSI + Universitair Ziekenhuis Gasthuisberg + Herestraat 49 + B-3000 Leuven + Belgium + + Email: Bar...@uz... +*/ + +//////////////////////////////////////////////////////////////////////// + +#ifndef __mlAnalyzeHeader_H__ +#define __mlAnalyzeHeader_H__ + +#include "../MLImageUtilitiesSystem.h" +#include "mlOperatorIncludes.h" + +ML_START_NAMESPACE + +//////////////////////////////////////////////////////////////////////// + +class MLIMAGEUTILITIES_EXPORT AnalyzeHeader : public BaseOp { +public: + AnalyzeHeader(); + virtual void handleNotification (Field *field); + virtual void activateAttachments(); +private: + StringField *_filenameFld; + + + FloatField *_funused1Fld; + FloatField *_funused2Fld; + FloatField *_funused3Fld; + + + void swap(void *s,int bytes); + bool checkEndianness(); + + ML_BASEOP_CLASS_HEADER(AnalyzeHeader) +}; + +//////////////////////////////////////////////////////////////////////// + +ML_END_NAMESPACE + +#endif This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wol...@us...> - 2009-06-12 15:05:56
|
Revision: 60 http://mevislabmodules.svn.sourceforge.net/mevislabmodules/?rev=60&view=rev Author: wolfspindler Date: 2009-06-12 15:05:24 +0000 (Fri, 12 Jun 2009) Log Message: ----------- BUG: -VesselGraph SDK usage made dependent on existence of mlGraph headers. Modified Paths: -------------- trunk/Community/General/Sources/ML/MLLoadCAT08Data/MLLoadCAT08Data.pro Modified: trunk/Community/General/Sources/ML/MLLoadCAT08Data/MLLoadCAT08Data.pro =================================================================== --- trunk/Community/General/Sources/ML/MLLoadCAT08Data/MLLoadCAT08Data.pro 2009-06-12 14:45:04 UTC (rev 59) +++ trunk/Community/General/Sources/ML/MLLoadCAT08Data/MLLoadCAT08Data.pro 2009-06-12 15:05:24 UTC (rev 60) @@ -41,8 +41,13 @@ WARN = MAXIMUM64 # add used projects here (see included pri files below for available projects) -CONFIG += dll ML MLBase MLVesselGraph +CONFIG += dll ML MLBase +exists( $${PACKAGE_SOURCES}/ML/MLVesselGraph/mlGraph.h ) { + CONFIG += MLVesselGraph + DEFINES += ML_GRAPH_IS_AVAILABLE +} + MLAB_PACKAGES += MeVisLab_Standard # make sure that this file is included after CONFIG and MLAB_PACKAGES This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wol...@us...> - 2009-06-12 14:45:09
|
Revision: 59 http://mevislabmodules.svn.sourceforge.net/mevislabmodules/?rev=59&view=rev Author: wolfspindler Date: 2009-06-12 14:45:04 +0000 (Fri, 12 Jun 2009) Log Message: ----------- BUG: -Use of VesselGraph SDK deactivated with compiler switches (VesselGraph SDK is not available in public SDK). Modified Paths: -------------- trunk/Community/General/Sources/ML/MLLoadCAT08Data/mlLoadCAT08Data.cpp trunk/Community/General/Sources/ML/MLLoadCAT08Data/mlLoadCAT08Data.h Property Changed: ---------------- trunk/Community/General/Sources/ML/MLLoadCAT08Data/ Property changes on: trunk/Community/General/Sources/ML/MLLoadCAT08Data ___________________________________________________________________ Added: svn:ignore + MLLoadCAT08Data.sln MLLoadCAT08Data.suo MLLoadCAT08Data.vcproj MLLoadCAT08Data.vcproj.lapsus-win.wolf.user Modified: trunk/Community/General/Sources/ML/MLLoadCAT08Data/mlLoadCAT08Data.cpp =================================================================== --- trunk/Community/General/Sources/ML/MLLoadCAT08Data/mlLoadCAT08Data.cpp 2009-06-12 11:34:46 UTC (rev 58) +++ trunk/Community/General/Sources/ML/MLLoadCAT08Data/mlLoadCAT08Data.cpp 2009-06-12 14:45:04 UTC (rev 59) @@ -76,11 +76,12 @@ _outputCenterLineFld = fields.addBase("outputCenterLine"); _outputCenterLineFld->setBaseValue(&_centerLineList); - // Add base output for vessel graph - _outputGraphFld = fields.addBase("outputGraph"); - _outputGraphFld->setBaseValue(&_outputGraph); + #if ML_GRAPH_IS_AVAILABLE + // Add base output for vessel graph + _outputGraphFld = fields.addBase("outputGraph"); + _outputGraphFld->setBaseValue(&_outputGraph); + #endif - // Reactivate calls of handleNotification on field changes. handleNotificationOn(); } @@ -180,48 +181,49 @@ dataFileName.str(""); // This is a strange way to clear the dataFileName, but dataFileName.clear() does not work file_to_read.close(); - // Get vessel centerline as XMarkers and Vessel Graph - dataFileName << pathname << "vessel" << vesselNbr << "/" << "reference.txt"; - file_to_read.open(dataFileName.str().c_str()); - if(file_to_read) { - int pointNbr = 0; - // Create a new vessel graph edge - VesselEdge *graphEdge = new VesselEdge; - VesselNode *rootNode = NULL; - do { + #if ML_GRAPH_IS_AVAILABLE + // Get vessel centerline as XMarkers and Vessel Graph + dataFileName << pathname << "vessel" << vesselNbr << "/" << "reference.txt"; + file_to_read.open(dataFileName.str().c_str()); + if(file_to_read) { + int pointNbr = 0; + // Create a new vessel graph edge + VesselEdge *graphEdge = new VesselEdge; + VesselNode *rootNode = NULL; + do { - // Extract point and radius - double x,y,z,r,foo; - file_to_read >> x >> y >> z >> r >> foo; - vec3 pos(x,y,z); + // Extract point and radius + double x,y,z,r,foo; + file_to_read >> x >> y >> z >> r >> foo; + vec3 pos(x,y,z); - // Add to XMarker list - _centerLineList.appendItem(XMarker(vec6(pos,0,0,0), vec3(0))); + // Add to XMarker list + _centerLineList.appendItem(XMarker(vec6(pos,0,0,0), vec3(0))); - // If this is the first point, add new root to the Vessel Graph - if(0 == pointNbr) { - rootNode = new VesselNode(pos); // Create new node - _outputGraph.addNode(rootNode); // Add it to the graph - GraphRoot *gRoot = new GraphRoot(rootNode); // Make the new node a root - _outputGraph.addRoot(gRoot); - } - // Create a skeleton and add it to the edge - graphEdge->addSkeleton(Skeleton(pos, r, r)); + // If this is the first point, add new root to the Vessel Graph + if(0 == pointNbr) { + rootNode = new VesselNode(pos); // Create new node + _outputGraph.addNode(rootNode); // Add it to the graph + GraphRoot *gRoot = new GraphRoot(rootNode); // Make the new node a root + _outputGraph.addRoot(gRoot); + } + // Create a skeleton and add it to the edge + graphEdge->addSkeleton(Skeleton(pos, r, r)); - // Increment - ++pointNbr; - }while(!file_to_read.eof()); - - // Finish generating the vessel graph by adding the edge and end node to the graph - VesselNode *endNode = new VesselNode(graphEdge->backSkeleton()->pos); - _outputGraph.addNode(endNode); - // Connect the vessel edge - graphEdge->setPred(rootNode); - graphEdge->setSucc(endNode); - // Add the vessel edge to the graph - _outputGraph.attachIdEdge(graphEdge,rootNode->getId(),endNode->getId()); - - } + // Increment + ++pointNbr; + }while(!file_to_read.eof()); + + // Finish generating the vessel graph by adding the edge and end node to the graph + VesselNode *endNode = new VesselNode(graphEdge->backSkeleton()->pos); + _outputGraph.addNode(endNode); + // Connect the vessel edge + graphEdge->setPred(rootNode); + graphEdge->setSucc(endNode); + // Add the vessel edge to the graph + _outputGraph.attachIdEdge(graphEdge,rootNode->getId(),endNode->getId()); + } + #endif dataFileName.str(""); // This is a strange way to clear the dataFileName, but dataFileName.clear() does not work file_to_read.close(); file_to_read.clear(); // Another strange thing, clear() must be called when we read the file to eof, otherwise we cannot reopen file_to_read later. @@ -232,7 +234,9 @@ _outputSFld->notifyAttachments(); _outputEFld->notifyAttachments(); _outputCenterLineFld->notifyAttachments(); - _outputGraphFld->notifyAttachments(); + #if ML_GRAPH_IS_AVAILABLE + _outputGraphFld->notifyAttachments(); + #endif } void LoadCAT08Data::_clearAll() @@ -243,7 +247,9 @@ _SList.clear(); _EList.clear(); _centerLineList.clear(); - _outputGraph.clearGraph(); + #if ML_GRAPH_IS_AVAILABLE + _outputGraph.clearGraph(); + #endif } Modified: trunk/Community/General/Sources/ML/MLLoadCAT08Data/mlLoadCAT08Data.h =================================================================== --- trunk/Community/General/Sources/ML/MLLoadCAT08Data/mlLoadCAT08Data.h 2009-06-12 11:34:46 UTC (rev 58) +++ trunk/Community/General/Sources/ML/MLLoadCAT08Data/mlLoadCAT08Data.h 2009-06-12 14:45:04 UTC (rev 59) @@ -44,10 +44,12 @@ // ML includes #include "mlOperatorIncludes.h" #include "mlXMarkerList.h" -#include "mlGraph.h" -#include "mlVesselNode.h" -#include "mlVesselEdge.h" -#include "mlSkeleton.h" +#if ML_GRAPH_IS_AVAILABLE + #include "mlGraph.h" + #include "mlVesselNode.h" + #include "mlVesselEdge.h" + #include "mlSkeleton.h" +#endif ML_START_NAMESPACE @@ -82,7 +84,9 @@ BaseField* _outputSFld; BaseField* _outputEFld; BaseField* _outputCenterLineFld; - BaseField* _outputGraphFld; + #if ML_GRAPH_IS_AVAILABLE + BaseField* _outputGraphFld; + #endif //! Data structures for A,B,S,E points, centerlines and an ML Graph XMarkerList _AList; @@ -90,7 +94,9 @@ XMarkerList _SList; XMarkerList _EList; XMarkerList _centerLineList; - Graph _outputGraph; + #if ML_GRAPH_IS_AVAILABLE + Graph _outputGraph; + #endif //! Clear all data structures. void _clearAll(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bar...@us...> - 2009-06-12 11:34:49
|
Revision: 58 http://mevislabmodules.svn.sourceforge.net/mevislabmodules/?rev=58&view=rev Author: bartdedobbelaer Date: 2009-06-12 11:34:46 +0000 (Fri, 12 Jun 2009) Log Message: ----------- - Implemented patch from Pieter Kitselaar Modified Paths: -------------- trunk/Community/General/Modules/Macros/CombinedOrthoView/CombinedOrthoView2D.py trunk/Community/General/Modules/Macros/CombinedOrthoView/CombinedOrthoView2D.script trunk/Community/General/Modules/Macros/CombinedOrthoView/CombinedOrthoView3D.py trunk/Community/General/Modules/Macros/CombinedOrthoView/CombinedOrthoView3D.script Modified: trunk/Community/General/Modules/Macros/CombinedOrthoView/CombinedOrthoView2D.py =================================================================== --- trunk/Community/General/Modules/Macros/CombinedOrthoView/CombinedOrthoView2D.py 2009-06-12 10:52:48 UTC (rev 57) +++ trunk/Community/General/Modules/Macros/CombinedOrthoView/CombinedOrthoView2D.py 2009-06-12 11:34:46 UTC (rev 58) @@ -23,4 +23,7 @@ freeFloat.setControlSize(soRenderArea1, hwidth - 2 * margin, hheight - 2 * margin) - return \ No newline at end of file + return + +def update(): + mainFrameResizeEventSlot(None) \ No newline at end of file Modified: trunk/Community/General/Modules/Macros/CombinedOrthoView/CombinedOrthoView2D.script =================================================================== --- trunk/Community/General/Modules/Macros/CombinedOrthoView/CombinedOrthoView2D.script 2009-06-12 10:52:48 UTC (rev 57) +++ trunk/Community/General/Modules/Macros/CombinedOrthoView/CombinedOrthoView2D.script 2009-06-12 11:34:46 UTC (rev 58) @@ -49,7 +49,13 @@ viewing = Yes } } - } + } + + FieldListener { + listenField = position + listenField = margin + command = update + } } EventFilter { Modified: trunk/Community/General/Modules/Macros/CombinedOrthoView/CombinedOrthoView3D.py =================================================================== --- trunk/Community/General/Modules/Macros/CombinedOrthoView/CombinedOrthoView3D.py 2009-06-12 10:52:48 UTC (rev 57) +++ trunk/Community/General/Modules/Macros/CombinedOrthoView/CombinedOrthoView3D.py 2009-06-12 11:34:46 UTC (rev 58) @@ -23,4 +23,7 @@ freeFloat.setControlSize(soExaminerViewer, hwidth - 2 * margin, hheight - 2 * margin) - return \ No newline at end of file + return + +def update(): + mainFrameResizeEventSlot(None) \ No newline at end of file Modified: trunk/Community/General/Modules/Macros/CombinedOrthoView/CombinedOrthoView3D.script =================================================================== --- trunk/Community/General/Modules/Macros/CombinedOrthoView/CombinedOrthoView3D.script 2009-06-12 10:52:48 UTC (rev 57) +++ trunk/Community/General/Modules/Macros/CombinedOrthoView/CombinedOrthoView3D.script 2009-06-12 11:34:46 UTC (rev 58) @@ -52,7 +52,13 @@ viewing = Yes } } - } + } + + FieldListener { + listenField = position + listenField = margin + command = update + } } EventFilter { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bro...@us...> - 2009-06-12 10:52:56
|
Revision: 57 http://mevislabmodules.svn.sourceforge.net/mevislabmodules/?rev=57&view=rev Author: broersen Date: 2009-06-12 10:52:48 +0000 (Fri, 12 Jun 2009) Log Message: ----------- ENH: -Added checkbox to show/hide MATLAB session window Modified Paths: -------------- trunk/Community/General/Modules/ML/MLMatlabScriptWrapper/MLMatlabScriptWrapper.def trunk/Community/General/Modules/ML/MLMatlabScriptWrapper/html/MatlabScriptWrapper.html Modified: trunk/Community/General/Modules/ML/MLMatlabScriptWrapper/MLMatlabScriptWrapper.def =================================================================== --- trunk/Community/General/Modules/ML/MLMatlabScriptWrapper/MLMatlabScriptWrapper.def 2009-06-12 10:49:00 UTC (rev 56) +++ trunk/Community/General/Modules/ML/MLMatlabScriptWrapper/MLMatlabScriptWrapper.def 2009-06-12 10:52:48 UTC (rev 57) @@ -41,8 +41,9 @@ expandX = yes browseButton = ON browseMode = open - browseFilter = "Database Files (*.m)" - dependsOn = useExternalScript} + browseFilter = "MATLAB M-files (*.m)" + dependsOn = useExternalScript + } } Vertical { Horizontal { @@ -67,8 +68,9 @@ } } Horizontal { - CheckBox autoUpdate {title = "Auto-update on input data change"} - Button restartMatlab {alignX = Right title = "Restart Matlab"} + CheckBox autoUpdate { title = "Auto-update on input data change" } + CheckBox showSessionWindow { title = "Show Matlab session window" } + Button restartMatlab { alignX = Right title = "Restart Matlab" } } Field status { title = "Status:" edit = No } Button update { alignX = Left title = "Update" } Modified: trunk/Community/General/Modules/ML/MLMatlabScriptWrapper/html/MatlabScriptWrapper.html =================================================================== --- trunk/Community/General/Modules/ML/MLMatlabScriptWrapper/html/MatlabScriptWrapper.html 2009-06-12 10:49:00 UTC (rev 56) +++ trunk/Community/General/Modules/ML/MLMatlabScriptWrapper/html/MatlabScriptWrapper.html 2009-06-12 10:52:48 UTC (rev 57) @@ -314,6 +314,17 @@ Execute the script automatically on input change (only for input images and the XMarkerList, not for changes in the GUI).<br> + <span style="font-weight: bold;">Show Matlab session window</span><br> + +Show or hide the Matlab session window.<br> + + + <span style="font-weight: bold;">Restart Matlab</span><br> + +Restarts the Matlab engine.<br><br> + + + <span style="font-weight: bold;">Status</span><br> @@ -321,14 +332,10 @@ <br> - <span style="font-weight: bold;">Restart Matlab</span><br> -Restarts the Matlab engine.<br> - - </blockquote> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bro...@us...> - 2009-06-12 10:49:02
|
Revision: 56 http://mevislabmodules.svn.sourceforge.net/mevislabmodules/?rev=56&view=rev Author: broersen Date: 2009-06-12 10:49:00 +0000 (Fri, 12 Jun 2009) Log Message: ----------- ENH: -Added functionality to show/hide MATLAB session window Modified Paths: -------------- trunk/Community/General/Sources/ML/MLMatlabScriptWrapper/mlMatlabScriptWrapper.cpp trunk/Community/General/Sources/ML/MLMatlabScriptWrapper/mlMatlabScriptWrapper.h Modified: trunk/Community/General/Sources/ML/MLMatlabScriptWrapper/mlMatlabScriptWrapper.cpp =================================================================== --- trunk/Community/General/Sources/ML/MLMatlabScriptWrapper/mlMatlabScriptWrapper.cpp 2009-06-11 15:00:53 UTC (rev 55) +++ trunk/Community/General/Sources/ML/MLMatlabScriptWrapper/mlMatlabScriptWrapper.cpp 2009-06-12 10:49:00 UTC (rev 56) @@ -76,6 +76,9 @@ //! Where will matlab script be dumped. (_matlabScriptPathFld = fields->addString("matlabScriptPath"))->setStringValue(""); + //! Show the Matlab session window. + (_showSessionWindowFld = fields->addBool("showSessionWindow"))->setBoolValue(false); + //! Set input and output data names used in matlab. (_inDataNameFld[0] = fields->addString("inDataName0"))->setStringValue("Input0"); (_inDataNameFld[1] = fields->addString("inDataName1"))->setStringValue("Input1"); @@ -115,7 +118,9 @@ //! Reactivate calls of handleNotification on field changes. handleNotificationOn(); - m_pEngine = engOpen("\0"); + m_pEngine = engOpen(NULL); + engSetVisible(m_pEngine,false); + if ( !_checkMatlabIsStarted() ) { std::cerr << "MatlabScriptWrapper::MatlabScriptWrapper():" << std::endl; @@ -159,17 +164,24 @@ { if(!_checkMatlabIsStarted()) { // Start Matlab if it's not started. - m_pEngine = engOpen("\0"); + m_pEngine = engOpen(NULL); + engSetVisible(m_pEngine,_showSessionWindowFld->getBoolValue()); + } else { + std::cout << "Matlab is already started"; } - else{ - std::cout<<"Matlab is already started"; + } + + if(field == _showSessionWindowFld) { + if(_showSessionWindowFld->isOn()) { + engSetVisible(m_pEngine, true); + } else { + engSetVisible(m_pEngine, false); } } - + // Update output only if autoapply is enabled. - if ( ((field == getInField(0))||(field == getInField(1))||(field == getInField(2))) && (_autoCalculationFld->isOn()) - || (field == _calculateFld) ) - { + if ( ((field == getInField(0))||(field == getInField(1))||(field == getInField(2))) && (_autoCalculationFld->isOn()) + || (field == _calculateFld) ) { // Check if Matlab is started. if (!_checkMatlabIsStarted()) { _statusFld->setStringValue("Cannot finding matlab engine!"); @@ -181,8 +193,7 @@ bool validScriptString = true; if(_useExternalScriptFld->isOn()) { // Get script from .m-file validScriptString = _loadMatlabScriptFromFile(evaluateString); - } - else { + } else { evaluateString = _matlabScriptFld->getStringValue(); } @@ -207,8 +218,7 @@ if(mtmp!=NULL) { _statusFld->setStringValue("Execution successful!"); engEvalString(m_pEngine, "clear mevmatscr"); - } - else { + } else { _statusFld->setStringValue("Matlab script contains errors!"); _clearAllVariables(); } @@ -493,7 +503,7 @@ // Get XMarkerList size and go through all list step by step. const size_t listSize = inputXMarkerList.size(); - for(i = 0; i < listSize; i++) + for(i = 0; i < listSize; i++) { XMarker marker = inputXMarkerList[i]; @@ -536,7 +546,6 @@ { // File to open. std::ifstream dat; - dat.open(pathString.c_str()); if(dat.fail()) { // Throw error message if file couldn't be opened. Modified: trunk/Community/General/Sources/ML/MLMatlabScriptWrapper/mlMatlabScriptWrapper.h =================================================================== --- trunk/Community/General/Sources/ML/MLMatlabScriptWrapper/mlMatlabScriptWrapper.h 2009-06-11 15:00:53 UTC (rev 55) +++ trunk/Community/General/Sources/ML/MLMatlabScriptWrapper/mlMatlabScriptWrapper.h 2009-06-12 10:49:00 UTC (rev 56) @@ -136,10 +136,13 @@ StringField* _matlabScriptFld; //! Use external script. BoolField* _useExternalScriptFld; - + //! Name of file where matlab script will be dumped. StringField *_matlabScriptPathFld; - + + //! Show the Matlab session window. + BoolField* _showSessionWindowFld; + //{@ Set matlab names for input and output images. StringField *_inDataNameFld[3]; StringField *_outDataNameFld[3]; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <of...@us...> - 2009-06-11 15:00:59
|
Revision: 55 http://mevislabmodules.svn.sourceforge.net/mevislabmodules/?rev=55&view=rev Author: ofriman Date: 2009-06-11 15:00:53 +0000 (Thu, 11 Jun 2009) Log Message: ----------- Added the MatlabScriptWrapper to the ignore list as it requires Matlab lib files to compile. Modified Paths: -------------- trunk/Community/General/Configuration/MasterBuilder/MLAB_Community_General/ignoredProFiles.txt Modified: trunk/Community/General/Configuration/MasterBuilder/MLAB_Community_General/ignoredProFiles.txt =================================================================== --- trunk/Community/General/Configuration/MasterBuilder/MLAB_Community_General/ignoredProFiles.txt 2009-06-11 07:34:23 UTC (rev 54) +++ trunk/Community/General/Configuration/MasterBuilder/MLAB_Community_General/ignoredProFiles.txt 2009-06-11 15:00:53 UTC (rev 55) @@ -13,6 +13,7 @@ # Example of an ignored profile: # Sources/ML/MLExampleProject/MLExampleProject.pro +Sources/ML/MLMatlabScriptWrapper/MLMatlabScriptWrapper.pro # Example of an ignored directory (including subdirs): # Sources/ML/MLExampleProject/* This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |