stuff

opensourceBIM · Dec 7, 2014 · 5c6590c · 5c6590c
1 parent a18fa6e
commit 5c6590c
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 16 deletions.
diff --git a/.classpath b/.classpath
@@ -12,10 +12,6 @@
 	<classpathentry kind="lib" path="build/antlibs/githubrelease.jar"/>
 	<classpathentry kind="lib" path="build/antlibs/org.eclipse.egit.github.core-2.1.5.jar"/>
 	<classpathentry kind="lib" path="build/antlibs/fluent-hc-4.3.6.jar"/>
-	<classpathentry kind="lib" path="build/antlibs/httpclient-4.3.6.jar"/>
-	<classpathentry kind="lib" path="build/antlibs/httpclient-cache-4.3.6.jar"/>
-	<classpathentry kind="lib" path="build/antlibs/httpcore-4.3.3.jar"/>
-	<classpathentry kind="lib" path="build/antlibs/httpmime-4.3.6.jar"/>
 	<classpathentry kind="lib" path="build/antlibs/httpclient-4.3.2.jar"/>
 	<classpathentry kind="lib" path="build/antlibs/httpclient-cache-4.3.2.jar"/>
 	<classpathentry kind="lib" path="build/antlibs/httpcore-4.3.1.jar"/>

diff --git a/2dview.html b/2dview.html
@@ -1,5 +1,8 @@
 <div class="twodview">
-	<div id="viewport" class="viewport">
+	<div class="alert alert-warning">
+		THIS IS IN DEVELOPMENT
+	</div>
+	<div id="viewport2d" class="viewport2d">
 		<svg xmlns="http://www.w3.org/2000/svg"></svg>
 	</div>
 </div>

diff --git a/3dview.html b/3dview.html
@@ -1,4 +1,9 @@
 <div class="threedview">
+	<div class="progressbars">
+		<div class="waiting">
+			<span class="badge">3</span><span class="text"> Waiting...</span>
+		</div>
+	</div>
 	<div id="viewport"></div>
 </div>
 <script>
@@ -44,7 +49,7 @@
 
 	this.objectVisibilityChanged = function(objects, oldModes){
 		// todo use groupid
-
+		
 		var uniqueRoids = [];
 
 		if (Array.isArray(objects) && Array.isArray(oldModes)) {
@@ -170,8 +175,8 @@
 	};
 
 	this.loadRevision = function(project, roid, types){
-		var model = projectPage.models[roid];
-		model.getAllOfType("IfcProject", false, function(ifcProduct){
+//		var model = projectPage.models[roid];
+/*		model.getAllOfType("IfcProject", false, function(ifcProduct){
 			ifcProduct.getUnitsInContext(function(ifcUnitAssignment){
 				ifcUnitAssignment.getUnits(function(ifcUnit){
 					if (ifcUnit.getType() == "IfcSIUnit") {
@@ -185,8 +190,7 @@
 				});
 			});
 		});
-
-		/*
+
 		if (roid != -1 && project.nrSubProjects == 0) {
 			var geometryLoader = new GeometryLoader(Global.bimServerApi, o.viewer);
 
@@ -218,7 +222,7 @@
 			});
 			geometryLoader.setLoadRevision(roid, types);
 		}
-		*/
+*/
 	};
 
 	this.close = function(){};

diff --git a/project.html b/project.html
@@ -332,7 +332,7 @@
 		containerDiv.find(".rightCol > .details").hide();
 		containerDiv.find(".rightCol > .rightpanel").show();
 		containerDiv.find(".rightCol > .rightpanel").load("rightpanel.html", function(){
-			othis.rightPanel = new RightPanel($(this), othis);
+			othis.rightPanel = new RightPanel($(this), main, othis);
 			othis.rightPanel.selectListeners.push(othis.selected);
 			othis.rightPanel.unselectListeners.push(othis.unselected);
 

diff --git a/projectdetails.html b/projectdetails.html
@@ -8,11 +8,9 @@
 	  <li class="queryLink"><a>Query</a></li>
 	  <li class="extendedDataLink"><a>Extended Data</a></li>
 	  <li class="browserLink"><a>Browse</a></li>
-	  <!--  <li class="surferLink"><a>Surf</a></li>-->
 	  <li class="usersLink"><a>Users</a></li>
 	  <li class="modelCheckersLink"><a>Model Checkers</a></li>
 	  <li class="logLink"><a>Log</a></li>
-	  <li class="3dLink"><a>3D</a></li>
 	</ul>
 	<div class="content">
 		<div class="tab-pane details">

diff --git a/rightpanel.html b/rightpanel.html
@@ -3,7 +3,7 @@
 		<div class="panel-heading btn-group threedviewTabs" style="padding: 0px; width: 100%" data-toggle="buttons">
 			<label class="btn btn-default button2d"> <input type="radio" name="options" id="option1" autocomplete="off">2D</label>
 			<label class="btn btn-default button3d active"> <input type="radio" name="options" id="option2" autocomplete="off" checked>3D</label>
-			<label class="btn btn-default"> <input type="radio" name="options" id="option3" autocomplete="off">Details</label>
+			<label class="btn btn-default buttonDetails"> <input type="radio" name="options" id="option3" autocomplete="off">Details</label>
 		</div>
 		<div class="panel-body">
 			<div class="content">
@@ -12,7 +12,7 @@
 	</div>
 </div>
 <script>
-function RightPanel(containerDiv, projectPage) {
+function RightPanel(containerDiv, main, projectPage) {
 	var o = this;
 
 	o.selectListeners = [];
@@ -33,5 +33,11 @@
 			new ThreeDView($(this), projectPage);
 		});
 	});
+
+	containerDiv.find(".buttonDetails").click(function(){
+		containerDiv.find(".content").load("projectdetails.html", function(){
+			new ProjectDetails($(this), main, projectPage.project, projectPage).show();
+		});
+	});
 }
 </script>