Move feature set to a separate file.
This commit is contained in:
parent
a39de09715
commit
7c5a1d263b
@ -56,6 +56,7 @@
|
||||
"source/viewer/domviewer.js"
|
||||
],
|
||||
"website_files" : [
|
||||
"website/o3dv/featureset.js",
|
||||
"website/o3dv/utils.js",
|
||||
"website/o3dv/toolbar.js",
|
||||
"website/o3dv/treeview.js",
|
||||
|
||||
@ -70,6 +70,7 @@
|
||||
<!-- importer end -->
|
||||
|
||||
<!-- website start -->
|
||||
<script type="text/javascript" src="o3dv/featureset.js"></script>
|
||||
<script type="text/javascript" src="o3dv/utils.js"></script>
|
||||
<script type="text/javascript" src="o3dv/toolbar.js"></script>
|
||||
<script type="text/javascript" src="o3dv/treeview.js"></script>
|
||||
|
||||
@ -70,6 +70,7 @@
|
||||
<!-- importer end -->
|
||||
|
||||
<!-- website start -->
|
||||
<script type="text/javascript" src="o3dv/featureset.js"></script>
|
||||
<script type="text/javascript" src="o3dv/utils.js"></script>
|
||||
<script type="text/javascript" src="o3dv/toolbar.js"></script>
|
||||
<script type="text/javascript" src="o3dv/treeview.js"></script>
|
||||
|
||||
@ -1,9 +1,3 @@
|
||||
OV.FeatureSet =
|
||||
{
|
||||
SetDefaultColor : false,
|
||||
ModelQuantities : false
|
||||
};
|
||||
|
||||
OV.ShowMessageDialog = function (title, message, subMessage)
|
||||
{
|
||||
let dialog = new OV.ButtonDialog ();
|
||||
@ -28,8 +22,8 @@ OV.ShowListPopup = function (button, items, callbacks)
|
||||
let popup = new OV.ListPopup ();
|
||||
popup.SetCustomResizeHandler (function (modalDiv) {
|
||||
let offset = button.offset ();
|
||||
let left = offset.left + button.outerWidth (true);
|
||||
let bottom = offset.top + button.outerHeight (true);
|
||||
let left = offset.left + button.outerWidth (false);
|
||||
let bottom = offset.top + button.outerHeight (false);
|
||||
modalDiv.offset ({
|
||||
left : left,
|
||||
top : bottom - modalDiv.outerHeight (true)
|
||||
|
||||
5
website/o3dv/featureset.js
Normal file
5
website/o3dv/featureset.js
Normal file
@ -0,0 +1,5 @@
|
||||
OV.FeatureSet =
|
||||
{
|
||||
SetDefaultColor : false,
|
||||
ModelQuantities : false
|
||||
};
|
||||
@ -1,5 +1,12 @@
|
||||
OV.ShowQuantitiesDialog = function (model)
|
||||
{
|
||||
function AddTableRow (table, name, value)
|
||||
{
|
||||
let row = $('<tr>').appendTo (table);
|
||||
$('<td>').html (name).appendTo (row);
|
||||
$('<td>').addClass ('right').html (value).appendTo (row);
|
||||
}
|
||||
|
||||
if (model === null) {
|
||||
return OV.ShowMessageDialog (
|
||||
'Quantity Calculation Failed',
|
||||
@ -32,9 +39,10 @@ OV.ShowQuantitiesDialog = function (model)
|
||||
} else {
|
||||
volumeString = volume.toFixed (5);
|
||||
}
|
||||
const surfaceAreaString = surfaceArea.toFixed (5);
|
||||
$('<div>').html ('Volume: ' + volumeString).appendTo (contentDiv);
|
||||
$('<div>').html ('Surface Area: ' + surfaceAreaString).appendTo (contentDiv);
|
||||
let surfaceAreaString = surfaceArea.toFixed (5);
|
||||
let table = $('<table>').addClass ('ov_dialog_table').appendTo (contentDiv);
|
||||
AddTableRow (table, 'Volume', volumeString);
|
||||
AddTableRow (table, 'Surface Area', surfaceAreaString);
|
||||
|
||||
dialog.Show ();
|
||||
|
||||
|
||||
@ -265,8 +265,8 @@ div.ov_menu_info_panel div.ov_info_box_details
|
||||
|
||||
div.ov_menu_info_panel div.ov_info_box_row
|
||||
{
|
||||
overflow: auto;
|
||||
padding: 2px 0px;
|
||||
overflow: auto;
|
||||
}
|
||||
|
||||
div.ov_menu_info_panel div.ov_info_box_row_name
|
||||
@ -301,6 +301,7 @@ div.ov_menu_info_panel div.ov_info_box_rgbtext
|
||||
div.ov_menu_info_panel div.ov_info_box_button
|
||||
{
|
||||
cursor: pointer;
|
||||
margin-top: 10px;
|
||||
border: 1px solid #dddddd;
|
||||
border-radius: 5px;
|
||||
overflow: auto;
|
||||
@ -601,6 +602,23 @@ div.ov_dialog input.ov_dialog_checkradio
|
||||
margin-right: 10px;
|
||||
}
|
||||
|
||||
div.ov_dialog table.ov_dialog_table
|
||||
{
|
||||
width: 100%;
|
||||
border-collapse: collapse;
|
||||
}
|
||||
|
||||
div.ov_dialog table.ov_dialog_table td
|
||||
{
|
||||
padding: 5px 10px;
|
||||
border: 1px solid #dddddd;
|
||||
}
|
||||
|
||||
div.ov_dialog table.ov_dialog_table td.right
|
||||
{
|
||||
text-align: right;
|
||||
}
|
||||
|
||||
div.ov_popup
|
||||
{
|
||||
background: #ffffff;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user