[Mevislabmodules-svn] SF.net SVN: mevislabmodules:[358] trunk/Community/General/Modules/Macros/ Viewers

[<rha...@us...>]

Revision: 358
          http://mevislabmodules.svn.sourceforge.net/mevislabmodules/?rev=358&view=rev
Author:   rhameeteman
Date:     2011-06-15 07:57:48 +0000 (Wed, 15 Jun 2011)

Log Message:
-----------
KH.

* Fixed bug in displayed LUT values

Modified Paths:
--------------
    trunk/Community/General/Modules/Macros/Viewers/nSyncViewer.mlab
    trunk/Community/General/Modules/Macros/Viewers/nSyncViewer.py
    trunk/Community/General/Modules/Macros/Viewers/nSyncViewer.script

Modified: trunk/Community/General/Modules/Macros/Viewers/nSyncViewer.mlab
===================================================================
--- trunk/Community/General/Modules/Macros/Viewers/nSyncViewer.mlab	2011-06-08 16:11:47 UTC (rev 357)
+++ trunk/Community/General/Modules/Macros/Viewers/nSyncViewer.mlab	2011-06-15 07:57:48 UTC (rev 358)
@@ -2,6 +2,86 @@
 network  {
   watchlist = ""
 }
+module SyncFields {
+  internal  {
+    frame = "-179 793 136 64"
+    moduleGroupName = ""
+    windows  {
+      window _default {
+        geometry = "399 397 183 387"
+        sizeHint = "183 387"
+        wasOpen = no
+        wasActive = no
+      }
+    }
+  }
+  fields  {
+    instanceName = SyncViewingCenter
+    mode = Float
+    on = TRUE
+    precision = 0.001000000047
+    float0 = 0
+    float1 = 0
+    float2 = 0
+    float3 = 0
+    float4 = 0
+    float5 = 0
+    float6 = 0
+    float7 = 0
+    float8 = 0
+    float9 = 0
+    vector0 = "0 0 0 0 0 0"
+    vector1 = "0 0 0 0 0 0"
+    vector2 = "0 0 0 0 0 0"
+    vector3 = "0 0 0 0 0 0"
+    vector4 = "0 0 0 0 0 0"
+    vector5 = "0 0 0 0 0 0"
+    vector6 = "0 0 0 0 0 0"
+    vector7 = "0 0 0 0 0 0"
+    vector8 = "0 0 0 0 0 0"
+    vector9 = "0 0 0 0 0 0"
+  }
+}
+module SyncFields {
+  internal  {
+    frame = "-171 721 120 64"
+    moduleGroupName = ""
+    windows  {
+      window _default {
+        geometry = "399 397 183 387"
+        sizeHint = "183 387"
+        wasOpen = no
+        wasActive = no
+      }
+    }
+  }
+  fields  {
+    instanceName = SyncSliceOrigin
+    mode = Float
+    on = TRUE
+    precision = 0.001000000047
+    float0 = 0
+    float1 = 0
+    float2 = 0
+    float3 = 0
+    float4 = 0
+    float5 = 0
+    float6 = 0
+    float7 = 0
+    float8 = 0
+    float9 = 0
+    vector0 = "0 0 0 0 0 0"
+    vector1 = "0 0 0 0 0 0"
+    vector2 = "0 0 0 0 0 0"
+    vector3 = "0 0 0 0 0 0"
+    vector4 = "0 0 0 0 0 0"
+    vector5 = "0 0 0 0 0 0"
+    vector6 = "0 0 0 0 0 0"
+    vector7 = "0 0 0 0 0 0"
+    vector8 = "0 0 0 0 0 0"
+    vector9 = "0 0 0 0 0 0"
+  }
+}
 module CustomOrthoView2D {
   internal  {
     frame = "21 341 152 56"
@@ -484,7 +564,7 @@
       window _default {
         geometry = "455 147 183 434"
         sizeHint = "183 434"
-        wasOpen = yes
+        wasOpen = no
         wasActive = no
       }
     }
@@ -638,7 +718,7 @@
 }
 module SoSeparator {
   internal  {
-    frame = "-163 729 104 64"
+    frame = "-171 865 104 64"
     moduleGroupName = ""
   }
   fields  {

Modified: trunk/Community/General/Modules/Macros/Viewers/nSyncViewer.py
===================================================================
--- trunk/Community/General/Modules/Macros/Viewers/nSyncViewer.py	2011-06-08 16:11:47 UTC (rev 357)
+++ trunk/Community/General/Modules/Macros/Viewers/nSyncViewer.py	2011-06-15 07:57:48 UTC (rev 358)
@@ -193,14 +193,36 @@
   for i in range(1,nInputs) :
     if ( syncZoom ) :
       ctx.field( 'CustomOrthoView2D'+ str( i )+'.view.sliceZoom' ).connectFrom( ctx.field('CustomOrthoView2D'+ str( i-1 ) + '.view.sliceZoom') )
+      ctx.field( 'CustomOrthoView2D'+ str( i )+'.view.sliceOrigin1' ).connectFrom( ctx.field('CustomOrthoView2D'+ str( i-1 ) + '.view.sliceOrigin1') )
+      ctx.field( 'CustomOrthoView2D'+ str( i )+'.view.sliceOrigin2' ).connectFrom( ctx.field('CustomOrthoView2D'+ str( i-1 ) + '.view.sliceOrigin2') )
+      ctx.field( 'CustomOrthoView2D'+ str( i )+'.view.sliceOrigin3' ).connectFrom( ctx.field('CustomOrthoView2D'+ str( i-1 ) + '.view.sliceOrigin3') )
+      ctx.field( 'CustomOrthoView2D'+ str( i )+'.view.viewingCenter1' ).connectFrom( ctx.field('CustomOrthoView2D'+ str( i-1 ) + '.view.viewingCenter1') )
+      ctx.field( 'CustomOrthoView2D'+ str( i )+'.view.viewingCenter2' ).connectFrom( ctx.field('CustomOrthoView2D'+ str( i-1 ) + '.view.viewingCenter2') )
+      ctx.field( 'CustomOrthoView2D'+ str( i )+'.view.viewingCenter3' ).connectFrom( ctx.field('CustomOrthoView2D'+ str( i-1 ) + '.view.viewingCenter3') )
     else :
       ctx.field( 'CustomOrthoView2D'+ str( i ) + '.view.sliceZoom').disconnectAll()
+      ctx.field( 'CustomOrthoView2D'+ str( i )+'.view.sliceOrigin1' ).disconnectAll()
+      ctx.field( 'CustomOrthoView2D'+ str( i )+'.view.sliceOrigin2' ).disconnectAll()
+      ctx.field( 'CustomOrthoView2D'+ str( i )+'.view.sliceOrigin3' ).disconnectAll()
+      ctx.field( 'CustomOrthoView2D'+ str( i )+'.view.viewingCenter1' ).disconnectAll()
+      ctx.field( 'CustomOrthoView2D'+ str( i )+'.view.viewingCenter2' ).disconnectAll()
+      ctx.field( 'CustomOrthoView2D'+ str( i )+'.view.viewingCenter3' ).disconnectAll()
   if syncZoom :
     ctx.field( 'SyncZoom.float0' ).connectFrom(ctx.field('CustomOrthoView2D'+ str( nInputs-1 ) + '.view.sliceZoom'))
     ctx.field( 'CustomOrthoView2D0.view.sliceZoom').connectFrom(  ctx.field('SyncZoom.float1') )
+    ctx.field( 'CustomOrthoView2D0.view.sliceOrigin3' ).connectFrom( ctx.field('SyncSliceOrigin.float1') )
+    ctx.field( 'CustomOrthoView2D0.view.viewingCenter1' ).connectFrom( ctx.field('SyncViewingCenter.float1') )
   else :
     ctx.field( 'SyncZoom.float0' ).disconnectAll()
+    ctx.field( 'SyncSliceOrigin.float0' ).disconnectAll()
+    ctx.field( 'SyncViewingCenter.float0' ).disconnectAll()
     ctx.field( 'CustomOrthoView2D0.view.sliceZoom').disconnectAll()
+    ctx.field( 'CustomOrthoView2D0.view.sliceOrigin1' ).disconnectAll()
+    ctx.field( 'CustomOrthoView2D0.view.sliceOrigin2' ).disconnectAll()
+    ctx.field( 'CustomOrthoView2D0.view.sliceOrigin3' ).disconnectAll()
+    ctx.field( 'CustomOrthoView2D0.view.viewingCenter1' ).disconnectAll()
+    ctx.field( 'CustomOrthoView2D0.view.viewingCenter2' ).disconnectAll()
+    ctx.field( 'CustomOrthoView2D0.view.viewingCenter3' ).disconnectAll()
   return
 
 

Modified: trunk/Community/General/Modules/Macros/Viewers/nSyncViewer.script
===================================================================
--- trunk/Community/General/Modules/Macros/Viewers/nSyncViewer.script	2011-06-08 16:11:47 UTC (rev 357)
+++ trunk/Community/General/Modules/Macros/Viewers/nSyncViewer.script	2011-06-15 07:57:48 UTC (rev 358)
@@ -109,6 +109,9 @@
         item LAYOUT_CUBE_EQUAL {
           title = "Cube equal"
         }
+        item LAYOUT_ROW_EQUAL {
+          title = "Row equal"
+        }
       }
     }
     Field syncZoom            { type = bool   value = false }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.