Commit 4a847003 authored by Edward Vigmond's avatar Edward Vigmond
Browse files

Fixed bugs when state saving of Data Opacity and Clipping.

parent c5482df1
This diff is collapsed.
......@@ -10,7 +10,9 @@ decl {\#include <math.h>} {public
decl {\#define SAVE_CP(A) xdir\#\#A->value()<<" "<<ydir\#\#A->value()<<" "<<zdir\#\#A->value()<<" "<<intercept\#\#A->value()<<" "<<dispas\#\#A->value()} {}
decl {\#define READ_CP(A,S) {double val; S>>val; xdir\#\#A->value(val); S>>val; ydir\#\#A->value(val); S>>val; zdir\#\#A->value(val);S>>val; intercept\#\#A->value(val); S>>val; dispas\#\#A->value(int(val));if(val==3||val==4)tbmw->determine_cutplane(A);}} {}
decl {\#define READ_CP(A,S) {double val; S>>val; xdir\#\#A->value(val); S>>val; ydir\#\#A->value(val); S>>val; zdir\#\#A->value(val);S>>val; intercept\#\#A->value(val); S>>val; dispas\#\#A->value(int(val));}}{}
decl {\#define CHECK_CP(A) {int val=dispas\#\#A->value();if(val==3||val==4)tbmw->determine_cutplane(A);}} {}
class ClipPlane {open
} {
......@@ -679,7 +681,13 @@ for( int i=0; i<6; i++ ){
for( int j=0; j<4; j++ )
ifs >> x[i][j];
ifs >> intercept[i];
}} {selected
}
CHECK_CP(0);
CHECK_CP(1);
CHECK_CP(2);
CHECK_CP(3);
CHECK_CP(4);
CHECK_CP(5);} {selected
}
}
}
......
// generated by Fast Light User Interface Designer (fluid) version 1.0106
// generated by Fast Light User Interface Designer (fluid) version 1.0107
#ifndef ClipPlane_h
#define ClipPlane_h
......@@ -19,253 +19,253 @@ public:
Fl_Group *Clip0;
Fl_Value_Input *xdir0;
private:
inline void cb_xdir0_i(Fl_Value_Input*, void*);
void cb_xdir0_i(Fl_Value_Input*, void*);
static void cb_xdir0(Fl_Value_Input*, void*);
public:
Fl_Value_Input *ydir0;
private:
inline void cb_ydir0_i(Fl_Value_Input*, void*);
void cb_ydir0_i(Fl_Value_Input*, void*);
static void cb_ydir0(Fl_Value_Input*, void*);
public:
Fl_Value_Input *zdir0;
private:
inline void cb_zdir0_i(Fl_Value_Input*, void*);
void cb_zdir0_i(Fl_Value_Input*, void*);
static void cb_zdir0(Fl_Value_Input*, void*);
public:
Fl_Button *unit0;
private:
inline void cb_unit0_i(Fl_Button*, void*);
void cb_unit0_i(Fl_Button*, void*);
static void cb_unit0(Fl_Button*, void*);
inline void cb_Flip_i(Fl_Button*, void*);
void cb_Flip_i(Fl_Button*, void*);
static void cb_Flip(Fl_Button*, void*);
public:
Fl_Value_Slider *intercept0;
private:
inline void cb_intercept0_i(Fl_Value_Slider*, void*);
void cb_intercept0_i(Fl_Value_Slider*, void*);
static void cb_intercept0(Fl_Value_Slider*, void*);
public:
Fl_Choice *dispas0;
static Fl_Menu_Item menu_dispas0[];
private:
inline void cb_Off_i(Fl_Menu_*, void*);
void cb_Off_i(Fl_Menu_*, void*);
static void cb_Off(Fl_Menu_*, void*);
inline void cb_On_i(Fl_Menu_*, void*);
void cb_On_i(Fl_Menu_*, void*);
static void cb_On(Fl_Menu_*, void*);
inline void cb_Whole_i(Fl_Menu_*, void*);
void cb_Whole_i(Fl_Menu_*, void*);
static void cb_Whole(Fl_Menu_*, void*);
inline void cb_Intersection_i(Fl_Menu_*, void*);
void cb_Intersection_i(Fl_Menu_*, void*);
static void cb_Intersection(Fl_Menu_*, void*);
inline void cb_Datified_i(Fl_Menu_*, void*);
void cb_Datified_i(Fl_Menu_*, void*);
static void cb_Datified(Fl_Menu_*, void*);
public:
Fl_Group *Clip1;
Fl_Value_Input *xdir1;
private:
inline void cb_xdir1_i(Fl_Value_Input*, void*);
void cb_xdir1_i(Fl_Value_Input*, void*);
static void cb_xdir1(Fl_Value_Input*, void*);
public:
Fl_Value_Input *ydir1;
private:
inline void cb_ydir1_i(Fl_Value_Input*, void*);
void cb_ydir1_i(Fl_Value_Input*, void*);
static void cb_ydir1(Fl_Value_Input*, void*);
public:
Fl_Value_Input *zdir1;
private:
inline void cb_zdir1_i(Fl_Value_Input*, void*);
void cb_zdir1_i(Fl_Value_Input*, void*);
static void cb_zdir1(Fl_Value_Input*, void*);
public:
Fl_Button *unit1;
private:
inline void cb_unit1_i(Fl_Button*, void*);
void cb_unit1_i(Fl_Button*, void*);
static void cb_unit1(Fl_Button*, void*);
inline void cb_Flip1_i(Fl_Button*, void*);
void cb_Flip1_i(Fl_Button*, void*);
static void cb_Flip1(Fl_Button*, void*);
public:
Fl_Value_Slider *intercept1;
private:
inline void cb_intercept1_i(Fl_Value_Slider*, void*);
void cb_intercept1_i(Fl_Value_Slider*, void*);
static void cb_intercept1(Fl_Value_Slider*, void*);
public:
Fl_Choice *dispas1;
static Fl_Menu_Item menu_dispas1[];
private:
inline void cb_Off1_i(Fl_Menu_*, void*);
void cb_Off1_i(Fl_Menu_*, void*);
static void cb_Off1(Fl_Menu_*, void*);
inline void cb_On1_i(Fl_Menu_*, void*);
void cb_On1_i(Fl_Menu_*, void*);
static void cb_On1(Fl_Menu_*, void*);
inline void cb_Whole1_i(Fl_Menu_*, void*);
void cb_Whole1_i(Fl_Menu_*, void*);
static void cb_Whole1(Fl_Menu_*, void*);
inline void cb_Intersection1_i(Fl_Menu_*, void*);
void cb_Intersection1_i(Fl_Menu_*, void*);
static void cb_Intersection1(Fl_Menu_*, void*);
inline void cb_Datified1_i(Fl_Menu_*, void*);
void cb_Datified1_i(Fl_Menu_*, void*);
static void cb_Datified1(Fl_Menu_*, void*);
public:
Fl_Group *Clip2;
Fl_Value_Input *xdir2;
private:
inline void cb_xdir2_i(Fl_Value_Input*, void*);
void cb_xdir2_i(Fl_Value_Input*, void*);
static void cb_xdir2(Fl_Value_Input*, void*);
public:
Fl_Value_Input *ydir2;
private:
inline void cb_ydir2_i(Fl_Value_Input*, void*);
void cb_ydir2_i(Fl_Value_Input*, void*);
static void cb_ydir2(Fl_Value_Input*, void*);
public:
Fl_Value_Input *zdir2;
private:
inline void cb_zdir2_i(Fl_Value_Input*, void*);
void cb_zdir2_i(Fl_Value_Input*, void*);
static void cb_zdir2(Fl_Value_Input*, void*);
public:
Fl_Button *unit2;
private:
inline void cb_unit2_i(Fl_Button*, void*);
void cb_unit2_i(Fl_Button*, void*);
static void cb_unit2(Fl_Button*, void*);
inline void cb_Flip2_i(Fl_Button*, void*);
void cb_Flip2_i(Fl_Button*, void*);
static void cb_Flip2(Fl_Button*, void*);
public:
Fl_Value_Slider *intercept2;
private:
inline void cb_intercept2_i(Fl_Value_Slider*, void*);
void cb_intercept2_i(Fl_Value_Slider*, void*);
static void cb_intercept2(Fl_Value_Slider*, void*);
public:
Fl_Choice *dispas2;
static Fl_Menu_Item menu_dispas2[];
private:
inline void cb_Off2_i(Fl_Menu_*, void*);
void cb_Off2_i(Fl_Menu_*, void*);
static void cb_Off2(Fl_Menu_*, void*);
inline void cb_On2_i(Fl_Menu_*, void*);
void cb_On2_i(Fl_Menu_*, void*);
static void cb_On2(Fl_Menu_*, void*);
inline void cb_Whole2_i(Fl_Menu_*, void*);
void cb_Whole2_i(Fl_Menu_*, void*);
static void cb_Whole2(Fl_Menu_*, void*);
inline void cb_Intersection2_i(Fl_Menu_*, void*);
void cb_Intersection2_i(Fl_Menu_*, void*);
static void cb_Intersection2(Fl_Menu_*, void*);
inline void cb_Datified2_i(Fl_Menu_*, void*);
void cb_Datified2_i(Fl_Menu_*, void*);
static void cb_Datified2(Fl_Menu_*, void*);
public:
Fl_Group *Clip3;
Fl_Value_Input *xdir3;
private:
inline void cb_xdir3_i(Fl_Value_Input*, void*);
void cb_xdir3_i(Fl_Value_Input*, void*);
static void cb_xdir3(Fl_Value_Input*, void*);
public:
Fl_Value_Input *ydir3;
private:
inline void cb_ydir3_i(Fl_Value_Input*, void*);
void cb_ydir3_i(Fl_Value_Input*, void*);
static void cb_ydir3(Fl_Value_Input*, void*);
public:
Fl_Value_Input *zdir3;
private:
inline void cb_zdir3_i(Fl_Value_Input*, void*);
void cb_zdir3_i(Fl_Value_Input*, void*);
static void cb_zdir3(Fl_Value_Input*, void*);
public:
Fl_Button *unit3;
private:
inline void cb_unit3_i(Fl_Button*, void*);
void cb_unit3_i(Fl_Button*, void*);
static void cb_unit3(Fl_Button*, void*);
inline void cb_Flip3_i(Fl_Button*, void*);
void cb_Flip3_i(Fl_Button*, void*);
static void cb_Flip3(Fl_Button*, void*);
public:
Fl_Value_Slider *intercept3;
private:
inline void cb_intercept3_i(Fl_Value_Slider*, void*);
void cb_intercept3_i(Fl_Value_Slider*, void*);
static void cb_intercept3(Fl_Value_Slider*, void*);
public:
Fl_Choice *dispas3;
static Fl_Menu_Item menu_dispas3[];
private:
inline void cb_Off3_i(Fl_Menu_*, void*);
void cb_Off3_i(Fl_Menu_*, void*);
static void cb_Off3(Fl_Menu_*, void*);
inline void cb_On3_i(Fl_Menu_*, void*);
void cb_On3_i(Fl_Menu_*, void*);
static void cb_On3(Fl_Menu_*, void*);
inline void cb_Whole3_i(Fl_Menu_*, void*);
void cb_Whole3_i(Fl_Menu_*, void*);
static void cb_Whole3(Fl_Menu_*, void*);
inline void cb_Intersection3_i(Fl_Menu_*, void*);
void cb_Intersection3_i(Fl_Menu_*, void*);
static void cb_Intersection3(Fl_Menu_*, void*);
inline void cb_Datified3_i(Fl_Menu_*, void*);
void cb_Datified3_i(Fl_Menu_*, void*);
static void cb_Datified3(Fl_Menu_*, void*);
public:
Fl_Group *Clip4;
Fl_Value_Input *xdir4;
private:
inline void cb_xdir4_i(Fl_Value_Input*, void*);
void cb_xdir4_i(Fl_Value_Input*, void*);
static void cb_xdir4(Fl_Value_Input*, void*);
public:
Fl_Value_Input *ydir4;
private:
inline void cb_ydir4_i(Fl_Value_Input*, void*);
void cb_ydir4_i(Fl_Value_Input*, void*);
static void cb_ydir4(Fl_Value_Input*, void*);
public:
Fl_Value_Input *zdir4;
private:
inline void cb_zdir4_i(Fl_Value_Input*, void*);
void cb_zdir4_i(Fl_Value_Input*, void*);
static void cb_zdir4(Fl_Value_Input*, void*);
public:
Fl_Button *unit4;
private:
inline void cb_unit4_i(Fl_Button*, void*);
void cb_unit4_i(Fl_Button*, void*);
static void cb_unit4(Fl_Button*, void*);
inline void cb_Flip4_i(Fl_Button*, void*);
void cb_Flip4_i(Fl_Button*, void*);
static void cb_Flip4(Fl_Button*, void*);
public:
Fl_Value_Slider *intercept4;
private:
inline void cb_intercept4_i(Fl_Value_Slider*, void*);
void cb_intercept4_i(Fl_Value_Slider*, void*);
static void cb_intercept4(Fl_Value_Slider*, void*);
public:
Fl_Choice *dispas4;
static Fl_Menu_Item menu_dispas4[];
private:
inline void cb_Off4_i(Fl_Menu_*, void*);
void cb_Off4_i(Fl_Menu_*, void*);
static void cb_Off4(Fl_Menu_*, void*);
inline void cb_On4_i(Fl_Menu_*, void*);
void cb_On4_i(Fl_Menu_*, void*);
static void cb_On4(Fl_Menu_*, void*);
inline void cb_Whole4_i(Fl_Menu_*, void*);
void cb_Whole4_i(Fl_Menu_*, void*);
static void cb_Whole4(Fl_Menu_*, void*);
inline void cb_Intersection4_i(Fl_Menu_*, void*);
void cb_Intersection4_i(Fl_Menu_*, void*);
static void cb_Intersection4(Fl_Menu_*, void*);
inline void cb_Datified4_i(Fl_Menu_*, void*);
void cb_Datified4_i(Fl_Menu_*, void*);
static void cb_Datified4(Fl_Menu_*, void*);
public:
Fl_Group *Clip5;
Fl_Value_Input *xdir5;
private:
inline void cb_xdir5_i(Fl_Value_Input*, void*);
void cb_xdir5_i(Fl_Value_Input*, void*);
static void cb_xdir5(Fl_Value_Input*, void*);
public:
Fl_Value_Input *ydir5;
private:
inline void cb_ydir5_i(Fl_Value_Input*, void*);
void cb_ydir5_i(Fl_Value_Input*, void*);
static void cb_ydir5(Fl_Value_Input*, void*);
public:
Fl_Value_Input *zdir5;
private:
inline void cb_zdir5_i(Fl_Value_Input*, void*);
void cb_zdir5_i(Fl_Value_Input*, void*);
static void cb_zdir5(Fl_Value_Input*, void*);
public:
Fl_Button *unit5;
private:
inline void cb_unit5_i(Fl_Button*, void*);
void cb_unit5_i(Fl_Button*, void*);
static void cb_unit5(Fl_Button*, void*);
inline void cb_Flip5_i(Fl_Button*, void*);
void cb_Flip5_i(Fl_Button*, void*);
static void cb_Flip5(Fl_Button*, void*);
public:
Fl_Value_Slider *intercept5;
private:
inline void cb_intercept5_i(Fl_Value_Slider*, void*);
void cb_intercept5_i(Fl_Value_Slider*, void*);
static void cb_intercept5(Fl_Value_Slider*, void*);
public:
Fl_Choice *dispas5;
static Fl_Menu_Item menu_dispas5[];
private:
inline void cb_Off5_i(Fl_Menu_*, void*);
void cb_Off5_i(Fl_Menu_*, void*);
static void cb_Off5(Fl_Menu_*, void*);
inline void cb_On5_i(Fl_Menu_*, void*);
void cb_On5_i(Fl_Menu_*, void*);
static void cb_On5(Fl_Menu_*, void*);
inline void cb_Whole5_i(Fl_Menu_*, void*);
void cb_Whole5_i(Fl_Menu_*, void*);
static void cb_Whole5(Fl_Menu_*, void*);
inline void cb_Intersection5_i(Fl_Menu_*, void*);
void cb_Intersection5_i(Fl_Menu_*, void*);
static void cb_Intersection5(Fl_Menu_*, void*);
inline void cb_Datified5_i(Fl_Menu_*, void*);
void cb_Datified5_i(Fl_Menu_*, void*);
static void cb_Datified5(Fl_Menu_*, void*);
GLdouble x[6][4];
bool intercept[6];
......
// generated by Fast Light User Interface Designer (fluid) version 1.0106
// generated by Fast Light User Interface Designer (fluid) version 1.0107
#include "TBmeshWin.h"
#include "DataOpacity.h"
#include<iostream>
using namespace std;
#include "TBmeshWin.h"
dataOpac::dataOpac() {
_on = false;
......@@ -26,7 +24,7 @@ bool dataOpac::on() {
return _on;
}
inline void DataOpacity::cb_minopacval_i(Fl_Value_Slider* o, void*) {
void DataOpacity::cb_minopacval_i(Fl_Value_Slider* o, void*) {
Object_t a=get_ot(objtype->value());
dop[a].omin = o->value();
dop[a].ofactor = (dop[a].omax-dop[a].omin)/(dop[a].dmax-dop[a].dmin);
......@@ -36,7 +34,7 @@ void DataOpacity::cb_minopacval(Fl_Value_Slider* o, void* v) {
((DataOpacity*)(o->parent()->user_data()))->cb_minopacval_i(o,v);
}
inline void DataOpacity::cb_maxopacval_i(Fl_Value_Slider* o, void*) {
void DataOpacity::cb_maxopacval_i(Fl_Value_Slider* o, void*) {
Object_t a=get_ot(objtype->value());
dop[a].omax = o->value();
dop[a].ofactor = (dop[a].omax-dop[a].omin)/(dop[a].dmax-dop[a].dmin);
......@@ -46,7 +44,7 @@ void DataOpacity::cb_maxopacval(Fl_Value_Slider* o, void* v) {
((DataOpacity*)(o->parent()->user_data()))->cb_maxopacval_i(o,v);
}
inline void DataOpacity::cb_onbut_i(Fl_Light_Button* o, void*) {
void DataOpacity::cb_onbut_i(Fl_Light_Button* o, void*) {
Object_t a=get_ot(objtype->value());
dop[a]._on = o->value();
dop[a].ofactor = (dop[a].omax-dop[a].omin)/(dop[a].dmax-dop[a].dmin);
......@@ -56,7 +54,7 @@ void DataOpacity::cb_onbut(Fl_Light_Button* o, void* v) {
((DataOpacity*)(o->parent()->user_data()))->cb_onbut_i(o,v);
}
inline void DataOpacity::cb_mindatval_i(Fl_Value_Input* o, void*) {
void DataOpacity::cb_mindatval_i(Fl_Value_Input* o, void*) {
Object_t a=get_ot(objtype->value());
dop[a].dmin = o->value();
dop[a].ofactor = (dop[a].omax-dop[a].omin)/(dop[a].dmax-dop[a].dmin);
......@@ -66,7 +64,7 @@ void DataOpacity::cb_mindatval(Fl_Value_Input* o, void* v) {
((DataOpacity*)(o->parent()->user_data()))->cb_mindatval_i(o,v);
}
inline void DataOpacity::cb_maxdatval_i(Fl_Value_Input* o, void*) {
void DataOpacity::cb_maxdatval_i(Fl_Value_Input* o, void*) {
Object_t a=get_ot(objtype->value());
dop[a].dmax = o->value();
dop[a].ofactor = (dop[a].omax-dop[a].omin)/(dop[a].dmax-dop[a].dmin);
......@@ -76,7 +74,7 @@ void DataOpacity::cb_maxdatval(Fl_Value_Input* o, void* v) {
((DataOpacity*)(o->parent()->user_data()))->cb_maxdatval_i(o,v);
}
inline void DataOpacity::cb_objtype_i(Fl_Choice*, void*) {
void DataOpacity::cb_objtype_i(Fl_Choice*, void*) {
Object_t a=get_ot(objtype->value());
minopacval->value(dop[a].omin);
maxopacval->value(dop[a].omax);
......@@ -88,10 +86,10 @@ void DataOpacity::cb_objtype(Fl_Choice* o, void* v) {
}
Fl_Menu_Item DataOpacity::menu_objtype[] = {
{"Vertex", 0, 0, 0, 0, 0, 0, 14, 56},
{"Surface", 0, 0, 0, 0, 0, 0, 14, 56},
{"Triangle", 0, 0, 0, 0, 0, 0, 14, 56},
{"Cable", 0, 0, 0, 0, 0, 0, 14, 56},
{"Vertex", 0, 0, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
{"Surface", 0, 0, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
{"Triangle", 0, 0, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
{"Cable", 0, 0, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
{0,0,0,0,0,0,0,0,0}
};
......@@ -153,8 +151,10 @@ void DataOpacity::save(ofstream& ofs) {
}
void DataOpacity::read(ifstream &ifs) {
for( int i=0; i<NUM_OBJ; i++ )
for( int i=0; i<NUM_OBJ; i++ ) {
ifs >> dop[i];
dop[i].ofactor = (dop[i].omax-dop[i].omin)/(dop[i].dmax-dop[i].dmin);
}
minopacval->value(dop[Vertex].omin);
maxopacval->value(dop[Vertex].omax);
......@@ -164,11 +164,11 @@ onbut->value(dop[Vertex]._on);
}
ostream& operator<<(ostream&ofs,dataOpac&dop) {
ofs<<dop.ofactor<<" "<<dop.dmin<<" "<<dop.dmax<<" "<<dop.omin<<" "<<dop.omax<<" "<<dop._on<<endl;
ofs<<dop.dmin<<" "<<dop.dmax<<" "<<dop.omin<<" "<<dop.omax<<" "<<dop._on<<endl;
return ofs;
}
istream& operator>>(istream&ifs,dataOpac&dop) {
ifs>>dop.ofactor>>dop.dmin>>dop.dmax>>dop.omin>>dop.omax>>dop._on;
ifs>>dop.dmin>>dop.dmax>>dop.omin>>dop.omax>>dop._on;
return ifs;
}
# data file for the Fltk User Interface Designer (fluid)
version 1.0106
version 1.0107
header_name {.h}
code_name {.cc}
decl {\#include "TBmeshWin.h"} {}
decl {\#include<iostream>} {}
decl {\#include<iostream>} {public
}
decl {using namespace std;} {}
decl {\#include "objects.h"} {selected public
}
decl {using namespace std;} {public
}
decl {\#define NUM_OBJ 7} {public
}
......@@ -56,7 +61,7 @@ class DataOpacity {open
} {
Fl_Window window {
label {Data Opacity Controls} open
xywh {854 73 380 150} type Double visible
xywh {579 44 380 150} type Double visible
} {
Fl_Value_Slider minopacval {
label {Minimum Opacity}
......@@ -107,19 +112,19 @@ mindatval->value(dop[a].dmin);
maxdatval->value(dop[a].dmax);onbut->value(dop[a]._on);}
tooltip {apply to which object type} xywh {75 10 120 30} down_box BORDER_BOX
} {
menuitem {} {
MenuItem {} {
label Vertex
xywh {0 0 100 20}
}
menuitem {} {
MenuItem {} {
label Surface
xywh {0 0 100 20}
}
menuitem {} {
MenuItem {} {
label Triangle
xywh {0 0 100 20}
}
menuitem {} {
MenuItem {} {
label Cable
xywh {0 0 100 20}
}
......@@ -130,7 +135,7 @@ maxdatval->value(dop[a].dmax);onbut->value(dop[a]._on);}
decl {TBmeshWin *mwtb;} {}
decl {dataOpac dop[NUM_OBJ];} {public
}
Function {get_ot( int a )} {return_type Object_t
Function {get_ot( int a )} {open return_type Object_t
} {
code {if( a==0 )
return Vertex;
......@@ -149,8 +154,10 @@ return Cable;} {}
}
Function {read(ifstream &ifs)} {open
} {
code {for( int i=0; i<NUM_OBJ; i++ )
code {for( int i=0; i<NUM_OBJ; i++ ) {
ifs >> dop[i];
dop[i].ofactor = (dop[i].omax-dop[i].omin)/(dop[i].dmax-dop[i].dmin);
}
minopacval->value(dop[Vertex].omin);
maxopacval->value(dop[Vertex].omax);
......@@ -162,12 +169,12 @@ onbut->value(dop[Vertex]._on);} {}
Function {operator<<(ostream&ofs,dataOpac&dop)} {open return_type {ostream&}
} {
code {ofs<<dop.ofactor<<" "<<dop.dmin<<" "<<dop.dmax<<" "<<dop.omin<<" "<<dop.omax<<" "<<dop._on<<endl;
code {ofs<<dop.dmin<<" "<<dop.dmax<<" "<<dop.omin<<" "<<dop.omax<<" "<<dop._on<<endl;
return ofs;} {}
}
Function {operator>>(istream&ifs,dataOpac&dop)} {open selected return_type {istream&}
Function {operator>>(istream&ifs,dataOpac&dop)} {open return_type {istream&}
} {
code {ifs>>dop.ofactor>>dop.dmin>>dop.dmax>>dop.omin>>dop.omax>>dop._on;
code {ifs>>dop.dmin>>dop.dmax>>dop.omin>>dop.omax>>dop._on;
return ifs;} {}
}
// generated by Fast Light User Interface Designer (fluid) version 1.0106
// generated by Fast Light User Interface Designer (fluid) version 1.0107
#ifndef DataOpacity_h
#define DataOpacity_h
#include <FL/Fl.H>
#include<iostream>
#include "objects.h"
using namespace std;
#define NUM_OBJ 7
class TBmeshWin;
......@@ -30,32 +33,32 @@ public:
Fl_Double_Window *window;
Fl_Value_Slider *minopacval;
private:
inline void cb_minopacval_i(Fl_Value_Slider*, void*);
void cb_minopacval_i(Fl_Value_Slider*, void*);
static void cb_minopacval(Fl_Value_Slider*, void*);
public:
Fl_Value_Slider *maxopacval;
private:
inline void cb_maxopacval_i(Fl_Value_Slider*, void*);
void cb_maxopacval_i(Fl_Value_Slider*, void*);
static void cb_maxopacval(Fl_Value_Slider*, void*);
public:
Fl_Light_Button *onbut;
private:
inline void cb_onbut_i(Fl_Light_Button*, void*);
void cb_onbut_i(Fl_Light_Button*, void*);
static void cb_onbut(Fl_Light_Button*, void*);
public:
Fl_Value_Input *mindatval;
private:
inline void cb_mindatval_i(Fl_Value_Input*, void*);
void cb_mindatval_i(Fl_Value_Input*, void*);
static void cb_mindatval(Fl_Value_Input*, void*);
public:
Fl_Value_Input *maxdatval;
private:
inline void cb_maxdatval_i(Fl_Value_Input*, void*);
void cb_maxdatval_i(Fl_Value_Input*, void*);
static void cb_maxdatval(Fl_Value_Input*, void*);
public:
Fl_Choice *objtype;
private:
inline void cb_objtype_i(Fl_Choice*, void*);
void cb_objtype_i(Fl_Choice*, void*);
static void cb_objtype(Fl_Choice*, void*);
static Fl_Menu_Item menu_objtype[];
TBmeshWin *mwtb;
......
#ifndef DRAWINGOBJECT_H
#define DRAWINGOBJECT_H
typedef enum objects{
Vertex, Cable, Cnnx, SurfEle, Surface, Tetrahedron, RegionDef, Nothing, All } Object_t;
static const int maxobject=6;
#include "objects.h"
#include <vector>
#include "drawgl.h"
#include "Colourscale.h"
......
......@@ -4,7 +4,7 @@ HOSTMACHINE := $(shell uname)
FLTK_INC := $(shell fltk-config --use-gl --cxxflags)
FLTK_LD_FLAGS := $(shell fltk-config --use-gl --ldflags)
COMMON_LIBS = -lpng -lpthread -lm -lz