fix to handle also neutral models

unibas-gravis · Oct 9, 2017 · 8528db7 · 8528db7
1 parent 88edbac
commit 8528db7
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/src/main/scala/faces/apps/ModelViewer.scala b/src/main/scala/faces/apps/ModelViewer.scala
@@ -93,14 +93,14 @@ case class SimpleModelViewer(
     case _ => model.neutralModel.shape.rank
   }
 
-  val colorRank = maximalShapeRank match {
+  val colorRank = maximalColorRank match {
     case Some(rank) => min(model.neutralModel.color.rank, rank)
     case _ => model.neutralModel.color.rank
   }
 
-  val expRank = maximalShapeRank match {
-    case Some(rank) => min(model.expressionModel.get.expression.rank, rank)
-    case _ => model.expressionModel.get.expression.rank
+  val expRank = maximalExpressionRank match {
+    case Some(rank) => try{min(model.expressionModel.get.expression.rank, rank)} catch {case e: Exception => 0}
+    case _ => try{model.expressionModel.get.expression.rank} catch {case e: Exception => 0}
   }
 
   val renderer = MoMoRenderer(model, RGBA.BlackTransparent).cached(5)