- Timestamp:
- Feb 18, 2015 6:05:14 AM (10 years ago)
- Branches:
- master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload
- Children:
- 66f21cd
- Parents:
- 9398f7b (diff), 6f82ba1 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent. - Location:
- src/sas
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
src/sas/perspectives/fitting/models.py
rb9a5f0e r6f82ba1 310 310 311 311 # regular model names only 312 self.model_name_list = [] 313 from sas.models.SphereModel import SphereModel 314 self.model_dictionary[SphereModel.__name__] = SphereModel 315 # self.shape_list.append(SphereModel) 316 self.multiplication_factor.append(SphereModel) 317 self.model_name_list.append(SphereModel.__name__) 318 319 from sas.models.BinaryHSModel import BinaryHSModel 320 self.model_dictionary[BinaryHSModel.__name__] = BinaryHSModel 321 # self.shape_list.append(BinaryHSModel) 322 self.model_name_list.append(BinaryHSModel.__name__) 323 324 from sas.models.FuzzySphereModel import FuzzySphereModel 325 self.model_dictionary[FuzzySphereModel.__name__] = FuzzySphereModel 326 # self.shape_list.append(FuzzySphereModel) 327 self.multiplication_factor.append(FuzzySphereModel) 328 self.model_name_list.append(FuzzySphereModel.__name__) 329 330 from sas.models.RaspBerryModel import RaspBerryModel 331 self.model_dictionary[RaspBerryModel.__name__] = RaspBerryModel 332 # self.shape_list.append(RaspBerryModel) 333 self.model_name_list.append(RaspBerryModel.__name__) 334 335 from sas.models.CoreShellModel import CoreShellModel 336 self.model_dictionary[CoreShellModel.__name__] = CoreShellModel 337 # self.shape_list.append(CoreShellModel) 338 self.multiplication_factor.append(CoreShellModel) 339 self.model_name_list.append(CoreShellModel.__name__) 340 341 from sas.models.Core2ndMomentModel import Core2ndMomentModel 342 self.model_dictionary[Core2ndMomentModel.__name__] = Core2ndMomentModel 343 # self.shape_list.append(Core2ndMomentModel) 344 self.model_name_list.append(Core2ndMomentModel.__name__) 345 346 from sas.models.CoreMultiShellModel import CoreMultiShellModel 347 self.model_dictionary[CoreMultiShellModel.__name__] = CoreMultiShellModel 348 # self.shape_list.append(CoreMultiShellModel) 349 self.multiplication_factor.append(CoreMultiShellModel) 350 self.multi_func_list.append(CoreMultiShellModel) 351 352 from sas.models.VesicleModel import VesicleModel 353 self.model_dictionary[VesicleModel.__name__] = VesicleModel 354 # self.shape_list.append(VesicleModel) 355 self.multiplication_factor.append(VesicleModel) 356 self.model_name_list.append(VesicleModel.__name__) 357 358 from sas.models.MultiShellModel import MultiShellModel 359 self.model_dictionary[MultiShellModel.__name__] = MultiShellModel 360 # self.shape_list.append(MultiShellModel) 361 self.multiplication_factor.append(MultiShellModel) 362 self.model_name_list.append(MultiShellModel.__name__) 363 364 from sas.models.OnionExpShellModel import OnionExpShellModel 365 self.model_dictionary[OnionExpShellModel.__name__] = OnionExpShellModel 366 # self.shape_list.append(OnionExpShellModel) 367 self.multiplication_factor.append(OnionExpShellModel) 368 self.multi_func_list.append(OnionExpShellModel) 369 370 from sas.models.SphericalSLDModel import SphericalSLDModel 371 self.model_dictionary[SphericalSLDModel.__name__] = SphericalSLDModel 372 # self.shape_list.append(SphericalSLDModel) 373 self.multiplication_factor.append(SphericalSLDModel) 374 self.multi_func_list.append(SphericalSLDModel) 375 376 377 from sas.models.LinearPearlsModel import LinearPearlsModel 378 self.model_dictionary[LinearPearlsModel.__name__] = LinearPearlsModel 379 # self.shape_list.append(LinearPearlsModel) 380 self.model_name_list.append(LinearPearlsModel.__name__) 381 382 from sas.models.PearlNecklaceModel import PearlNecklaceModel 383 self.model_dictionary[PearlNecklaceModel.__name__] = PearlNecklaceModel 384 # self.shape_list.append(PearlNecklaceModel) 385 self.model_name_list.append(PearlNecklaceModel.__name__) 386 #self.multiplication_factor.append(PearlNecklaceModel) 387 388 from sas.models.CylinderModel import CylinderModel 389 self.model_dictionary[CylinderModel.__name__] = CylinderModel 390 # self.shape_list.append(CylinderModel) 391 self.multiplication_factor.append(CylinderModel) 392 self.model_name_list.append(CylinderModel.__name__) 393 394 from sas.models.CoreShellCylinderModel import CoreShellCylinderModel 395 self.model_dictionary[CoreShellCylinderModel.__name__] = CoreShellCylinderModel 396 # self.shape_list.append(CoreShellCylinderModel) 397 self.multiplication_factor.append(CoreShellCylinderModel) 398 self.model_name_list.append(CoreShellCylinderModel.__name__) 399 400 from sas.models.CoreShellBicelleModel import CoreShellBicelleModel 401 self.model_dictionary[CoreShellBicelleModel.__name__] = CoreShellBicelleModel 402 # self.shape_list.append(CoreShellBicelleModel) 403 self.multiplication_factor.append(CoreShellBicelleModel) 404 self.model_name_list.append(CoreShellBicelleModel.__name__) 405 406 from sas.models.HollowCylinderModel import HollowCylinderModel 407 self.model_dictionary[HollowCylinderModel.__name__] = HollowCylinderModel 408 # self.shape_list.append(HollowCylinderModel) 409 self.multiplication_factor.append(HollowCylinderModel) 410 self.model_name_list.append(HollowCylinderModel.__name__) 411 412 from sas.models.FlexibleCylinderModel import FlexibleCylinderModel 413 self.model_dictionary[FlexibleCylinderModel.__name__] = FlexibleCylinderModel 414 # self.shape_list.append(FlexibleCylinderModel) 415 self.model_name_list.append(FlexibleCylinderModel.__name__) 416 417 from sas.models.FlexCylEllipXModel import FlexCylEllipXModel 418 self.model_dictionary[FlexCylEllipXModel.__name__] = FlexCylEllipXModel 419 # self.shape_list.append(FlexCylEllipXModel) 420 self.model_name_list.append(FlexCylEllipXModel.__name__) 421 422 from sas.models.StackedDisksModel import StackedDisksModel 423 self.model_dictionary[StackedDisksModel.__name__] = StackedDisksModel 424 # self.shape_list.append(StackedDisksModel) 425 self.multiplication_factor.append(StackedDisksModel) 426 self.model_name_list.append(StackedDisksModel.__name__) 427 428 from sas.models.ParallelepipedModel import ParallelepipedModel 429 self.model_dictionary[ParallelepipedModel.__name__] = ParallelepipedModel 430 # self.shape_list.append(ParallelepipedModel) 431 self.multiplication_factor.append(ParallelepipedModel) 432 self.model_name_list.append(ParallelepipedModel.__name__) 433 434 from sas.models.CSParallelepipedModel import CSParallelepipedModel 435 self.model_dictionary[CSParallelepipedModel.__name__] = CSParallelepipedModel 436 # self.shape_list.append(CSParallelepipedModel) 437 self.multiplication_factor.append(CSParallelepipedModel) 438 self.model_name_list.append(CSParallelepipedModel.__name__) 439 440 from sas.models.EllipticalCylinderModel import EllipticalCylinderModel 441 self.model_dictionary[EllipticalCylinderModel.__name__] = EllipticalCylinderModel 442 # self.shape_list.append(EllipticalCylinderModel) 443 self.multiplication_factor.append(EllipticalCylinderModel) 444 self.model_name_list.append(EllipticalCylinderModel.__name__) 445 446 from sas.models.BarBellModel import BarBellModel 447 self.model_dictionary[BarBellModel.__name__] = BarBellModel 448 # self.shape_list.append(BarBellModel) 449 self.model_name_list.append(BarBellModel.__name__) 450 # not implemeted yet! 451 #self.multiplication_factor.append(BarBellModel) 452 453 from sas.models.CappedCylinderModel import CappedCylinderModel 454 self.model_dictionary[CappedCylinderModel.__name__] = CappedCylinderModel 455 # self.shape_list.append(CappedCylinderModel) 456 self.model_name_list.append(CappedCylinderModel.__name__) 457 # not implemeted yet! 458 #self.multiplication_factor.append(CappedCylinderModel) 459 460 from sas.models.EllipsoidModel import EllipsoidModel 461 self.model_dictionary[EllipsoidModel.__name__] = EllipsoidModel 462 # self.shape_list.append(EllipsoidModel) 463 self.multiplication_factor.append(EllipsoidModel) 464 self.model_name_list.append(EllipsoidModel.__name__) 465 466 from sas.models.CoreShellEllipsoidModel import CoreShellEllipsoidModel 467 self.model_dictionary[CoreShellEllipsoidModel.__name__] = CoreShellEllipsoidModel 468 # self.shape_list.append(CoreShellEllipsoidModel) 469 self.multiplication_factor.append(CoreShellEllipsoidModel) 470 self.model_name_list.append(CoreShellEllipsoidModel.__name__) 471 472 from sas.models.CoreShellEllipsoidXTModel import CoreShellEllipsoidXTModel 473 self.model_dictionary[CoreShellEllipsoidXTModel.__name__] = CoreShellEllipsoidXTModel 474 # self.shape_list.append(CoreShellEllipsoidXTModel) 475 self.multiplication_factor.append(CoreShellEllipsoidXTModel) 476 self.model_name_list.append(CoreShellEllipsoidXTModel.__name__) 477 478 from sas.models.TriaxialEllipsoidModel import TriaxialEllipsoidModel 479 self.model_dictionary[TriaxialEllipsoidModel.__name__] = TriaxialEllipsoidModel 480 # self.shape_list.append(TriaxialEllipsoidModel) 481 self.multiplication_factor.append(TriaxialEllipsoidModel) 482 self.model_name_list.append(TriaxialEllipsoidModel.__name__) 483 484 from sas.models.LamellarModel import LamellarModel 485 self.model_dictionary[LamellarModel.__name__] = LamellarModel 486 # self.shape_list.append(LamellarModel) 487 self.model_name_list.append(LamellarModel.__name__) 488 489 from sas.models.LamellarFFHGModel import LamellarFFHGModel 490 self.model_dictionary[LamellarFFHGModel.__name__] = LamellarFFHGModel 491 # self.shape_list.append(LamellarFFHGModel) 492 self.model_name_list.append(LamellarFFHGModel.__name__) 493 494 from sas.models.LamellarPSModel import LamellarPSModel 495 self.model_dictionary[LamellarPSModel.__name__] = LamellarPSModel 496 # self.shape_list.append(LamellarPSModel) 497 self.model_name_list.append(LamellarPSModel.__name__) 498 499 from sas.models.LamellarPSHGModel import LamellarPSHGModel 500 self.model_dictionary[LamellarPSHGModel.__name__] = LamellarPSHGModel 501 # self.shape_list.append(LamellarPSHGModel) 502 self.model_name_list.append(LamellarPSHGModel.__name__) 503 504 from sas.models.LamellarPCrystalModel import LamellarPCrystalModel 505 self.model_dictionary[LamellarPCrystalModel.__name__] = LamellarPCrystalModel 506 # self.shape_list.append(LamellarPCrystalModel) 507 self.model_name_list.append(LamellarPCrystalModel.__name__) 508 509 from sas.models.SCCrystalModel import SCCrystalModel 510 self.model_dictionary[SCCrystalModel.__name__] = SCCrystalModel 511 # self.shape_list.append(SCCrystalModel) 512 self.model_name_list.append(SCCrystalModel.__name__) 513 514 from sas.models.FCCrystalModel import FCCrystalModel 515 self.model_dictionary[FCCrystalModel.__name__] = FCCrystalModel 516 # self.shape_list.append(FCCrystalModel) 517 self.model_name_list.append(FCCrystalModel.__name__) 518 519 from sas.models.BCCrystalModel import BCCrystalModel 520 self.model_dictionary[BCCrystalModel.__name__] = BCCrystalModel 521 # self.shape_list.append(BCCrystalModel) 522 self.model_name_list.append(BCCrystalModel.__name__) 523 312 try: 313 self.model_name_list = [] 314 from sas.models.SphereModel import SphereModel 315 self.model_dictionary[SphereModel.__name__] = SphereModel 316 # self.shape_list.append(SphereModel) 317 self.multiplication_factor.append(SphereModel) 318 self.model_name_list.append(SphereModel.__name__) 319 except: 320 pass 321 322 try: 323 from sas.models.BinaryHSModel import BinaryHSModel 324 self.model_dictionary[BinaryHSModel.__name__] = BinaryHSModel 325 # self.shape_list.append(BinaryHSModel) 326 self.model_name_list.append(BinaryHSModel.__name__) 327 except: 328 pass 329 330 try: 331 from sas.models.FuzzySphereModel import FuzzySphereModel 332 self.model_dictionary[FuzzySphereModel.__name__] = FuzzySphereModel 333 # self.shape_list.append(FuzzySphereModel) 334 self.multiplication_factor.append(FuzzySphereModel) 335 self.model_name_list.append(FuzzySphereModel.__name__) 336 except: 337 pass 338 339 try: 340 from sas.models.RaspBerryModel import RaspBerryModel 341 self.model_dictionary[RaspBerryModel.__name__] = RaspBerryModel 342 # self.shape_list.append(RaspBerryModel) 343 self.model_name_list.append(RaspBerryModel.__name__) 344 except: 345 pass 346 347 try: 348 from sas.models.CoreShellModel import CoreShellModel 349 350 self.model_dictionary[CoreShellModel.__name__] = CoreShellModel 351 # self.shape_list.append(CoreShellModel) 352 self.multiplication_factor.append(CoreShellModel) 353 self.model_name_list.append(CoreShellModel.__name__) 354 except: 355 pass 356 357 try: 358 from sas.models.Core2ndMomentModel import Core2ndMomentModel 359 self.model_dictionary[Core2ndMomentModel.__name__] = Core2ndMomentModel 360 # self.shape_list.append(Core2ndMomentModel) 361 self.model_name_list.append(Core2ndMomentModel.__name__) 362 except: 363 pass 364 365 try: 366 from sas.models.CoreMultiShellModel import CoreMultiShellModel 367 self.model_dictionary[CoreMultiShellModel.__name__] = CoreMultiShellModel 368 # self.shape_list.append(CoreMultiShellModel) 369 self.multiplication_factor.append(CoreMultiShellModel) 370 self.multi_func_list.append(CoreMultiShellModel) 371 except: 372 pass 373 374 try: 375 from sas.models.VesicleModel import VesicleModel 376 self.model_dictionary[VesicleModel.__name__] = VesicleModel 377 # self.shape_list.append(VesicleModel) 378 self.multiplication_factor.append(VesicleModel) 379 self.model_name_list.append(VesicleModel.__name__) 380 except: 381 pass 382 383 try: 384 from sas.models.MultiShellModel import MultiShellModel 385 self.model_dictionary[MultiShellModel.__name__] = MultiShellModel 386 # self.shape_list.append(MultiShellModel) 387 self.multiplication_factor.append(MultiShellModel) 388 self.model_name_list.append(MultiShellModel.__name__) 389 except: 390 pass 391 392 try: 393 from sas.models.OnionExpShellModel import OnionExpShellModel 394 self.model_dictionary[OnionExpShellModel.__name__] = OnionExpShellModel 395 # self.shape_list.append(OnionExpShellModel) 396 self.multiplication_factor.append(OnionExpShellModel) 397 self.multi_func_list.append(OnionExpShellModel) 398 except: 399 pass 400 401 try: 402 from sas.models.SphericalSLDModel import SphericalSLDModel 403 404 self.model_dictionary[SphericalSLDModel.__name__] = SphericalSLDModel 405 # self.shape_list.append(SphericalSLDModel) 406 self.multiplication_factor.append(SphericalSLDModel) 407 self.multi_func_list.append(SphericalSLDModel) 408 except: 409 pass 410 411 try: 412 from sas.models.LinearPearlsModel import LinearPearlsModel 413 414 self.model_dictionary[LinearPearlsModel.__name__] = LinearPearlsModel 415 # self.shape_list.append(LinearPearlsModel) 416 self.model_name_list.append(LinearPearlsModel.__name__) 417 except: 418 pass 419 420 try: 421 from sas.models.PearlNecklaceModel import PearlNecklaceModel 422 423 self.model_dictionary[PearlNecklaceModel.__name__] = PearlNecklaceModel 424 # self.shape_list.append(PearlNecklaceModel) 425 self.model_name_list.append(PearlNecklaceModel.__name__) 426 except: 427 pass 428 429 try: 430 from sas.models.CylinderModel import CylinderModel 431 432 self.model_dictionary[CylinderModel.__name__] = CylinderModel 433 # self.shape_list.append(CylinderModel) 434 self.multiplication_factor.append(CylinderModel) 435 self.model_name_list.append(CylinderModel.__name__) 436 except: 437 pass 438 439 try: 440 from sas.models.CoreShellCylinderModel import CoreShellCylinderModel 441 442 self.model_dictionary[CoreShellCylinderModel.__name__] = CoreShellCylinderModel 443 # self.shape_list.append(CoreShellCylinderModel) 444 self.multiplication_factor.append(CoreShellCylinderModel) 445 self.model_name_list.append(CoreShellCylinderModel.__name__) 446 except: 447 pass 448 449 try: 450 from sas.models.CoreShellBicelleModel import CoreShellBicelleModel 451 452 self.model_dictionary[CoreShellBicelleModel.__name__] = CoreShellBicelleModel 453 # self.shape_list.append(CoreShellBicelleModel) 454 self.multiplication_factor.append(CoreShellBicelleModel) 455 self.model_name_list.append(CoreShellBicelleModel.__name__) 456 except: 457 pass 458 459 try: 460 from sas.models.HollowCylinderModel import HollowCylinderModel 461 462 self.model_dictionary[HollowCylinderModel.__name__] = HollowCylinderModel 463 # self.shape_list.append(HollowCylinderModel) 464 self.multiplication_factor.append(HollowCylinderModel) 465 self.model_name_list.append(HollowCylinderModel.__name__) 466 except: 467 pass 468 469 try: 470 from sas.models.FlexibleCylinderModel import FlexibleCylinderModel 471 472 self.model_dictionary[FlexibleCylinderModel.__name__] = FlexibleCylinderModel 473 # self.shape_list.append(FlexibleCylinderModel) 474 self.model_name_list.append(FlexibleCylinderModel.__name__) 475 except: 476 pass 477 478 try: 479 from sas.models.FlexCylEllipXModel import FlexCylEllipXModel 480 481 self.model_dictionary[FlexCylEllipXModel.__name__] = FlexCylEllipXModel 482 # self.shape_list.append(FlexCylEllipXModel) 483 self.model_name_list.append(FlexCylEllipXModel.__name__) 484 except: 485 pass 486 487 try: 488 from sas.models.StackedDisksModel import StackedDisksModel 489 490 self.model_dictionary[StackedDisksModel.__name__] = StackedDisksModel 491 # self.shape_list.append(StackedDisksModel) 492 self.multiplication_factor.append(StackedDisksModel) 493 self.model_name_list.append(StackedDisksModel.__name__) 494 except: 495 pass 496 497 try: 498 from sas.models.ParallelepipedModel import ParallelepipedModel 499 500 self.model_dictionary[ParallelepipedModel.__name__] = ParallelepipedModel 501 # self.shape_list.append(ParallelepipedModel) 502 self.multiplication_factor.append(ParallelepipedModel) 503 self.model_name_list.append(ParallelepipedModel.__name__) 504 except: 505 pass 506 507 try: 508 from sas.models.CSParallelepipedModel import CSParallelepipedModel 509 510 self.model_dictionary[CSParallelepipedModel.__name__] = CSParallelepipedModel 511 # self.shape_list.append(CSParallelepipedModel) 512 self.multiplication_factor.append(CSParallelepipedModel) 513 self.model_name_list.append(CSParallelepipedModel.__name__) 514 except: 515 pass 516 517 try: 518 from sas.models.EllipticalCylinderModel import EllipticalCylinderModel 519 520 self.model_dictionary[EllipticalCylinderModel.__name__] = EllipticalCylinderModel 521 # self.shape_list.append(EllipticalCylinderModel) 522 self.multiplication_factor.append(EllipticalCylinderModel) 523 self.model_name_list.append(EllipticalCylinderModel.__name__) 524 except: 525 pass 526 527 try: 528 from sas.models.CappedCylinderModel import CappedCylinderModel 529 530 self.model_dictionary[CappedCylinderModel.__name__] = CappedCylinderModel 531 # self.shape_list.append(CappedCylinderModel) 532 self.model_name_list.append(CappedCylinderModel.__name__) 533 except: 534 pass 535 536 try: 537 from sas.models.EllipsoidModel import EllipsoidModel 538 539 self.model_dictionary[EllipsoidModel.__name__] = EllipsoidModel 540 # self.shape_list.append(EllipsoidModel) 541 self.multiplication_factor.append(EllipsoidModel) 542 self.model_name_list.append(EllipsoidModel.__name__) 543 except: 544 pass 545 546 try: 547 from sas.models.CoreShellEllipsoidModel import CoreShellEllipsoidModel 548 549 self.model_dictionary[CoreShellEllipsoidModel.__name__] = CoreShellEllipsoidModel 550 # self.shape_list.append(CoreShellEllipsoidModel) 551 self.multiplication_factor.append(CoreShellEllipsoidModel) 552 self.model_name_list.append(CoreShellEllipsoidModel.__name__) 553 except: 554 pass 555 556 try: 557 from sas.models.CoreShellEllipsoidXTModel import CoreShellEllipsoidXTModel 558 559 self.model_dictionary[CoreShellEllipsoidXTModel.__name__] = CoreShellEllipsoidXTModel 560 # self.shape_list.append(CoreShellEllipsoidXTModel) 561 self.multiplication_factor.append(CoreShellEllipsoidXTModel) 562 self.model_name_list.append(CoreShellEllipsoidXTModel.__name__) 563 except: 564 pass 565 566 try: 567 from sas.models.TriaxialEllipsoidModel import TriaxialEllipsoidModel 568 569 self.model_dictionary[TriaxialEllipsoidModel.__name__] = TriaxialEllipsoidModel 570 # self.shape_list.append(TriaxialEllipsoidModel) 571 self.multiplication_factor.append(TriaxialEllipsoidModel) 572 self.model_name_list.append(TriaxialEllipsoidModel.__name__) 573 except: 574 pass 575 576 try: 577 from sas.models.LamellarModel import LamellarModel 578 579 self.model_dictionary[LamellarModel.__name__] = LamellarModel 580 # self.shape_list.append(LamellarModel) 581 self.model_name_list.append(LamellarModel.__name__) 582 except: 583 pass 584 585 try: 586 from sas.models.LamellarFFHGModel import LamellarFFHGModel 587 588 self.model_dictionary[LamellarFFHGModel.__name__] = LamellarFFHGModel 589 # self.shape_list.append(LamellarFFHGModel) 590 self.model_name_list.append(LamellarFFHGModel.__name__) 591 except: 592 pass 593 594 try: 595 from sas.models.LamellarPSModel import LamellarPSModel 596 597 self.model_dictionary[LamellarPSModel.__name__] = LamellarPSModel 598 # self.shape_list.append(LamellarPSModel) 599 self.model_name_list.append(LamellarPSModel.__name__) 600 except: 601 pass 602 603 try: 604 from sas.models.LamellarPSHGModel import LamellarPSHGModel 605 606 self.model_dictionary[LamellarPSHGModel.__name__] = LamellarPSHGModel 607 # self.shape_list.append(LamellarPSHGModel) 608 self.model_name_list.append(LamellarPSHGModel.__name__) 609 except: 610 pass 611 612 try: 613 from sas.models.LamellarPCrystalModel import LamellarPCrystalModel 614 615 self.model_dictionary[LamellarPCrystalModel.__name__] = LamellarPCrystalModel 616 # self.shape_list.append(LamellarPCrystalModel) 617 self.model_name_list.append(LamellarPCrystalModel.__name__) 618 except: 619 pass 620 621 try: 622 from sas.models.SCCrystalModel import SCCrystalModel 623 624 self.model_dictionary[SCCrystalModel.__name__] = SCCrystalModel 625 # self.shape_list.append(SCCrystalModel) 626 self.model_name_list.append(SCCrystalModel.__name__) 627 except: 628 pass 629 630 try: 631 from sas.models.FCCrystalModel import FCCrystalModel 632 633 self.model_dictionary[FCCrystalModel.__name__] = FCCrystalModel 634 # self.shape_list.append(FCCrystalModel) 635 self.model_name_list.append(FCCrystalModel.__name__) 636 except: 637 pass 638 639 try: 640 from sas.models.BCCrystalModel import BCCrystalModel 641 642 self.model_dictionary[BCCrystalModel.__name__] = BCCrystalModel 643 # self.shape_list.append(BCCrystalModel) 644 self.model_name_list.append(BCCrystalModel.__name__) 645 except: 646 pass 647 648 524 649 ## Structure factor 525 from sas.models.SquareWellStructure import SquareWellStructure 526 self.model_dictionary[SquareWellStructure.__name__] = SquareWellStructure 527 self.struct_list.append(SquareWellStructure) 528 self.model_name_list.append(SquareWellStructure.__name__) 529 530 from sas.models.HardsphereStructure import HardsphereStructure 531 self.model_dictionary[HardsphereStructure.__name__] = HardsphereStructure 532 self.struct_list.append(HardsphereStructure) 533 self.model_name_list.append(HardsphereStructure.__name__) 534 535 from sas.models.StickyHSStructure import StickyHSStructure 536 self.model_dictionary[StickyHSStructure.__name__] = StickyHSStructure 537 self.struct_list.append(StickyHSStructure) 538 self.model_name_list.append(StickyHSStructure.__name__) 539 540 from sas.models.HayterMSAStructure import HayterMSAStructure 541 self.model_dictionary[HayterMSAStructure.__name__] = HayterMSAStructure 542 self.struct_list.append(HayterMSAStructure) 543 self.model_name_list.append(HayterMSAStructure.__name__) 650 try: 651 from sas.models.SquareWellStructure import SquareWellStructure 652 653 self.model_dictionary[SquareWellStructure.__name__] = SquareWellStructure 654 self.struct_list.append(SquareWellStructure) 655 self.model_name_list.append(SquareWellStructure.__name__) 656 except: 657 pass 658 659 try: 660 from sas.models.HardsphereStructure import HardsphereStructure 661 662 self.model_dictionary[HardsphereStructure.__name__] = HardsphereStructure 663 self.struct_list.append(HardsphereStructure) 664 self.model_name_list.append(HardsphereStructure.__name__) 665 except: 666 pass 667 668 try: 669 from sas.models.StickyHSStructure import StickyHSStructure 670 671 self.model_dictionary[StickyHSStructure.__name__] = StickyHSStructure 672 self.struct_list.append(StickyHSStructure) 673 self.model_name_list.append(StickyHSStructure.__name__) 674 except: 675 pass 676 677 try: 678 from sas.models.HayterMSAStructure import HayterMSAStructure 679 680 self.model_dictionary[HayterMSAStructure.__name__] = HayterMSAStructure 681 self.struct_list.append(HayterMSAStructure) 682 self.model_name_list.append(HayterMSAStructure.__name__) 683 except: 684 pass 685 544 686 545 687 546 688 ##shape-independent models 547 from sas.models.PowerLawAbsModel import PowerLawAbsModel 548 self.model_dictionary[PowerLawAbsModel.__name__] = PowerLawAbsModel 549 # self.shape_indep_list.append(PowerLawAbsModel) 550 self.model_name_list.append(PowerLawAbsModel.__name__) 551 552 from sas.models.BEPolyelectrolyte import BEPolyelectrolyte 553 self.model_dictionary[BEPolyelectrolyte.__name__] = BEPolyelectrolyte 554 # self.shape_indep_list.append(BEPolyelectrolyte) 555 self.model_name_list.append(BEPolyelectrolyte.__name__) 556 self.form_factor_dict[str(wx.NewId())] = [SphereModel] 557 558 from sas.models.BroadPeakModel import BroadPeakModel 559 self.model_dictionary[BroadPeakModel.__name__] = BroadPeakModel 560 # self.shape_indep_list.append(BroadPeakModel) 561 self.model_name_list.append(BroadPeakModel.__name__) 562 563 from sas.models.CorrLengthModel import CorrLengthModel 564 self.model_dictionary[CorrLengthModel.__name__] = CorrLengthModel 565 # self.shape_indep_list.append(CorrLengthModel) 566 self.model_name_list.append(CorrLengthModel.__name__) 567 568 from sas.models.DABModel import DABModel 569 self.model_dictionary[DABModel.__name__] = DABModel 570 # self.shape_indep_list.append(DABModel) 571 self.model_name_list.append(DABModel.__name__) 572 573 from sas.models.DebyeModel import DebyeModel 574 self.model_dictionary[DebyeModel.__name__] = DebyeModel 575 # self.shape_indep_list.append(DebyeModel) 576 self.model_name_list.append(DebyeModel.__name__) 577 578 from sas.models.FractalModel import FractalModel 579 self.model_dictionary[FractalModel.__name__] = FractalModel 580 # self.shape_indep_list.append(FractalModel) 581 self.model_name_list.append(FractalModel.__name__) 582 583 from sas.models.FractalCoreShellModel import FractalCoreShellModel 584 self.model_dictionary[FractalCoreShellModel.__name__] = FractalCoreShellModel 585 # self.shape_indep_list.append(FractalCoreShellModel) 586 self.model_name_list.append(FractalCoreShellModel.__name__) 587 588 from sas.models.GaussLorentzGelModel import GaussLorentzGelModel 589 self.model_dictionary[GaussLorentzGelModel.__name__] = GaussLorentzGelModel 590 # self.shape_indep_list.append(GaussLorentzGelModel) 591 self.model_name_list.append(GaussLorentzGelModel.__name__) 592 593 from sas.models.GuinierModel import GuinierModel 594 self.model_dictionary[GuinierModel.__name__] = GuinierModel 595 # self.shape_indep_list.append(GuinierModel) 596 self.model_name_list.append(GuinierModel.__name__) 597 598 from sas.models.GuinierPorodModel import GuinierPorodModel 599 self.model_dictionary[GuinierPorodModel.__name__] = GuinierPorodModel 600 # self.shape_indep_list.append(GuinierPorodModel) 601 self.model_name_list.append(GuinierPorodModel.__name__) 602 603 from sas.models.LorentzModel import LorentzModel 604 self.model_dictionary[LorentzModel.__name__] = LorentzModel 605 # self.shape_indep_list.append(LorentzModel) 606 self.model_name_list.append(LorentzModel.__name__) 607 608 from sas.models.MassFractalModel import MassFractalModel 609 self.model_dictionary[MassFractalModel.__name__] = MassFractalModel 610 # self.shape_indep_list.append(MassFractalModel) 611 self.model_name_list.append(MassFractalModel.__name__) 612 613 from sas.models.MassSurfaceFractal import MassSurfaceFractal 614 self.model_dictionary[MassSurfaceFractal.__name__] = MassSurfaceFractal 615 # self.shape_indep_list.append(MassSurfaceFractal) 616 self.model_name_list.append(MassSurfaceFractal.__name__) 617 618 from sas.models.PeakGaussModel import PeakGaussModel 619 self.model_dictionary[PeakGaussModel.__name__] = PeakGaussModel 620 # self.shape_indep_list.append(PeakGaussModel) 621 self.model_name_list.append(PeakGaussModel.__name__) 622 623 from sas.models.PeakLorentzModel import PeakLorentzModel 624 self.model_dictionary[PeakLorentzModel.__name__] = PeakLorentzModel 625 # self.shape_indep_list.append(PeakLorentzModel) 626 self.model_name_list.append(PeakLorentzModel.__name__) 627 628 from sas.models.Poly_GaussCoil import Poly_GaussCoil 629 self.model_dictionary[Poly_GaussCoil.__name__] = Poly_GaussCoil 630 # self.shape_indep_list.append(Poly_GaussCoil) 631 self.model_name_list.append(Poly_GaussCoil.__name__) 632 633 from sas.models.PolymerExclVolume import PolymerExclVolume 634 self.model_dictionary[PolymerExclVolume.__name__] = PolymerExclVolume 635 # self.shape_indep_list.append(PolymerExclVolume) 636 self.model_name_list.append(PolymerExclVolume.__name__) 637 638 from sas.models.PorodModel import PorodModel 639 self.model_dictionary[PorodModel.__name__] = PorodModel 640 # self.shape_indep_list.append(PorodModel) 641 self.model_name_list.append(PorodModel.__name__) 642 643 from sas.models.RPA10Model import RPA10Model 644 self.model_dictionary[RPA10Model.__name__] = RPA10Model 645 # self.shape_indep_list.append(RPA10Model) 646 self.multi_func_list.append(RPA10Model) 647 648 from sas.models.StarPolymer import StarPolymer 649 self.model_dictionary[StarPolymer.__name__] = StarPolymer 650 # self.shape_indep_list.append(StarPolymer) 651 self.model_name_list.append(StarPolymer.__name__) 652 653 from sas.models.SurfaceFractalModel import SurfaceFractalModel 654 self.model_dictionary[SurfaceFractalModel.__name__] = SurfaceFractalModel 655 # self.shape_indep_list.append(SurfaceFractalModel) 656 self.model_name_list.append(SurfaceFractalModel.__name__) 657 658 from sas.models.TeubnerStreyModel import TeubnerStreyModel 659 self.model_dictionary[TeubnerStreyModel.__name__] = TeubnerStreyModel 660 # self.shape_indep_list.append(TeubnerStreyModel) 661 self.model_name_list.append(TeubnerStreyModel.__name__) 662 663 from sas.models.TwoLorentzianModel import TwoLorentzianModel 664 self.model_dictionary[TwoLorentzianModel.__name__] = TwoLorentzianModel 665 # self.shape_indep_list.append(TwoLorentzianModel) 666 self.model_name_list.append(TwoLorentzianModel.__name__) 667 668 from sas.models.TwoPowerLawModel import TwoPowerLawModel 669 self.model_dictionary[TwoPowerLawModel.__name__] = TwoPowerLawModel 670 # self.shape_indep_list.append(TwoPowerLawModel) 671 self.model_name_list.append(TwoPowerLawModel.__name__) 672 673 from sas.models.UnifiedPowerRgModel import UnifiedPowerRgModel 674 self.model_dictionary[UnifiedPowerRgModel.__name__] = UnifiedPowerRgModel 675 # self.shape_indep_list.append(UnifiedPowerRgModel) 676 self.multi_func_list.append(UnifiedPowerRgModel) 677 678 from sas.models.LineModel import LineModel 679 self.model_dictionary[LineModel.__name__] = LineModel 680 # self.shape_indep_list.append(LineModel) 681 self.model_name_list.append(LineModel.__name__) 682 683 from sas.models.ReflectivityModel import ReflectivityModel 684 self.model_dictionary[ReflectivityModel.__name__] = ReflectivityModel 685 # self.shape_indep_list.append(ReflectivityModel) 686 self.multi_func_list.append(ReflectivityModel) 687 688 from sas.models.ReflectivityIIModel import ReflectivityIIModel 689 self.model_dictionary[ReflectivityIIModel.__name__] = ReflectivityIIModel 690 # self.shape_indep_list.append(ReflectivityIIModel) 691 self.multi_func_list.append(ReflectivityIIModel) 692 693 from sas.models.GelFitModel import GelFitModel 694 self.model_dictionary[GelFitModel.__name__] = GelFitModel 695 # self.shape_indep_list.append(GelFitModel) 696 self.model_name_list.append(GelFitModel.__name__) 697 698 from sas.models.PringlesModel import PringlesModel 699 self.model_dictionary[PringlesModel.__name__] = PringlesModel 700 # self.shape_indep_list.append(PringlesModel) 701 self.model_name_list.append(PringlesModel.__name__) 702 703 from sas.models.RectangularPrismModel import RectangularPrismModel 704 self.model_dictionary[RectangularPrismModel.__name__] = RectangularPrismModel 705 # self.shape_list.append(RectangularPrismModel) 706 self.multiplication_factor.append(RectangularPrismModel) 707 self.model_name_list.append(RectangularPrismModel.__name__) 708 709 from sas.models.RectangularHollowPrismInfThinWallsModel import RectangularHollowPrismInfThinWallsModel 710 self.model_dictionary[RectangularHollowPrismInfThinWallsModel.__name__] = RectangularHollowPrismInfThinWallsModel 711 # self.shape_list.append(RectangularHollowPrismInfThinWallsModel) 712 self.multiplication_factor.append(RectangularHollowPrismInfThinWallsModel) 713 self.model_name_list.append(RectangularHollowPrismInfThinWallsModel.__name__) 714 715 from sas.models.RectangularHollowPrismModel import RectangularHollowPrismModel 716 self.model_dictionary[RectangularHollowPrismModel.__name__] = RectangularHollowPrismModel 717 # self.shape_list.append(RectangularHollowPrismModel) 718 self.multiplication_factor.append(RectangularHollowPrismModel) 719 self.model_name_list.append(RectangularHollowPrismModel.__name__) 720 721 from sas.models.MicelleSphCoreModel import MicelleSphCoreModel 722 self.model_dictionary[MicelleSphCoreModel.__name__] = MicelleSphCoreModel 723 # self.shape_list.append(MicelleSphCoreModel) 724 self.multiplication_factor.append(MicelleSphCoreModel) 725 self.model_name_list.append(MicelleSphCoreModel.__name__) 689 try: 690 from sas.models.PowerLawAbsModel import PowerLawAbsModel 691 692 self.model_dictionary[PowerLawAbsModel.__name__] = PowerLawAbsModel 693 # self.shape_indep_list.append(PowerLawAbsModel) 694 self.model_name_list.append(PowerLawAbsModel.__name__) 695 except: 696 pass 697 698 try: 699 from sas.models.BEPolyelectrolyte import BEPolyelectrolyte 700 701 self.model_dictionary[BEPolyelectrolyte.__name__] = BEPolyelectrolyte 702 # self.shape_indep_list.append(BEPolyelectrolyte) 703 self.model_name_list.append(BEPolyelectrolyte.__name__) 704 self.form_factor_dict[str(wx.NewId())] = [SphereModel] 705 except: 706 pass 707 708 try: 709 from sas.models.BroadPeakModel import BroadPeakModel 710 711 self.model_dictionary[BroadPeakModel.__name__] = BroadPeakModel 712 # self.shape_indep_list.append(BroadPeakModel) 713 self.model_name_list.append(BroadPeakModel.__name__) 714 except: 715 pass 716 717 try: 718 from sas.models.CorrLengthModel import CorrLengthModel 719 720 self.model_dictionary[CorrLengthModel.__name__] = CorrLengthModel 721 # self.shape_indep_list.append(CorrLengthModel) 722 self.model_name_list.append(CorrLengthModel.__name__) 723 except: 724 pass 725 726 try: 727 from sas.models.DABModel import DABModel 728 729 self.model_dictionary[DABModel.__name__] = DABModel 730 # self.shape_indep_list.append(DABModel) 731 self.model_name_list.append(DABModel.__name__) 732 except: 733 pass 734 735 try: 736 from sas.models.DebyeModel import DebyeModel 737 738 self.model_dictionary[DebyeModel.__name__] = DebyeModel 739 # self.shape_indep_list.append(DebyeModel) 740 self.model_name_list.append(DebyeModel.__name__) 741 except: 742 pass 743 744 try: 745 from sas.models.FractalModel import FractalModel 746 747 self.model_dictionary[FractalModel.__name__] = FractalModel 748 # self.shape_indep_list.append(FractalModel) 749 self.model_name_list.append(FractalModel.__name__) 750 except: 751 pass 752 753 try: 754 from sas.models.FractalCoreShellModel import FractalCoreShellModel 755 756 self.model_dictionary[FractalCoreShellModel.__name__] = FractalCoreShellModel 757 # self.shape_indep_list.append(FractalCoreShellModel) 758 self.model_name_list.append(FractalCoreShellModel.__name__) 759 except: 760 pass 761 762 try: 763 from sas.models.GaussLorentzGelModel import GaussLorentzGelModel 764 765 self.model_dictionary[GaussLorentzGelModel.__name__] = GaussLorentzGelModel 766 # self.shape_indep_list.append(GaussLorentzGelModel) 767 self.model_name_list.append(GaussLorentzGelModel.__name__) 768 except: 769 pass 770 771 try: 772 from sas.models.GuinierModel import GuinierModel 773 774 self.model_dictionary[GuinierModel.__name__] = GuinierModel 775 # self.shape_indep_list.append(GuinierModel) 776 self.model_name_list.append(GuinierModel.__name__) 777 except: 778 pass 779 780 try: 781 from sas.models.GuinierPorodModel import GuinierPorodModel 782 783 self.model_dictionary[GuinierPorodModel.__name__] = GuinierPorodModel 784 # self.shape_indep_list.append(GuinierPorodModel) 785 self.model_name_list.append(GuinierPorodModel.__name__) 786 except: 787 pass 788 789 try: 790 from sas.models.LorentzModel import LorentzModel 791 792 self.model_dictionary[LorentzModel.__name__] = LorentzModel 793 # self.shape_indep_list.append(LorentzModel) 794 self.model_name_list.append(LorentzModel.__name__) 795 except: 796 pass 797 798 try: 799 from sas.models.MassFractalModel import MassFractalModel 800 801 self.model_dictionary[MassFractalModel.__name__] = MassFractalModel 802 # self.shape_indep_list.append(MassFractalModel) 803 self.model_name_list.append(MassFractalModel.__name__) 804 except: 805 pass 806 807 try: 808 from sas.models.MassSurfaceFractal import MassSurfaceFractal 809 810 self.model_dictionary[MassSurfaceFractal.__name__] = MassSurfaceFractal 811 # self.shape_indep_list.append(MassSurfaceFractal) 812 self.model_name_list.append(MassSurfaceFractal.__name__) 813 except: 814 pass 815 816 try: 817 from sas.models.PeakGaussModel import PeakGaussModel 818 819 self.model_dictionary[PeakGaussModel.__name__] = PeakGaussModel 820 # self.shape_indep_list.append(PeakGaussModel) 821 self.model_name_list.append(PeakGaussModel.__name__) 822 except: 823 pass 824 825 try: 826 from sas.models.PeakLorentzModel import PeakLorentzModel 827 828 self.model_dictionary[PeakLorentzModel.__name__] = PeakLorentzModel 829 # self.shape_indep_list.append(PeakLorentzModel) 830 self.model_name_list.append(PeakLorentzModel.__name__) 831 except: 832 pass 833 834 try: 835 from sas.models.Poly_GaussCoil import Poly_GaussCoil 836 837 self.model_dictionary[Poly_GaussCoil.__name__] = Poly_GaussCoil 838 # self.shape_indep_list.append(Poly_GaussCoil) 839 self.model_name_list.append(Poly_GaussCoil.__name__) 840 except: 841 pass 842 843 try: 844 from sas.models.PolymerExclVolume import PolymerExclVolume 845 846 self.model_dictionary[PolymerExclVolume.__name__] = PolymerExclVolume 847 # self.shape_indep_list.append(PolymerExclVolume) 848 self.model_name_list.append(PolymerExclVolume.__name__) 849 except: 850 pass 851 852 try: 853 from sas.models.PorodModel import PorodModel 854 855 self.model_dictionary[PorodModel.__name__] = PorodModel 856 # self.shape_indep_list.append(PorodModel) 857 self.model_name_list.append(PorodModel.__name__) 858 except: 859 pass 860 861 try: 862 from sas.models.RPA10Model import RPA10Model 863 864 self.model_dictionary[RPA10Model.__name__] = RPA10Model 865 # self.shape_indep_list.append(RPA10Model) 866 self.multi_func_list.append(RPA10Model) 867 except: 868 pass 869 870 try: 871 from sas.models.StarPolymer import StarPolymer 872 873 self.model_dictionary[StarPolymer.__name__] = StarPolymer 874 # self.shape_indep_list.append(StarPolymer) 875 self.model_name_list.append(StarPolymer.__name__) 876 except: 877 pass 878 879 try: 880 from sas.models.SurfaceFractalModel import SurfaceFractalModel 881 882 self.model_dictionary[SurfaceFractalModel.__name__] = SurfaceFractalModel 883 # self.shape_indep_list.append(SurfaceFractalModel) 884 self.model_name_list.append(SurfaceFractalModel.__name__) 885 except: 886 pass 887 888 try: 889 from sas.models.TeubnerStreyModel import TeubnerStreyModel 890 891 self.model_dictionary[TeubnerStreyModel.__name__] = TeubnerStreyModel 892 # self.shape_indep_list.append(TeubnerStreyModel) 893 self.model_name_list.append(TeubnerStreyModel.__name__) 894 except: 895 pass 896 897 try: 898 from sas.models.TwoLorentzianModel import TwoLorentzianModel 899 900 self.model_dictionary[TwoLorentzianModel.__name__] = TwoLorentzianModel 901 # self.shape_indep_list.append(TwoLorentzianModel) 902 self.model_name_list.append(TwoLorentzianModel.__name__) 903 except: 904 pass 905 906 try: 907 from sas.models.TwoPowerLawModel import TwoPowerLawModel 908 909 self.model_dictionary[TwoPowerLawModel.__name__] = TwoPowerLawModel 910 # self.shape_indep_list.append(TwoPowerLawModel) 911 self.model_name_list.append(TwoPowerLawModel.__name__) 912 except: 913 pass 914 915 try: 916 from sas.models.UnifiedPowerRgModel import UnifiedPowerRgModel 917 918 self.model_dictionary[UnifiedPowerRgModel.__name__] = UnifiedPowerRgModel 919 # self.shape_indep_list.append(UnifiedPowerRgModel) 920 self.multi_func_list.append(UnifiedPowerRgModel) 921 except: 922 pass 923 924 try: 925 from sas.models.LineModel import LineModel 926 927 self.model_dictionary[LineModel.__name__] = LineModel 928 # self.shape_indep_list.append(LineModel) 929 self.model_name_list.append(LineModel.__name__) 930 except: 931 pass 932 933 try: 934 from sas.models.ReflectivityModel import ReflectivityModel 935 936 self.model_dictionary[ReflectivityModel.__name__] = ReflectivityModel 937 # self.shape_indep_list.append(ReflectivityModel) 938 self.multi_func_list.append(ReflectivityModel) 939 except: 940 pass 941 942 try: 943 from sas.models.ReflectivityIIModel import ReflectivityIIModel 944 945 self.model_dictionary[ReflectivityIIModel.__name__] = ReflectivityIIModel 946 # self.shape_indep_list.append(ReflectivityIIModel) 947 self.multi_func_list.append(ReflectivityIIModel) 948 except: 949 pass 950 951 try: 952 from sas.models.GelFitModel import GelFitModel 953 954 self.model_dictionary[GelFitModel.__name__] = GelFitModel 955 # self.shape_indep_list.append(GelFitModel) 956 self.model_name_list.append(GelFitModel.__name__) 957 except: 958 pass 959 960 try: 961 from sas.models.PringlesModel import PringlesModel 962 963 self.model_dictionary[PringlesModel.__name__] = PringlesModel 964 # self.shape_indep_list.append(PringlesModel) 965 self.model_name_list.append(PringlesModel.__name__) 966 except: 967 pass 968 969 try: 970 from sas.models.RectangularPrismModel import RectangularPrismModel 971 972 self.model_dictionary[RectangularPrismModel.__name__] = RectangularPrismModel 973 # self.shape_list.append(RectangularPrismModel) 974 self.multiplication_factor.append(RectangularPrismModel) 975 self.model_name_list.append(RectangularPrismModel.__name__) 976 except: 977 pass 978 979 try: 980 from sas.models.RectangularHollowPrismInfThinWallsModel import RectangularHollowPrismInfThinWallsModel 981 982 self.model_dictionary[RectangularHollowPrismInfThinWallsModel.__name__] = RectangularHollowPrismInfThinWallsModel 983 # self.shape_list.append(RectangularHollowPrismInfThinWallsModel) 984 self.multiplication_factor.append(RectangularHollowPrismInfThinWallsModel) 985 self.model_name_list.append(RectangularHollowPrismInfThinWallsModel.__name__) 986 except: 987 pass 988 989 try: 990 from sas.models.RectangularHollowPrismModel import RectangularHollowPrismModel 991 992 self.model_dictionary[RectangularHollowPrismModel.__name__] = RectangularHollowPrismModel 993 # self.shape_list.append(RectangularHollowPrismModel) 994 self.multiplication_factor.append(RectangularHollowPrismModel) 995 self.model_name_list.append(RectangularHollowPrismModel.__name__) 996 except: 997 pass 998 999 try: 1000 from sas.models.MicelleSphCoreModel import MicelleSphCoreModel 1001 1002 self.model_dictionary[MicelleSphCoreModel.__name__] = MicelleSphCoreModel 1003 # self.shape_list.append(MicelleSphCoreModel) 1004 self.multiplication_factor.append(MicelleSphCoreModel) 1005 self.model_name_list.append(MicelleSphCoreModel.__name__) 1006 except: 1007 pass 1008 726 1009 727 1010 -
src/sas/guiframe/documentation_window.py
ra4340d1 r69032d4 12 12 13 13 class DocumentationWindow(Frame): 14 def __init__(self, parent, id, path, title ='Help', size=(850, 540)):14 def __init__(self, parent, id, path, title, size=(850, 540)): 15 15 Frame.__init__(self, parent, id, title, size=size) 16 16 … … 38 38 39 39 webbrowser.open_new_tab("file:///" + docs_path + "/" + path) 40 print ("file:///" + docs_path + "/" + path) 40 41 41 42 -
src/sas/guiframe/gui_manager.py
r4d5c42f r707c6be 2164 2164 from documentation_window import DocumentationWindow 2165 2165 2166 sphinx_doc_viewer = DocumentationWindow(self, -1, "index.html") 2167 # sphinx_doc_viewer.Show() 2168 2166 sphinx_doc_viewer = DocumentationWindow(self, -1, "index.html", \ 2167 "General Help") 2169 2168 2170 2169 def set_manager(self, manager): -
src/sas/guiframe/local_perspectives/data_loader/data_loader.py
rb45cde3 r8729965 57 57 Show a general help dialog. 58 58 """ 59 from help_panel import HelpWindow 60 frame = HelpWindow(None, -1) 61 if hasattr(frame, "IsIconized"): 62 if not frame.IsIconized(): 63 try: 64 icon = self.parent.GetIcon() 65 frame.SetIcon(icon) 66 except: 67 pass 68 frame.Show(True) 59 # from documentation_window import DocumentationWindow 60 # _sphinx_doc_viewer = DocumentationWindow(self, -1, "/user/guiframe/ \ 61 # data_explorer_help.html", "DataLoader Help") 62 # from help_panel import HelpWindow 63 # frame = HelpWindow(None, -1) 64 # if hasattr(frame, "IsIconized"): 65 # if not frame.IsIconized(): 66 # try: 67 # icon = self.parent.GetIcon() 68 # frame.SetIcon(icon) 69 # except: 70 # pass 71 # frame.Show(True) 69 72 70 73 def populate_file_menu(self): -
src/sas/perspectives/fitting/basepage.py
r6e653582 r0d9401e 1861 1861 [max_state, max_value], unit]) 1862 1862 1863 # The following funcion seems to be superseded with fillsizer and1864 # init combo box. certainly it seems not to know about categories and uses1865 # only shapes and shape independent -- tested after commenting out and does1866 # not seem to cause problem. Leave commented out for now but delete in1867 # a code cleanup once clear it really is no longer used.1868 # PDB 8 April 20141869 1870 # def _set_model_sizer_selection(self, model):1871 # """1872 # Display the sizer according to the type of the current model1873 # """1874 # if model == None:1875 # return1876 # if hasattr(model, "s_model"):1877 #1878 # class_name = model.s_model.__class__1879 # name = model.s_model.name1880 # flag = (name != "NoStructure")1881 # if flag and \1882 # (class_name in self.model_list_box["Structure Factors"]):1883 # self.structurebox.Show()1884 # self.text2.Show()1885 # self.structurebox.Enable()1886 # self.text2.Enable()1887 # items = self.structurebox.GetItems()1888 # self.sizer1.Layout()1889 #1890 # for i in range(len(items)):1891 # if items[i] == str(name):1892 # self.structurebox.SetSelection(i)1893 # break1894 #1895 # if hasattr(model, "p_model"):1896 # class_name = model.p_model.__class__1897 # name = model.p_model.name1898 # self.formfactorbox.Clear()1899 #1900 # for k, list in self.model_list_box.iteritems():1901 # if k in["P(Q)*S(Q)", "Shapes"] and \1902 # class_name in self.model_list_box["Shapes"]:1903 # self.shape_rbutton.SetValue(True)1904 # ## fill the form factor list with new model1905 # self._populate_box(self.formfactorbox,1906 # self.model_list_box["Shapes"])1907 # items = self.formfactorbox.GetItems()1908 # ## set comboxbox to the selected item1909 # for i in range(len(items)):1910 # if items[i] == str(name):1911 # self.formfactorbox.SetSelection(i)1912 # break1913 # return1914 # elif k == "Shape-Independent":1915 # self.shape_indep_rbutton.SetValue(True)1916 # elif k == "Structure Factors":1917 # self.struct_rbutton.SetValue(True)1918 # elif k == "Multi-Functions":1919 # continue1920 # else:1921 # self.plugin_rbutton.SetValue(True)1922 #1923 # if class_name in list:1924 # ## fill the form factor list with new model1925 # self._populate_box(self.formfactorbox, list)1926 # items = self.formfactorbox.GetItems()1927 # ## set comboxbox to the selected item1928 # for i in range(len(items)):1929 # if items[i] == str(name):1930 # self.formfactorbox.SetSelection(i)1931 # break1932 # break1933 # else:1934 ## Select the model from the menu1935 # class_name = model.__class__1936 # name = model.name1937 # self.formfactorbox.Clear()1938 # items = self.formfactorbox.GetItems()1939 #1940 # for k, list in self.model_list_box.iteritems():1941 # if k in["P(Q)*S(Q)", "Shapes"] and \1942 # class_name in self.model_list_box["Shapes"]:1943 # if class_name in self.model_list_box["P(Q)*S(Q)"]:1944 # self.structurebox.Show()1945 # self.text2.Show()1946 # self.structurebox.Enable()1947 # self.structurebox.SetSelection(0)1948 # self.text2.Enable()1949 # else:1950 # self.structurebox.Hide()1951 # self.text2.Hide()1952 # self.structurebox.Disable()1953 # self.structurebox.SetSelection(0)1954 # self.text2.Disable()1955 #1956 # self.shape_rbutton.SetValue(True)1957 ## fill the form factor list with new model1958 # self._populate_box(self.formfactorbox,1959 # self.model_list_box["Shapes"])1960 # items = self.formfactorbox.GetItems()1961 # ## set comboxbox to the selected item1962 # for i in range(len(items)):1963 # if items[i] == str(name):1964 # self.formfactorbox.SetSelection(i)1965 # break1966 # return1967 # elif k == "Shape-Independent":1968 # self.shape_indep_rbutton.SetValue(True)1969 # elif k == "Structure Factors":1970 # self.struct_rbutton.SetValue(True)1971 # elif k == "Multi-Functions":1972 # continue1973 # else:1974 # self.plugin_rbutton.SetValue(True)1975 # if class_name in list:1976 # self.structurebox.SetSelection(0)1977 # self.structurebox.Disable()1978 # self.text2.Disable()1979 ## fill the form factor list with new model1980 # self._populate_box(self.formfactorbox, list)1981 # items = self.formfactorbox.GetItems()1982 ## set comboxbox to the selected item1983 # for i in range(len(items)):1984 # if items[i] == str(name):1985 # self.formfactorbox.SetSelection(i)1986 # break1987 # break1988 1863 1989 1864 def _draw_model(self, update_chisqr=True, source='model'): … … 3043 2918 def on_model_help_clicked(self, event): 3044 2919 """ 3045 on 'More details' button 2920 Function called when 'Details' button is pressed next to model 2921 of interest. As of Feb 2015 this function follows two paths: 2922 For regular models that ship with the release, it calls the Sphinx 2923 generated html documentation. For plugin models it still uses the 2924 old pop up window reading the description provided in the model. 2925 2926 This will presumably be deprecated when the sas mdels team decides 2927 on how to discover new models and grab their documentation from the 2928 file. 2929 2930 PDB 18 Feb 2015 2931 2932 :param evt: on Details Button pressed event 3046 2933 """ 3047 2934 from sas.perspectives.fitting.help_panel import HelpWindow … … 3052 2939 model_path = os.path.join(path, "model_functions.html") 3053 2940 if self.model == None: 3054 name = ' FuncHelp'2941 name = 'index.html' 3055 2942 else: 3056 2943 name = self.formfactorbox.GetValue() 3057 2944 frame = HelpWindow(None, -1, pageToOpen=model_path) 3058 # 2945 #If model name exists and model is not a custom model 3059 2946 #mod_cat = self.categorybox.GetStringSelection() 3060 2947 if frame.rhelp.HasAnchor(name): … … 3131 3018 def on_pd_help_clicked(self, event): 3132 3019 """ 3133 Button event for PD help 3134 """ 3135 from help_panel import HelpWindow 3136 import sas.models as models 3137 3138 # Get models help model_function path 3139 path = models.get_data_path(media='media') 3140 pd_path = os.path.join(path, "pd_help.html") 3141 3142 frame = HelpWindow(None, -1, pageToOpen=pd_path) 3143 frame.Show(True) 3020 Bring up Polydispersit Documentation whenever the ? button is clicked. 3021 Calls DocumentationWindow with the path of the location within the 3022 documentation tree (after /doc/ ...." 3023 3024 :param evt: Triggers on clicking ? in polydispersity box 3025 """ 3026 3027 from sas.guiframe.documentation_window import DocumentationWindow 3028 3029 _TreeLocation = "user/perspectives/fitting/fitting_help.html" 3030 _TreeLocation += "#polydispersity-distributions" 3031 _doc_viewer = DocumentationWindow(self, -1, \ 3032 _TreeLocation,"Polydispersity Help") 3144 3033 3145 3034 def on_left_down(self, event):
Note: See TracChangeset
for help on using the changeset viewer.