Changeset 6655

Timestamp:

Dec 5, 2016 11:06:37 AM (7 years ago)

Author:

ldelgass

Message:

merge from trunk;

Location:

branches/blt4_trunk

Files:

• . (modified) (1 prop)
• gui/scripts/map.tcl (modified) (1 diff)
• gui/scripts/molvisviewer.tcl (modified) (5 diffs)

branches/blt4_trunk/gui/scripts/map.tcl

@@ -215 +215 @@
     } elseif { $projection == "equirectangular" ||
                $projection == "eqc-wgs84" } {
-        set projection "epsg:32663"
+        # FIXME: epsg:32663 not recognized?
+        #set projection "epsg:32663"
+        set projection "+proj=eqc +lat_ts=0 +lat_0=0 +lon_0=0 +x_0=0 +y_0=0 +ellps=WGS84 +datum=WGS84 +units=m +no_defs"
     }
     # FIXME: Verify projection is valid.
     setProjection $projection
     if {$extents != ""} {
-        foreach {xmin ymin xmax ymax srs} $extents {}
-        if {$srs == ""} {
-            setExtents $xmin $ymin $xmax $ymax
+        if {[string range $projection 0 6] == "global-"} {
+            puts stderr "ERROR: cannot specify extents for global profile"
+            clearExtents
         } else {
-            setExtents $xmin $ymin $xmax $ymax $srs
+            foreach {xmin ymin xmax ymax srs} $extents {}
+            if {$srs == ""} {
+                setExtents $xmin $ymin $xmax $ymax
+            } else {
+                setExtents $xmin $ymin $xmax $ymax $srs
+            }
         }
     } else {

branches/blt4_trunk/gui/scripts/molvisviewer.tcl

@@ -910 +910 @@
             set serial    1
 
-            if { $_reportClientInfo }  {
-                set parent [$dataobj parent -as object]
-                while { $parent != "" } {
-                    set xmlobj $parent
-                    set parent [$parent parent -as object]
-                }
-                set info {}
-                lappend info "tool_id"      [$xmlobj get tool.id]
-                lappend info "tool_name"    [$xmlobj get tool.name]
-                lappend info "tool_title"   [$xmlobj get tool.title]
-                lappend info "tool_command" [$xmlobj get tool.execute]
-                lappend info "tool_revision" \
-                    [$xmlobj get tool.version.application.revision]
-                SendCmd "clientinfo [list $info]"
-            }
             foreach _atom [$dataobj children -type atom components.molecule] {
                 set symbol [$dataobj get components.molecule.$_atom.symbol]
@@ -946 +931 @@
                 incr serial
             }
+            if { $_reportClientInfo }  {
+                set parent [$dataobj parent -as object]
+                while { $parent != "" } {
+                    set xmlobj $parent
+                    set parent [$parent parent -as object]
+                }
+            }
             if {"" != $data1} {
                 # Save the PDB data in case the user wants to later save it.
                 set _pdbdata $data1
                 set numBytes [string length $data1]
+
+                if { $_reportClientInfo }  {
+                    set info {}
+                    lappend info "tool_id"      [$xmlobj get tool.id]
+                    lappend info "tool_name"    [$xmlobj get tool.name]
+                    lappend info "tool_title"   [$xmlobj get tool.title]
+                    lappend info "tool_command" [$xmlobj get tool.execute]
+                    lappend info "tool_revision" \
+                        [$xmlobj get tool.version.application.revision]
+                    lappend info "dataset_type" "molecule-xml"
+                    lappend info "dataset_size"  $numBytes
+                    lappend info "dataset_tag"   $model-$state
+                    SendCmd "clientinfo [list $info]"
+                }
 
                 # We know we're buffered here, so append the "loadpdb" command
@@ -964 +970 @@
                 set numBytes [string length $data2]
 
+                if { $_reportClientInfo }  {
+                    set info {}
+                    lappend info "tool_id"      [$xmlobj get tool.id]
+                    lappend info "tool_name"    [$xmlobj get tool.name]
+                    lappend info "tool_title"   [$xmlobj get tool.title]
+                    lappend info "tool_command" [$xmlobj get tool.execute]
+                    lappend info "tool_revision" \
+                        [$xmlobj get tool.version.application.revision]
+                    lappend info "dataset_type" "pdb"
+                    lappend info "dataset_size"  $numBytes
+                    lappend info "dataset_tag"   $model-$state
+                    SendCmd "clientinfo [list $info]"
+                }
+
                 # We know we're buffered here, so append the "loadpdb" command
                 # with the data payload immediately afterwards.
@@ -971 +991 @@
             }
             # lammps dump file overwrites pdb file (change this?)
-            set lammpstypemap [$dataobj get components.molecule.lammpstypemap]
             set lammpsdata [$dataobj get components.molecule.lammps]
             if {"" != $lammpsdata} {
+                set lammpstypemap [$dataobj get components.molecule.lammpstypemap]
                 set data3 ""
                 set modelcount 0
@@ -1013 +1033 @@
                     set numBytes [string length $data3]
 
+                    if { $_reportClientInfo }  {
+                        set info {}
+                        lappend info "tool_id"      [$xmlobj get tool.id]
+                        lappend info "tool_name"    [$xmlobj get tool.name]
+                        lappend info "tool_title"   [$xmlobj get tool.title]
+                        lappend info "tool_command" [$xmlobj get tool.execute]
+                        lappend info "tool_revision" \
+                            [$xmlobj get tool.version.application.revision]
+                        lappend info "dataset_type" "lammps"
+                        lappend info "dataset_size"  $numBytes
+                        lappend info "dataset_tag"   $model-$state
+                        SendCmd "clientinfo [list $info]"
+                    }
+
                     # We know we're buffered here, so append the "loadpdb"
                     # command with the data payload immediately afterwards.